aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2016-02-29 18:45:06 +0100
committerFlorian Bruhin <git@the-compiler.org>2016-02-29 18:45:06 +0100
commit735b641246c3e000f00e75f13c5b06080466e6b8 (patch)
tree1674efdc6248500626a9a8b9f14427157770dc02
parentaef75b7267fc95c2d40c85ff70f5b4a91237e83a (diff)
downloadqt-debug-pkgbuild-735b641246c3e000f00e75f13c5b06080466e6b8.tar.gz
qt-debug-pkgbuild-735b641246c3e000f00e75f13c5b06080466e6b8.zip
Add journald patch
-rw-r--r--qt5/PKGBUILD9
1 files changed, 7 insertions, 2 deletions
diff --git a/qt5/PKGBUILD b/qt5/PKGBUILD
index 0f25d81..2d5b1d9 100644
--- a/qt5/PKGBUILD
+++ b/qt5/PKGBUILD
@@ -45,13 +45,15 @@ 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'
- 'division-by-zero.patch::http://code.qt.io/cgit/qt/qtbase.git/patch/?id=79447068579ea93d616d840bb8cbbf8adb1ed6ec')
+ 'division-by-zero.patch::http://code.qt.io/cgit/qt/qtbase.git/patch/?id=79447068579ea93d616d840bb8cbbf8adb1ed6ec'
+ 'journald.patch::http://code.qt.io/cgit/qt/qtbase.git/patch/config.tests/unix/journald/journald.pro?id=c689bcafd3196aad22372e8056fe0ccb13c15f35')
md5sums=('c2a249e8795d45200d997d96860d0353'
'b2897dd6a2967bccf8f10e397aafee55'
'76e150b20178d2d43801f7367232e5f7'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- '43ed20fa76dc49aa5736fa6de9ddca03')
+ '43ed20fa76dc49aa5736fa6de9ddca03'
+ '56ccd525aac1b4195927b3a515f8978b')
options=('debug' '!strip')
prepare() {
@@ -60,6 +62,9 @@ prepare() {
# Fix division by zero when using a recent Xvfb (QTBUG-49322/FS#48195)
patch -d qtbase -p1 -i "${srcdir}/division-by-zero.patch"
+ # Fix build with systemd >= 229
+ patch -d qtbase -p1 -i "${srcdir}/journald.patch"
+
# 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}|" \