[libgnome] Add patch to build with the latest glib

Colin Walters walters at fedoraproject.org
Thu May 2 22:28:19 UTC 2013


commit 56d31cb4f6afbb31384b2b8dcf1844405d3a2892
Author: Colin Walters <walters at verbum.org>
Date:   Thu May 2 18:28:06 2013 -0400

    Add patch to build with the latest glib

 0001-Don-t-use-G_DISABLE_DEPRECATED.patch |   26 ++++++++++++++++++++++++++
 libgnome.spec                             |    9 ++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-Don-t-use-G_DISABLE_DEPRECATED.patch b/0001-Don-t-use-G_DISABLE_DEPRECATED.patch
new file mode 100644
index 0000000..fdbf8fb
--- /dev/null
+++ b/0001-Don-t-use-G_DISABLE_DEPRECATED.patch
@@ -0,0 +1,26 @@
+From 64a0443e26a50745c8fdc02eddf60985a977275f Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 2 May 2013 17:58:00 -0400
+Subject: [PATCH] Don't use G_DISABLE_DEPRECATED
+
+Because really, no one cares about this code, we're not going to
+stay on the GLib treadmill.
+---
+ libgnome/Makefile.am |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
+index 9c8cd3e..aa01f6c 100644
+--- a/libgnome/Makefile.am
++++ b/libgnome/Makefile.am
+@@ -17,7 +17,6 @@ INCLUDES = \
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\
+ 	$(LIBGNOME_CFLAGS)					\
+-	-DG_DISABLE_DEPRECATED					\
+ 	-DLIBGNOME_PREFIX=\""$(prefix)"\"			\
+ 	-DLIBGNOME_LIBDIR=\""$(libdir)"\"			\
+ 	-DLIBGNOME_DATADIR=\""$(datadir)"\"			\
+-- 
+1.7.1
+
diff --git a/libgnome.spec b/libgnome.spec
index 6263e94..1b76f75 100644
--- a/libgnome.spec
+++ b/libgnome.spec
@@ -50,7 +50,7 @@ BuildRequires:  ORBit2-devel
 BuildRequires:  libxslt-devel 
 BuildRequires:  libcanberra-devel
 BuildRequires:  intltool
-BuildRequires:  libtool
+BuildRequires:  gnome-common autoconf automake libtool
 BuildRequires:  gettext
 BuildRequires:  popt-devel
 
@@ -70,6 +70,8 @@ Patch8: im-setting.patch
 
 Patch9: libgnome-2.24.1-default-noblink.patch
 
+Patch10: 0001-Don-t-use-G_DISABLE_DEPRECATED.patch
+
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 GUI applications and desktop tools to be used in conjunction with a
@@ -99,8 +101,10 @@ if you just want to use the GNOME desktop environment.
 %patch7 -p1 -b .default-sound-effects
 %patch8 -p1 -b .im-setting
 %patch9 -p1 -b .default-noblink
+%patch10 -p1
 
 %build
+autoreconf -vfi
 %configure --disable-gtk-doc --disable-static --disable-esd
 
 make %{?_smp_mflags} 
@@ -168,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu May 02 2013 Colin Walters <walters at verbum.org> - 2.32.1-7
+- Add patch to build with the latest glib
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list