[libdmapsharing/f16] libdmapsharing-2.9.12-glib.patch: Fix FTBFS against new glib
mikep
mikep at fedoraproject.org
Mon Dec 5 19:48:02 UTC 2011
commit 488fc1a32c2c0e8cc04390f86701c3258cc953c4
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Nov 8 22:29:03 2011 -0500
libdmapsharing-2.9.12-glib.patch: Fix FTBFS against new glib
Conflicts:
libdmapsharing.spec
libdmapsharing-2.9.12-glib.patch | 13 +++++++++++++
libdmapsharing.spec | 5 +++++
2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/libdmapsharing-2.9.12-glib.patch b/libdmapsharing-2.9.12-glib.patch
new file mode 100644
index 0000000..d0a7207
--- /dev/null
+++ b/libdmapsharing-2.9.12-glib.patch
@@ -0,0 +1,13 @@
+diff -up libdmapsharing-2.9.12/libdmapsharing/dpap-share.c.jx libdmapsharing-2.9.12/libdmapsharing/dpap-share.c
+--- libdmapsharing-2.9.12/libdmapsharing/dpap-share.c.jx 2011-04-30 17:40:56.000000000 -0400
++++ libdmapsharing-2.9.12/libdmapsharing/dpap-share.c 2011-11-08 20:08:25.370101810 -0500
+@@ -27,8 +27,7 @@
+ #include <stdlib.h>
+
+ #include <glib/gi18n.h>
+-#include <glib/gslist.h>
+-#include <glib/gmappedfile.h>
++#include <glib.h>
+
+ #include <unistd.h>
+ #include <sys/types.h>
diff --git a/libdmapsharing.spec b/libdmapsharing.spec
index 9c4748e..9e94711 100644
--- a/libdmapsharing.spec
+++ b/libdmapsharing.spec
@@ -9,6 +9,7 @@ Summary: A DMAP client and server library
Group: Development/Libraries
BuildRequires: pkgconfig, glib2-devel, libsoup-devel >= 2.32
BuildRequires: avahi-glib-devel, gdk-pixbuf2-devel, gstreamer-plugins-base-devel >= 0.10.23.2
+Patch0: libdmapsharing-2.9.12-glib.patch
%description
libdmapsharing implements the DMAP protocols. This includes support for
@@ -41,6 +42,7 @@ other resources needed for developing applications using libdmapsharing.
%prep
%setup -q
+%patch0 -p1 -b .glib
%build
%configure --disable-static
@@ -63,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
- new upstream version
- Remove patch from previous release (upstreamed)
+* Tue Nov 08 2011 Adam Jackson <ajax at redhat.com> 2.9.12-2
+- libdmapsharing-2.9.12-glib.patch: Fix FTBFS against new glib
+
* Mon Aug 22 2011 Adam Williamson <awilliam at redhat.com> - 2.9.12-1
- new upstream version
More information about the scm-commits
mailing list