[gnaughty] Fix building against gthread

Petr Pisar ppisar at fedoraproject.org
Wed Feb 15 12:29:07 UTC 2012


commit bfd33d26210eb8b365c44db07d1d3d37148095f5
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Feb 15 13:23:22 2012 +0100

    Fix building against gthread

 gnaughty-1.2.5-Link-to-gthread.patch |   26 ++++++++++++++++++++++++++
 gnaughty.spec                        |    7 +++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/gnaughty-1.2.5-Link-to-gthread.patch b/gnaughty-1.2.5-Link-to-gthread.patch
new file mode 100644
index 0000000..2ceff2b
--- /dev/null
+++ b/gnaughty-1.2.5-Link-to-gthread.patch
@@ -0,0 +1,26 @@
+From 0e87e5cc6d63a31e2b1596e246ca7e53e00540ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 15 Feb 2012 13:17:59 +0100
+Subject: [PATCH] Link to gthread
+
+---
+ configure.in |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 06151f5..3c15d7d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -13,7 +13,8 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ 
+ # Checks for libraries.
+-PKG_CHECK_MODULES(GNAUGHTY, gtk+-2.0 >= 2.0.0 gconf-2.0 libglade-2.0)
++PKG_CHECK_MODULES(GNAUGHTY, gtk+-2.0 >= 2.0.0 gconf-2.0 libglade-2.0
++                  gthread-2.0)
+ #GNAUGHTY_LIBS="${GNAUGHTY_LIBS}"
+ 
+ AM_GCONF_SOURCE_2
+-- 
+1.7.7.6
+
diff --git a/gnaughty.spec b/gnaughty.spec
index 9b93ec6..0d2b3ee 100644
--- a/gnaughty.spec
+++ b/gnaughty.spec
@@ -7,14 +7,18 @@ License:         GPLv2+
 URL:             http://gnaughty.sourceforge.net
 Source0:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:          %{name}-1.2.5-cURL-does-not-provide-curl-types.h-anymore.patch
+Patch1:          %{name}-1.2.5-Link-to-gthread.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   libglade2-devel
+BuildRequires:   glib2-devel
 BuildRequires:   gtk2-devel
 BuildRequires:   GConf2-devel
 BuildRequires:   libcurl-devel
 BuildRequires:   pcre-devel
 BuildRequires:   desktop-file-utils
+# Due to Link-to-gthread patch 
+BuildRequires:   autoconf
 
 Requires(pre):   GConf2
 Requires(preun): GConf2
@@ -29,6 +33,8 @@ pictures, from a known internet directory.
 %prep
 %setup -q
 %patch0 -p1 -b .curl
+%patch1 -p1 -b .gthread
+autoconf
 
 sed -i 's|Icon=%{name}.png|Icon=%{name}|g' %{name}.desktop
 sed -i 's|Comment=Porn downloader|Comment=Downloader for adult content|g' %{name}.desktop
@@ -92,6 +98,7 @@ rm -rf %{buildroot}
 * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 1.2.5-4
 - Rebuild against PCRE 8.30
 - Fix building against curl
+- Fix building against gthread
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


More information about the scm-commits mailing list