rpms/kdebindings/devel kdebindings-4.4.92-qt47.patch, NONE, 1.1 kdebindings.spec, 1.323, 1.324

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.4.92-qt47.patch 
Log Message:
* Fri Jul 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.92-2
- fix Smoke build with Qt 4.7 (#612666, kde#243971)

kdebindings-4.4.92-qt47.patch:
 smokeconfig.xml |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE kdebindings-4.4.92-qt47.patch ---
diff -ur kdebindings-4.4.92/smoke/qtgui/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qtgui/smokeconfig.xml
--- kdebindings-4.4.92/smoke/qtgui/smokeconfig.xml	2010-04-07 13:24:17.000000000 +0200
+++ kdebindings-4.4.92-qt47/smoke/qtgui/smokeconfig.xml	2010-07-09 03:44:56.000000000 +0200
@@ -30,7 +30,13 @@
         <signature>.*qFrom.*Endian_helper.*</signature>
         <signature>.*QPixmapData.*</signature>
         <signature>.*qt_x11_getX11InfoForWindow.*</signature>
-   </exclude>
+        <!-- enum items from Qt 4.7 qs60style.h which cause compiler errors -->
+        <signature>.*PM_FrameCornerWidth</signature>
+        <signature>.*PM_FrameCornerHeight</signature>
+        <signature>.*PM_BoldLineWidth</signature>
+        <signature>.*PM_ThinLineWidth</signature>
+        <signature>.*PM_MessageBoxHeight</signature>
+    </exclude>
     <functions>
         <!-- include functions starting with 'q' -->
         <name>^q.*</name>


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -r1.323 -r1.324
--- kdebindings.spec	7 Jul 2010 18:30:43 -0000	1.323
+++ kdebindings.spec	9 Jul 2010 01:48:13 -0000	1.324
@@ -8,13 +8,10 @@
 #        It's also not working properly. And there are no Falcon bindings for
 #        the libraries anyway, just the Kross backend. -- Kevin
 %define falcon 0
-## smoke qt47 bindings currently busted
-%if "%{?_qt4_version}%{!?_qt4_version:4.6.2}" < "4.7.0" 
-%define smoke 1 
-# these depend on smoke
+%define smoke 1
+# php and ruby depend on smoke
 %define php 1
 %define ruby 1
-%endif
 %define java 0
 %endif
 
@@ -41,7 +38,7 @@
 
 Name: kdebindings
 Version: 4.4.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -52,6 +49,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 #Source0: kdebindings-1130463.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Smoke: blacklist enum items from qs60style.h which cause compiler errors
+# fixes Smoke build with Qt 4.7 (#612666, kde#243971), will submit upstream
+Patch0: kdebindings-4.4.92-qt47.patch
+
 ## upstream patches
 
 BuildRequires:  akonadi-devel
@@ -256,6 +257,7 @@ Falcon plugin for the Kross archtecture 
 
 %prep
 %setup -q -n kdebindings-%{version}%{?alphatag}
+%patch0 -p1 -b .qt47
 
 
 %build
@@ -537,6 +539,9 @@ fi
 
 
 %changelog
+* Fri Jul 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.92-2
+- fix Smoke build with Qt 4.7 (#612666, kde#243971)
+
 * Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.92-1
 - 4.5 RC2 (4.4.92)