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 07718138334 for ; Sun, 13 Jan 2019 12:17:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6ECBE096F; Sun, 13 Jan 2019 12:16:56 +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 A73A0E096F for ; Sun, 13 Jan 2019 12:16:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6AEA1335CC8 for ; Sun, 13 Jan 2019 12:16:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FECF50C for ; Sun, 13 Jan 2019 12:16:52 +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: <1547381570.88fca674666341bc813e89ba260b98b2f9a35498.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild X-VCS-Directories: kde-plasma/xembed-sni-proxy/ kde-plasma/xembed-sni-proxy/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 88fca674666341bc813e89ba260b98b2f9a35498 X-VCS-Branch: master Date: Sun, 13 Jan 2019 12:16:52 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22be2ca1-22cf-4fa7-9c43-a6b6fe488b0a X-Archives-Hash: 908a221b87d71a50820280462a41d790 commit: 88fca674666341bc813e89ba260b98b2f9a35498 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 13 12:02:32 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 13 12:12:50 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=88fca674 kde-plasma/xembed-sni-proxy: Fix standalone patch to 5.15 min versions Closes: https://bugs.gentoo.org/675316 Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> ...2-standalone.patch => xembed-sni-proxy-5.14.90-standalone.patch} | 6 +++--- kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch similarity index 93% rename from kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch rename to kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch index ddbf13d55d..8fb3c17090 100644 --- a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch +++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch @@ -20,8 +20,8 @@ index c2f67ac6..30b2c1b5 100644 + + cmake_minimum_required(VERSION 3.0) + -+ set(QT_MIN_VERSION "GENTOO_QT_MINIMAL") -+ set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL") ++ set(QT_MIN_VERSION "5.11.0") ++ set(KF5_MIN_VERSION "5.54.0") + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras) + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -39,7 +39,7 @@ index c2f67ac6..30b2c1b5 100644 + + configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) +else() -+ set(PROJECT_VERSION "5.14.1") ++ set(PROJECT_VERSION "5.14.90") + set(PROJECT_VERSION_MAJOR 5) +endif() + diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild index 2199e1bdd1..cd0e53d4a5 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild @@ -31,13 +31,11 @@ RDEPEND="${DEPEND} S="${S}/${PN}" -PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" ) src_prepare() { kde5_src_prepare - sed -e "/set/s/GENTOO_PV/${PV}/" \ - -e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \ - -e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \ + sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" }