Properly fix building with glib-2.32; thanks to Yaw_e for reporting.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 32 insertions, 23 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 1e8e2f67f188..036db0ad5343 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.228 2012/04/16 16:53:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.229 2012/04/16 17:32:38 tetromino Exp $
+
+  16 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-utils-3.2.1.ebuild, +files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch,
+  -files/gnome-utils-3.2.1-gtk+-3.4-ft2.patch:
+  Properly fix building with glib-2.32; thanks to Yaw_e for reporting.
 
   16 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-utils-2.32.0-r2.ebuild, gnome-utils-3.2.1.ebuild:
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 051867b34d2d..10b05f00741b 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -4,22 +4,22 @@ Hash: SHA1
 AUX gnome-utils-2.32.0-fix-uninitialized.patch 903 RMD160 bd78aea0fd11c764e7816bbe4ff9ecf2aa008bc3 SHA1 60b5875f874fbb6da90db7ef6d99199e3f637514 SHA256 e4ded0888d6350452ffc4053edd3c5133fc86807c76c4a6f9d2e311ec2fe3919
 AUX gnome-utils-2.32.0-new-icons.patch 5478 RMD160 157d0dbe228aa773e7ef6783ad940ca4737d1e25 SHA1 00b3b9cdba1e81bfc6ff044652a479bd2524d45b SHA256 9410f0dd5cc2f7484330f5fdaa336355e0b43cd5501ec118db5d14136f870b36
 AUX gnome-utils-2.32.0-new-icons2.patch 564 RMD160 7000ac4e61e129ab40d8d0a09740e02ca81b4a4c SHA1 d22775a821161dcece3d6152b35b1b3f69f74ce6 SHA256 31edf1380334941fc092d21be21ba320fdaf0de0498268f981fcbf798d20f3ca
-AUX gnome-utils-3.2.1-gtk+-3.4-ft2.patch 1503 RMD160 de3187dc98fb4068cd576dc518216f56c935c22c SHA1 1aa9b40e8492df899825529a03a7c5c715c68ae1 SHA256 ef3cbc26f2d2d85b9cd702c8c8e397b4494f4a176968254da7a8d21f8db261a3
+AUX gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch 1676 RMD160 29af827aaad26190620dac0410260b60978b939c SHA1 82ea01fbb5e371e2f3600bd79597984480a1b152 SHA256 5632f8a8bd3ed0af34f24aaa9b42639b7bae350e9f40995b0db8748d47a0aa08
 DIST gnome-utils-2.32.0-icons.tar.xz 153632 RMD160 3e0f88fced7ab807a425de67ce90834894a41b70 SHA1 231f49f11233c1bf5f95763f12d1447fee2c222c SHA256 234e86914fa49daf3b11ffe7efb7090a3caf4146dce41414724b597e0e9c508e
 DIST gnome-utils-2.32.0.tar.bz2 7705320 RMD160 c25667eec2ba4fd0d704c10a92e2e6b071eb1bfc SHA1 68ef7e12280969bde9bee4bbd566ad4ab0572e77 SHA256 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa
 DIST gnome-utils-3.2.1.tar.xz 7273572 RMD160 a0e34b7057c0b77b58f7310ec8a8a3af238071bd SHA1 2f837a420ea73ad1a1cab56656b450e704f2faab SHA256 3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328
 EBUILD gnome-utils-2.32.0-r2.ebuild 2524 RMD160 f6536e2f9ac540a55cd695e6f90155a452bd27b9 SHA1 9a32d69497e62148c8de1229af5026764deb0bfa SHA256 f00483817e5a415afb44e023a4b3b423aef6d6935142f61c928d85c8573dc08b
-EBUILD gnome-utils-3.2.1.ebuild 2161 RMD160 525e9f683a70d3fa5502d62f50d657a4223d9159 SHA1 79e66d12e3d2d7af1aa6d85ae4bc87779226cc50 SHA256 049a217b9d418201653ab14e297df64c209dea90045f5d3afd7f82475181e502
-MISC ChangeLog 29421 RMD160 28b365e7d9eb191b375f67f60816cca93aaaf078 SHA1 9a7977f65ae054cfb63c9b55956ff887022940d4 SHA256 df5ca680d4c525fac9291e958ab5574d34d4539a7a94cc7e80bb9bfacd7747c5
+EBUILD gnome-utils-3.2.1.ebuild 2166 RMD160 94310042c9b677e3bbde9e2c68c9c17b8bdacedd SHA1 8afcf8b2cb823f2a65f459be4771aa2e052eaaab SHA256 b1194b2d447b764807fcf66637d4b8dbc80c0ecf62e9d332909cf443f63b9a6b
+MISC ChangeLog 29677 RMD160 02ed4c115973eb03501f6c535031cab1ba9a7554 SHA1 434789f346a65eaad506219ca00ab53d5c0bfc37 SHA256 e77e34c8fb6fc00cd4d9317968f07c5f4a391cac1c4089496c2d4e1ee1330263
 MISC metadata.xml 305 RMD160 c788a49e4dc8332a8f5a5a79268ed2bff3d164c8 SHA1 9aa1970fee27c41f0eebf198f94b1fa41b3644b9 SHA256 3c6d345a89e0c8dbacd26f232e8220bd2558bc90cff9041e3e07f2f44ce4bb85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPjE6TAAoJEJ0WA1zPCt1hOVEH/iOUXAD/uNnnAIcTKP4/r3os
