From 65bec898fcebde5632056d90996fa00927976ca3 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jul 09 2010 09:10:24 +0000 Subject: - use upstream fix for Qt 4.7 build issue (#612666, kde#243971) --- diff --git a/kdebindings-4.4.92-qt47.patch b/kdebindings-4.4.92-qt47.patch index 30ba922..88be5cf 100644 --- a/kdebindings-4.4.92-qt47.patch +++ b/kdebindings-4.4.92-qt47.patch @@ -1,199 +1,42 @@ -diff -ur kdebindings-4.4.92/generator/generators/smoke/helpers.cpp kdebindings-4.4.92-qt47/generator/generators/smoke/helpers.cpp ---- kdebindings-4.4.92/generator/generators/smoke/helpers.cpp 2010-05-27 19:21:49.000000000 +0200 -+++ kdebindings-4.4.92-qt47/generator/generators/smoke/helpers.cpp 2010-07-09 05:46:48.000000000 +0200 -@@ -166,6 +166,11 @@ - t = Type::registerType(Type(&e)); - } - (*usedTypes) << t; -+ foreach (const EnumMember& member, e.members()) { -+ if (Options::typeExcluded(member.toString())) { -+ e.membersRef().removeOne(member); -+ } -+ } - 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 @@ - .*DOM::Element::(set)?(c|C)ontentEditable\(.* - .*DOM::TextEvent::data\(\).* - .*khtml::applyRule\(DOM::CSSProperty\*\).* -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight - - - -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 @@ - .*Q3.* - - .*Nepomuk::ResourceManager::allResources\(\).* -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight - - - -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 @@ - .*Phonon::.*::k_ptr - .*Phonon::.*::d_ptr - .*Phonon::.*::d -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight - - - Phonon -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 @@ - QStringList - QString - -+ -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight -+ - - QsciAbstractAPIs - QsciAPIs -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 -@@ -30,7 +30,13 @@ - .*qFrom.*Endian_helper.* - .*QPixmapData.* - .*qt_x11_getX11InfoForWindow.* -- -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight -+ - - - ^q.* -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 @@ - .*qFindString.* - - .*qFrom.*Endian_helper.* -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight - - - -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 @@ - .*qFindString.* - - .*qFrom.*Endian_helper.* -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight - - - -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 -@@ -27,6 +27,12 @@ - .*qFindString.* - - .*qFrom.*Endian_helper.* -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight - - - -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 @@ - QStringList - QString - -+ -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight -+ - - QUiLoader - -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 @@ - QStringList - QString - -+ -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight -+ - - QWebDatabase - QWebElement -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 @@ - - .*QwtData::operator=\(const QwtData&\).* - .*QwtSpline::d_data -+ -+ .*::PM_FrameCornerWidth -+ .*::PM_FrameCornerHeight -+ .*::PM_BoldLineWidth -+ .*::PM_ThinLineWidth -+ .*::PM_MessageBoxHeight - - - QwtAbstractScaleDraw +Index: smoke/qtcore/tests/test.cpp +=================================================================== +--- smoke/qtcore/tests/test.cpp (revision 1147833) ++++ smoke/qtcore/tests/test.cpp (revision 1147834) +@@ -611,6 +611,16 @@ + + #endif + ++#ifdef TEST_QT_NO_STYLE_S60 ++#include "QtGui/qs60style.h" ++ ++int main(int argc, char ** argv) ++{ ++ QS60Style foo; ++} ++ ++#endif ++ + #ifdef TEST_QT_NO_STYLE_WINDOWSXP + #include "QtGui/qwindowsxpstyle.h" + +Index: smoke/qtcore/QtGuess.txt +=================================================================== +--- smoke/qtcore/QtGuess.txt (revision 1147833) ++++ smoke/qtcore/QtGuess.txt (revision 1147834) +@@ -53,6 +53,7 @@ + set(QT_NO_SOUND 5) + set(QT_NO_STRINGLIST 0) + set(QT_NO_STYLE_PLASTIQUE 16) ++set(QT_NO_STYLE_S60 16) + set(QT_NO_STYLE_WINDOWSXP 16) + set(QT_NO_STYLE_WINDOWS 16) + set(QT_NO_STYLE_MAC 16) +@@ -85,7 +86,7 @@ + QT_NO_PRINTER QT_NO_PRINTDIALOG QT_NO_PROCESS QT_NO_PROGRESSBAR + QT_NO_PROGRESSDIALOG QT_NO_PROPERTIES QT_NO_PUSHBUTTON QT_NO_QUUID_STRING + QT_NO_RADIOBUTTON QT_NO_SCROLLBAR QT_NO_SETTINGS QT_NO_SIGNALMAPPER +-QT_NO_SIZEGRIP QT_NO_SLIDER QT_NO_SOUND QT_NO_STRINGLIST QT_NO_STYLE_PLASTIQUE ++QT_NO_SIZEGRIP QT_NO_SLIDER QT_NO_SOUND QT_NO_STRINGLIST QT_NO_STYLE_PLASTIQUE QT_NO_STYLE_S60 + QT_NO_STYLE_WINDOWSXP QT_NO_STYLE_WINDOWS QT_NO_STYLE_MAC QT_NO_STYLE_CLEANLOOKS + QT_NO_TABBAR QT_NO_TABLEVIEW QT_NO_TABWIDGET QT_NO_TEXTBROWSER QT_NO_TEXTCODEC + QT_NO_TEXTCODECPLUGIN QT_NO_TEXTEDIT QT_NO_TEXTSTREAM QT_NO_THREAD QT_NO_TOOLBAR diff --git a/kdebindings.spec b/kdebindings.spec index 7387cc7..a516fa2 100644 --- a/kdebindings.spec +++ b/kdebindings.spec @@ -38,7 +38,7 @@ Name: kdebindings Version: 4.4.92 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE bindings to non-C++ languages # http://techbase.kde.org/Policies/Licensing_Policy @@ -49,12 +49,13 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar. #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 +## 4.5 branch +# Smoke: test for QT_NO_STYLE_S60 (upstream patch by Arno Rehn) +# fixes Smoke build with Qt 4.7 (#612666, kde#243971) +Patch100: kdebindings-4.4.92-qt47.patch + BuildRequires: akonadi-devel BuildRequires: kdebase-workspace-devel >= %{version} # okular bindings @@ -257,7 +258,7 @@ Falcon plugin for the Kross archtecture in KDE4. %prep %setup -q -n kdebindings-%{version}%{?alphatag} -%patch0 -p1 -b .qt47 +%patch100 -p0 -b .qt47 %build @@ -539,6 +540,9 @@ fi %changelog +* Fri Jul 09 2010 Kevin Kofler - 4.4.92-3 +- use upstream fix for Qt 4.7 build issue (#612666, kde#243971) + * Fri Jul 09 2010 Kevin Kofler - 4.4.92-2 - fix Smoke build with Qt 4.7 (#612666, kde#243971)