Fix patch to work with both freetype-2.4.11 and >=2.5.1 (bug #504850, thanks to Fabio Rossi).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 60 insertions, 20 deletions

diff --git a/gnome-base/libgnomeprint/ChangeLog b/gnome-base/libgnomeprint/ChangeLog
index 28b3a3f38f0e..9492bf3f13e1 100644
--- a/gnome-base/libgnomeprint/ChangeLog
+++ b/gnome-base/libgnomeprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnomeprint
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.195 2014/03/17 04:05:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/ChangeLog,v 1.196 2014/03/17 23:44:49 tetromino Exp $
+
+  17 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgnomeprint-2.18.8.ebuild, files/libgnomeprint-2.18.8-freetype-2.5.1.patch:
+  Fix patch to work with both freetype-2.4.11 and >=2.5.1 (bug #504850, thanks
+  to Fabio Rossi).
 
   17 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   libgnomeprint-2.18.8.ebuild,
diff --git a/gnome-base/libgnomeprint/Manifest b/gnome-base/libgnomeprint/Manifest
index 8882d6734e73..fa88f6c1353a 100644
--- a/gnome-base/libgnomeprint/Manifest
+++ b/gnome-base/libgnomeprint/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libgnomeprint-2.18.8-freetype-2.5.1.patch 1643 SHA256 7e4773259393d8993eaebfe181e4460f93aa4901bc9e0a8760327ee73eedd7d4 SHA512 05f9bf55763bb534b964cd7d40e1c61ab501af74a30ec872ac8039832920e7d737998235f1bfb9c0a71df718d6d6a46fcae424ac4ef65882257154d4e1091bec WHIRLPOOL 37e4e62cd75bc0a2ca575c226a07e286a8004b46f8aa08ac37d3ad3e69959b58dc814356ba0170272ddbed689ad039d69cafc892626b5d23603215b22d620366
+AUX libgnomeprint-2.18.8-freetype-2.5.1.patch 2993 SHA256 9a84d95d833fc77ebaefc7722cb5efe851a89cf139428c721829542f8492d215 SHA512 bb628829fd81ef2163540920a014effb219548c78837acb638eaded7a5fc077ace17c7287c6553c725e1452c0e87ded310bdf7811cadc309b9bfbfe7d7f9ca0f WHIRLPOOL 4622b611fdd9d97503b52a7eb0fedd3ea1ce488d850bbde637e7c8b151f3b52ac91bcb889ae36f904fa64fa27a1229a27c2e5aff005f4aedb40a95e69053e9af
 AUX libgnomeprint-2.18.8-stdio-include.patch 271 SHA256 9a0a7631ce4c209acdd3916ff1911dfd106d3379e8d822a0968c976be25a459c SHA512 3905f9d85606504666b8b4585a8360fc372504f2431049abf4518b8d8106c4c6e69f6cc401b48810d4252763f6adfcafe1303695350f91a17e2522f02898fce7 WHIRLPOOL 0f51a7836bb4303762138f6b48b158927195705509b827859f88838f7bc5127dcb98f92215a4674695407d5b59d12d576c4d89e9d68d48ee623293ec7040b563
 DIST libgnomeprint-2.18.8.tar.bz2 880489 SHA256 1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691 SHA512 eca4f118e918f8db04332c3c6df5370ee45497057b44747457b05f0517c55b38271b24cdf7493b8ba24875b2d53d99b5e64d5d63a04cd7fd895cb02ae1606469 WHIRLPOOL cfe18a12dfa0b3a8e659e8bff07764fcf93d02fc7e28f8d9f52796fe1044a30b257ab15a21b88438696841d7b8a61976c9af64971039141b73fa55ec00537a37
-EBUILD libgnomeprint-2.18.8.ebuild 1633 SHA256 cd7bda19be16569f438c5abf788d74de06710dc2924dfd070130a4d4e92eef4c SHA512 abbde613c07e5e5992a1883c6e557652ac70200c8dfab2a453cc3a36fb96da084815fe0a56458c9c309274390127adf64a8b26e67a293b79070f4d8a88083c30 WHIRLPOOL cb37d7b3e4a09097d2be2f14525020f12450869903c1af9cdf649c91aa61b6897987da5183b5a00ad9f979dc58933749725c285a1d710d55df277617650d4df8
-MISC ChangeLog 23771 SHA256 776874c39986d85cbca0f387e8afea6650a04f998e6a8e72c4366053b5f4053a SHA512 6a49e4de038edef7937ed887f290f30bd10293f97de544a7fc934f7bf84e3a02c9be02cb5aaec51c6720aefaf842eeff9555d8d280022c4ccfcd8b9a94ab4f1d WHIRLPOOL 61a4c2ada9322fd2dc559a330d4e2559630e506acb2dc2a5de64ef8e1d1a46301989bffc7f09e19127f1f16d1becd8d5be43b1f7ce9d13ccbe18c78e1c99ac0c
+EBUILD libgnomeprint-2.18.8.ebuild 1656 SHA256 fd14701759cf17eeae1cc29d8d6f431ad9d41f62e9268cb4aa5f714af88754de SHA512 a69cc141c2590251fc5c7c3e8b90d649951cecde1c0aa47087df5c872a2655ae6c24999202c4ad39480fe20f74f20978881f22fab67acc06b65bce6eea1fc2e0 WHIRLPOOL 9c723f95f2728775b125d59aa9b4066ca4f1d33cb4c001ad51ed2a1c9405f32bd608cbef758a1a22c828e9d5d72c52c52ba08e1e74eb141a334189d230f6e2b3
+MISC ChangeLog 24009 SHA256 a36dfe69bd90852d8b00f67dd96bcd188eb106d79e364fd34297c1b417baa23d SHA512 f8770093ab5d7f2d2c8bab0f9c6f686fc757aee53fc325bab1830bf98cf767477fdadeea4d48b33afad8a0371441a7a621de624f483a0e57bfe3d982ce721504 WHIRLPOOL ea01c9b8a25740e8b69e292ec2a2f4bc04ecd8e20748d61b46dec6e5cfe8efbba1a91014da88c00ffaaeaa48dc77b714e527e1436eef94f3dbcbcbd7bb7cd4df
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTJnRIAAoJEJ0WA1zPCt1hOJcH/0V4DgFs9Aa8s4HcFfAUNPTc
-hq15HBUYBxWKelWbeM138OXzmfnxm/rtqfBf6gWH4Vz8firmRQBVlMFJEHXrvai/
-HF6gCTm8X+WrVmKHkaLrZI1Ez9hUo3HdcGhqScyE87uVeeLQPZjyX+pQ0z2RzmgY
-bJHrC5r3Nx8029uoosRr/j1opCK6jg3mzBSUAS6NLV/trFHFp7J57en7nzDFzSSj
-aRD1iqR4GIwRJ+keoxvgTEtV54P5cTXtH6crOlpG1Ljulwi/xN/1dYysNeCWrB8Q
-YRD2TMCxx4UqKjHtNw3NfSEpppzKP8PQx4fmFPAU07koZxVIn0pal9zOh7U/gEs=
-=WWr7
+iQEcBAEBCAAGBQJTJ4jAAAoJEJ0WA1zPCt1hzDkH/2YPCxf4PbjcszAdZlwORBSZ
+rUg4NqaicJewKGg7A6ckHmnHuS/3/6j+k7u1JVDnN9j00BdW1b51ZZheoD13vr4/
+xgE1N9P+QNv1vYJC/TCWYp83bWuIpqzOMrWeM/c2OIKwcdTeBRZxsvl0AZ6IO8bd
+eguNNrTFGgiD1eNryulFraCmqve85QrcaOdLSW2rbzc3DPTdGue//ajpMUV889Hi
+R3kO8TaJxN1t2pZR65XiSDzNZHnJlFhsaBEdPCc/0M6sVPulN400qbHeV5YRzkCL
+HHwwYHolMbBkvM3JvDYJ2eEEi8RYcCMwuYhvzHLHdvFtAlmiP5KW0wEHKx5mhak=
+=3Ic0
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
index c21e92177c5f..c0cb5957fae8 100644
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
+++ b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
@@ -1,14 +1,48 @@
-From 9ed3ddc0cefd9aec123eeee3ce494289bf080495 Mon Sep 17 00:00:00 2001
+From cf17a44bd5b8aac1c73f3bb00ca872cd8f08df4a Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Mon, 17 Mar 2014 00:01:10 -0400
 Subject: [PATCH] Update freetype includes to work with >=freetype-2.5.1
 
 ---
- libgnomeprint/gnome-font-face.c | 2 +-
- libgnomeprint/gnome-print-gdi.c | 2 +-
- libgnomeprint/gnome-rfont.c     | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
+ configure.in                    | 22 +++-------------------
+ libgnomeprint/gnome-font-face.c |  2 +-
+ libgnomeprint/gnome-print-gdi.c |  2 +-
+ libgnomeprint/gnome-rfont.c     |  4 ++--
+ 4 files changed, 7 insertions(+), 23 deletions(-)
 
+diff --git a/configure.in b/configure.in
+index c15bb69..aebe591 100644
+--- a/configure.in
++++ b/configure.in
+@@ -162,25 +162,9 @@ LDFLAGS="$LDFLAGS $LIBM"
+ dnl =================================
+ dnl Checking for freetype2
+ dnl =================================
+-FREETYPE_LIBS=
+-FREETYPE_CFLAGS=
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-if test "x$FREETYPE_CONFIG" = "xno" ; then
+-	AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
+-else
+-	FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
+-	FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
+-fi
+-
+-libgnomeprint_save_ldflags=$LDFLAGS
+-LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+-
+-freetype_version=false
+-AC_MSG_NOTICE([checking for sufficiently new FreeType (at least 2.0.5)])
+-AC_CHECK_LIB(freetype, FT_Get_Postscript_Name,:,[
+-    AC_MSG_ERROR(You need FreeType2 (freetype-devel 2.0.5 or greater package) for this version of libgnomeprint)])
+-
+-LDFLAGS=$libgnomeprint_save_ldflags
++dnl "freetype2 >= 17" means freetype-2.5.1
++PKG_CHECK_MODULES(FREETYPE, freetype2 >= 17, ,
++	[PKG_CHECK_MODULES(FREETYPE, freetype2, [FREETYPE_CFLAGS="$FREETYPE_CFLAGS -I`$PKG_CONFIG --variable=includedir freetype2`/freetype2/freetype"])])
+ 
+ dnl =================================
+ dnl END: Checking for freetype2
 diff --git a/libgnomeprint/gnome-font-face.c b/libgnomeprint/gnome-font-face.c
 index 0447377..f9f8f3e 100644
 --- a/libgnomeprint/gnome-font-face.c
@@ -23,7 +57,7 @@ index 0447377..f9f8f3e 100644
  #include <libgnomeprint/gnome-print-private.h>
  #include <libgnomeprint/gnome-font-private.h>
 diff --git a/libgnomeprint/gnome-print-gdi.c b/libgnomeprint/gnome-print-gdi.c
-index f89a8e8..d30672b 100755
+index f89a8e8..7755673 100755
 --- a/libgnomeprint/gnome-print-gdi.c
 +++ b/libgnomeprint/gnome-print-gdi.c
 @@ -36,7 +36,7 @@
@@ -31,7 +65,7 @@ index f89a8e8..d30672b 100755
  
  #include <ft2build.h>
 -#include <freetype/freetype.h>
-+#include <freetype.h>
++#include FT_FREETYPE_H
  
  #define WIN32_LEAN_AND_MEAN
  #include <windows.h>
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
index 118929720c8d..f60dcb57034e 100644
--- a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
+++ b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.12 2014/03/17 04:05:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.13 2014/03/17 23:44:49 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Printer handling for Gnome"
 HOMEPAGE="http://www.gnome.org/"
@@ -46,6 +46,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-stdio-include.patch
 	epatch "${FILESDIR}"/${P}-freetype-2.5.1.patch
+	eautoreconf
 	gnome2_src_prepare
 
 	# Drop DEPRECATED flags, bug #384807