From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB2DB1382C5 for ; Fri, 13 Apr 2018 23:47:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23437E08EC; Fri, 13 Apr 2018 23:47:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA662E08EB for ; Fri, 13 Apr 2018 23:47:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0542E335CA0 for ; Fri, 13 Apr 2018 23:47:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC4912C2 for ; Fri, 13 Apr 2018 23:27:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1523662038.9ddde11f7b9b63ddebe1f5608077dcfe53e0d735.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ksystemlog/, kde-apps/ksystemlog/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild X-VCS-Directories: kde-apps/ksystemlog/ kde-apps/ksystemlog/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9ddde11f7b9b63ddebe1f5608077dcfe53e0d735 X-VCS-Branch: master Date: Fri, 13 Apr 2018 23:27:30 +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: 0ce4f28b-7f31-4195-87f9-1daaf7191d38 X-Archives-Hash: 781f14f908a2a26191552158c91ad0a0 commit: 9ddde11f7b9b63ddebe1f5608077dcfe53e0d735 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 13 23:27:18 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 13 23:27:18 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9ddde11f kde-apps/ksystemlog: Fix build with Qt 5.11_beta3 Package-Manager: Portage-2.3.28, Repoman-2.3.9 .../files/ksystemlog-18.04.0-qt-5.11.patch | 32 ++++++++++++++++++++++ kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild | 2 ++ 2 files changed, 34 insertions(+) diff --git a/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch b/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch new file mode 100644 index 0000000000..efed562efe --- /dev/null +++ b/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch @@ -0,0 +1,32 @@ +From 3ab2bd7564bcb9518892704e47634053875fac14 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 14 Apr 2018 01:18:05 +0200 +Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + src/lib/CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt +index 5cabcba..30b97f0 100644 +--- a/src/lib/CMakeLists.txt ++++ b/src/lib/CMakeLists.txt +@@ -49,7 +49,8 @@ add_dependencies( + + target_link_libraries(ksystemlog_lib + ksystemlog_config +- ++ Qt5::Widgets ++ Qt5::PrintSupport + KF5::I18n + KF5::Archive + KF5::ConfigWidgets +@@ -58,5 +59,3 @@ target_link_libraries(ksystemlog_lib + KF5::KIOCore + KF5::Completion + ) +- +-qt5_use_modules(ksystemlog_lib Widgets PrintSupport) +-- +2.17.0 + diff --git a/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild b/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild index 613a2eccdf..0c60ccb040 100644 --- a/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild +++ b/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild @@ -37,6 +37,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) + src_prepare() { kde5_src_prepare