[arch-commits] Commit in (10 files)
Antonio Rojas
arojas at archlinux.org
Tue May 22 12:07:09 UTC 2018
Date: Tuesday, May 22, 2018 @ 12:07:08
Author: arojas
Revision: 324764
Qt 5.11 rebuild
Added:
pyqt5/trunk/pyqt-qt5.11.patch
Modified:
akonadi/trunk/PKGBUILD
gcin/trunk/PKGBUILD
kwin/trunk/PKGBUILD
plasma-framework/trunk/PKGBUILD
plasma-integration/trunk/PKGBUILD
pyqt5/trunk/PKGBUILD
pyqt5/trunk/pyqt-support-new-qt.patch
qqc2-desktop-style/trunk/PKGBUILD
qtcreator/trunk/PKGBUILD
---------------------------------------+
akonadi/trunk/PKGBUILD | 2 +-
gcin/trunk/PKGBUILD | 2 +-
kwin/trunk/PKGBUILD | 2 +-
plasma-framework/trunk/PKGBUILD | 2 +-
plasma-integration/trunk/PKGBUILD | 2 +-
pyqt5/trunk/PKGBUILD | 12 +++++++-----
pyqt5/trunk/pyqt-qt5.11.patch | 17 +++++++++++++++++
pyqt5/trunk/pyqt-support-new-qt.patch | 4 ++--
qqc2-desktop-style/trunk/PKGBUILD | 2 +-
qtcreator/trunk/PKGBUILD | 2 +-
10 files changed, 33 insertions(+), 14 deletions(-)
Modified: akonadi/trunk/PKGBUILD
===================================================================
--- akonadi/trunk/PKGBUILD 2018-05-22 11:04:01 UTC (rev 324763)
+++ akonadi/trunk/PKGBUILD 2018-05-22 12:07:08 UTC (rev 324764)
@@ -5,7 +5,7 @@
pkgname=akonadi
pkgver=18.04.1
-pkgrel=1
+pkgrel=2
pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
arch=(x86_64)
url='https://community.kde.org/KDE_PIM/Akonadi'
Modified: gcin/trunk/PKGBUILD
===================================================================
--- gcin/trunk/PKGBUILD 2018-05-22 11:04:01 UTC (rev 324763)
+++ gcin/trunk/PKGBUILD 2018-05-22 12:07:08 UTC (rev 324764)
@@ -6,7 +6,7 @@
pkgname=gcin
pkgver=2.8.5
-pkgrel=2
+pkgrel=3
pkgdesc='Input method server supporting various input methods'
url='http://hyperrate.com/dir.php?eid=67'
license=('LGPL')
Modified: kwin/trunk/PKGBUILD
===================================================================
--- kwin/trunk/PKGBUILD 2018-05-22 11:04:01 UTC (rev 324763)
+++ kwin/trunk/PKGBUILD 2018-05-22 12:07:08 UTC (rev 324764)
@@ -5,7 +5,7 @@
pkgname=kwin
pkgver=5.12.5
-pkgrel=1
+pkgrel=2
pkgdesc='An easy to use, but flexible, composited Window Manager'
arch=(x86_64)
url='https://www.kde.org/workspaces/plasmadesktop/'
Modified: plasma-framework/trunk/PKGBUILD
===================================================================
--- plasma-framework/trunk/PKGBUILD 2018-05-22 11:04:01 UTC (rev 324763)
+++ plasma-framework/trunk/PKGBUILD 2018-05-22 12:07:08 UTC (rev 324764)
@@ -5,7 +5,7 @@
pkgname=plasma-framework
pkgver=5.46.0
-pkgrel=1
+pkgrel=2
pkgdesc='Plasma library and runtime components based upon KF5 and Qt5'
arch=(x86_64)
url='https://community.kde.org/Frameworks'
Modified: plasma-integration/trunk/PKGBUILD
===================================================================
--- plasma-integration/trunk/PKGBUILD 2018-05-22 11:04:01 UTC (rev 324763)
+++ plasma-integration/trunk/PKGBUILD 2018-05-22 12:07:08 UTC (rev 324764)
@@ -4,7 +4,7 @@
pkgname=plasma-integration
pkgver=5.12.5
-pkgrel=1
+pkgrel=2
pkgdesc="Qt Platform Theme integration plugins for the Plasma workspaces"
arch=(x86_64)
url='https://www.kde.org/workspaces/plasmadesktop/'
Modified: pyqt5/trunk/PKGBUILD
===================================================================
--- pyqt5/trunk/PKGBUILD 2018-05-22 11:04:01 UTC (rev 324763)
+++ pyqt5/trunk/PKGBUILD 2018-05-22 12:07:08 UTC (rev 324764)
@@ -8,7 +8,7 @@
pkgbase=pyqt5
pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
pkgver=5.10.1
-pkgrel=2
+pkgrel=3
arch=('x86_64')
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
license=('GPL')
@@ -17,16 +17,18 @@
'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-networkauth')
source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" pyqt-support-new-qt.patch
- pyqt5-cura-crash.patch)
+ pyqt5-cura-crash.patch pyqt-qt5.11.patch)
sha512sums=('04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b'
- '9e4184291c0ece0bf375da3e0cf6e3f22df33eea1ee2b981fe9e2a0ba7d625583dd513c029c49562189986c0145262ac2aa8e5aa85701a981b3ed4061f4acf36'
- '3f6e1c0dcd95d3ff39c03f59d7c09cbf2e42431bf9cb6dc7a63da10b7a387e5977992e57ef0ff1dea495f29dfbf4db2568b4588e801cca966a0136fe98d1ed45')
+ 'a9c45534d540cd4eff732a92e66f98eb313b0734e64a2289fbc703fdb208265a610ccc3c4f54f43d0813afa3a7003ec7956e6029904cc56992a5e8cc2efb280c'
+ '3f6e1c0dcd95d3ff39c03f59d7c09cbf2e42431bf9cb6dc7a63da10b7a387e5977992e57ef0ff1dea495f29dfbf4db2568b4588e801cca966a0136fe98d1ed45'
+ 'bae60dd592701929acf403514d8be87d53330dccff74267efb615005d82f5710ce13636a99b2a75beb04fd93a4ade34486c3c2aa190efd334d01c78b34f1bcc0')
prepare() {
# Support new versions of Qt - don't remove, needs to be reapplied after every new Qt release
pushd PyQt5_gpl-$pkgver
- # patch -p1 -i ../pyqt-support-new-qt.patch
+ patch -p1 -i ../pyqt-support-new-qt.patch
patch -p1 -i ../pyqt5-cura-crash.patch # Fix crash in Cura
+ patch -p1 -i ../pyqt-qt5.11.patch # Fix build with Qt 5.11 (opensuse)
popd
# The additional include path was removed due to this line, I don't really know why they are doing this...
Added: pyqt5/trunk/pyqt-qt5.11.patch
===================================================================
--- pyqt5/trunk/pyqt-qt5.11.patch (rev 0)
+++ pyqt5/trunk/pyqt-qt5.11.patch 2018-05-22 12:07:08 UTC (rev 324764)
@@ -0,0 +1,17 @@
+From: Fabian Vogt <fabian at ritter-vogt.de>
+Subject: QTest::waitForEvents() is internal only
+
+Must not be used, got removed with Qt 5.11.
+
+Index: PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip
+===================================================================
+--- PyQt5_gpl-5.10.1.orig/sip/QtTest/qtestmouse.sip
++++ PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip
+@@ -41,7 +41,6 @@ namespace QTest
+ void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
+ void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
+ void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
+- void waitForEvents() /ReleaseGIL/;
+ void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
+ void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
+ void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
Modified: pyqt5/trunk/pyqt-support-new-qt.patch
===================================================================
--- pyqt5/trunk/pyqt-support-new-qt.patch 2018-05-22 11:04:01 UTC (rev 324763)
+++ pyqt5/trunk/pyqt-support-new-qt.patch 2018-05-22 12:07:08 UTC (rev 324764)
@@ -5,8 +5,8 @@
%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_10_0}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_10_0 Qt_5_10_1}
+-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
++%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0}
%Platforms {WS_X11 WS_WIN WS_MACX}
Modified: qqc2-desktop-style/trunk/PKGBUILD
===================================================================
--- qqc2-desktop-style/trunk/PKGBUILD 2018-05-22 11:04:01 UTC (rev 324763)
+++ qqc2-desktop-style/trunk/PKGBUILD 2018-05-22 12:07:08 UTC (rev 324764)
@@ -2,7 +2,7 @@
pkgname=qqc2-desktop-style
pkgver=5.46.2
-pkgrel=1
+pkgrel=2
pkgdesc='A style for Qt Quick Controls 2 to make it follow your desktop theme'
arch=(x86_64)
url='https://community.kde.org/Frameworks'
Modified: qtcreator/trunk/PKGBUILD
===================================================================
--- qtcreator/trunk/PKGBUILD 2018-05-22 11:04:01 UTC (rev 324763)
+++ qtcreator/trunk/PKGBUILD 2018-05-22 12:07:08 UTC (rev 324764)
@@ -10,7 +10,7 @@
pkgname=qtcreator
pkgver=4.6.1
_clangver=6.0.0
-pkgrel=1
+pkgrel=2
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=(x86_64)
url='http://qt-project.org'
More information about the arch-commits
mailing list