Add fedora patch to support libwpd-0.9, bug 363691

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 87 insertions, 4 deletions

diff --git a/app-office/kword/ChangeLog b/app-office/kword/ChangeLog
index 96def818ef32..0eee7f758315 100644
--- a/app-office/kword/ChangeLog
+++ b/app-office/kword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kword
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.161 2011/03/13 08:29:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/ChangeLog,v 1.162 2011/04/24 13:11:32 dilfridge Exp $
+
+*kword-2.3.3-r1 (24 Apr 2011)
+
+  24 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kword-2.3.3-r1.ebuild:
+  Add fedora patch to support libwpd-0.9, bug 363691
 
   13 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org> kword-2.2.2.ebuild:
   koffice version 2.2.2 does not build with kde-4.6
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 0285601ee166..da8f779fd588 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST koffice-2.2.2.tar.bz2 56470974 RMD160 bdd75cb056e2fa96b799eeec0ecb5ed6b6aef4c2 SHA1 ab6405e0efae0d8e895879183f1369facae410e0 SHA256 e5b060f640dd7ecd13b5d17f7e9ace7c0d1c0621e5fb83529f6e6db2d5c1edcb
 DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
+DIST kword-2.3.3-libwpg02.patch.bz2 9107 RMD160 0e6aa2afe288d692ee4cf569dd58451d329eaabc SHA1 c6c94c15d6b84e79a1369bf9314141ec57ecff7c SHA256 edf3187dc5f93bba7eac834a296baaee11a65d603a82b8d5544a16c916a9980e
 EBUILD kword-2.2.2.ebuild 809 RMD160 4e7c56247843effa5b2b11800681e23998122395 SHA1 4cf83028a3de2793a634bd0e57da4abeace14741 SHA256 c40e5e5ed7c02619adb0d35608764d2705d6d2989203f88aafe233846bafd6f6
+EBUILD kword-2.3.3-r1.ebuild 1007 RMD160 85434feb6ad5cbd13c248a746d2d5035c189ac37 SHA1 d13a21c5dfcc42cb569ec38cbf7c812deed0316d SHA256 9ab2a777ac7f9bf571b7eb2d3119fada3f4754fca7305a7e185ebaf83e9ca978
 EBUILD kword-2.3.3.ebuild 860 RMD160 11ee0515bc42aed670afb902002f0217bfcd243d SHA1 8253aa0916c837e09d00458cf777dae6e1e88290 SHA256 c464e26dc2051d35b1e7593270273a1a40ecf42bd135a679bb1c0bf5c5c64d04
-MISC ChangeLog 19797 RMD160 fe320648038dca4916db82546ee8e66b45373bbc SHA1 b7bef35dcbd933f7d091d87b066e645e4566aa89 SHA256 247fa75e8b002f2d2fbfa37842e7843c267de12f24bce20db5b6c9b7182266f4
-MISC metadata.xml 344 RMD160 a1c7f55634b6dd0f7001c209cf3a0ccfc0f47ae3 SHA1 75025b1c6c1d4a9a0f536d28cf2093788015f670 SHA256 966dafeeb0bbbeb205605d46d54a2d9e90831d145083eca26e7c5ec89768ecba
+MISC ChangeLog 19965 RMD160 928605e77c0aba42408d47279fbd70b743f2bba4 SHA1 0d4794ba65d68eaf456be970f9f3512ceba8a7d5 SHA256 7d6230900b9760dc013b82e72a8a5bacfcbb0c8b84df19ae89f6a42ec4849994
+MISC metadata.xml 291 RMD160 85d41e5de43911dd90da9ec4d1f8764c9e70c77b SHA1 7fc1c71d68071baf6fd65b855888e115c003994d SHA256 62f7dcee3e01b8cbcef89e476255d24cfba3d2ad715eece090be0d68fef03e60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNtCIqAAoJENwGBM22xffeQ1gP/3KyyN7ID4gZBU/nJMZK+dIc
+5F0drSjWvfYLFgeTpE5IIOMSbWzTRkPYkRViLlhL7MpZ4lpx5vPnpA7dSltd8bZn
+amWeFR6FTgmwygnIbYGLInf/3369URKzTGOxD142r/EQQNVRYyCAwM0p5zwTjRKC
+UEln26dMBvBTG0hlmmdX1blO9ic9qdRq3dFKG6EEeO8uLsM9ObTfobrkoQFa7lb0
+W44OIMefS/arZLu0gF8GSr3NXPtanXy9cd/hAE4ZRpN8Ai2jrKFcLn5xFvOTAuVj
+lK9FlFCtadcI2d4h7A19TaagSNFprcfyfmQJEsEJC+d/KYRvOUNei0/3wo8ZMkoy
+HycDghC8RAO0Han3XN3VL2TlX8pwa2dm902q5SYe1VPUHYsCmoO7G+ec9v612w9a
+POP08MCW2h1Fng5p0CzAn1pSiU1jIkDOLjFB3nsZcjAgc3HQ4pkpnecIiqxuoHow
+Y2MKxX/FMlj7M34betKFSugpzm5oqREwGTlYvYHzMAly1N61OYqmZKXuyjDTv6VO
+d+2LH9fkhzAHR9fA4dbcSVcNeuu/mZCZp3z9RiTJ4RksNq/f4zmAWbBC/xXVkrh6
+c0yuiXSfQCGQGfxd6wupQa/WqgvoYTzxpbQMpb/J1h9xnox333ZDn+DsGVAG7SBO
+Jk5VTJvbg4S5Qrl1fx8u
+=VH83
+-----END PGP SIGNATURE-----
diff --git a/app-office/kword/kword-2.3.3-r1.ebuild b/app-office/kword/kword-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..8d6e5866fc6e
--- /dev/null
+++ b/app-office/kword/kword-2.3.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-2.3.3-r1.ebuild,v 1.1 2011/04/24 13:11:32 dilfridge Exp $
+
+EAPI=3
+
+KMNAME="koffice"
+KMMODULE="${PN}"
+inherit kde4-meta
+
+DESCRIPTION="KOffice word processor"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="wpd"
+
+SRC_URI+=" http://dev.gentoo.org/~dilfridge/distfiles/kword-2.3.3-libwpg02.patch.bz2"
+
+DEPEND="
+	wpd? ( app-text/libwpd )
+"
+RDEPEND="${DEPEND}
+	!app-text/wv2
+"
+
+PATCHES=( "${DISTDIR}/${PN}-2.3.3-libwpg02.patch.bz2" )
+
+KMEXTRA="filters/${KMMODULE}/
+	filters/libmso/
+"
+
+KMEXTRACTONLY="
+	KoConfig.h.cmake
+	filters/
+	kspread/
+	libs/
+	plugins/
+"
+
+KMLOADLIBS="koffice-libs"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with wpd)
+		-DWITH_DCMTK=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	# this is already installed by koffice-data
+	rm -f "${D}/usr/include/config-opengl.h"
+	rm -f "${D}/usr/include/KoConfig.h"
+}
diff --git a/app-office/kword/metadata.xml b/app-office/kword/metadata.xml
index 9bc6776efca9..c4568b031f03 100644
--- a/app-office/kword/metadata.xml
+++ b/app-office/kword/metadata.xml
@@ -5,6 +5,5 @@
 <maintainer><email>dilfridge@gentoo.org</email></maintainer>
 <use>
 	<flag name="wpd">Build wordperfect document support.</flag>
-	<flag name="wv2">Build MS-Word .doc support.</flag>
 </use>
 </pkgmetadata>