From 935bba93444a49b012ab41c0bc7a6827386b0013 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 17 Oct 2013 20:41:55 +0000 Subject: Apply upstream fix to solve abiword-docs building in the right way Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- app-office/abiword/ChangeLog | 8 +- app-office/abiword/Manifest | 11 +- app-office/abiword/abiword-3.0.0-r1.ebuild | 144 +++++++++++++++++++++ app-office/abiword/abiword-3.0.0.ebuild | 141 -------------------- .../abiword/files/abiword-3.0.0-fix-crash.patch | 33 +++++ 5 files changed, 190 insertions(+), 147 deletions(-) create mode 100644 app-office/abiword/abiword-3.0.0-r1.ebuild delete mode 100644 app-office/abiword/abiword-3.0.0.ebuild create mode 100644 app-office/abiword/files/abiword-3.0.0-fix-crash.patch (limited to 'app-office') diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index 102ccaee30d5..d94abf180e32 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,12 @@ # 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.265 2013/10/15 20:47:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.266 2013/10/17 20:41:51 pacho Exp $ + +*abiword-3.0.0-r1 (17 Oct 2013) + + 17 Oct 2013; Pacho Ramos +abiword-3.0.0-r1.ebuild, + +files/abiword-3.0.0-fix-crash.patch, -abiword-3.0.0.ebuild: + Apply upstream fix to solve abiword-docs building in the right way 15 Oct 2013; Pacho Ramos abiword-3.0.0.ebuild: DEPEND on fixed ots letting the plugin to compile (#488140 by croutch) diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index 672411d2c969..87df1ea5ca41 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -6,16 +6,17 @@ AUX abiword-2.8.6-glib-2.31.patch 1318 SHA256 e16a496a552f43f21041e0be6077f179a6 AUX abiword-2.8.6-libpng15.patch 3710 SHA256 a5ea99ba7aa00ebc3a669d6cbd019b172e576df6b2eb8349505ed18576e10e90 SHA512 868cd6e3ea6b7e766a56c8361d4999578a603bcda7c144e519b2f85dffea675afe4efe09aa360fbd02477b5717b0768338a3e2d54cd4f46e5770290de06af1ac WHIRLPOOL d13dada3cb19b090c018a6057a41ead84b2c2743f5b2f83820750d54dbac645c630d62bdd7a2a43a745084e77757933caa55d3736864b8280b572b423aecfc36 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 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.ebuild 4280 SHA256 332cd124fcdde3fb71528e757047d01f69d9b170983267b30ed840ea607b2d86 SHA512 afb50fcd221d4ed40195eb072faa7d14bedfe82032d7e89d078c66804bfb4bd76a51f42931120c83a6eabae67b8794df7740c7d2161cad91faa9256e6a44afd6 WHIRLPOOL 50ceae726472e5b51c0d6c569a2a8c3908bccbe41173a6e169d9cb35ebfb8952ffdf29b0a442353f574a4fea8ff28570a49d3f4830a5446653688c0bfcf8e955 -MISC ChangeLog 36137 SHA256 6751a5365aaf26e7d5a8d0234fd6c50ae05ba5d21441aaa2804bce69e7fb5be2 SHA512 541db86812a1c0f67047277d3828a35b1b86432c1633be6b187c949c054959b537c443d5ab538aac6c221d98544daa167480f9db331385898f19e9685f27d1da WHIRLPOOL 0819c6a356b8ade695d08292fde3355da19f91a5e514c4851734357771e2d3885653f873dd84031b29ede0f82cf5becde0c07534e0253952b0cad253506d2bba +EBUILD abiword-3.0.0-r1.ebuild 4389 SHA256 0953fcd675770a478ae9df0d6bf6fe613613f7898d1bd727ce5138e6e694e4ad SHA512 5d52e2276c4f4b1e7f2378076ecc436d3d4a3edc9cdb8548a04687a5aae89089d2a865453734c0fe5308624060833d938cf9dc8f2bd0dbf121e7f212a1201814 WHIRLPOOL 176a1eb987f9350a43bcf8675bafd5f017515c0d3222f09051d6a76b1478019c9b36b633df3ec3d905412ebb9aa4c198ed8511af1c4eb2919506acf1b6efa2c4 +MISC ChangeLog 36375 SHA256 b24822b0b0d067d27b1ef18e0ee5a3f28b56012f7148132a6c1a65af3ebef60e SHA512 5c94576f5ba43291463b82eb6fd10320bf0ec27da5fd02ec1ee711f97da265590f2a91cf760a23ec0e5d855a846fc29ec71707baf89671942cd375f67d3e4be1 WHIRLPOOL 82777db7277e999eb182e0dbe1ae6484d7d1e50cde191b691865c2a81fb3901604d0aab751ead17d2977f798863ce6da21595f95a126a129e35dd17d76ac95b1 MISC metadata.xml 1075 SHA256 87a99d011719e338650c164d6a05917f3450d1b42026ee667c99ae31bc765875 SHA512 cb3da885c7d97720bc9ec8a0729dfaff8619410be0bf4db1bc075b1e3c32e7e9f04a1836009647b3995769a56af332725c1120fd404f7f42d0473dc64eb489b0 WHIRLPOOL c3830a2ef6087109c61d5d6b89b7d760ce36a2c348ef02274aca545d349d2201fecd3e3faefd33f27bed855b660ac1c05f1aa73dc137065f29409563cfec46c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJdqfQACgkQCaWpQKGI+9TJsgCdEY8IuFvc01DCTgnA+jjKrd5A -H/MAniqkZGQUtPas9fEvAj7d+C9g1xoE -=Z3Is +iEYEAREIAAYFAlJgS5AACgkQCaWpQKGI+9Sg/QCeI+llmM+ewLLnGEHh+lpEW0Wn +cWwAn2P2t38tjhLLPs0iD/tiuplYJa+O +=cNhS -----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 new file mode 100644 index 000000000000..9fe03c3e3d79 --- /dev/null +++ b/app-office/abiword/abiword-3.0.0-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2013 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.1 2013/10/17 20:41:51 pacho Exp $ + +EAPI=5 +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 + +DESCRIPTION="Fully featured yet light and fast cross platform word processor" +HOMEPAGE="http://www.abisource.com/" +SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="calendar collab cups eds +goffice grammar +introspection latex map math ots openxml +plugins readline redland spell wordperfect wmf thesaurus" + +# You need 'plugins' enabled if want to enable the extra plugins +REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !openxml !ots !readline !thesaurus !wordperfect !wmf )" + +RDEPEND=" + >=app-text/wv-1.2 + dev-lang/perl + >=dev-libs/boost-1.40.0 + >=dev-libs/fribidi-0.10.4 + >=dev-libs/glib-2.16:2 + >=dev-libs/libgcrypt-1.4.5 + >=gnome-base/librsvg-2.16:2 + >=gnome-extra/libgsf-1.14.18 + >=media-libs/libpng-1.2 + virtual/jpeg + >=x11-libs/cairo-1.10[X] + >=x11-libs/gtk+-3.0.8:3[cups?] + calendar? ( >=dev-libs/libical-0.46 ) + eds? ( gnome-extra/evolution-data-server ) + goffice? ( >=x11-libs/goffice-0.10.0:0.10 ) + introspection? ( >=dev-libs/gobject-introspection-1.0.0 ) + map? ( >=media-libs/libchamplain-0.12 ) + plugins? ( + collab? ( + >=dev-libs/libxml2-2.4 + >=net-libs/loudmouth-1 + net-libs/libsoup:2.4 + net-libs/gnutls ) + grammar? ( >=dev-libs/link-grammar-4.2.1 ) + latex? ( dev-libs/libxslt ) + math? ( >=x11-libs/gtkmathview-0.7.5 ) + ots? ( >=app-text/ots-0.5-r1 ) + readline? ( sys-libs/readline ) + thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) + wordperfect? ( + app-text/libwpd:0.9 + app-text/libwpg:0.2 ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + ) + redland? ( + >=dev-libs/redland-1.0.10 + >=dev-libs/rasqal-0.9.17 ) + spell? ( >=app-text/enchant-1.2 ) + !=psiconv-0.9.4 + use readline && plugins="${plugins} command" + use thesaurus && plugins="${plugins} aiksaurus" + use wmf && plugins="${plugins} wmf" + # wordperfect: >=wpd-0.9 >=wpg-0.2 + use wordperfect && plugins="${plugins} wpg" + fi + + gnome2_src_configure \ + --enable-plugins="$(echo ${plugins})" \ + --disable-static \ + --disable-default-plugins \ + --disable-builtin-plugins \ + --disable-collab-backend-telepathy \ + --enable-clipart \ + --enable-statusbar \ + --enable-templates \ + --with-gio \ + --without-gnomevfs \ + --without-gtk2 \ + $(use_with goffice goffice) \ + $(use_with calendar libical) \ + $(use_enable cups print) \ + $(use_enable collab collab-backend-xmpp) \ + $(use_enable collab collab-backend-tcp) \ + $(use_enable collab collab-backend-service) \ + $(use_with eds evolution-data-server) \ + $(use_enable introspection) \ + $(use_with map champlain) \ + $(use_with redland) \ + $(use_enable spell) +} + +src_install() { + gnome2_src_install + dodoc user/wp/readme.txt +} diff --git a/app-office/abiword/abiword-3.0.0.ebuild b/app-office/abiword/abiword-3.0.0.ebuild deleted file mode 100644 index 07511e8c119d..000000000000 --- a/app-office/abiword/abiword-3.0.0.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2013 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.ebuild,v 1.3 2013/10/15 20:47:47 pacho Exp $ - -EAPI=5 -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 - -DESCRIPTION="Fully featured yet light and fast cross platform word processor" -HOMEPAGE="http://www.abisource.com/" -SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="calendar collab cups eds +goffice grammar +introspection latex map math ots openxml +plugins readline redland spell wordperfect wmf thesaurus" - -# You need 'plugins' enabled if want to enable the extra plugins -REQUIRED_USE="!plugins? ( !collab !grammar !latex !math !openxml !ots !readline !thesaurus !wordperfect !wmf )" - -RDEPEND=" - >=app-text/wv-1.2 - dev-lang/perl - >=dev-libs/boost-1.40.0 - >=dev-libs/fribidi-0.10.4 - >=dev-libs/glib-2.16:2 - >=dev-libs/libgcrypt-1.4.5 - >=gnome-base/librsvg-2.16:2 - >=gnome-extra/libgsf-1.14.18 - >=media-libs/libpng-1.2 - virtual/jpeg - >=x11-libs/cairo-1.10[X] - >=x11-libs/gtk+-3.0.8:3[cups?] - calendar? ( >=dev-libs/libical-0.46 ) - eds? ( gnome-extra/evolution-data-server ) - goffice? ( >=x11-libs/goffice-0.10.0:0.10 ) - introspection? ( >=dev-libs/gobject-introspection-1.0.0 ) - map? ( >=media-libs/libchamplain-0.12 ) - plugins? ( - collab? ( - >=dev-libs/libxml2-2.4 - >=net-libs/loudmouth-1 - net-libs/libsoup:2.4 - net-libs/gnutls ) - grammar? ( >=dev-libs/link-grammar-4.2.1 ) - latex? ( dev-libs/libxslt ) - math? ( >=x11-libs/gtkmathview-0.7.5 ) - ots? ( >=app-text/ots-0.5-r1 ) - readline? ( sys-libs/readline ) - thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) - wordperfect? ( - app-text/libwpd:0.9 - app-text/libwpg:0.2 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - ) - redland? ( - >=dev-libs/redland-1.0.10 - >=dev-libs/rasqal-0.9.17 ) - spell? ( >=app-text/enchant-1.2 ) - !=psiconv-0.9.4 - use readline && plugins="${plugins} command" - use thesaurus && plugins="${plugins} aiksaurus" - use wmf && plugins="${plugins} wmf" - # wordperfect: >=wpd-0.9 >=wpg-0.2 - use wordperfect && plugins="${plugins} wpg" - fi - - gnome2_src_configure \ - --enable-plugins="$(echo ${plugins})" \ - --disable-static \ - --disable-default-plugins \ - --disable-builtin-plugins \ - --disable-collab-backend-telepathy \ - --enable-clipart \ - --enable-statusbar \ - --enable-templates \ - --with-gio \ - --without-gnomevfs \ - --without-gtk2 \ - $(use_with goffice goffice) \ - $(use_with calendar libical) \ - $(use_enable cups print) \ - $(use_enable collab collab-backend-xmpp) \ - $(use_enable collab collab-backend-tcp) \ - $(use_enable collab collab-backend-service) \ - $(use_with eds evolution-data-server) \ - $(use_enable introspection) \ - $(use_with map champlain) \ - $(use_with redland) \ - $(use_enable spell) -} - -src_install() { - gnome2_src_install - dodoc user/wp/readme.txt -} diff --git a/app-office/abiword/files/abiword-3.0.0-fix-crash.patch b/app-office/abiword/files/abiword-3.0.0-fix-crash.patch new file mode 100644 index 000000000000..bce09d18c3b2 --- /dev/null +++ b/app-office/abiword/files/abiword-3.0.0-fix-crash.patch @@ -0,0 +1,33 @@ +commit e0e81e6c2d7f2478b9effc8476b62425ca2c12cd +Author: Hubert Figuière +Date: Wed Oct 16 22:48:36 2013 -0400 + + Bug 13564 - Fix crash in abw to HTML conversion. + +diff --git a/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp b/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp +index 86c57ec..b9dace1 100644 +--- a/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp ++++ b/src/wp/impexp/xp/ie_exp_HTML_Listener.cpp +@@ -2232,12 +2232,18 @@ void IE_Exp_HTML_Listener::_openList(PT_AttrPropIndex api, bool recursiveCall) + _openList(api, true); + } + } +- +- }else ++ } ++ else + { +- const gchar* szListStyle; ++ const gchar* szListStyle = NULL; + pAP->getProperty("list-style", szListStyle); +- bool isOrdered = g_ascii_strcasecmp(szListStyle, "Bullet List") != 0; ++ bool isOrdered = szListStyle ++ && (g_ascii_strcasecmp(szListStyle, "Bullet List") != 0); ++#ifdef DEBUG ++ if(!szListStyle) { ++ UT_DEBUGMSG(("***BUG*** szListStyle is NULL - http://bugzilla.abisource.com/show_bug.cgi?id=13564\n")); ++ } ++#endif + ListInfo info; + if (iCurrentLevel == 0) + { -- cgit v1.2.3-65-gdbad