aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2016-03-07 13:55:28 +0100
committerFlorian Bruhin <git@the-compiler.org>2016-03-07 13:55:28 +0100
commit44fa8c4a00c4a9d734cb722f4c6b31e615cff33b (patch)
tree1a3b6ec5951ff334241758698b95e4d25536e231
parent47b1448093f561bb3663d0637be5fd612186df0e (diff)
parentce48da58bc714a8c533a0073457473b2b6a75372 (diff)
downloadqt-debug-pkgbuild-master.tar.gz
qt-debug-pkgbuild-master.zip
Merge branch 'upstream'HEADmaster
-rw-r--r--qt5/PKGBUILD8
1 files changed, 6 insertions, 2 deletions
diff --git a/qt5/PKGBUILD b/qt5/PKGBUILD
index 2d5b1d9..42ad7dd 100644
--- a/qt5/PKGBUILD
+++ b/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 258362 2016-01-16 13:27:23Z fyan $
+# $Id: PKGBUILD 261081 2016-03-06 10:49:07Z pierre $
# Maintainer: Felix Yan <felixonmars@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -30,7 +30,7 @@ pkgname=('qt5-3d-debug'
'qt5-x11extras-debug'
'qt5-xmlpatterns-debug')
pkgver=5.5.1
-pkgrel=9.1
+pkgrel=10.1
arch=('i686' 'x86_64')
url='http://www.qt.io/developers'
license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -83,6 +83,10 @@ prepare() {
sed -e 's/contains(WEBENGINE_CONFIG, proprietary_codecs): //' \
-e '/use_system_ffmpeg=0"/a GYP_ARGS += "-Duse_system_yasm=1"' \
-i qtwebengine/src/core/gyp_run.pro
+
+ sed -i 's/libsystemd-journal/libsystemd/g' \
+ qtbase/src/corelib/global/global.pri \
+ qtbase/config.tests/unix/journald/journald.pro
}
build() {