diff options
Diffstat (limited to 'kde-apps/akonadi-search')
| -rw-r--r-- | kde-apps/akonadi-search/Manifest | 7 | ||||
| -rw-r--r-- | kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild | 2 | ||||
| -rw-r--r-- | kde-apps/akonadi-search/akonadi-search-18.12.0.ebuild (renamed from kde-apps/akonadi-search/akonadi-search-18.04.3.ebuild) | 6 | ||||
| -rw-r--r-- | kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch | 62 |
4 files changed, 71 insertions, 6 deletions
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest index 3915b84a4478..4b05baf89a68 100644 --- a/kde-apps/akonadi-search/Manifest +++ b/kde-apps/akonadi-search/Manifest @@ -1,5 +1,6 @@ -DIST akonadi-search-18.04.3.tar.xz 82440 BLAKE2B 9bd8fb4a8c0e319d8606741efcda247fa4b4bc3c647ecd5dfb2746739bb954e3e2ca68394464fb7c696722eaf5aceeae21e3c68c322c870a1b8af1fd1cc1dcc9 SHA512 5b353542f6e32b9a71ddecf36a358a7e261626e8f58e011d40cdde71afdc7c03abfed5e1b2c047eb7f01a57744b7d2be0af8cf53398f4fabb31413224cb2946e +AUX akonadi-search-18.12.0-cmake.patch 2096 BLAKE2B 6659077a290eaa582a2eb35df4a02d54d07c700baa833a952e6f59e01a0398fa0caf4d6fe62601683d7f0e7230ab448c67af1b5657a284262431f42bce50fd67 SHA512 02e8394cfaa1d4117a8b7e990779d54335741746cccba06dfd57ea77d2e674cf3b2604adb89198c94e762ed3f36165ba9f009cf737fc0b36c10a6b9177ece205 DIST akonadi-search-18.08.3.tar.xz 82856 BLAKE2B 9d33e95aedb2b1146b9482d249ef581ab5c02985528de0fb042cbb9e8ace22e0b18f9315dbf8300593e422a5cd1d917fbc7e5e4109727020116acd8c9711b7e3 SHA512 c5808b09527008f73166333833ceec29c269b96f3a1efd47f2f56e8e3e8054cae5aaff6f5c9a58d0311df8f6c5da7f92c38333becb13deeb40ff4a9c925cf670 -EBUILD akonadi-search-18.04.3.ebuild 1073 BLAKE2B 61a3f53f239027c4635498c4c19bc31c70b8d977f01d99d809f82c8a9b349a6ec3bd29e38ed374b2e50cfe7bc77a7c3ef3174c833616a1573ce3e1161c028595 SHA512 2c199dacbba1ae04b6e37aaede09be77e777f2b5e572c961cf840badfe96a46739bb7cb4cb7117e9f770fa0e697978c2318ba1e047772a5bc0239feca1f3311b -EBUILD akonadi-search-18.08.3.ebuild 1072 BLAKE2B 8b7b0e171b385c5f09e6a78aed93d5baa566723c379423f7234f4d15a135fc4da6e4511b6c1c7892eeec42933e28c3609a7d409068bfa51357d4cd6d4f7329da SHA512 6f06cc0021e6c3ccd7177ed46848c17cbd7b7e545bb798e9d6362fc05a02b6754a49b1bcae1b1d49e82fbc1bd786f08299b4d2f10554e79cfe86b71afbac8a4a +DIST akonadi-search-18.12.0.tar.xz 82816 BLAKE2B 3d59125598a1a100b0416dba827126c8f921a69d68ac8fabec644d80f0f1eec4ec4fb156d528e1491c9c7ab498b7b80a355abe1eb394b3df11455f46dfe8da7f SHA512 49c6aab6f55eb34debb482307f95d422e7706ee257ddf90684c77ea4f45767282325d05d3284f1336289913f09dbeaa1acc26a6f8d92e303ced7d62bef74ee9c +EBUILD akonadi-search-18.08.3.ebuild 1070 BLAKE2B db59cbd862c8e83e69989f4dd523a219a7a7382e7dfcb36ef1a21759a949c3822dd6d51c737c679644373d5cd685886363293f1c49a2515e1c6bdf7bf1d2813d SHA512 4f02e14d2a27a250027d9a2e504bd685839d0b23a6504b46e66bc1f0032ec8175e9b6cddf9349036d0deb2273266a2e36c7c900ab162aa10288dec4044dcd199 +EBUILD akonadi-search-18.12.0.ebuild 1116 BLAKE2B aa8757f82d261f09d645b300f34fb753451fc1458a12e163abc5d61b0552698c743cee34bbe88ebc96e3fea7dd19c92df851e2efca5d015f9c21dbc6ea63f734 SHA512 1d978fb1e70708725f3d3a246ef733edee81a68f3fc5aeff4d7b61e06a2ad974941bc5352b46dabea264d58003732e46662bd758a0160286bd3613b126c1beeb MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild index 415aae7b1a24..437596059cf0 100644 --- a/kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild +++ b/kde-apps/akonadi-search/akonadi-search-18.08.3.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Libraries and daemons to implement searching in Akonadi" HOMEPAGE="https://cgit.kde.org/akonadi-search.git" LICENSE="GPL-2+ LGPL-2.1+" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" COMMON_DEPEND=" diff --git a/kde-apps/akonadi-search/akonadi-search-18.04.3.ebuild b/kde-apps/akonadi-search/akonadi-search-18.12.0.ebuild index 2dec1473b6a5..72104375caac 100644 --- a/kde-apps/akonadi-search/akonadi-search-18.04.3.ebuild +++ b/kde-apps/akonadi-search/akonadi-search-18.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Libraries and daemons to implement searching in Akonadi" HOMEPAGE="https://cgit.kde.org/akonadi-search.git" LICENSE="GPL-2+ LGPL-2.1+" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" COMMON_DEPEND=" @@ -40,3 +40,5 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim-l10n " + +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) diff --git a/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch b/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch new file mode 100644 index 000000000000..e6a6bd79d45f --- /dev/null +++ b/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch @@ -0,0 +1,62 @@ +From f5af0d46904125f0c4c874b462c9f44d4688a528 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 19 Dec 2018 14:21:13 +0100 +Subject: [PATCH] Use KF5_MIN_VERSION instead of KF5_VERSION + +Summary: +KF5_VERSION is overridden by first KF5 find_package version found result, which may be higher +than other installed Frameworks versions at the time, leading to cmake error. + +Reviewers: #kde_pim, dvratil + +Reviewed By: #kde_pim, dvratil + +Subscribers: dvratil, kde-pim + +Tags: #kde_pim + +Differential Revision: https://phabricator.kde.org/D17684 +--- + CMakeLists.txt | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f54a17f..708a266 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,9 +4,9 @@ set(PIM_VERSION "5.10.0") + project(AkonadiSearch VERSION ${PIM_VERSION}) + + # ECM setup +-set(KF5_VERSION "5.51.0") ++set(KF5_MIN_VERSION "5.51.0") + +-find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) ++find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + + include(GenerateExportHeader) +@@ -39,9 +39,9 @@ set(KMIME_LIB_VERSION "5.10.0") + set(QT_REQUIRED_VERSION "5.9.0") + + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Test) +-find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Config Crash KCMUtils) ++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n Config Crash DBusAddons KCMUtils KIO) + if (AKONADISEARCH_ENABLE_KRUNNER_RUNNER) +- find_package(KF5Runner ${KF5_VERSION} REQUIRED) ++ find_package(KF5Runner ${KF5_MIN_VERSION} REQUIRED) + endif() + + +@@ -57,8 +57,6 @@ find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED) + find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED) +-find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) +-find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) + + ecm_setup_version(PROJECT + VARIABLE_PREFIX AKONADISEARCH +-- +2.20.1 + |