[packages/ORBit2] - fix building with with glib >= 2.30 - release 3

[hawk]

commit 62ddc6e21a83090beb65a03baaf0fedd7a3673ad
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Mon Apr 1 20:48:21 2013 +0000

    - fix building with with glib >= 2.30
    - release 3

 ORBit2-build-fix.patch | 37 +++++++++++++++++++++++++++++++++++++
 ORBit2.spec            |  4 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)
---
diff --git a/ORBit2.spec b/ORBit2.spec
index 35ea9c5..0d5d33e 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -8,13 +8,14 @@ Summary(fr.UTF-8):	Requète d'Objects CORBA
 Summary(pl.UTF-8):	Wysoko wydajny CORBA Object Request Broker
 Name:		ORBit2
 Version:	2.14.19
-Release:	2
+Release:	3
 Epoch:		1
 License:	GPL v2+/LGPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
 # Source0-md5:	7082d317a9573ab338302243082d10d1
 Patch0:		%{name}-pthread.patch
+Patch1:		%{name}-build-fix.patch
 URL:		http://projects.gnome.org/ORBit2/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.9
@@ -127,6 +128,7 @@ skonsolidowanych statycznie używających technologii CORBA.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if !%{with apidocs}
 echo 'EXTRA_DIST=' > gtk-doc.make
diff --git a/ORBit2-build-fix.patch b/ORBit2-build-fix.patch
new file mode 100644
index 0000000..a1c1725
--- /dev/null
+++ b/ORBit2-build-fix.patch
@@ -0,0 +1,37 @@
+diff -ur ORBit2-2.14.19.orig/configure.in ORBit2-2.14.19/configure.in
+--- ORBit2-2.14.19.orig/configure.in	2010-07-01 13:57:01.000000000 +0000
++++ ORBit2-2.14.19/configure.in	2013-04-01 20:41:55.902571944 +0000
+@@ -262,7 +262,7 @@
+ 
+ if test "$enable_maintainer_mode" = "yes"; then
+ 	DISABLE_DEPRECATED_CFLAGS=" \
+-		-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
++		-DG_DISABLE_SINGLE_INCLUDES"
+ 	AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+ fi
+ 
+diff -ur ORBit2-2.14.19.orig/linc2/src/Makefile.am ORBit2-2.14.19/linc2/src/Makefile.am
+--- ORBit2-2.14.19.orig/linc2/src/Makefile.am	2010-02-09 12:05:35.000000000 +0000
++++ ORBit2-2.14.19/linc2/src/Makefile.am	2013-04-01 20:42:37.883571886 +0000
+@@ -12,8 +12,7 @@
+ 	-I$(top_builddir)/linc2/include  \
+ 	-I$(top_srcdir)/linc2/include    \
+ 	$(LINC_CFLAGS)             \
+-	$(WARN_CFLAGS)             \
+-	-DG_DISABLE_DEPRECATED
++	$(WARN_CFLAGS)             
+ 
+ if OS_WIN32
+ else
+diff -ur ORBit2-2.14.19.orig/linc2/src/Makefile.in ORBit2-2.14.19/linc2/src/Makefile.in
+--- ORBit2-2.14.19.orig/linc2/src/Makefile.in	2010-09-28 09:39:39.000000000 +0000
++++ ORBit2-2.14.19/linc2/src/Makefile.in	2013-04-01 20:42:51.310571646 +0000
+@@ -244,7 +244,7 @@
+ #	-I$(top_srcdir)/include    
+ INCLUDES = -I$(top_builddir)/linc2/include \
+ 	-I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \
+-	-DG_DISABLE_DEPRECATED $(am__append_1)
++	$(am__append_1)
+ liblinc_la_SOURCES = \
+ 	linc.c			\
+ 	linc-connection.c	\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ORBit2.git/commitdiff/62ddc6e21a83090beb65a03baaf0fedd7a3673ad