aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2015-01-24 22:55:25 +0100
committerFlorian Bruhin <git@the-compiler.org>2015-01-24 22:55:25 +0100
commita2bff8aaf0248bc80187dafb8e49f1ce73a8c6ce (patch)
treeef3bc81d4328f98f8469adaddf00512ebfda32ea
parentcdb278bfd222561404b47abd7eef67350be1ca0d (diff)
downloadqt-debug-pkgbuild-a2bff8aaf0248bc80187dafb8e49f1ce73a8c6ce.tar.gz
qt-debug-pkgbuild-a2bff8aaf0248bc80187dafb8e49f1ce73a8c6ce.zip
Update Qt to arch -3
-rw-r--r--qt5/PKGBUILD121
-rw-r--r--qt5/kdebug-329174.patch39
2 files changed, 108 insertions, 52 deletions
diff --git a/qt5/PKGBUILD b/qt5/PKGBUILD
index b6f793e..261f6fb 100644
--- a/qt5/PKGBUILD
+++ b/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 227559 2014-12-12 12:47:55Z andrea $
+# $Id: PKGBUILD 229609 2015-01-20 16:23:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=qt5
@@ -27,7 +27,7 @@ pkgname=('qt5-base'
'qt5-x11extras'
'qt5-xmlpatterns')
pkgver=5.4.0
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -41,27 +41,35 @@ 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')
+ 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
+ 'kdebug-329174.patch')
md5sums=('21843b00ecde8956217faab391bc007b'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
- '322b419b16c75d4de0ee7ad0a246caa1')
+ '322b419b16c75d4de0ee7ad0a246caa1'
+ 'f69ac1589a661f232fb86ad32e293b28')
prepare() {
cd ${_pkgfqn}
- sed -i "s|-O2|${CXXFLAGS}|" qtbase/mkspecs/common/{g++,gcc}-base.conf
- sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" qtbase/mkspecs/common/gcc-base-unix.conf
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" qtbase/mkspecs/common/gcc-base.conf
+ # Build qmake using Arch {C,LD}FLAGS
+ # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
+ sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
+ qtbase/mkspecs/common/gcc-base.conf
+ sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
+ qtbase/mkspecs/common/g++-unix.conf
# Use python2 for Python 2.x
find . -name '*.py' -exec sed -i \
's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
-
- # There are still a lot of relative calls which need a workaround
+ # 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() {
@@ -71,8 +79,10 @@ build() {
export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}"
export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
+ # python2 workaround
export PATH="${srcdir}/python2-path:$PATH"
+ # FS#38796
[[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2"
PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
@@ -97,12 +107,19 @@ build() {
make
- # Fix paths
- find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
- find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
- find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
- find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
- sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" qtwebkit/Source/Makefile.api
+ # Fix docs build when qt is not installed
+ sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \
+ "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
+ find "${QTDIR}" -name Makefile \
+ -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
+ sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
+ "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
+ find "${QTDIR}" -name Makefile \
+ -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
+ sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
+ qtwebkit/Source/Makefile.api
+ find "${QTDIR}" -name Makefile \
+ -exec sed -i "s|/usr/lib/qt/bin/qmlplugindump|${QTDIR}/qtdeclarative/bin/qmlplugindump|g" {} +
make docs
}
@@ -121,7 +138,6 @@ package_qt5-base() {
'libsm: xcb plugin'
'gtk2: GTK2 plugin')
conflicts=('qt')
- options=('staticlibs') #libQt5PlatformSupport builds static only
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT="${pkgdir}" install
@@ -129,9 +145,9 @@ package_qt5-base() {
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Fix wrong qmake path in pri file
sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \
@@ -151,9 +167,9 @@ package_qt5-connectivity() {
cd ${_pkgfqn}/qtconnectivity
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -167,9 +183,9 @@ package_qt5-declarative() {
cd ${_pkgfqn}/qtdeclarative
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Useful symlinks
install -d "${pkgdir}"/usr/bin
@@ -205,9 +221,9 @@ package_qt5-enginio() {
cd ${_pkgfqn}/qtenginio
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -221,9 +237,9 @@ package_qt5-xmlpatterns() {
cd ${_pkgfqn}/qtxmlpatterns
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Useful symlinks
install -d "${pkgdir}"/usr/bin
@@ -256,9 +272,9 @@ package_qt5-multimedia() {
cd ${_pkgfqn}/qtmultimedia
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -294,9 +310,9 @@ package_qt5-location() {
cd ${_pkgfqn}/qtlocation
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -310,9 +326,9 @@ package_qt5-quick1() {
cd ${_pkgfqn}/qtquick1
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Useful symlinks
install -d "${pkgdir}"/usr/bin
@@ -343,9 +359,9 @@ package_qt5-script() {
cd ${_pkgfqn}/qtscript
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -358,9 +374,9 @@ package_qt5-sensors() {
cd ${_pkgfqn}/qtsensors
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -373,9 +389,9 @@ package_qt5-serialport() {
cd ${_pkgfqn}/qtserialport
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -389,9 +405,9 @@ package_qt5-svg() {
cd ${_pkgfqn}/qtsvg
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -430,9 +446,9 @@ package_qt5-tools() {
install -m644 "${srcdir}"/{linguist,designer,assistant,qdbusviewer}.desktop \
"${pkgdir}/usr/share/applications/"
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Useful symlinks
install -d "${pkgdir}"/usr/bin
@@ -454,9 +470,9 @@ package_qt5-webkit() {
cd ${_pkgfqn}/qtwebkit
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
# Fix wrong path in pc file
perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc
@@ -469,9 +485,9 @@ package_qt5-wayland() {
cd ${_pkgfqn}/qtwayland
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -484,9 +500,9 @@ package_qt5-webchannel() {
cd ${_pkgfqn}/qtwebchannel
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
@@ -511,9 +527,9 @@ package_qt5-websockets() {
cd ${_pkgfqn}/qtwebsockets
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
}
package_qt5-x11extras() {
@@ -523,10 +539,11 @@ package_qt5-x11extras() {
cd ${_pkgfqn}/qtx11extras
make INSTALL_ROOT="${pkgdir}" install
- # Fix wrong path in prl files
+ # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
install -D -m644 LGPL_EXCEPTION.txt \
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
+
diff --git a/qt5/kdebug-329174.patch b/qt5/kdebug-329174.patch
new file mode 100644
index 0000000..bf0b657
--- /dev/null
+++ b/qt5/kdebug-329174.patch
@@ -0,0 +1,39 @@
+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
+