Fontconfig 2.2 support patch

4 files changed, 43 insertions, 19 deletions

diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 78db698c6146..01271a7efeb9 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,23 +1,24 @@
+MD5 e5fed35089f1426ede1dac402771fdf6 ChangeLog 4140
+MD5 c286c5cdcc826bca829d7cb96900a014 koffice-1.1.1.ebuild 1148
 MD5 aae91cf6b00df2f62381e45b73173473 koffice-1.2-r1.ebuild 887
+MD5 9a620860de6fc04a27efe67c76f8c71d koffice-1.2-r2.ebuild 963
+MD5 84176330e8ae4af50e950222ae00c7ef koffice-1.2.1-r1.ebuild 846
 MD5 cd7530c334d300a44640540064734d7d koffice-1.2.1.ebuild 774
-MD5 bd5dab4e58c73ac69462457eb3bf62d0 koffice-1.2.1-r1.ebuild 826
-MD5 41f373b330594e41454feaf1d1ec7cf6 koffice-1.2_beta2.ebuild 1105
 MD5 2e2842e7db798be596acdcb2f5a39e17 koffice-1.2.ebuild 770
-MD5 9a620860de6fc04a27efe67c76f8c71d koffice-1.2-r2.ebuild 963
-MD5 90b66cd7fcc3e63a926142dd5363c291 koffice-1.3_beta1.ebuild 1043
+MD5 41f373b330594e41454feaf1d1ec7cf6 koffice-1.2_beta2.ebuild 1105
 MD5 8d25144bc3f609caab76c82bc069a66b koffice-1.2_rc1.ebuild 847
-MD5 c286c5cdcc826bca829d7cb96900a014 koffice-1.1.1.ebuild 1148
-MD5 e5fed35089f1426ede1dac402771fdf6 ChangeLog 4140
-MD5 7eb5f8e0051bdfa9d39ddc41d0f2b11e files/digest-koffice-1.2_beta2 71
-MD5 362c1081c562d8405d25be71122ca125 files/koffice-1.2-connectortool.diff 493
-MD5 0fdb0d815d97087336270d8b09d82018 files/koffice-1.1.1-gentoo.diff 978
-MD5 284b55785dbede2c02523d9f341ac94a files/digest-koffice-1.3_beta1 69
-MD5 bd89862f0c15396ad54e30a1c9f2f5d9 files/koffice-1.2.1-kword-crashes.diff 3840
-MD5 539a2c71f344995967d87d9662175330 files/koffice-1.2-kspread_cell.diff 2373
+MD5 9dfd67549464c941de67d93b890a5164 koffice-1.3_beta1.ebuild 1212
+MD5 4372c7005e477861f588fc5a4839127d files/digest-koffice-1.1.1 67
+MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2 65
 MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2-r1 65
 MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2-r2 65
-MD5 ad9689676acdfdf5ed01b2467275d536 files/digest-koffice-1.2 65
-MD5 4372c7005e477861f588fc5a4839127d files/digest-koffice-1.1.1 67
 MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1 67
-MD5 f8969b89924fa67d77c0deb8127cf159 files/digest-koffice-1.2_rc1 69
 MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1-r1 67
+MD5 7eb5f8e0051bdfa9d39ddc41d0f2b11e files/digest-koffice-1.2_beta2 71
+MD5 f8969b89924fa67d77c0deb8127cf159 files/digest-koffice-1.2_rc1 69
+MD5 0fdb0d815d97087336270d8b09d82018 files/koffice-1.1.1-gentoo.diff 978
+MD5 362c1081c562d8405d25be71122ca125 files/koffice-1.2-connectortool.diff 493
+MD5 539a2c71f344995967d87d9662175330 files/koffice-1.2-kspread_cell.diff 2373
+MD5 bd89862f0c15396ad54e30a1c9f2f5d9 files/koffice-1.2.1-kword-crashes.diff 3840
+MD5 284b55785dbede2c02523d9f341ac94a files/digest-koffice-1.3_beta1 69
+MD5 9146229d784d3d16978b11ea03be6912 files/koffice-1.3_beta1-fontconfig-2.2-support.diff 645
diff --git a/app-office/koffice/files/koffice-1.3_beta1-fontconfig-2.2-support.diff b/app-office/koffice/files/koffice-1.3_beta1-fontconfig-2.2-support.diff
new file mode 100644
index 000000000000..6e2e4ec6b37a
--- /dev/null
+++ b/app-office/koffice/files/koffice-1.3_beta1-fontconfig-2.2-support.diff
@@ -0,0 +1,14 @@
+--- karbon/configure.in.in.old	2002-11-30 18:23:39.000000000 +0100
++++ karbon/configure.in.in	2003-05-17 19:25:56.000000000 +0200
+@@ -64,6 +64,11 @@
+   AC_MSG_WARN([Could not find fontconfig anywhere, please check http://fontconfig.org])
+ ])
+ 
++PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
++if test -n "$FONTCONFIG_LIBS"; then
++     AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1, [Defines if your system has the libfontconfig library])
++fi
++
+ if test -n "$FONTCONFIG_CONFIG"; then
+   vers=`$FONTCONFIG_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+   if test -n "$vers" && test "$vers" -ge 1000001
diff --git a/app-office/koffice/koffice-1.2.1-r1.ebuild b/app-office/koffice/koffice-1.2.1-r1.ebuild
index cded6049facb..05b212f2115a 100644
--- a/app-office/koffice/koffice-1.2.1-r1.ebuild
+++ b/app-office/koffice/koffice-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1-r1.ebuild,v 1.3 2003/03/18 16:07:33 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1-r1.ebuild,v 1.4 2003/05/19 13:02:52 brain Exp $
 inherit kde-base flag-o-matic
 
 filter-flags "-fomit-frame-pointer"
@@ -17,7 +17,8 @@ KEYWORDS="x86 ~ppc ~sparc"
 DEPEND="$DEPEND
 	>=dev-lang/python-2.2.1
 	>=media-libs/libart_lgpl-2.3.9
-	>=media-gfx/imagemagick-5.4.5"
+	>=media-gfx/imagemagick-5.4.5
+	dev-util/pkgconfig"
 
 PATCHES="$FILESDIR/${P}-kword-crashes.diff"
 
diff --git a/app-office/koffice/koffice-1.3_beta1.ebuild b/app-office/koffice/koffice-1.3_beta1.ebuild
index b897135bb5f9..5caedd89ef38 100644
--- a/app-office/koffice/koffice-1.3_beta1.ebuild
+++ b/app-office/koffice/koffice-1.3_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3_beta1.ebuild,v 1.1 2003/04/16 18:22:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3_beta1.ebuild,v 1.2 2003/05/19 13:02:52 brain Exp $
 inherit kde-base flag-o-matic
 
 # TODO : mysql support
@@ -24,7 +24,8 @@ DEPEND="$DEPEND
 	>=dev-lang/python-2.2.1
 	>=media-libs/libart_lgpl-2.3.9
 	>=media-gfx/imagemagick-5.4.5
-	>=app-text/wv2-0.0.9"
+	>=app-text/wv2-0.0.9
+	dev-util/pkgconfig"
 
 export LIBPYTHON="`python-config --libs`"
 export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
@@ -32,3 +33,10 @@ export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
 need-automake 1.5
 need-autoconf 2.5
 
+PATCHES="$FILESDIR/$P-fontconfig-2.2-support.diff"
+
+src_compile() {
+	rm -f configure configure.in
+	kde_src_compile configure
+	kde_src_compile make
+}