diff options
4 files changed, 2 insertions, 72 deletions
diff --git a/app-office/libalkimia/files/libalkimia-8.1.2-cmake.patch b/app-office/libalkimia/files/libalkimia-8.1.2-cmake.patch deleted file mode 100644 index 5a699d8ec3b..00000000000 --- a/app-office/libalkimia/files/libalkimia-8.1.2-cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 12 Jun 2019 19:44:12 +0200 -Subject: 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 ---- 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 diff --git a/app-office/libalkimia/files/libalkimia-8.1.2-pkgconfig.patch b/app-office/libalkimia/files/libalkimia-8.1.2-pkgconfig.patch deleted file mode 100644 index 0696d1cfdb9..00000000000 --- a/app-office/libalkimia/files/libalkimia-8.1.2-pkgconfig.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 12 Jun 2019 16:43:54 +0200 -Subject: 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 ---- 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.2.9999.ebuild b/app-office/libalkimia/libalkimia-8.2.9999.ebuild index 025bbb8f618..9f669314e7f 100644 --- a/app-office/libalkimia/libalkimia-8.2.9999.ebuild +++ b/app-office/libalkimia/libalkimia-8.2.9999.ebuild @@ -47,10 +47,7 @@ BDEPEND=" doc? ( app-text/doxygen ) " -PATCHES=( - "${FILESDIR}/${PN}-8.1.2-cmake.patch" - "${FILESDIR}/${PN}-8.1.92-pkgconfig.patch" -) +PATCHES=( "${FILESDIR}/${PN}-8.1.92-pkgconfig.patch" ) src_configure() { local mycmakeargs=( @@ -64,11 +61,3 @@ src_configure() { ) ecm_src_configure } - -src_test() { - # Depends on BUILD_WITH_WEBKIT, bug 736128 - local myctestargs=( - -E "(alkonlinequotestest)" - ) - ecm_src_test -} diff --git a/app-office/libalkimia/libalkimia-9999.ebuild b/app-office/libalkimia/libalkimia-9999.ebuild index 98ae423c785..a95ea06ca8f 100644 --- a/app-office/libalkimia/libalkimia-9999.ebuild +++ b/app-office/libalkimia/libalkimia-9999.ebuild @@ -49,10 +49,7 @@ BDEPEND=" doc? ( app-text/doxygen ) " -PATCHES=( - "${FILESDIR}/${PN}-8.1.2-cmake.patch" - "${FILESDIR}/${PN}-8.1.92-pkgconfig.patch" -) +PATCHES=( "${FILESDIR}/${PN}-8.1.92-pkgconfig.patch" ) src_configure() { local mycmakeargs=( @@ -66,11 +63,3 @@ src_configure() { ) ecm_src_configure } - -src_test() { - # Depends on BUILD_WITH_WEBKIT, bug 736128 - local myctestargs=( - -E "(alkonlinequotestest)" - ) - ecm_src_test -} |