rpms/kdebindings/devel kdebindings-4.0.2-qt434.patch, NONE, 1.1 kdebindings.spec, 1.86, 1.87

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19483/devel

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.0.2-qt434.patch 
Log Message:
* Sat Mar 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
- backport 1 line of rev 776653 from trunk to fix build with Qt 4.3.4

kdebindings-4.0.2-qt434.patch:

--- NEW FILE kdebindings-4.0.2-qt434.patch ---
diff -ur kdebindings-4.0.2/kalyptus/kalyptus kdebindings-4.0.2-qt434/kalyptus/kalyptus
--- kdebindings-4.0.2/kalyptus/kalyptus	2008-01-05 00:53:01.000000000 +0100
+++ kdebindings-4.0.2-qt434/kalyptus/kalyptus	2008-03-01 20:45:53.000000000 +0100
@@ -574,6 +574,7 @@
 				     $p =~ m/^#\s*ifdef\s+QT_COMPAT/ or
 				     $p =~ m/^#\s*if\s+defined\s*\(?QT_COMPAT/ or
 				     $p =~ m/^#\s*ifdef\s+CONTAINER_CUSTOM_WIDGETS/ or
+				     $p =~ m/^#\s*ifdef\s+Q_MAC_COMPAT_GL_FUNCTIONS/ or
 				     $p =~ m/^#\s*ifdef\s+QT3_SUPPORT/ or
 				     $p =~ m/^#\s*ifdef\s+KDE3_SUPPORT/ or
 				     $p =~ m/^#\s*ifdef\s+Q_WS_WIN/ or


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kdebindings.spec	29 Feb 2008 23:55:59 -0000	1.86
+++ kdebindings.spec	1 Mar 2008 19:51:13 -0000	1.87
@@ -7,13 +7,16 @@
 
 Name: kdebindings
 Version: 4.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# one line from http://websvn.kde.org/?view=rev&revision=776653 (Qt 4.4 fixes)
+# fixes QMacCompatGL*-related errors with Qt 4.3.4
+Patch0: kdebindings-4.0.2-qt434.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -59,6 +62,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt434
 
 
 %build
@@ -113,6 +117,9 @@
 
 
 %changelog
+* Sat Mar 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-3
+- backport 1 line of rev 776653 from trunk to fix build with Qt 4.3.4
+
 * Fri Feb 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
 - drop lib64 patches (fixed upstream)