diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-03-10 19:57:31 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-03-10 19:59:14 +0100 |
| commit | 7f17fc577e82fb7eb720444f0e8c6181a452bfe9 (patch) | |
| tree | 35924a2611aa07e08ecb53d800a8799a2489cff7 /kde-apps | |
| parent | sys-apps/sandbox: fix handling of symlinks w/symlinkat/renameat #612202 (diff) | |
| download | gentoo-7f17fc577e82fb7eb720444f0e8c6181a452bfe9.tar.gz gentoo-7f17fc577e82fb7eb720444f0e8c6181a452bfe9.tar.bz2 gentoo-7f17fc577e82fb7eb720444f0e8c6181a452bfe9.zip | |
kde-apps/kholidays: Revert upstream depfreeze break, fix KF5_VERSION
Reported-by: Marc Joliet <marcec@gmx.de>
Gentoo-bug: 612186
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/kholidays/files/kholidays-16.12.3-revert-kf5-dep.patch | 55 | ||||
| -rw-r--r-- | kde-apps/kholidays/kholidays-16.12.3.ebuild | 2 |
2 files changed, 57 insertions, 0 deletions
diff --git a/kde-apps/kholidays/files/kholidays-16.12.3-revert-kf5-dep.patch b/kde-apps/kholidays/files/kholidays-16.12.3-revert-kf5-dep.patch new file mode 100644 index 000000000000..774f16c898fa --- /dev/null +++ b/kde-apps/kholidays/files/kholidays-16.12.3-revert-kf5-dep.patch @@ -0,0 +1,55 @@ +commit b59aa106fedbfa17f1675a20990564d79c1ec090 +Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Fri Mar 10 13:33:10 2017 +0100 + + Revert depfreeze breaking merge (KF5_VERSION, cmake, PIM_VERSION) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 05164db..e0b67b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,28 +1,28 @@ +-cmake_minimum_required(VERSION 3.0) +-set(PIM_VERSION "5.4.40") ++cmake_minimum_required(VERSION 2.8.12) + +-project(KHolidays VERSION ${PIM_VERSION}) ++project(KHolidays) + + # ECM setup +-set(KF5_VERSION "5.31.0") ++set(KF5_VERSION "5.28.0") + find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + + include(GenerateExportHeader) + include(ECMGenerateHeaders) + include(ECMGeneratePriFile) +-include(CMakePackageConfigHelpers) ++include(ECMPackageConfigHelpers) + include(ECMSetupVersion) + include(ECMPoQmTools) + include(FeatureSummary) + include(KDEInstallDirs) + include(KDECMakeSettings) + include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +-include(ECMCoverageOption) ++ ++set(PIM_VERSION "5.4.3") + + set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION}) + +-ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS ++ecm_setup_version(${KHOLIDAYS_LIB_VERSION} VARIABLE_PREFIX KHOLIDAYS + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfigVersion.cmake" + SOVERSION 5 +@@ -50,7 +50,7 @@ endif() + ########### CMake Config Files ########### + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Holidays") + +-configure_package_config_file( ++ecm_configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5HolidaysConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff --git a/kde-apps/kholidays/kholidays-16.12.3.ebuild b/kde-apps/kholidays/kholidays-16.12.3.ebuild index 16371373edbc..64bddb46415f 100644 --- a/kde-apps/kholidays/kholidays-16.12.3.ebuild +++ b/kde-apps/kholidays/kholidays-16.12.3.ebuild @@ -18,3 +18,5 @@ RDEPEND="${DEPEND}" # bug 579592 RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-revert-kf5-dep.patch" ) |