rpms/kdebindings/devel kdebindings-4.4.92-qt47.patch,1.5,1.6

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebindings-4.4.92-qt47.patch 
Log Message:
Also blacklist the junk enum in QtMultimedia where it also gets picked up.

kdebindings-4.4.92-qt47.patch:
 generator/generators/smoke/helpers.cpp |    5 +++++
 smoke/khtml/smokeconfig.xml            |    6 ++++++
 smoke/nepomuk/smokeconfig.xml          |    6 ++++++
 smoke/phonon/smokeconfig.xml           |    6 ++++++
 smoke/qsci/smokeconfig.xml             |    8 ++++++++
 smoke/qtgui/smokeconfig.xml            |    8 +++++++-
 smoke/qtmultimedia/smokeconfig.xml     |    6 ++++++
 smoke/qtopengl/smokeconfig.xml         |    6 ++++++
 smoke/qtsvg/smokeconfig.xml            |    6 ++++++
 smoke/qtuitools/smokeconfig.xml        |    8 ++++++++
 smoke/qtwebkit/smokeconfig.xml         |    8 ++++++++
 smoke/qwt/smokeconfig.xml              |    6 ++++++
 12 files changed, 78 insertions(+), 1 deletion(-)

Index: kdebindings-4.4.92-qt47.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.4.92-qt47.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- kdebindings-4.4.92-qt47.patch	9 Jul 2010 04:35:04 -0000	1.5
+++ kdebindings-4.4.92-qt47.patch	9 Jul 2010 05:09:30 -0000	1.6
@@ -97,6 +97,22 @@ diff -ur kdebindings-4.4.92/smoke/qtgui/
      <functions>
          <!-- include functions starting with 'q' -->
          <name>^q.*</name>
+diff -ur kdebindings-4.4.92/smoke/qtmultimedia/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qtmultimedia/smokeconfig.xml
+--- kdebindings-4.4.92/smoke/qtmultimedia/smokeconfig.xml	2010-04-15 10:58:18.000000000 +0200
++++ kdebindings-4.4.92-qt47/smoke/qtmultimedia/smokeconfig.xml	2010-07-09 07:06:06.000000000 +0200
+@@ -25,6 +25,12 @@
+         <signature>.*qFindString.*</signature>
+         <!-- windows internal helper functions -->
+         <signature>.*qFrom.*Endian_helper.*</signature>
++        <!-- 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' -->
 diff -ur kdebindings-4.4.92/smoke/qtopengl/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qtopengl/smokeconfig.xml
 --- kdebindings-4.4.92/smoke/qtopengl/smokeconfig.xml	2009-12-31 14:35:31.000000000 +0100
 +++ kdebindings-4.4.92-qt47/smoke/qtopengl/smokeconfig.xml	2010-07-09 06:27:51.000000000 +0200