diff options
| -rw-r--r-- | app-editors/juffed/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/juffed/Manifest | 34 | ||||
| -rw-r--r-- | app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch | 24 | ||||
| -rw-r--r-- | app-editors/juffed/juffed-0.10.ebuild | 18 |
4 files changed, 59 insertions, 23 deletions
diff --git a/app-editors/juffed/ChangeLog b/app-editors/juffed/ChangeLog index cafbe23a8d19..51fc0a3f4833 100644 --- a/app-editors/juffed/ChangeLog +++ b/app-editors/juffed/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/juffed # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/ChangeLog,v 1.35 2015/04/26 15:44:28 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/ChangeLog,v 1.36 2015/05/11 14:58:52 pesa Exp $ + + 11 May 2015; Davide Pesavento <pesa@gentoo.org> + +files/0.10-link-libjuff-against-libenca.patch, juffed-0.10.ebuild: + Fix linking against libenca, bug 540554. 26 Apr 2015; Michael Palimaka <kensington@gentoo.org> -juffed-0.8.1.ebuild: Remove old. diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest index f97510809398..2c81b4b22e56 100644 --- a/app-editors/juffed/Manifest +++ b/app-editors/juffed/Manifest @@ -1,25 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX 0.10-link-libjuff-against-libenca.patch 635 SHA256 03e5b96563193956ad860915e29f48e3c8fbafbd2a9b2af9daed02f93f55f383 SHA512 499511446f69ad696b7324482733951e5ee5a9427a4b6d24fb28ae3a49ededd2ec804aff7db80345780892eda9c53b1ae0de05f77f7138305cfd3f4b6c6517e5 WHIRLPOOL 4cb7d12182e168b79ef781fe4b88cae988b2e840af96f58883274b4d4d1c80e5663531894a064a4abfd3d23bdf6187ae82a4d210abb26c52df4a1686e91b4162 DIST juffed-0.10-1054.tar.bz2 1657118 SHA256 ac58d32acaf9d60e4758e9ae05b1a6b7fc0cb7ecd3b207db769dbb9c747be16c SHA512 023e9fca1f02fdb39645bd41700c7481fe8d6ae08ec62b0bf5ba58f627eb6872f96d27f05eae4bc92d90fd204dd0c30f868c858de873ab6511ac21748254b47c WHIRLPOOL ceb9e0dc9100dd5f2578abc14fff336adf664726d8e347f9832ffc4942c36e6e28aaff931fd528e6f572bcb29e4027ee486a82ee93d216d0751b5d8aa4233f6c -EBUILD juffed-0.10.ebuild 861 SHA256 a53d617a5681cffc60c68fda24e6d865e1ffe87ed36f0310dc6b644c76bb545b SHA512 db750c7b9cc398590eceaad33d4c3dbe1520a3e1a3e0415bc2cd61d4b10cd61b1189306963a56ee09c48b2fcc156b96873b1b196441310b7cf5895753d0dc7f1 WHIRLPOOL cd330dc5f6435f65140313c5eea629721d18e9deacce7d04475a53110b90f1736239d8ec9900b342b353f7f1e01db06c68901bd2a77f0987ef77850b6a8b3b38 -MISC ChangeLog 4759 SHA256 d14190f92d6c55a7a2801352b37733d154f01a0e130372349e395becc973114e SHA512 c36037f1585e78271023771edcf9b5d2f0391a4208f5738f6fee07ad349cfdbb6e4857293a2ee6239ab9fe54fed283220c934a0fff35d26caf5a5ffe08049bc8 WHIRLPOOL e550d02f72f97a8d902f94931672ba36269861254dbfa077ae7851864142185ca3faab422e734f60b432d963c252b0a5db8214c044d07eb6abca3b765697d6ac +EBUILD juffed-0.10.ebuild 943 SHA256 5b1c3b17084c9dcced9708da05cbd9fc55c335036759b0045dfd10fc568a3a53 SHA512 32d223d14931a9b382f49b32894f0adf8494b7d0975e3f147803500c1c73aef86726e43692f4ae1e972336bf517b895015dfc066d65bb15a65e161f32600a994 WHIRLPOOL f6e8552233d13b1acde475ee93b9abb0481c1cdc0456947b758c1cb83c3ab58472a14da66e779fdfae62c913ef6c4304d850a176cf9576164c41e3369ea916ef +MISC ChangeLog 4917 SHA256 8beb243682f51395a88219ab2bcd1cecc42a65b6e5c8d38b6c0682d960a81bff SHA512 262463d7437dfa0e9db72474b72e56854256f5c4496ca5f7507b03bce7b18b32603fbd0aafe29ea857b7f0ebafb2372ec4ea3a941ae7297cf39a8f1a7004ecea WHIRLPOOL cc1e1600bd73a3123caa3b8a4a20e2ee18cc71e760ca9054cf2d40508141c8b2f74d68350ce38535ffdd28eb638076566e65a8fda046d4a5d4d3aabd5bf76c60 MISC metadata.xml 156 SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 SHA512 d9991797d488000e1b306b9d97982fb862fbb44d72d4f7560e3ab12ba2022a7abdd3a71bd971a18f562edefc6948e5d5db0972425f7ebe7208696678f1c17b45 WHIRLPOOL aa1bf1df6e2bb4c13c1eae59bfa12dcfe4b81794562c52538f037c75d706f415fed1acc302501cd5f3017b13c910cadbbb9b823a0625cd3b64b29b860259492e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJiBAEBCABMBQJVPQffRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 -MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh -7EG+EACrWOjFtspuSFZbKUNT2LNO/kZi3BvQWEY+dnWKuYZfVlDMrQ84/a5hHlL4 -3/Z1H7TV9l8fjTmnSLGbfJi4feUqh8WiyOx4M8q2xz98DGSXna/Ej99A4VIzlm5l -eXvjzy/G8o7LD0zBbMybeQAs2UjcIH72o8YOYK3/2cYepgaTZHYlJbtH89hY2ypY -917nb3LNqXM43m8ApXnuOfB66nHGaj3Ik6Awkd7OPDOpMhHVOwEPXm/643RKx/2x -aCFOAy8jAcfek4ln4pTPzoz2V7nJUxSVxuiVH4/zj2rXxp5dxG4KAoHmEjMtWCN8 -jAcJmZbrD8YQQG1uayU4MRMKIE0sHrBk4TC1d2f9iGNggbGwVhJFw0qGK9VKAN1u -WWRz/JnIzVaezco5oGb5ZxQqhJsqTvYHqtPUMB1LR3PNxn6YOwUo1NNYtyRYs5J/ -HOPEjmTBKPU/dTSXtw7qoogRp5SoH6E/wnX6S+HDdvSzIgaJ8rJaXsvLPnv6ZApZ -1QUpiFPrZWAhOvyR7Qb4rLqf52R+cZvwSzwAB9rExvHrMGkUwGlL8PQc5wIbiVrm -cBeQQ+kOpyGURe9onbxyJ7PYFEqWaC9rOINPkFHnuyGr0afTKCeDA4B3nPKA4jwN -aqKplLDQofFVe2jTksanMNZPkBVxJ+LhkayZYTnba0KJNtSjSA== -=R4QY +iQJ8BAEBCABmBQJVUMOzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE +QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9hBMQALmWBkLz1TGFmg/WtyTNqK86 +iNII10NCiv43mREQcaT5rxlcrXyF5J2WBBMHEBzw7K66IQ5LMc0tqpAfG0gTXtKc +I3g6WYxAmvPpoFthf9G6I9X9xu6n8pWGhF9dSmyFrzmlPifY3tdRP0Jd3VtztYjE +JfmFZuVbArJ7yLew3Y5VTqdyFlOmfgTjgWdcCtOe8zBZMJgYuyI6wkn7WRMYfawU +0Aa/I+DFgBiTMn9fLBgsobPblBNL79r5LDltjapP5ntEXxom33GlGSdSUSfMtUbU +dheNXLgVJxDm7Xt1MqB6O7K9UXfL91UPJnYOwzmWXp9c5jBtLiHXI8T042QGxkRk +1mvg/X2T/UMHx3LgIwKnmpSX26DxAGgy+jzDm4ItatTKGnxMX9VYRabZp4/nE8Im +r5eQntMVY+LsjVEy6+pAtlwIMFwdYpWZR2MUSTSELxjB4fF0/3EvqY8XHc0vJMwo +8hHQe6yXPmwn10j8fj4NkDGvRx9rEphfNZNIF7IWL2KAyZ4f5wDgT6yVhrXX7+ZU +dC00QtNkQrRwRk6bCUqz7u7HClK+ex6158eSZI6c0lzLEa8KnRQbL/Y6Mk1mGQri +gQR8IDI//z1iplqT0ufd+eIAYcvO9IyFmvhPwAGBJSKYdFezrFtSNAc2hgJCTqFo +6OVq8fEg5C0DkOk5qIVG +=+sDj -----END PGP SIGNATURE----- diff --git a/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch b/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch new file mode 100644 index 000000000000..5bd3882309ae --- /dev/null +++ b/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ccad5d1..304c0aa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,6 +190,9 @@ add_library ( ${JUFFLIB} SHARED + target_link_libraries ( ${JUFFLIB} + ${QT_LIBRARIES} + ) ++if (ENCA_FOUND) ++ target_link_libraries( ${JUFFLIB} ${ENCA_LIBRARIES} ) ++endif (ENCA_FOUND) + + add_library ( ${QSCI_ENGINE} SHARED + ${juffed_qsci_SRCS} +@@ -277,9 +280,6 @@ target_link_libraries ( ${JUFFED} + ${QT_LIBRARIES} + ${QT_QTNETWORK_LIBRARY} + ) +-if (ENCA_FOUND) +- target_link_libraries( ${JUFFED} ${ENCA_LIBRARIES} ) +-endif (ENCA_FOUND) + + if ( UNIX ) + set(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra") diff --git a/app-editors/juffed/juffed-0.10.ebuild b/app-editors/juffed/juffed-0.10.ebuild index 1dc85a72567c..0792d2eeeae3 100644 --- a/app-editors/juffed/juffed-0.10.ebuild +++ b/app-editors/juffed/juffed-0.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/juffed-0.10.ebuild,v 1.8 2015/04/01 18:26:45 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/juffed/juffed-0.10.ebuild,v 1.9 2015/05/11 14:58:52 pesa Exp $ EAPI=5 @@ -15,25 +15,31 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="debug" -RDEPEND="app-i18n/enca +RDEPEND=" + app-i18n/enca dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsingleapplication[qt4(+),X] - x11-libs/qscintilla:=" + x11-libs/qscintilla:= +" DEPEND="${RDEPEND}" DOCS=( ChangeLog README ) -src_prepare() { - sed "/set(CMAKE_CXX_FLAGS/d" -i CMakeLists.txt || die +PATCHES=( + # bug 540554 + "${FILESDIR}/0.10-link-libjuff-against-libenca.patch" +) +src_prepare() { cmake-utils_src_prepare + + sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die } src_configure() { local mycmakeargs=( -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON ) - cmake-utils_src_configure } |