rpms/qbittorrent/devel gtk-include.patch, NONE, 1.1 qbittorrent.spec, 1.110, 1.111

[Leigh Scott]

Author: leigh123linux

Update of /cvs/pkgs/rpms/qbittorrent/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5923

Modified Files:
	qbittorrent.spec 
Added Files:
	gtk-include.patch 
Log Message:
* Mon Jul 19 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-0.4.rc5
- update to 2.3.0rc5
- add patch to fix libnotify gtk problem


gtk-include.patch:
 configure         |   13 ++++++++++++-
 qcm/libnotify.qcm |   13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

--- NEW FILE gtk-include.patch ---
Index: qcm/libnotify.qcm
===================================================================
--- qcm/libnotify.qcm	(revision 4256)
+++ qcm/libnotify.qcm	(working copy)
@@ -40,10 +40,21 @@
 			} else {
 				return false;
 			}
+			QStringList incs3;
+                        QString req_ver3 = "2.0";
+                        QString version3, libs3, other3;
+			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
+                                for(int n = 0; n < incs3.count(); ++n)
+                                conf->addIncludePath(incs3[n]);
+                                if(!libs3.isEmpty())
+                                        conf->addLib(libs3);
+                        } else {
+                                return false;
+                        }
 		} else {
 			return false;
 		}
-		
+
 		return true;
 	}
 };
Index: configure
===================================================================
--- configure	(revision 4256)
+++ configure	(working copy)
@@ -529,10 +529,21 @@
 			} else {
 				return false;
 			}
+			QStringList incs3;
+                        QString req_ver3 = "2.0";
+                        QString version3, libs3, other3;
+			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
+                                for(int n = 0; n < incs3.count(); ++n)
+                                conf->addIncludePath(incs3[n]);
+                                if(!libs3.isEmpty())
+                                        conf->addLib(libs3);
+                        } else {
+                                return false;
+                        }
 		} else {
 			return false;
 		}
-		
+
 		return true;
 	}
 };


Index: qbittorrent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qbittorrent/devel/qbittorrent.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- qbittorrent.spec	19 Jul 2010 19:03:32 -0000	1.110
+++ qbittorrent.spec	20 Jul 2010 17:59:23 -0000	1.111
@@ -15,6 +15,7 @@ Source0: http://downloads.sourceforge.ne
 Source1: qbittorrent-nox.README
 Patch0:  disable_extra_debug.patch
 Patch1:  qt_deprecated.patch
+Patch2:  gtk-include.patch
 
 # Upstream patches
 
@@ -52,6 +53,7 @@ It aims to be as fast as possible and to
 #%patch0 -p1 -b .disable_extra_debug
 %patch1 -p1 -b .qt_deprecated
 # Upstream patches
+%patch2 -p0 -b .gtk-include
 
 cp -p %{SOURCE1} .
 
@@ -127,6 +129,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %changelog
 * Mon Jul 19 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-0.4.rc5
 - update to 2.3.0rc5
+- add patch to fix libnotify gtk problem
 
 * Thu Jul 08 2010 Leigh Scott <leigh123linux at googlemail.com> - 2.3.0-0.3.rc2
 - update to 2.3.0rc2