| 1 |
commit: d61ca2d372d03f68a56e2c28d8ba3f9dbc61bab8 |
| 2 |
Author: David Flogeras <dflogeras2 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jun 26 13:55:44 2020 +0000 |
| 4 |
Commit: David Flogeras <dflogeras2 <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Jun 26 13:58:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d61ca2d3 |
| 7 |
|
| 8 |
x11-libs/kimageannotator: Bump to 0.3.1 and remove 0.3.0. |
| 9 |
|
| 10 |
Signed-off-by: David Flogeras <dflogeras2 <AT> gmail.com> |
| 11 |
|
| 12 |
x11-libs/kimageannotator/Manifest | 1 + |
| 13 |
...do-command-delete-items-that-are-required.patch | 10 ------ |
| 14 |
.../files/include-gnuinstalldirs-before-use.patch | 36 ---------------------- |
| 15 |
...r-0.3.0.ebuild => kimageannotator-0.3.1.ebuild} | 7 ----- |
| 16 |
4 files changed, 1 insertion(+), 53 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-libs/kimageannotator/Manifest b/x11-libs/kimageannotator/Manifest |
| 19 |
index 539d692..c15f6e6 100644 |
| 20 |
--- a/x11-libs/kimageannotator/Manifest |
| 21 |
+++ b/x11-libs/kimageannotator/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST kImageAnnotator-0.2.1.tar.gz 107027 BLAKE2B 247ea31f3dfd90fd175b879c3fe06a50ee2ce8f3f2ce395efa1882fe8abc4be4e5a739782054682336cf327fe288d24b17971c89dfaf7f5202ba3f607165b0f2 SHA512 6f9d03b6d0d020c90fa050ac6be30b680db8dd3a2035db80856bb69c9e6ef0228b2d152c5f234caf6d3fe2d8433b17fbdfee728246f2a8c339936b6ba051a52b |
| 24 |
DIST kImageAnnotator-0.3.0.tar.gz 128019 BLAKE2B 412748b432e41e6bdc01aa7270cbb32342016423beeca537c92096641e06f9a82a0ce7d1779fb25aec51e6e4c9451778fc339bb3c82edcdc56657ac810859447 SHA512 0d9e4ab5bdef1554e3b476e0d0e8f2ad08387abd94d9167c2b4987b0857294618b7a6626640381dade10c7eedaa5dec9e449715b46437c1d9a044142c15b7617 |
| 25 |
+DIST kImageAnnotator-0.3.1.tar.gz 130708 BLAKE2B 5491ca5b3d11bfeeb92366d737251bfeb5a19631e37269d8edc4b9799d86f93ac276aa1edd34ed0aa27fff2b2fbfe07044150ef90b3dfe59d40f7669c547cce8 SHA512 5953b4083328a632c889b8a7bef0e61ef7dd9c6dfdeb9cf99fa248409116f2757ca63ff98e1695b46dfb24d818bf296c89abb7609af1b06034f814557e1c5af0 |
| 26 |
|
| 27 |
diff --git a/x11-libs/kimageannotator/files/fix-undo-command-delete-items-that-are-required.patch b/x11-libs/kimageannotator/files/fix-undo-command-delete-items-that-are-required.patch |
| 28 |
deleted file mode 100644 |
| 29 |
index 39aa759..0000000 |
| 30 |
--- a/x11-libs/kimageannotator/files/fix-undo-command-delete-items-that-are-required.patch |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,10 +0,0 @@ |
| 33 |
---- a/src/annotations/undo/AddCommand.cpp |
| 34 |
-+++ b/src/annotations/undo/AddCommand.cpp |
| 35 |
-@@ -29,7 +29,6 @@ AddCommand::AddCommand(AbstractAnnotationItem *item, AnnotationArea *annotationA |
| 36 |
- |
| 37 |
- AddCommand::~AddCommand() |
| 38 |
- { |
| 39 |
-- delete mItem; |
| 40 |
- } |
| 41 |
- |
| 42 |
- void AddCommand::undo() |
| 43 |
|
| 44 |
diff --git a/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch b/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch |
| 45 |
deleted file mode 100644 |
| 46 |
index c5c7677..0000000 |
| 47 |
--- a/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch |
| 48 |
+++ /dev/null |
| 49 |
@@ -1,36 +0,0 @@ |
| 50 |
-From 94b08e1a3cef1d826ccae09a1287c2d5e327a293 Mon Sep 17 00:00:00 2001 |
| 51 |
-From: Dave Flogeras <dflogeras2@×××××.com> |
| 52 |
-Date: Fri, 19 Jun 2020 09:23:29 -0300 |
| 53 |
-Subject: [PATCH] Include GNUInstallDirs before using variables that rely on |
| 54 |
- it. |
| 55 |
- |
| 56 |
-This was subtle because when building by hand, and running cmake |
| 57 |
-multiple times, it seems to cache the variable. However when building |
| 58 |
-for Gentoo in an ebuild, cmake makes one pass, and the |
| 59 |
-CMAKE_INSTALL_DATAROOTDIR variable is empty. This results in the |
| 60 |
-translation files going in the wrong place. |
| 61 |
---- |
| 62 |
- CMakeLists.txt | 3 ++- |
| 63 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
| 64 |
- |
| 65 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 66 |
-index 12ad227..5c14937 100644 |
| 67 |
---- a/CMakeLists.txt |
| 68 |
-+++ b/CMakeLists.txt |
| 69 |
-@@ -11,6 +11,8 @@ set(CMAKE_AUTORCC ON) |
| 70 |
- option(BUILD_TESTS "Build Unit Tests" OFF) |
| 71 |
- option(BUILD_EXAMPLE "Build Example Application" ON) |
| 72 |
- |
| 73 |
-+include(GNUInstallDirs) |
| 74 |
-+ |
| 75 |
- if (WIN32) |
| 76 |
- set(KIMAGEANNOTATOR_LANG_INSTAL_DIR "translations") |
| 77 |
- elseif (APPLE) |
| 78 |
-@@ -27,7 +29,6 @@ if (UNIX) |
| 79 |
- find_package(X11 REQUIRED) |
| 80 |
- endif () |
| 81 |
- |
| 82 |
--include(GNUInstallDirs) |
| 83 |
- include(FeatureSummary) |
| 84 |
- |
| 85 |
- set(KCOLORPICKER_MIN_VERSION "0.1.4") |
| 86 |
|
| 87 |
diff --git a/x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild b/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild |
| 88 |
similarity index 73% |
| 89 |
rename from x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild |
| 90 |
rename to x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild |
| 91 |
index d1dd0cb..9139507 100644 |
| 92 |
--- a/x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild |
| 93 |
+++ b/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild |
| 94 |
@@ -22,10 +22,3 @@ RDEPEND="${DEPEND}" |
| 95 |
BDEPEND="" |
| 96 |
|
| 97 |
S="${WORKDIR}/${MY_P}" |
| 98 |
- |
| 99 |
-src_prepare() { |
| 100 |
- default |
| 101 |
- eapply "${FILESDIR}"/fix-undo-command-delete-items-that-are-required.patch |
| 102 |
- eapply "${FILESDIR}"/include-gnuinstalldirs-before-use.patch |
| 103 |
- cmake_src_prepare |
| 104 |
-} |
Archives