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 0EB18139694 for ; Wed, 19 Jul 2017 18:54:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72AA0E0EE8; Wed, 19 Jul 2017 18:54:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 50792E0EEF for ; Wed, 19 Jul 2017 18:54:13 +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 6D52734182B for ; Wed, 19 Jul 2017 18:54:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F41674BC for ; Wed, 19 Jul 2017 18:54:10 +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: <1500490430.3ee9d86e27337f3581bf52cc693adbf77c25f517.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch X-VCS-Directories: kde-plasma/plasma-workspace/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3ee9d86e27337f3581bf52cc693adbf77c25f517 X-VCS-Branch: master Date: Wed, 19 Jul 2017 18:54: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: 121e2bc5-e98b-4f75-aa57-c158bb4e73a9 X-Archives-Hash: cd30d21fd984f35c00b5e78bf1cf30af commit: 3ee9d86e27337f3581bf52cc693adbf77c25f517 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 19 18:49:47 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 19 18:53:50 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee9d86e kde-plasma/plasma-workspace: Drop obsolete patch Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../plasma-workspace-5.7.90-baloo-optional.patch | 41 ---------------------- 1 file changed, 41 deletions(-) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch deleted file mode 100644 index 34f7142dfdf..00000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.7.90-baloo-optional.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 7ea5034dda3d7a497be8c8d1adea08897c165916 -Author: Andreas Sturmlechner -Date: Thu Sep 15 00:22:38 2016 +0200 - - Make KF5Baloo optional - - https://mail.kde.org/pipermail/kde-frameworks-devel/2016-September/037734.html - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e57cb73..49584d9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,8 +26,13 @@ find_package(KF5XmlRpcClient REQUIRED) - find_package(KF5 REQUIRED COMPONENTS PlasmaQuick) - find_package(KF5 REQUIRED COMPONENTS SysGuard) - find_package(KF5 REQUIRED COMPONENTS Package) --# Baloo has a different version scheme than KF5 for now --find_package(KF5 5.1 REQUIRED COMPONENTS Baloo) -+ -+find_package(KF5Baloo) -+set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" -+ TYPE OPTIONAL -+ PURPOSE "Needed for the File Search runner." -+ ) -+ - find_package(KF5TextEditor) - find_package(KWinDBusInterface CONFIG REQUIRED) - -diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt -index 48cc379..d7656c8 100644 ---- a/runners/CMakeLists.txt -+++ b/runners/CMakeLists.txt -@@ -1,5 +1,7 @@ - add_subdirectory(activities) --add_subdirectory(baloo) -+if(KF5Baloo_FOUND) -+ add_subdirectory(baloo) -+endif() - add_subdirectory(bookmarks) - add_subdirectory(calculator) - add_subdirectory(locations)