aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pyqt5/PKGBUILD22
-rw-r--r--qt5/PKGBUILD25
-rw-r--r--qt5/designer.desktop2
-rw-r--r--qt5/kdebug-329174.patch39
4 files changed, 24 insertions, 64 deletions
diff --git a/pyqt5/PKGBUILD b/pyqt5/PKGBUILD
index 2e64da6..ddbf71f 100644
--- a/pyqt5/PKGBUILD
+++ b/pyqt5/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 228889 2015-01-10 11:31:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 232203 2015-03-01 07:49:05Z fyan $
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Yichao Yu <yyc1992@gmail.com>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
@@ -7,9 +8,9 @@
pkgbase=pyqt5
pkgname=pyqt5
pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.4.0
-_pkgver=5.4
-pkgrel=2
+pkgver=5.4.1
+_pkgver=$pkgver
+pkgrel=1
arch=('i686' 'x86_64')
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
license=('GPL')
@@ -18,15 +19,15 @@ makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
'qt5-webengine' 'qt5-websockets' 'qt5-x11extras')
source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${_pkgver}/PyQt-gpl-${_pkgver}.tar.gz")
-md5sums=('7f2eb79eaf3d7e5e7df5a4e9c8c9340e')
+md5sums=('a07bd7c426c7cda39f9a5072ee724aba')
build() {
- cp -r PyQt-gpl-${_pkgver} Py2Qt-gpl-${_pkgver}
+ cp -a PyQt-gpl-${_pkgver} Py2Qt-gpl-${_pkgver}
cd PyQt-gpl-${_pkgver}
python3 configure.py \
--confirm-license \
- -v /usr/share/sip/PyQt5 \
+ --no-sip-files \
--qsci-api \
-q /usr/bin/qmake-qt5
@@ -39,7 +40,7 @@ build() {
cd ../Py2Qt-gpl-${_pkgver}
python2 configure.py \
--confirm-license \
- -v /usr/share/sip/Py2-PyQt5 \
+ --no-sip-files \
--qsci-api \
-q /usr/bin/qmake-qt5
@@ -58,6 +59,9 @@ package_pyqt5-common(){
make -C pylupdate DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+
+ install -d "${pkgdir}"/usr/share/sip/PyQt5
+ cp -a sip/* "${pkgdir}"/usr/share/sip/PyQt5
}
package_python-pyqt5(){
diff --git a/qt5/PKGBUILD b/qt5/PKGBUILD
index 261f6fb..1945fad 100644
--- a/qt5/PKGBUILD
+++ b/qt5/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 229609 2015-01-20 16:23:11Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 232201 2015-03-01 07:49:03Z fyan $
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgbase=qt5
pkgname=('qt5-base'
@@ -26,8 +27,8 @@ pkgname=('qt5-base'
'qt5-websockets'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.4.0
-pkgrel=3
+pkgver=5.4.1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -41,14 +42,12 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz"
- 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
- 'kdebug-329174.patch')
-md5sums=('21843b00ecde8956217faab391bc007b'
+ 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop')
+md5sums=('7afb5f9235d8d42b5b6e832442a32a5d'
'b2897dd6a2967bccf8f10e397aafee55'
- '9638a78e502719ef8fe5f8d10d0361a9'
+ '76e150b20178d2d43801f7367232e5f7'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1'
- 'f69ac1589a661f232fb86ad32e293b28')
+ '322b419b16c75d4de0ee7ad0a246caa1')
prepare() {
cd ${_pkgfqn}
@@ -66,10 +65,6 @@ prepare() {
# in qtwebengine there are still a lot of relative calls which need a workaround
mkdir "${srcdir}"/python2-path
ln -s /usr/bin/python2 "${srcdir}"/python2-path/python
-
- # Fixed in 5.4.1
- cd qtbase
- patch -p1 -i "${srcdir}"/kdebug-329174.patch
}
build() {
@@ -437,7 +432,7 @@ package_qt5-tools() {
install -D -m644 src/assistant/assistant/images/assistant-128.png \
"${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png"
install -D -m644 src/designer/src/designer/images/designer.png \
- "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
+ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/QtProject-designer.png"
install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png \
"${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer.png"
install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
diff --git a/qt5/designer.desktop b/qt5/designer.desktop
index 86aefe0..b39e77a 100644
--- a/qt5/designer.desktop
+++ b/qt5/designer.desktop
@@ -3,7 +3,7 @@ Name=Qt Designer
GenericName=Interface Designer
Comment=Design GUIs for Qt applications
Exec=/usr/lib/qt/bin/designer
-Icon=designer
+Icon=QtProject-designer
MimeType=application/x-designer;
Terminal=false
Type=Application
diff --git a/qt5/kdebug-329174.patch b/qt5/kdebug-329174.patch
deleted file mode 100644
index bf0b657..0000000
--- a/qt5/kdebug-329174.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6a7ee92b3958e3a3ebc16be15f8bd34217ec7bd2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
-Date: Wed, 10 Dec 2014 07:27:23 +0100
-Subject: [PATCH] Handle SelectionClientClose in QXcbClipboard
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QXcbClipboard listens for subtype SelectionClientClose of Xfixes
-SelectionNotify event, but doesn't handle it. When the client holding
-the clipboard selection closes the Clipboard becomes empty and thus the
-change should be emitted.
-
-This fixes downstream KDE Bug #329174.
-
-Change-Id: I19fb8cfd7bd3b249c0bc6ca2a724a9aeeb05ac7e
-Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
-Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
----
- src/plugins/platforms/xcb/qxcbclipboard.cpp | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-index 8b3893e..f56a29d 100644
---- a/src/plugins/platforms/xcb/qxcbclipboard.cpp
-+++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp
-@@ -742,7 +742,8 @@ void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_eve
- m_xClipboard[mode]->reset();
- }
- emitChanged(mode);
-- }
-+ } else if (event->subtype == XCB_XFIXES_SELECTION_EVENT_SELECTION_CLIENT_CLOSE)
-+ emitChanged(mode);
- }
-
-
---
-1.7.1
-