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 0D3D8139694 for ; Tue, 25 Apr 2017 17:35:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29F8921C0FA; Tue, 25 Apr 2017 17:35:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 EE05F21C0FA for ; Tue, 25 Apr 2017 17:35:21 +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 EA9D633E4AD for ; Tue, 25 Apr 2017 17:35:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 928E47427 for ; Tue, 25 Apr 2017 17:35:19 +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: <1493141710.632584c8498bfded1bda552160578dfdd47fbd4f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kglobalaccel/files/, kde-frameworks/kglobalaccel/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kglobalaccel/files/kglobalaccel-5.33.0-deps.patch kde-frameworks/kglobalaccel/kglobalaccel-5.33.0-r1.ebuild X-VCS-Directories: kde-frameworks/kglobalaccel/files/ kde-frameworks/kglobalaccel/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 632584c8498bfded1bda552160578dfdd47fbd4f X-VCS-Branch: master Date: Tue, 25 Apr 2017 17:35:19 +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: cd5f685b-c309-47b1-a9a6-fba286accb5f X-Archives-Hash: 1dbeceb30ad0c32afb68851e7bc0e038 commit: 632584c8498bfded1bda552160578dfdd47fbd4f Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 25 17:30:52 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 25 17:35:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632584c8 kde-frameworks/kglobalaccel: Drop unused DEPEND Upstream commit 3670b49d572195f623297eb7f27c62136ffe3490 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/kglobalaccel-5.33.0-deps.patch | 44 ++++++++++++++++++++++ .../kglobalaccel/kglobalaccel-5.33.0-r1.ebuild | 31 +++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.33.0-deps.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.33.0-deps.patch new file mode 100644 index 00000000000..59d9125c983 --- /dev/null +++ b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.33.0-deps.patch @@ -0,0 +1,44 @@ +commit 3670b49d572195f623297eb7f27c62136ffe3490 +Author: Aleix Pol +Date: Tue Apr 25 12:25:12 2017 +0200 + + build: Remove KService dependency + + Summary: + ..as it's not used anywhere (and the KService isn't some kind of + "selfinitializing" library, that only needs to be linked to). + + Reviewers: graesslin, cfeck, apol + + Reviewed By: graesslin + + Subscribers: #frameworks + + Tags: #frameworks + + Differential Revision: https://phabricator.kde.org/D5556 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4e5a9e4..670c677 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,6 @@ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) +-find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) + + # no X11 stuff on mac + if (NOT APPLE) +diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt +index 4aeb13c..a318818 100644 +--- a/src/runtime/CMakeLists.txt ++++ b/src/runtime/CMakeLists.txt +@@ -30,7 +30,6 @@ target_link_libraries(KF5GlobalAccelPrivate + KF5::WindowSystem # KKeyServer + KF5::CoreAddons # KAboutData + KF5::ConfigCore +- KF5::Service + ) + + set_target_properties(KF5GlobalAccelPrivate PROPERTIES VERSION ${KGLOBALACCEL_VERSION_STRING} diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.33.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.33.0-r1.ebuild new file mode 100644 index 00000000000..5fc51130a26 --- /dev/null +++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.33.0-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework to handle global shortcuts" +KEYWORDS="~amd64 ~arm ~x86" +LICENSE="LGPL-2+" +IUSE="nls" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kwindowsystem X) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + x11-libs/libxcb + x11-libs/xcb-util-keysyms +" +DEPEND="${RDEPEND} + nls? ( $(add_qt_dep linguist-tools) ) +" + +PATCHES=( "${FILESDIR}/${P}-deps.patch" )