-y3Ap2dhyORDL+wbe8NDNYnXzLexlSHYtX6ehBku8nY3dJeK1YSwp3ZK/tJW59pVB
-B7num+gJAlM4uyeND2mCoJ7wMgWDxu14clcmG1VvtG+Bys7/vm3xj7t083jwQ2/P
-xAl6oMHaWzju/MYmyycELM9WSDPRZv713dO9bvS6VKCeIXuihIdl/XyBs9BA5pZZ
-gbSRNJP9HxEQfgW7NM98aUNVrd+aD89cVAdpjoTJOySCeWkW5nH5+r1MWyjUwj0e
-EyZMKLKqXlh/C59Eh+NTJq+x2B7wLEpKAUKjc8MATzcxgvpe5Lw1TH5SD0H5BSg=
-=Z0FZ
+iQEcBAEBAgAGBQJPjFe7AAoJEJ0WA1zPCt1hm38IAI0Up28/d+pJAAegsEGmTtcL
+5H/UVG7vFqHKUF0T6iuEpnF4Aa3sw0ljTGTlTQEAiyB7jwU3FHfHZS/Y0lq5zRmO
+Ogc1WKE9rFKoPMC7oCRjC4qPTRRgo1dBlAEdjD2ur4m3n2TP3xzFHC0761hQkcty
+hzdnKvjSVkG7/Fy8dAKtrnk1VQ8SmxBaPHmDLm+tMNmpcLrVrKVR2nr01vkR9rlT
+XFsjG5xojY2xwfLieIXdXOLz/oo3MAuTQR7KdFCQ4FMOQCawSiYSxxUQlJERlWEF
+KYvQTNUIC4bzRa8Gr62MVHh+8/RJdsn0KholjDzMBlYdYRYfqv7abj+MTVvF+Ok=
+=lUrz
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-gtk+-3.4-ft2.patch b/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch
index a47357e44f8a..0acdf24c4784 100644
--- a/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-gtk+-3.4-ft2.patch
+++ b/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch
@@ -1,14 +1,14 @@
-From b11a122a1a6d9d71fe145fa1af12eddf8458cf66 Mon Sep 17 00:00:00 2001
+From 0c4555bc321b27b8f6d54be63562ed315a6bddcb Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Sun, 15 Apr 2012 00:16:59 -0400
-Subject: [PATCH] font-viewer: fix building with gtk+-3.4
+Subject: [PATCH] font-viewer: fix building with glib-2.32 gtk+-3.4
 
-Due to changes in gtk+-3.4's pkgconfig files, freetype2 must now be
-checked for explicitly.
+Due to changes in glib's and gtk's pkgconfig files, freetype2 must
+now be checked for explicitly, and gthread flags explicitly added.
 ---
  configure.ac            |    4 ++++
- font-viewer/Makefile.am |    4 +++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
+ font-viewer/Makefile.am |    6 +++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index b25d4ec..c8a07f6 100644
@@ -26,25 +26,29 @@ index b25d4ec..c8a07f6 100644
  # 	first release: increment major += 1, minor = micro = 0;
  # 	each release before API freeze: minor += 1;
 diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am
-index ed8d380..7d44bc3 100644
+index ed8d380..74ecb95 100644
 --- a/font-viewer/Makefile.am
 +++ b/font-viewer/Makefile.am
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,8 @@
  
  INCLUDES =					\
 +	$(FREETYPE2_CFLAGS)			\
  	$(GIO_CFLAGS)				\
++	$(GTHREAD_CFLAGS)			\
  	$(GTK_CFLAGS)				\
  	-DDIRECTORY_DIR=\"$(directorydir)\" 	\
-@@ -14,6 +15,7 @@ ftstream_SOURCES = \
+ 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"
+@@ -14,7 +16,9 @@ ftstream_SOURCES = \
  	ftstream-vfs.c
  
  gnome_thumbnail_font_LDADD = \
 +	$(FREETYPE2_LIBS) \
  	$(GIO_LIBS) \
++	$(GTHREAD_LIBS) \
  	$(GTK_LIBS)
  
-@@ -24,7 +26,7 @@ gnome_thumbnail_font_SOURCES = \
+ gnome_thumbnail_font_SOURCES = \
+@@ -24,7 +28,7 @@ gnome_thumbnail_font_SOURCES = \
  	totem-resources.h
  
  gnome_font_viewer_LDADD = \
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
index b018303be60e..e280721a88d4 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild,v 1.4 2012/04/16 16:53:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild,v 1.5 2012/04/16 17:32:38 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -56,7 +56,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Fix missing freetype2 headers/libs with gtk+-3.4, bug #411939
-	epatch "${FILESDIR}/${PN}-3.2.1-gtk+-3.4-ft2.patch"
+	epatch "${FILESDIR}/${PN}-3.2.1-glib-2.32-gtk-3.4.patch"
 	eautoreconf
 
 	# Remove idiotic -D.*DISABLE_DEPRECATED cflags