qt5: add patch to build with systemd 230

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 54 insertions, 1 deletions

diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0002-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch b/patches/qt-everywhere-opensource-src-5.6.0/0002-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
new file mode 100644
index 000000000..14ef205ff
--- /dev/null
+++ b/patches/qt-everywhere-opensource-src-5.6.0/0002-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
@@ -0,0 +1,52 @@
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 12 Feb 2016 12:37:15 +0100
+Subject: [PATCH] Search for libsystemd first, fall back to libsystemd-journal
+
+systemd >= 209 merged the individual libraries libsystemd-journal,
+libsystemd-login, libsystemd-id128 and libsystemd-daemon into
+a single library, libsystemd. To ease the transition one could pass
+an option to its build to generate stub libraries and matching
+pkg-config files. With systemd >= 229 this option has now been
+removed, causing the build to fail when the journald option is
+enabled.
+
+Change-Id: I26670f207f1a9e79c16be5ce8c8a49353143c5ba
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
+---
+ qtbase/config.tests/unix/journald/journald.pro | 6 +++++-
+ qtbase/src/corelib/global/global.pri           | 5 ++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/qtbase/config.tests/unix/journald/journald.pro b/qtbase/config.tests/unix/journald/journald.pro
+index 2bb50ceb71c5..ea765642e6ea 100644
+--- a/qtbase/config.tests/unix/journald/journald.pro
++++ b/qtbase/config.tests/unix/journald/journald.pro
+@@ -1,6 +1,10 @@
+ SOURCES = journald.c
+ 
+ CONFIG += link_pkgconfig
+-PKGCONFIG_PRIVATE += libsystemd-journal
++
++packagesExist(libsystemd): \
++    PKGCONFIG_PRIVATE += libsystemd
++else: \
++    PKGCONFIG_PRIVATE += libsystemd-journal
+ 
+ CONFIG -= qt
+diff --git a/qtbase/src/corelib/global/global.pri b/qtbase/src/corelib/global/global.pri
+index aa4945f90e3a..dd846955f61e 100644
+--- a/qtbase/src/corelib/global/global.pri
++++ b/qtbase/src/corelib/global/global.pri
+@@ -53,7 +53,10 @@ slog2 {
+ 
+ journald {
+     CONFIG += link_pkgconfig
+-    PKGCONFIG_PRIVATE += libsystemd-journal
++    packagesExist(libsystemd): \
++        PKGCONFIG_PRIVATE += libsystemd
++    else: \
++        PKGCONFIG_PRIVATE += libsystemd-journal
+     DEFINES += QT_USE_JOURNALD
+ }
+ 
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/series b/patches/qt-everywhere-opensource-src-5.6.0/series
index b3fea8ba7..a6a6c513e 100644
--- a/patches/qt-everywhere-opensource-src-5.6.0/series
+++ b/patches/qt-everywhere-opensource-src-5.6.0/series
@@ -2,6 +2,7 @@
 #tag:base --start-number 1
 #tag:upstream --start-number 1
 0001-Disable-c-standard-compiler-flags-for-the-host-build.patch
+0002-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
 #tag:fixes --start-number 100
 0100-eglfs-plugin-needs-egl-for-correct-cflags.patch
 0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch
@@ -11,4 +12,4 @@
 0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch
 0201-HACK-put-wayland-scanner-outout-in-srcdir.patch
 0202-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch
-# d5dd92d5dbf8f69f80adb7ff72e9f273  - git-ptx-patches magic
+# 08e3e873ae4e579c68fcd1e3500a81f2  - git-ptx-patches magic