From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 44FF859CAF for ; Sun, 10 Apr 2016 13:21:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A15C721C013; Sun, 10 Apr 2016 13:21:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E53521C013 for ; Sun, 10 Apr 2016 13:21:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03DA13408D4 for ; Sun, 10 Apr 2016 13:21:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29142C8 for ; Sun, 10 Apr 2016 13:21:10 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1460294464.1e739fcf981d6299b73cf6c5611fbbbca611bc66.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch dev-qt/qtcore/qtcore-5.6.0.ebuild X-VCS-Directories: dev-qt/qtcore/files/ dev-qt/qtcore/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 1e739fcf981d6299b73cf6c5611fbbbca611bc66 X-VCS-Branch: master Date: Sun, 10 Apr 2016 13:21:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 36270a17-5667-4755-8707-26bee1af3fe3 X-Archives-Hash: adc9b3f2f20f2176c5b62c07343b7403 commit: 1e739fcf981d6299b73cf6c5611fbbbca611bc66 Author: Davide Pesavento gentoo org> AuthorDate: Sun Apr 10 13:21:04 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Apr 10 13:21:04 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=1e739fcf 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.6.0.ebuild | 4 ++ 2 files changed, 60 insertions(+) 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 +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 +Reviewed-by: Robin Burchell +--- + 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.6.0.ebuild b/dev-qt/qtcore/qtcore-5.6.0.ebuild index 8bff4ba..ef6a230 100644 --- a/dev-qt/qtcore/qtcore-5.6.0.ebuild +++ b/dev-qt/qtcore/qtcore-5.6.0.ebuild @@ -24,6 +24,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-5.5.1-libsystemd.patch" # bug 578316 +) + QT5_TARGET_SUBDIRS=( src/tools/bootstrap src/tools/moc