diff options
| -rw-r--r-- | app-office/abiword/ChangeLog | 9 | ||||
| -rw-r--r-- | app-office/abiword/Manifest | 11 | ||||
| -rw-r--r-- | app-office/abiword/abiword-3.0.0-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch | 27 |
4 files changed, 46 insertions, 10 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index 4396d36a374e..c09b3cc4c94b 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/abiword -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.272 2013/12/19 21:10:25 pacho Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.273 2014/02/09 12:15:00 pacho Exp $ + + 09 Feb 2014; Pacho Ramos <pacho@gentoo.org> + +files/abiword-3.0.0-libgcrypt_1_6_0-1.patch, abiword-3.0.0-r1.ebuild: + Fix build with libcrypt-1.6 (#495176 by Anton Kochkov) and boost dependency + (#493786 by Maxim Kammerer) 19 Dec 2013; Pacho Ramos <pacho@gentoo.org> abiword-3.0.0-r1.ebuild: eds-3.6 or newer is needed (#494774 by Jeremy Huddleston) diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index f3ec4b6c7975..31695449a562 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -7,16 +7,17 @@ AUX abiword-2.8.6-libpng15.patch 3710 SHA256 a5ea99ba7aa00ebc3a669d6cbd019b172e5 AUX abiword-2.8.6-libwpd.patch 15024 SHA256 92f89f04633f67d0568160e701815a5daf0a2de03608a1a3bd5b8f7e7f4f0fea SHA512 de43be752858beff389bee3f2f4197b545188652e8783da9362c4c1fa71da0b2c75cf5dea46727972819563ff2d561f4d2b298e7f9dc7f7652b023f6b14e2783 WHIRLPOOL 63d5841b0f9843119adbc4c476f76722748b7b4eae04d22f1a529ce454267ee4ee3c2378511591731a007d378e5bbff898501e3374e51d083a3b8ffd9c560ca2 AUX abiword-3.0.0-eds-3.6.patch 354 SHA256 8b932f689df9dbad1e89f18483ac10bd00a82947c9f262decad14af4a47494d5 SHA512 2cc20c74af163203a89061afc5daba681b8ea8680a9b535470adbb7178f10207daed0ef4147cd5dfb5aa3bb0776b3bfba4b3fd9da53de623790df942b94d0934 WHIRLPOOL 6467e5a03ca704c548e8dca00e29267ac62e5f09ebba6bf3ced5f94edb51724a247b4faefb229246196fd06eb42c989f6af4759cbdfa148ce7aa4068d1fa772c AUX abiword-3.0.0-fix-crash.patch 1180 SHA256 9c1cd977a35e7b86dba4cb032a5b0f571134dc81170ba3627f69ba27d633c8e7 SHA512 e5e8200b913abddd7f1544f2ef2cd68c4ce6e0a49a36fe078ccb8d861c3f4e8174366d1232cc43dc918b9274ccb8c15221ab191d1c210b2a90fb8a184edd0d1e WHIRLPOOL f575549f26f3aee6b23b529d80963123754bc8a30153fdad9a9139d680a3342f88cc595f6c8c8f97a89845d087973e7bc30f73105d695d0c218c5d592b83a075 +AUX abiword-3.0.0-libgcrypt_1_6_0-1.patch 1129 SHA256 69290d7c7a1a06523f03f57c68a9fff087855a2ae524064b73a93087400064c8 SHA512 adf6eb70b411284a97ed78b7be2e501dd977489186d32595f37f45e4802de5b8400b0381bfe75b056a58267fdd6e981c4456171d946ade9adc1f35938133eee2 WHIRLPOOL 38cf0622f421dd2ed63bb6bd754c275943a574bacbb0b64eb32f537b1e622d718ec4871345745f6088b444491c62c6ea2931a7c705fce6b813fc18f5d32303e6 DIST abiword-2.8.6.tar.gz 9218827 SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 SHA512 327ffa6da73f7a1b74d1bc374239ac087ee76672da590626da3a068f972684b0963c50641718c39a7fb2429a56c1076bdfd67e8f7f0eab0eda90b70cf846bbbd WHIRLPOOL 15f060e6e31028ebb507e8b2e4b82670dd4d0850be256851d21081d42d83e81efcd33457bd634d99bb82686dbdc6ccd6d24794ce063ec4751c511a3ff6b463ee DIST abiword-3.0.0.tar.gz 10956892 SHA256 d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 SHA512 3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637 WHIRLPOOL 54cb234dbaae070d4f9dfa215e3c5a80a45666b7363febf4b56c7ec685c7b084bf78f2f3a6827cb8585bec4ead5c6fd8bd71bc51c35bf3423f3b31a296bdb144 EBUILD abiword-2.8.6-r2.ebuild 4773 SHA256 a8f99373fbe9c3b82a725e90745258f96d658ff42651618642b0d5b1679fa085 SHA512 b8bbfdf938ab28ccdb3f87ad473795fe98f9163cb25643661f6343dbfa04447d8f5655ea847aecbd1f864c7117a871630b0f8d0acadf5ca439f413ffb6bc8837 WHIRLPOOL 56cc019615cbd7f29b95cbf1b182be74f1e40a09555838e7578341686638f88f04fab5e1e4a953efd50ef3c8fc082deb5437ca060e18dad740796ed8270ee860 -EBUILD abiword-3.0.0-r1.ebuild 4434 SHA256 a3ca25a1f4b07b10474cc24f9006372bd0582d99ff2a21dc55c4b4d4d5ff1c0a SHA512 d5986e8eef9b109c5a082f8df5d59aa9c9d3f1b72d3abe3984feb63544e1c7019d3749f221f772787b85836211a93192617e03cc7640f0b62250646afa5ee474 WHIRLPOOL 5bd705f1f7e9fa8f8cfe459c1440d6bc8c2ff6636991d205414d7b8f50c367c14c94c3ba5bd28eb714409257e56b81dde40c1be26d7c14d9c42a93b65aec3ae5 -MISC ChangeLog 37146 SHA256 5d39b79c4d9d55c14b2b0671122d4a63fae97a068544aa31a1d2d3e1d17f188b SHA512 b997513d6538b81eb167d7a3ed171d727c777bb6c94ccc4f25194863f3c11d3e2da4b975276e4c8853c69849e9ec6316ac175d62c63a6576238929eaabded591 WHIRLPOOL 741dd4e9d4b19b32a9783a6bf2879e61f2f247055f35f696fb5af6893ca8a6a75b85b65b8f1693785f0ae928b2f418c31420c134bddc1493a55e62bccacfd16d +EBUILD abiword-3.0.0-r1.ebuild 4548 SHA256 139d09045a6d5e336a51ddf306c7eeba82dd01d549ad591190a69c0debbe9e0b SHA512 b9b8a491dd9e29417072cccc57bc3d04f51f4dec3dcbed1d4bd317c6dd6cfee3ad8bc3827e3e35b054206e37821d26c0ee74e428847c4977b20c0729e5cbf37c WHIRLPOOL 4236fa5d8baf242abbe2c74f41851a4f0ade44212a401cd10c35ebfbf7033f335c42e3379b152d30fa1fafca5965bf02c60e1eb6342bf5102f673014715b01e2 +MISC ChangeLog 37374 SHA256 21b1ca2e993ae6c872ee57f73937100e638bff437dcc688b827c8b9a2109e098 SHA512 6ffcc0642fbe790908cfddc2aba52c1be21354f55e99d131dcbe83a2dfc2705126e9787aded67ff995809fd723cf2d43df029d056c1af122646f8796df35ca9b WHIRLPOOL a91fd8171bb33d4d2c2506f67ce545c492dfcb7b6cf7a14832e71c48add68337550a03abef140da15044afaf1ac284b65da1f7ab7013351cbdd156f0ac1b1b5f MISC metadata.xml 1075 SHA256 87a99d011719e338650c164d6a05917f3450d1b42026ee667c99ae31bc765875 SHA512 cb3da885c7d97720bc9ec8a0729dfaff8619410be0bf4db1bc075b1e3c32e7e9f04a1836009647b3995769a56af332725c1120fd404f7f42d0473dc64eb489b0 WHIRLPOOL c3830a2ef6087109c61d5d6b89b7d760ce36a2c348ef02274aca545d349d2201fecd3e3faefd33f27bed855b660ac1c05f1aa73dc137065f29409563cfec46c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlKzYMIACgkQCaWpQKGI+9QaBwCePtp0YwsNuuSnsm9wtzXtIKjh -F98An1aeCPZpFJ0n4AtH5eqfWijDmW2B -=s/+j +iEYEAREIAAYFAlL3cUUACgkQCaWpQKGI+9TT1QCfYabCZg6OWIBMJNxrC5428wZC +IZ8AmgJEdJruGijESW/E8xnP0tm4e711 +=zhOx -----END PGP SIGNATURE----- diff --git a/app-office/abiword/abiword-3.0.0-r1.ebuild b/app-office/abiword/abiword-3.0.0-r1.ebuild index 460ed3557172..20a92e381e14 100644 --- a/app-office/abiword/abiword-3.0.0-r1.ebuild +++ b/app-office/abiword/abiword-3.0.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-3.0.0-r1.ebuild,v 1.7 2013/12/19 21:10:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-3.0.0-r1.ebuild,v 1.8 2014/02/09 12:15:00 pacho Exp $ EAPI=5 GCONF_DEBUG="yes" @@ -22,7 +22,6 @@ REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !ots !readline !thesauru RDEPEND=" >=app-text/wv-1.2 - >=dev-libs/boost-1.40.0 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=dev-libs/libgcrypt-1.4.5 @@ -62,6 +61,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-lang/perl + >=dev-libs/boost-1.40.0 virtual/pkgconfig collab? ( dev-cpp/asio ) " @@ -77,6 +77,9 @@ src_prepare() { # http://bugzilla.abisource.com/show_bug.cgi?id=13564 epatch "${FILESDIR}/${PN}-3.0.0-fix-crash.patch" + # http://bugzilla.abisource.com/show_bug.cgi?id=13589 + epatch "${FILESDIR}/${PN}-3.0.0-libgcrypt_1_6_0-1.patch" + gnome2_src_prepare } diff --git a/app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch b/app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch new file mode 100644 index 000000000000..7ad3dd476717 --- /dev/null +++ b/app-office/abiword/files/abiword-3.0.0-libgcrypt_1_6_0-1.patch @@ -0,0 +1,27 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2013-12-21 +Initial Package Version: 3.0.0 +Upstream Status: Not submitted +Origin: Self +Description: Fixes building with libgcrypt 1.6.0 + +diff -Naur a/plugins/collab/backends/service/xp/tls_tunnel.cpp b/plugins/collab/backends/service/xp/tls_tunnel.cpp +--- a/plugins/collab/backends/service/xp/tls_tunnel.cpp 2009-09-10 12:46:19.000000000 +0200 ++++ b/plugins/collab/backends/service/xp/tls_tunnel.cpp 2013-12-20 19:25:38.728798750 +0100 +@@ -123,11 +123,16 @@ + return 0; + } + ++#if GCRYPT_VERSION_NUMBER >= 0x010600 ++ GCRY_THREAD_OPTION_PTHREAD_IMPL; ++ static struct gcry_thread_cbs &gcry_threads_tunnel = gcry_threads_pthread; ++#else + static struct gcry_thread_cbs gcry_threads_tunnel = + { GCRY_THREAD_OPTION_USER, NULL, + gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy, + gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; ++#endif + + bool Proxy::tls_tunnel_init() { + if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0) |