Hello community,
here is the log from the commit of package python-qt5 for openSUSE:Factory
checked in at 2014-05-17 21:44:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qt5/python-qt5.changes 2014-03-22
09:10:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-qt5.new/python-qt5.changes
2014-05-17 21:44:31.000000000 +0200
@@ -1,0 +2,10 @@
+Fri May 16 19:38:53 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Added qglobal.patch, to resolve build failure with Qt 5.3 API
+
+-------------------------------------------------------------------
+Sun May 4 15:06:38 UTC 2014 - i...@marguerite.su
+
+- added missing qtmultimedia/qtserialport/qtxmlpatterns modules.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/python-qt5/python3-qt5.changes 2014-03-22
09:10:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-qt5.new/python3-qt5.changes
2014-05-17 21:44:31.000000000 +0200
@@ -1,0 +2,11 @@
+Fri May 16 19:38:53 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Added qglobal.patch, to resolve build failure with Qt 5.3 API
+
+-------------------------------------------------------------------
+Sun May 4 15:06:07 UTC 2014 - i...@marguerite.su
+
+- added missing qtmultimedia/qtserialport/qtxmlpatterns/
+ dbus-support modules
+
+-------------------------------------------------------------------
New:
----
qglobal.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qt5.spec ++++++
--- /var/tmp/diff_new_pack.AzphIO/_old 2014-05-17 21:44:32.000000000 +0200
+++ /var/tmp/diff_new_pack.AzphIO/_new 2014-05-17 21:44:32.000000000 +0200
@@ -31,6 +31,8 @@
Patch2: disable-rpaths.diff
# PATCH-FIX-UPSTREAM: fix_qreal_check.diff -- check if qreal is double based
on sizeof
Patch3: fix_qreal_check.diff
+# PATCH-FIX-UPSTREAM: qglobal.patch
+Patch4: qglobal.patch
BuildRequires: dbus-1-python-devel
BuildRequires: fdupes
BuildRequires: gdb
@@ -38,10 +40,13 @@
BuildRequires: libQt5WebKitWidgets-devel
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qtdeclarative-devel
+BuildRequires: libqt5-qtmultimedia-devel
BuildRequires: libqt5-qtquick1-devel
+BuildRequires: libqt5-qtserialport-devel
BuildRequires: libqt5-qtsvg-devel
BuildRequires: libqt5-qttools-devel
BuildRequires: libqt5-qtx11extras-devel
+BuildRequires: libqt5-qtxmlpatterns-devel
BuildRequires: pkg-config
#BuildRequires: phonon-devel
BuildRequires: python-devel
@@ -100,6 +105,7 @@
#PATCH-FIX-OPENSUSE: Disable RPATH when building PyQt5.
%patch2
#patch3 -p1
+%patch4 -p1
%build
export CXXFLAGS="%{optflags}"
++++++ python3-qt5.spec ++++++
--- /var/tmp/diff_new_pack.AzphIO/_old 2014-05-17 21:44:32.000000000 +0200
+++ /var/tmp/diff_new_pack.AzphIO/_new 2014-05-17 21:44:32.000000000 +0200
@@ -31,16 +31,22 @@
Patch2: disable-rpaths.diff
# PATCH-FIX-UPSTREAM: fix_qreal_check.diff -- check if qreal is double based
on sizeof
Patch3: fix_qreal_check.diff
+# PATCH-FIX-UPSTREAM: qglobal.patch
+Patch4: qglobal.patch
+BuildRequires: dbus-1-python-devel
BuildRequires: dbus-1-python3-devel
BuildRequires: fdupes
BuildRequires: libQt5WebKit5-devel
BuildRequires: libQt5WebKitWidgets-devel
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qtdeclarative-devel
+BuildRequires: libqt5-qtmultimedia-devel
BuildRequires: libqt5-qtquick1-devel
+BuildRequires: libqt5-qtserialport-devel
BuildRequires: libqt5-qtsvg-devel
BuildRequires: libqt5-qttools-devel
BuildRequires: libqt5-qtx11extras-devel
+BuildRequires: libqt5-qtxmlpatterns-devel
BuildRequires: pkg-config
#BuildRequires: phonon-devel
BuildRequires: python3-base
@@ -88,6 +94,7 @@
#PATCH-FIX-OPENSUSE: Disable RPATH when building PyQt5.
%patch2
#patch3 -p1
+%patch4 -p1
%build
export CXXFLAGS="%{optflags}"
@@ -158,6 +165,7 @@
%files
%defattr(-,root,root)
%doc README
+%{python3_sitelib}/dbus/mainloop/pyqt5.so
%{python3_sitearch}/PyQt5/
%dir %{_libqt5_plugindir}/PyQt5/
%{_libqt5_plugindir}/PyQt5/libpy3qt5qmlplugin.so
++++++ qglobal.patch ++++++
diff -Naur PyQt-gpl-5.2.1/sip/QtCore/qglobal.sip
PyQt-gpl-5.3-snapshot-22e30a316ffc/sip/QtCore/qglobal.sip
--- PyQt-gpl-5.2.1/sip/QtCore/qglobal.sip 2014-03-14 15:38:45.000000000
+0100
+++ PyQt-gpl-5.3-snapshot-22e30a316ffc/sip/QtCore/qglobal.sip 2014-05-16
03:32:13.000000000 +0200
@@ -129,7 +129,7 @@
if (PyObject_TypeCheck(sipPy, sipTypeAsPyTypeObject(sipType_ENUM)))
{
- *sipCppPtr = new QFlags(SIPLong_AsLong(sipPy));
+ *sipCppPtr = new QFlags(int(SIPLong_AsLong(sipPy)));
return sipGetState(sipTransferObj);
}
diff -Naur PyQt-gpl-5.2.1/sip/QtCore/qurl.sip
PyQt-gpl-5.3-snapshot-22e30a316ffc/sip/QtCore/qurl.sip
--- PyQt-gpl-5.2.1/sip/QtCore/qurl.sip 2014-03-14 15:38:45.000000000 +0100
+++ PyQt-gpl-5.3-snapshot-22e30a316ffc/sip/QtCore/qurl.sip 2014-05-16
03:32:13.000000000 +0200
@@ -83,7 +83,7 @@
if (PyObject_TypeCheck(sipPy, sipTypeAsPyTypeObject(sipType_E1)) ||
PyObject_TypeCheck(sipPy, sipTypeAsPyTypeObject(sipType_E2)))
{
- *sipCppPtr = new QUrlTwoFlags(SIPLong_AsLong(sipPy));
+ *sipCppPtr = new QUrlTwoFlags(int(SIPLong_AsLong(sipPy)));
return sipGetState(sipTransferObj);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
