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

Kevin Kofler kkofler at fedoraproject.org
Fri Jul 9 04:35:04 UTC 2010 

Author: kkofler

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

Modified Files:
	kdebindings-4.4.92-qt47.patch 
Log Message:
Add the blacklist to everything depending on QtGui.

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/qtopengl/smokeconfig.xml         |    6 ++++++
 smoke/qtsvg/smokeconfig.xml            |    6 ++++++
 smoke/qtuitools/smokeconfig.xml        |    8 ++++++++
 smoke/qtwebkit/smokeconfig.xml         |    8 ++++++++
 smoke/qwt/smokeconfig.xml              |    6 ++++++
 11 files changed, 72 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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kdebindings-4.4.92-qt47.patch	9 Jul 2010 04:08:03 -0000	1.4
+++ kdebindings-4.4.92-qt47.patch	9 Jul 2010 04:35:04 -0000	1.5
@@ -13,6 +13,72 @@ diff -ur kdebindings-4.4.92/generator/ge
              parent->appendChild(&e);
          }
      }
+diff -ur kdebindings-4.4.92/smoke/khtml/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/khtml/smokeconfig.xml
+--- kdebindings-4.4.92/smoke/khtml/smokeconfig.xml	2010-06-16 14:02:25.000000000 +0200
++++ kdebindings-4.4.92-qt47/smoke/khtml/smokeconfig.xml	2010-07-09 06:26:43.000000000 +0200
+@@ -27,6 +27,12 @@
+         <signature>.*DOM::Element::(set)?(c|C)ontentEditable\(.*</signature>
+         <signature>.*DOM::TextEvent::data\(\).*</signature>
+         <signature>.*khtml::applyRule\(DOM::CSSProperty\*\).*</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>
+         <!-- everything in that namespace.. -->
+diff -ur kdebindings-4.4.92/smoke/nepomuk/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/nepomuk/smokeconfig.xml
+--- kdebindings-4.4.92/smoke/nepomuk/smokeconfig.xml	2010-01-13 16:19:16.000000000 +0100
++++ kdebindings-4.4.92-qt47/smoke/nepomuk/smokeconfig.xml	2010-07-09 06:26:54.000000000 +0200
+@@ -23,6 +23,12 @@
+         <signature>.*Q3.*</signature>
+         
+         <signature>.*Nepomuk::ResourceManager::allResources\(\).*</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>
+         <!-- everything in that namespace.. -->
+diff -ur kdebindings-4.4.92/smoke/phonon/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/phonon/smokeconfig.xml
+--- kdebindings-4.4.92/smoke/phonon/smokeconfig.xml	2010-03-10 11:42:13.000000000 +0100
++++ kdebindings-4.4.92-qt47/smoke/phonon/smokeconfig.xml	2010-07-09 06:27:06.000000000 +0200
+@@ -19,6 +19,12 @@
+         <signature>.*Phonon::.*::k_ptr</signature>
+         <signature>.*Phonon::.*::d_ptr</signature>
+         <signature>.*Phonon::.*::d</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>
+     <classList>
+         <class>Phonon</class>
+diff -ur kdebindings-4.4.92/smoke/qsci/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qsci/smokeconfig.xml
+--- kdebindings-4.4.92/smoke/qsci/smokeconfig.xml	2010-01-13 16:19:16.000000000 +0100
++++ kdebindings-4.4.92-qt47/smoke/qsci/smokeconfig.xml	2010-07-09 06:27:40.000000000 +0200
+@@ -14,6 +14,14 @@
+         <typeName>QStringList</typeName>
+         <typeName>QString</typeName>
+     </voidpTypes>
++    <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>
+     <classList>
+         <class>QsciAbstractAPIs</class>
+         <class>QsciAPIs</class>
 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 05:45:45.000000000 +0200
@@ -31,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/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
+@@ -27,6 +27,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/qtsvg/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qtsvg/smokeconfig.xml
 --- kdebindings-4.4.92/smoke/qtsvg/smokeconfig.xml	2009-12-31 14:35:31.000000000 +0100
 +++ kdebindings-4.4.92-qt47/smoke/qtsvg/smokeconfig.xml	2010-07-09 06:05:30.000000000 +0200
@@ -47,3 +129,55 @@ diff -ur kdebindings-4.4.92/smoke/qtsvg/
     </exclude>
      <functions>
          <!-- include functions starting with 'q' -->
+diff -ur kdebindings-4.4.92/smoke/qtuitools/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qtuitools/smokeconfig.xml
+--- kdebindings-4.4.92/smoke/qtuitools/smokeconfig.xml	2009-12-31 14:35:31.000000000 +0100
++++ kdebindings-4.4.92-qt47/smoke/qtuitools/smokeconfig.xml	2010-07-09 06:28:07.000000000 +0200
+@@ -14,6 +14,14 @@
+         <typeName>QStringList</typeName>
+         <typeName>QString</typeName>
+     </voidpTypes>
++    <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>
+     <classList>
+         <class>QUiLoader</class>
+     </classList>
+diff -ur kdebindings-4.4.92/smoke/qtwebkit/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qtwebkit/smokeconfig.xml
+--- kdebindings-4.4.92/smoke/qtwebkit/smokeconfig.xml	2010-04-15 10:58:19.000000000 +0200
++++ kdebindings-4.4.92-qt47/smoke/qtwebkit/smokeconfig.xml	2010-07-09 06:28:20.000000000 +0200
+@@ -14,6 +14,14 @@
+         <typeName>QStringList</typeName>
+         <typeName>QString</typeName>
+     </voidpTypes>
++    <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>
+     <classList>
+         <class>QWebDatabase</class>
+         <class>QWebElement</class>
+diff -ur kdebindings-4.4.92/smoke/qwt/smokeconfig.xml kdebindings-4.4.92-qt47/smoke/qwt/smokeconfig.xml
+--- kdebindings-4.4.92/smoke/qwt/smokeconfig.xml	2009-12-31 14:35:32.000000000 +0100
++++ kdebindings-4.4.92-qt47/smoke/qwt/smokeconfig.xml	2010-07-09 06:28:28.000000000 +0200
+@@ -20,6 +20,12 @@
+     <exclude>
+         <signature>.*QwtData::operator=\(const QwtData&amp;\).*</signature>
+         <signature>.*QwtSpline::d_data</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>
+     <classList>
+         <class>QwtAbstractScaleDraw</class>

More information about the scm-commits mailing list