[PyQt4] update webkit patch

Than Ngo than at fedoraproject.org
Thu Oct 11 12:59:48 UTC 2012


commit 60930ea76b2c756385e2794735f31270309670f4
Author: Than Ngo <than at redhat.com>
Date:   Thu Oct 11 14:59:29 2012 +0200

    update webkit patch

 PyQt-x11-gpl-4.9-webkit.patch   |   11 -----------
 PyQt-x11-gpl-4.9.5-webkit.patch |   37 +++++++++++++++++++++++++++++++++++++
 PyQt4.spec                      |    7 +++++--
 3 files changed, 42 insertions(+), 13 deletions(-)
---
diff --git a/PyQt-x11-gpl-4.9.5-webkit.patch b/PyQt-x11-gpl-4.9.5-webkit.patch
new file mode 100644
index 0000000..f42d4e5
--- /dev/null
+++ b/PyQt-x11-gpl-4.9.5-webkit.patch
@@ -0,0 +1,37 @@
+diff -up PyQt-x11-gpl-4.9.5/configure.py.webkit PyQt-x11-gpl-4.9.5/configure.py
+--- PyQt-x11-gpl-4.9.5/configure.py.webkit	2012-10-11 14:37:49.000000000 +0200
++++ PyQt-x11-gpl-4.9.5/configure.py	2012-10-11 14:39:58.130639820 +0200
+@@ -379,16 +379,6 @@ class ConfigurePyQt4:
+         check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
+         if qt_version < 0x050000: check_module("QtTest", "QtTest", "QTest::qSleep(0)")
+ 
+-        # Qt v5-beta1 doesn't install the Headers directory for a framework
+-        # build of QtWebKit on OS/X.
+-        if qt_version >= 0x050000:
+-            webkit_inc_dirs = [os.path.join(qt_incdir, "QtWebKit")]
+-        else:
+-            webkit_inc_dirs = None
+-
+-        check_module("QtWebKit", "qwebpage.h", "new QWebPage()",
+-                extra_include_dirs=webkit_inc_dirs)
+-
+         check_module("QtXml", "qdom.h", "new QDomDocument()")
+ 
+         # Qt v5-beta1 causes compiler error messages.  Wait to see if it fixed
+@@ -537,16 +527,6 @@ class ConfigurePyQt4:
+         if "QtTest" in pyqt_modules:
+             generate_code("QtTest")
+ 
+-        if "QtWebKit" in pyqt_modules:
+-            # Qt v5-beta1 doesn't install the Headers directory for a framework
+-            # build of QtWebKit on OS/X.
+-            if qt_version >= 0x050000:
+-                webkit_inc_dirs = [os.path.join(qt_incdir, "QtWebKit")]
+-            else:
+-                webkit_inc_dirs = None
+-
+-            generate_code("QtWebKit", extra_include_dirs=webkit_inc_dirs)
+-
+         if "QtXml" in pyqt_modules:
+             generate_code("QtXml")
+ 
diff --git a/PyQt4.spec b/PyQt4.spec
index 672927d..fd9609a 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -6,7 +6,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -30,7 +30,7 @@ Patch52:  PyQt-x11-gpl-4.9.2-pyuic_shbang.patch
 Patch60:  qreal_float_support.diff
 
 # rhel patches
-Patch300: PyQt-x11-gpl-4.9-webkit.patch
+Patch300: PyQt-x11-gpl-4.9.5-webkit.patch
 
 BuildRequires: findutils
 BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python)
@@ -287,6 +287,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 11 2012 Than Ngo <than at redhat.com> - 4.9.5-2
+- update webkit patch
+
 * Mon Oct 01 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.5-1
 - PyQt-4.9.5
 


More information about the scm-commits mailing list