Add patch to fix FTBFS # 631415
This commit is contained in:
parent
cdb158ce7a
commit
cc00f3a62f
27
gupnp-igd-gcc.patch
Normal file
27
gupnp-igd-gcc.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 251a7c4bf1817a98140ab1ca80a0c636945d65bb Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?utf-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.co.uk>
|
||||||
|
Date: Mon, 20 Dec 2010 16:27:12 +0530
|
||||||
|
Subject: [PATCH] simpleigdthread: Add typecast to make newer GCC happy
|
||||||
|
|
||||||
|
Report by Peter Robinson
|
||||||
|
http://bugzilla.openedhand.com/show_bug.cgi?id=2209
|
||||||
|
---
|
||||||
|
libgupnp-igd/gupnp-simple-igd-thread.c | 2 +-
|
||||||
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libgupnp-igd/gupnp-simple-igd-thread.c b/libgupnp-igd/gupnp-simple-igd-thread.c
|
||||||
|
index bd4476e..905880d 100644
|
||||||
|
--- a/libgupnp-igd/gupnp-simple-igd-thread.c
|
||||||
|
+++ b/libgupnp-igd/gupnp-simple-igd-thread.c
|
||||||
|
@@ -214,7 +214,7 @@ gupnp_simple_igd_thread_dispose (GObject *object)
|
||||||
|
{
|
||||||
|
GSource *src = g_idle_source_new ();
|
||||||
|
|
||||||
|
- g_source_set_callback (src, stop_loop, self, NULL);
|
||||||
|
+ g_source_set_callback (src, (GSourceFunc) stop_loop, self, NULL);
|
||||||
|
g_source_attach (src, self->priv->context);
|
||||||
|
g_source_unref (src);
|
||||||
|
|
||||||
|
--
|
||||||
|
1.6.1
|
||||||
|
|
@ -1,11 +1,8 @@
|
|||||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||||
|
|
||||||
%define gupnp_ver 0.13.2
|
|
||||||
%define glib2_ver 2.16
|
|
||||||
|
|
||||||
Name: gupnp-igd
|
Name: gupnp-igd
|
||||||
Version: 0.1.7
|
Version: 0.1.7
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Library to handle UPnP IGD port mapping
|
Summary: Library to handle UPnP IGD port mapping
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -13,10 +10,10 @@ License: LGPLv2+
|
|||||||
URL: http://www.gupnp.org/
|
URL: http://www.gupnp.org/
|
||||||
Source0: http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
|
Source0: http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
|
||||||
Patch0: %{name}-0.1.7-make.patch
|
Patch0: %{name}-0.1.7-make.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Patch1: gupnp-igd-gcc.patch
|
||||||
|
|
||||||
BuildRequires: glib2-devel >= %{glib2_ver}
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: gupnp-devel >= %{gupnp_ver}
|
BuildRequires: gupnp-devel
|
||||||
BuildRequires: pygtk2-devel
|
BuildRequires: pygtk2-devel
|
||||||
|
|
||||||
|
|
||||||
@ -50,6 +47,7 @@ developing applications that use %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .make
|
%patch0 -p1 -b .make
|
||||||
|
%patch1 -p1 -b .gcc
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -60,15 +58,10 @@ make %{?_smp_mflags}
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
||||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||||
|
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
|
|
||||||
@ -97,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Dec 26 2010 Peter Robinson <pbrobinson@gmail.com> - 0.1.7-4
|
||||||
|
- Add patch to fix FTBFS # 631415
|
||||||
|
|
||||||
* Thu Dec 23 2010 Dan Horák <dan[at]danny.cz> - 0.1.7-3
|
* Thu Dec 23 2010 Dan Horák <dan[at]danny.cz> - 0.1.7-3
|
||||||
- workaround make 3.82 issue in python/Makefile
|
- workaround make 3.82 issue in python/Makefile
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user