Skip to content

Commit

Permalink
app-office/libalkimia: Re-org cmake- and pkgconfig patches, rebase
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/947339
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Jan 2, 2025
1 parent bddebbe commit 1ff4429
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 56 deletions.
54 changes: 0 additions & 54 deletions app-office/libalkimia/files/libalkimia-8.1.0-cmake.patch

This file was deleted.

23 changes: 23 additions & 0 deletions app-office/libalkimia/files/libalkimia-8.1.2-cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From d413b91839ca0e66beb56a71625e3194df1a6599 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
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
25 changes: 25 additions & 0 deletions app-office/libalkimia/files/libalkimia-8.1.2-pkgconfig.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
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
25 changes: 25 additions & 0 deletions app-office/libalkimia/files/libalkimia-8.1.92-pkgconfig.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 1fd611bcc060e779ac62f5f69d956c6dee2b3383 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
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=@CMAKE_INSTALL_LIBDIR@
-includedir=@INCLUDE_INSTALL_DIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=${prefix}/@INCLUDE_INSTALL_DIR@

# Human-readable name
Name: Alkimia
--
2.23.0
2 changes: 1 addition & 1 deletion app-office/libalkimia/libalkimia-8.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ BDEPEND="
doc? ( app-text/doxygen )
"

PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" )
PATCHES=( "${FILESDIR}"/${PN}-8.1.2-{cmake,pkgconfig}.patch )

src_configure() {
local mycmakeargs=(
Expand Down
5 changes: 4 additions & 1 deletion app-office/libalkimia/libalkimia-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ BDEPEND="
doc? ( app-text/doxygen )
"

PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" )
PATCHES=(
"${FILESDIR}/${PN}-8.1.2-cmake.patch"
"${FILESDIR}/${PN}-8.1.92-pkgconfig.patch"
)

src_configure() {
local mycmakeargs=(
Expand Down

0 comments on commit 1ff4429

Please sign in to comment.