commit: d61ca2d372d03f68a56e2c28d8ba3f9dbc61bab8
Author: David Flogeras <dflogeras2 <AT> gmail <DOT> com>
AuthorDate: Fri Jun 26 13:55:44 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jun 26 13:58:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d61ca2d3
x11-libs/kimageannotator: Bump to 0.3.1 and remove 0.3.0.
Signed-off-by: David Flogeras <dflogeras2 <AT> gmail.com>
x11-libs/kimageannotator/Manifest | 1 +
...do-command-delete-items-that-are-required.patch | 10 ------
.../files/include-gnuinstalldirs-before-use.patch | 36 ----------------------
...r-0.3.0.ebuild => kimageannotator-0.3.1.ebuild} | 7 -----
4 files changed, 1 insertion(+), 53 deletions(-)
diff --git a/x11-libs/kimageannotator/Manifest
b/x11-libs/kimageannotator/Manifest
index 539d692..c15f6e6 100644
--- a/x11-libs/kimageannotator/Manifest
+++ b/x11-libs/kimageannotator/Manifest
@@ -1,2 +1,3 @@
DIST kImageAnnotator-0.2.1.tar.gz 107027 BLAKE2B
247ea31f3dfd90fd175b879c3fe06a50ee2ce8f3f2ce395efa1882fe8abc4be4e5a739782054682336cf327fe288d24b17971c89dfaf7f5202ba3f607165b0f2
SHA512
6f9d03b6d0d020c90fa050ac6be30b680db8dd3a2035db80856bb69c9e6ef0228b2d152c5f234caf6d3fe2d8433b17fbdfee728246f2a8c339936b6ba051a52b
DIST kImageAnnotator-0.3.0.tar.gz 128019 BLAKE2B
412748b432e41e6bdc01aa7270cbb32342016423beeca537c92096641e06f9a82a0ce7d1779fb25aec51e6e4c9451778fc339bb3c82edcdc56657ac810859447
SHA512
0d9e4ab5bdef1554e3b476e0d0e8f2ad08387abd94d9167c2b4987b0857294618b7a6626640381dade10c7eedaa5dec9e449715b46437c1d9a044142c15b7617
+DIST kImageAnnotator-0.3.1.tar.gz 130708 BLAKE2B
5491ca5b3d11bfeeb92366d737251bfeb5a19631e37269d8edc4b9799d86f93ac276aa1edd34ed0aa27fff2b2fbfe07044150ef90b3dfe59d40f7669c547cce8
SHA512
5953b4083328a632c889b8a7bef0e61ef7dd9c6dfdeb9cf99fa248409116f2757ca63ff98e1695b46dfb24d818bf296c89abb7609af1b06034f814557e1c5af0
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
deleted file mode 100644
index 39aa759..0000000
---
a/x11-libs/kimageannotator/files/fix-undo-command-delete-items-that-are-required.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/annotations/undo/AddCommand.cpp
-+++ b/src/annotations/undo/AddCommand.cpp
-@@ -29,7 +29,6 @@ AddCommand::AddCommand(AbstractAnnotationItem *item,
AnnotationArea *annotationA
-
- AddCommand::~AddCommand()
- {
-- delete mItem;
- }
-
- void AddCommand::undo()
diff --git
a/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch
b/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch
deleted file mode 100644
index c5c7677..0000000
--- a/x11-libs/kimageannotator/files/include-gnuinstalldirs-before-use.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 94b08e1a3cef1d826ccae09a1287c2d5e327a293 Mon Sep 17 00:00:00 2001
-From: Dave Flogeras <[email protected]>
-Date: Fri, 19 Jun 2020 09:23:29 -0300
-Subject: [PATCH] Include GNUInstallDirs before using variables that rely on
- it.
-
-This was subtle because when building by hand, and running cmake
-multiple times, it seems to cache the variable. However when building
-for Gentoo in an ebuild, cmake makes one pass, and the
-CMAKE_INSTALL_DATAROOTDIR variable is empty. This results in the
-translation files going in the wrong place.
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 12ad227..5c14937 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,8 @@ set(CMAKE_AUTORCC ON)
- option(BUILD_TESTS "Build Unit Tests" OFF)
- option(BUILD_EXAMPLE "Build Example Application" ON)
-
-+include(GNUInstallDirs)
-+
- if (WIN32)
- set(KIMAGEANNOTATOR_LANG_INSTAL_DIR "translations")
- elseif (APPLE)
-@@ -27,7 +29,6 @@ if (UNIX)
- find_package(X11 REQUIRED)
- endif ()
-
--include(GNUInstallDirs)
- include(FeatureSummary)
-
- set(KCOLORPICKER_MIN_VERSION "0.1.4")
diff --git a/x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild
b/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild
similarity index 73%
rename from x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild
rename to x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild
index d1dd0cb..9139507 100644
--- a/x11-libs/kimageannotator/kimageannotator-0.3.0.ebuild
+++ b/x11-libs/kimageannotator/kimageannotator-0.3.1.ebuild
@@ -22,10 +22,3 @@ RDEPEND="${DEPEND}"
BDEPEND=""
S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- eapply
"${FILESDIR}"/fix-undo-command-delete-items-that-are-required.patch
- eapply "${FILESDIR}"/include-gnuinstalldirs-before-use.patch
- cmake_src_prepare
-}
