From f7ecd04fd43367eb0003bb885c84b60638f64ea0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 5 Mar 2021 16:42:50 +0100 Subject: app-office/libalkimia: 8.1 branch, rebase patch, kdelibs4support-- Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner --- .../libalkimia/files/libalkimia-8.0.3-cmake.patch | 54 ---------------------- .../libalkimia/files/libalkimia-8.1.0-cmake.patch | 54 ++++++++++++++++++++++ app-office/libalkimia/libalkimia-8.9999.ebuild | 6 +-- app-office/libalkimia/libalkimia-9999.ebuild | 2 +- 4 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch create mode 100644 app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch diff --git a/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch b/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch deleted file mode 100644 index 1b99061e6bf..00000000000 --- a/app-office/libalkimia/files/libalkimia-8.0.3-cmake.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 12 Jun 2019 19:44:12 +0200 -Subject: [PATCH 1/2] Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for - alkimia target - ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7c0f0f7..0774032 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) - - install(TARGETS alkimia - EXPORT alkimiaTargets -- ${INSTALL_TARGETS_DEFAULT_ARGS} -+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} - ) - - if(BUILD_QT4) --- -2.23.0 - - -From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 12 Jun 2019 16:43:54 +0200 -Subject: [PATCH 2/2] Fix pkgconfig libdir path - ---- - src/libalkimia.pc.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in -index c2087c9..6ada277 100644 ---- a/src/libalkimia.pc.in -+++ b/src/libalkimia.pc.in -@@ -4,8 +4,8 @@ - # General installation directories - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@KDE4_LIB_DIR@ --includedir=@INCLUDE_INSTALL_DIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=${prefix}/@INCLUDE_INSTALL_DIR@ - - # Human-readable name - Name: Alkimia --- -2.23.0 - diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch b/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch new file mode 100644 index 00000000000..652e951c4bc --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch @@ -0,0 +1,54 @@ +From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 12 Jun 2019 19:44:12 +0200 +Subject: [PATCH 1/2] Use non-deprecated KDE_INSTALL_TARGETS_DEFAULT_ARGS for + alkimia target + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7c0f0f7..0774032 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -147,7 +147,7 @@ set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) + + install(TARGETS alkimia + EXPORT alkimiaTargets +- ${INSTALL_TARGETS_DEFAULT_ARGS} ++ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} + ) + + if(BUILD_QT4) +-- +2.23.0 + + +From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 12 Jun 2019 16:43:54 +0200 +Subject: [PATCH 2/2] Fix pkgconfig libdir path + +--- + src/libalkimia.pc.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libalkimia.pc.in b/src/libalkimia.pc.in +index c2087c9..6ada277 100644 +--- a/src/libalkimia.pc.in ++++ b/src/libalkimia.pc.in +@@ -4,8 +4,8 @@ + # General installation directories + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@KDE4_LIB_DIR@ +-includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=${prefix}/@INCLUDE_INSTALL_DIR@ + + # Human-readable name + Name: Alkimia +-- +2.23.0 + diff --git a/app-office/libalkimia/libalkimia-8.9999.ebuild b/app-office/libalkimia/libalkimia-8.9999.ebuild index 91fb67ad631..209175e56df 100644 --- a/app-office/libalkimia/libalkimia-8.9999.ebuild +++ b/app-office/libalkimia/libalkimia-8.9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -EGIT_BRANCH="8.0" +EGIT_BRANCH="8.1" ECM_TEST="forceoptional" KDE_ORG_NAME="alkimia" KFMIN=5.74.0 @@ -38,9 +38,9 @@ DEPEND=" >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 @@ -55,7 +55,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-8.0.3-cmake.patch" ) +PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" ) src_configure() { local mycmakeargs=( diff --git a/app-office/libalkimia/libalkimia-9999.ebuild b/app-office/libalkimia/libalkimia-9999.ebuild index 07e57172ab1..32f13a2f29e 100644 --- a/app-office/libalkimia/libalkimia-9999.ebuild +++ b/app-office/libalkimia/libalkimia-9999.ebuild @@ -54,7 +54,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-8.0.3-cmake.patch" ) +PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" ) src_configure() { local mycmakeargs=( -- cgit v1.2.3