commit: db8680a067ad1ed5499ee4ea2f727a302a3b16fd
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 13:10:12 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 13:10:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db8680a0
dev-qt/qtcore: backport upstream patch fixing build against >=systemd-229-r100
Gentoo-Bug: 578316
Package-Manager: portage-2.2.28
dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch | 56 +++++++++++++++++++++++
dev-qt/qtcore/qtcore-5.5.1-r1.ebuild | 5 +-
2 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch
b/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch
new file mode 100644
index 0000000..edb58d1
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch
@@ -0,0 +1,56 @@
+From c689bcafd3196aad22372e8056fe0ccb13c15f35 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heire...@exherbo.org>
+Date: Fri, 12 Feb 2016 12:37:15 +0100
+Subject: 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.buddenha...@theqtcompany.com>
+Reviewed-by: Robin Burchell <robin.burch...@viroteck.net>
+---
+ config.tests/unix/journald/journald.pro | 6 +++++-
+ src/corelib/global/global.pri | 5 ++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/config.tests/unix/journald/journald.pro
b/config.tests/unix/journald/journald.pro
+index 2bb50ce..ea76564 100644
+--- a/config.tests/unix/journald/journald.pro
++++ b/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/src/corelib/global/global.pri b/src/corelib/global/global.pri
+index aa4945f..dd84695 100644
+--- a/src/corelib/global/global.pri
++++ b/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
+ }
+
+--
+2.8.1
+
diff --git a/dev-qt/qtcore/qtcore-5.5.1-r1.ebuild
b/dev-qt/qtcore/qtcore-5.5.1-r1.ebuild
index 2781f1e..f6506e9 100644
--- a/dev-qt/qtcore/qtcore-5.5.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,7 +25,8 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-qatomic_ia64.h.patch" # bug 559802
+ "${FILESDIR}/${PN}-5.5.1-qatomic_ia64.h.patch" # bug 559802
+ "${FILESDIR}/${PN}-5.5.1-libsystemd.patch" # bug 578316
)
QT5_TARGET_SUBDIRS=(
