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

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 22 insertions, 13 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/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