forked from gentoo/kde
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-office/libalkimia: Re-org cmake- and pkgconfig patches, rebase
Closes: https://bugs.gentoo.org/947339 Signed-off-by: Andreas Sturmlechner <[email protected]>
- Loading branch information
Showing
6 changed files
with
78 additions
and
56 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
25
app-office/libalkimia/files/libalkimia-8.1.2-pkgconfig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
25
app-office/libalkimia/files/libalkimia-8.1.92-pkgconfig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters