* [gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-utils/files: gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch gnome-utils-3.2.1-gtk+-3.4-ft2.patch
@ 2012-04-16 17:32 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-04-16 17:32 UTC (permalink / raw
To: gentoo-commits
tetromino 12/04/16 17:32:38
Added: gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch
Removed: gnome-utils-3.2.1-gtk+-3.4-ft2.patch
Log:
Properly fix building with glib-2.32; thanks to Yaw_e for reporting.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.1 gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch?rev=1.1&content-type=text/plain
Index: gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch
===================================================================
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 glib-2.32 gtk+-3.4
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 | 6 +++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index b25d4ec..c8a07f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,10 @@ PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
+PKG_CHECK_MODULES(FREETYPE2, freetype2)
+AC_SUBST(FREETYPE2_CFLAGS)
+AC_SUBST(FREETYPE2_LIBS)
+
# For each cycle:
# 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..74ecb95 100644
--- a/font-viewer/Makefile.am
+++ b/font-viewer/Makefile.am
@@ -1,6 +1,8 @@
INCLUDES = \
+ $(FREETYPE2_CFLAGS) \
$(GIO_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
$(GTK_CFLAGS) \
-DDIRECTORY_DIR=\"$(directorydir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
@@ -14,7 +16,9 @@ ftstream_SOURCES = \
ftstream-vfs.c
gnome_thumbnail_font_LDADD = \
+ $(FREETYPE2_LIBS) \
$(GIO_LIBS) \
+ $(GTHREAD_LIBS) \
$(GTK_LIBS)
gnome_thumbnail_font_SOURCES = \
@@ -24,7 +28,7 @@ gnome_thumbnail_font_SOURCES = \
totem-resources.h
gnome_font_viewer_LDADD = \
- $(XFT_LIBS) \
+ $(FREETYPE2_LIBS) \
$(GIO_LIBS) \
$(GTK_LIBS)
--
1.7.8.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-16 17:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-16 17:32 [gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-utils/files: gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch gnome-utils-3.2.1-gtk+-3.4-ft2.patch Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox