[pykde4] add rhel condition
Than Ngo
than at fedoraproject.org
Fri May 18 13:14:41 UTC 2012
commit 630ca733f0d4059635c8e597cb4ed60258055432
Author: Than Ngo <than at redhat.com>
Date: Fri May 18 15:14:35 2012 +0200
add rhel condition
pykde4-4.8.3-webkit.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++
pykde4.spec | 11 +++++++-
2 files changed, 76 insertions(+), 1 deletions(-)
---
diff --git a/pykde4-4.8.3-webkit.patch b/pykde4-4.8.3-webkit.patch
new file mode 100644
index 0000000..d5f6d8a
--- /dev/null
+++ b/pykde4-4.8.3-webkit.patch
@@ -0,0 +1,66 @@
+diff -up pykde4-4.8.3/CMakeLists.txt.webkit pykde4-4.8.3/CMakeLists.txt
+--- pykde4-4.8.3/CMakeLists.txt.webkit 2012-05-14 13:37:25.955000001 +0200
++++ pykde4-4.8.3/CMakeLists.txt 2012-05-14 14:18:31.840000524 +0200
+@@ -70,7 +70,6 @@ INCLUDE_DIRECTORIES(
+ ${QT_QTSQL_INCLUDE_DIR}
+ ${QT_QTXML_INCLUDE_DIR}
+ ${QT_QTSVG_INCLUDE_DIR}
+- ${QT_QTWEBKIT_INCLUDE_DIR}
+ ${KDE4_INCLUDE_DIR}
+ ${KDE4_INCLUDE_DIR}/solid
+ ${KDE4_INCLUDE_DIR}/kio
+diff -up pykde4-4.8.3/sip/plasma/abstractrunner.sip.webkit pykde4-4.8.3/sip/plasma/abstractrunner.sip
+--- pykde4-4.8.3/sip/plasma/abstractrunner.sip.webkit 2012-05-14 14:09:57.797000001 +0200
++++ pykde4-4.8.3/sip/plasma/abstractrunner.sip 2012-05-14 14:11:08.439995732 +0200
+@@ -94,7 +94,6 @@
+ #include <plasma/view.h>
+ #include <plasma/wallpaper.h>
+ #include <plasma/scripting/wallpaperscript.h>
+-#include <plasma/widgets/webview.h>
+ %End
+
+ namespace Plasma
+@@ -288,8 +287,6 @@ protected:
+ sipType = sipType_Plasma_SvgWidget;
+ else if (dynamic_cast<Plasma::TabBar*>(sipCpp))
+ sipType = sipType_Plasma_TabBar;
+- else if (dynamic_cast<Plasma::WebView*>(sipCpp))
+- sipType = sipType_Plasma_WebView;
+ else if (dynamic_cast<Plasma::CheckBox*>(sipCpp))
+ sipType = sipType_Plasma_CheckBox;
+ else if (dynamic_cast<Plasma::ComboBox*>(sipCpp))
+diff -up pykde4-4.8.3/sip/plasma/animation.sip.webkit pykde4-4.8.3/sip/plasma/animation.sip
+--- pykde4-4.8.3/sip/plasma/animation.sip.webkit 2012-05-14 14:21:54.546998613 +0200
++++ pykde4-4.8.3/sip/plasma/animation.sip 2012-05-14 14:22:11.819999510 +0200
+@@ -163,8 +163,6 @@ protected:
+ sipType = sipType_Plasma_SvgWidget;
+ else if (dynamic_cast<Plasma::TabBar*>(sipCpp))
+ sipType = sipType_Plasma_TabBar;
+- else if (dynamic_cast<Plasma::WebView*>(sipCpp))
+- sipType = sipType_Plasma_WebView;
+ else if (dynamic_cast<Plasma::CheckBox*>(sipCpp))
+ sipType = sipType_Plasma_CheckBox;
+ else if (dynamic_cast<Plasma::ComboBox*>(sipCpp))
+@@ -292,5 +290,4 @@ public:
+ #include <plasma/view.h>
+ #include <plasma/wallpaper.h>
+ #include <plasma/scripting/wallpaperscript.h>
+-#include <plasma/widgets/webview.h>
+ %End
+diff -up pykde4-4.8.3/sip/plasma/plasmamod.sip.webkit pykde4-4.8.3/sip/plasma/plasmamod.sip
+--- pykde4-4.8.3/sip/plasma/plasmamod.sip.webkit 2011-07-27 20:37:15.301683294 +0200
++++ pykde4-4.8.3/sip/plasma/plasmamod.sip 2012-05-14 14:21:40.506000083 +0200
+@@ -27,7 +27,6 @@
+ %Import QtGui/QtGuimod.sip
+ %Import QtNetwork/QtNetworkmod.sip
+ %Import QtSvg/QtSvgmod.sip
+-%Import QtWebKit/QtWebKitmod.sip
+ %Import QtXml/QtXmlmod.sip
+ %Import QtDeclarative/QtDeclarativemod.sip
+ %Import QtScript/QtScriptmod.sip
+@@ -116,5 +115,4 @@
+ %Include toolbutton.sip
+ %Include treeview.sip
+ %Include videowidget.sip
+-%Include webview.sip
+ %Include windoweffects.sip
diff --git a/pykde4.spec b/pykde4.spec
index 121d379..dd24c6b 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -6,7 +6,7 @@
Name: pykde4
Version: 4.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python bindings for KDE4
# http://techbase.kde.org/Policies/Licensing_Policy
@@ -24,6 +24,9 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
Patch200: make_pykde4_respect_sip_flags.diff
Patch201: fix_kpythonpluginfactory_build.diff
+# rhel patches
+Patch300: pykde4-4.8.3-webkit.patch
+
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: pkgconfig(akonadi)
@@ -140,6 +143,9 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release}
%patch200 -p1 -b .respect_sip_flags
%patch201 -p1 -b .kpythonpluginfactory_slots
+%if 0%{?rhel}
+%patch300 -p1 -b .webkit
+%endif
%build
%if 0%{?python3}
@@ -251,6 +257,9 @@ rm -rf %{buildroot}
%changelog
+* Mon May 14 2012 Than Ngo <than at redhat.com> 4.8.3-3
+- add rhel condition
+
* Mon Apr 30 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.3-2
- drop BR: kde-workspace-devel
More information about the scm-commits
mailing list