rpms/glibmm24/devel glibmm-2.18.0-gio-header-fix.patch, NONE, 1.1 glibmm.spec, 1.43, 1.44

[Adel Gadllah]

Author: drago01

Update of /cvs/pkgs/rpms/glibmm24/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1659

Modified Files:
	glibmm.spec 
Added Files:
	glibmm-2.18.0-gio-header-fix.patch 
Log Message:
Backport a fix from upstream that resolves the HOST_NOT_FOUND symbol conflict, which causes FTBS bugs (some packages fail to build because of this)

glibmm-2.18.0-gio-header-fix.patch:

--- NEW FILE glibmm-2.18.0-gio-header-fix.patch ---
diff -upNr glibmm-2.18.0.orign/gio/src/error.hg glibmm-2.18.0/gio/src/error.hg
--- glibmm-2.18.0.orign/gio/src/error.hg	2008-07-16 18:38:00.000000000 +0200
+++ glibmm-2.18.0/gio/src/error.hg	2008-10-05 11:52:14.000000000 +0200
@@ -19,6 +19,16 @@
 
 #include <glibmm/interface.h>
 
+// There have been issues with other libraries defining HOST_NOT_FOUND (e.g.
+// netdb.h).  As a workaround, we added the alternate name HOST_WAS_NOT_FOUND.
+// Portable code should not use HOST_NOT_FOUND.  Undefining it here (and
+// restoring it below) will allow programs to compile even if they include
+// netdb.h.  See Bug #529496
+#ifdef HOST_NOT_FOUND
+#define GIOMM_SAVED_HOST_NOT_FOUND HOST_NOT_FOUND
+#undef HOST_NOT_FOUND
+#endif // HOST_NOT_FOUND
+
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
 
@@ -35,3 +45,8 @@ _WRAP_GERROR(Error, GIOErrorEnum, G_IO_E
 
 } // namespace Gio
 
+#ifdef GIOMM_SAVED_HOST_NOT_FOUND
+// restore the previously-defined HOST_NOT_FOUND macro
+#define HOST_NOT_FOUND GIOMM_SAVED_HOST_NOT_FOUND
+#undef GIOMM_SAVED_HOST_NOT_FOUND
+#endif // GIOMM_SAVED_HOST_NOT_FOUND


Index: glibmm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibmm24/devel/glibmm.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- glibmm.spec	23 Sep 2008 07:40:23 -0000	1.43
+++ glibmm.spec	5 Oct 2008 10:03:07 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           glibmm24
 Version:        2.18.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ interface for GTK2 (a GUI library for X)
 
 Group:          System Environment/Libraries
@@ -9,6 +9,8 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.18/glibmm-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:		  glibmm-2.18.0-gio-header-fix.patch
+
 BuildRequires:  libsigc++20-devel >= 2.0.0
 BuildRequires:  glib2-devel >= 2.17.3
 
@@ -33,7 +35,7 @@
 
 %prep
 %setup -q -n glibmm-%{version}
-
+%patch1 -p1 -b .gio-header
 
 %build
 %configure --disable-fulldocs %{!?_with_static: --disable-static}
@@ -83,6 +85,10 @@
 
 
 %changelog
+* Sun Oct 05 2008 Adel Gadllah <adel.gadllah at gmail.com> - 2.18.0-2
+- Backport upstream fix that resolves HOST_NOT_FOUND
+  symbol conflicts (GNOME #529496)
+
 * Tue Sep 23 2008 Denis Leroy <denis at poolshark.org> - 2.18.0-1
 - Update to upstream 2.18.0