[PyQt4] update webkit patch
Than Ngo
than at fedoraproject.org
Mon Jul 30 16:06:44 UTC 2012
commit c916a45f124c6028ed022a83b1637f4195b064b2
Author: Than Ngo <than at redhat.com>
Date: Mon Jul 30 18:06:07 2012 +0200
update webkit patch
PyQt-x11-gpl-4.9-webkit.patch | 21 ++++++++++-----------
PyQt4.spec | 5 ++++-
2 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/PyQt-x11-gpl-4.9-webkit.patch b/PyQt-x11-gpl-4.9-webkit.patch
index 5bab0b9..60021e1 100644
--- a/PyQt-x11-gpl-4.9-webkit.patch
+++ b/PyQt-x11-gpl-4.9-webkit.patch
@@ -1,12 +1,11 @@
-diff -up PyQt-x11-gpl-4.9.1/configure.py.me PyQt-x11-gpl-4.9.1/configure.py
---- PyQt-x11-gpl-4.9.1/configure.py.me 2012-05-04 10:10:11.506441838 +0200
-+++ PyQt-x11-gpl-4.9.1/configure.py 2012-05-04 10:14:42.411733074 +0200
-@@ -372,7 +372,7 @@ class ConfigurePyQt4:
+diff -up PyQt-x11-gpl-4.9.4/configure.py.webkit PyQt-x11-gpl-4.9.4/configure.py
+--- PyQt-x11-gpl-4.9.4/configure.py.webkit 2012-07-30 17:35:01.000000000 +0200
++++ PyQt-x11-gpl-4.9.4/configure.py 2012-07-30 17:41:03.768738467 +0200
+@@ -377,7 +377,6 @@ class ConfigurePyQt4:
extra_libs=sql_libs)
- check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
- check_module("QtTest", "QtTest", "QTest::qSleep(0)")
-- check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
-+ #check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
- check_module("QtXml", "qdom.h", "new QDomDocument()")
- check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
- check_module("phonon", "phonon/videowidget.h",
+ if qt_version < 0x050000: check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
+ if qt_version < 0x050000: check_module("QtTest", "QtTest", "QTest::qSleep(0)")
+- if qt_version < 0x050000: check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
+ if qt_version < 0x050000: check_module("QtXml", "qdom.h", "new QDomDocument()")
+ if qt_version < 0x050000: check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+ if qt_version < 0x050000: check_module("phonon", "phonon/videowidget.h",
diff --git a/PyQt4.spec b/PyQt4.spec
index 9e469b2..b6bad3a 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -4,7 +4,7 @@
Summary: Python bindings for Qt4
Name: PyQt4
Version: 4.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions
@@ -285,6 +285,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jul 30 2012 Than Ngo <than at redhat.com> - 4.9.4-3
+- update webkit patch
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.9.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list