[packages/libgnome] - fix building with glib >= 2.30

hawk hawk at pld-linux.org
Mon May 6 21:13:16 CEST 2013


commit 7705713950515fde72396089872bb2b53b74a6b6
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Mon May 6 19:36:53 2013 +0000

    - fix building with glib >= 2.30

 libgnome-glib.patch | 22 ++++++++++++++++++++++
 libgnome.spec       |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/libgnome.spec b/libgnome.spec
index cc2cd8e..7188608 100644
--- a/libgnome.spec
+++ b/libgnome.spec
@@ -2,12 +2,13 @@ Summary:	GNOME base library
 Summary(pl.UTF-8):	Podstawowa biblioteka GNOME
 Name:		libgnome
 Version:	2.32.1
-Release:	2
+Release:	3
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgnome/2.32/%{name}-%{version}.tar.bz2
 # Source0-md5:	a4345e6087ae6195d65a4674ffdca559
 Patch0:		%{name}-load-config.patch
+Patch1:		%{name}-glib.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf >= 2.54
@@ -107,6 +108,7 @@ Dokumentacja API libgnome.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}
diff --git a/libgnome-glib.patch b/libgnome-glib.patch
new file mode 100644
index 0000000..5bcf734
--- /dev/null
+++ b/libgnome-glib.patch
@@ -0,0 +1,22 @@
+diff -ur libgnome-2.32.1.orig/libgnome/Makefile.am libgnome-2.32.1.fix/libgnome/Makefile.am
+--- libgnome-2.32.1.orig/libgnome/Makefile.am	2009-10-05 12:03:08.000000000 +0000
++++ libgnome-2.32.1.fix/libgnome/Makefile.am	2013-05-06 19:34:10.282571745 +0000
+@@ -17,7 +17,6 @@
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\
+ 	$(LIBGNOME_CFLAGS)					\
+-	-DG_DISABLE_DEPRECATED					\
+ 	-DLIBGNOME_PREFIX=\""$(prefix)"\"			\
+ 	-DLIBGNOME_LIBDIR=\""$(libdir)"\"			\
+ 	-DLIBGNOME_DATADIR=\""$(datadir)"\"			\
+diff -ur libgnome-2.32.1.orig/libgnome/Makefile.in libgnome-2.32.1.fix/libgnome/Makefile.in
+--- libgnome-2.32.1.orig/libgnome/Makefile.in	2011-01-31 13:36:49.000000000 +0000
++++ libgnome-2.32.1.fix/libgnome/Makefile.in	2013-05-06 19:28:27.204528696 +0000
+@@ -311,7 +311,6 @@
+ 	-I$(srcdir)/..						\
+ 	$(WARN_CFLAGS)						\
+ 	$(LIBGNOME_CFLAGS)					\
+-	-DG_DISABLE_DEPRECATED					\
+ 	-DLIBGNOME_PREFIX=\""$(prefix)"\"			\
+ 	-DLIBGNOME_LIBDIR=\""$(libdir)"\"			\
+ 	-DLIBGNOME_DATADIR=\""$(datadir)"\"			\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgnome.git/commitdiff/7705713950515fde72396089872bb2b53b74a6b6



More information about the pld-cvs-commit mailing list