diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
| commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
| tree | cf61513204d97974179580065e85df5c8009087c /media-libs/kimageannotator | |
| parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) | |
gentoo resync : 03.03.2021
Diffstat (limited to 'media-libs/kimageannotator')
| -rw-r--r-- | media-libs/kimageannotator/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch | 25 | ||||
| -rw-r--r-- | media-libs/kimageannotator/kimageannotator-0.4.1.ebuild (renamed from media-libs/kimageannotator/kimageannotator-0.4.0.ebuild) | 6 |
3 files changed, 3 insertions, 33 deletions
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest index 56c73835531c..d8eed87c472c 100644 --- a/media-libs/kimageannotator/Manifest +++ b/media-libs/kimageannotator/Manifest @@ -1,4 +1,3 @@ -AUX kimageannotator-0.4.0-fix-static-test-library-PR195.patch 1010 BLAKE2B c296f280c851b54d3a6d7fe088ce429b9840144214617346c5e6849784eaa4e3f5b1469cbbf05407aaef812c10f61f0e693bcf3be1d5b852802280e15b2f8c74 SHA512 6baa5fc3fe31e1f9cd6422a667a4cd295783cf8c92aec5c4ff22918edafa461a90008ff4d99f8ded9f3718dbf9c667c59a6dfb280c62292a5b0915bd3b1081a8 -DIST kImageAnnotator-0.4.0.tar.gz 164030 BLAKE2B 09ec5eb18d212739c21b30809808cdd453321bf785fd79d21ae3ad5259edfb1dcddbac4de3fc68131627f0252c67f45f22d8572d91bb8c182d68e0d3140bcad5 SHA512 4fb76ff889ad4619080246f91e92fe9683056766b96faa071e0f73efd7c3647f90716fcf94b283461cd0152bdaa647002d26ffc7bf2cd1756ecdf3111005085a -EBUILD kimageannotator-0.4.0.ebuild 962 BLAKE2B b5e381ba97888b47ddf9bc3ad10acec68252bdc8c3b2fed0bcf8dd2f73e7b6e13341c5413c164d0cf5c565fb9673a78058d2933bdf9d301809c5c632abb70ed0 SHA512 5800ebc6e15b18f0f50cd47d386a6204cb91888fa4a960738984eb7c9e07e63364f4ed4a6f1ad715fd5fc0ee2fc7c7c8ba59f941dd5f0e7b092d4df0d4a8f19c +DIST kImageAnnotator-0.4.1.tar.gz 165976 BLAKE2B e25679416b411082aeaefa8d56aba203443c5a8fedef418caf7bd48b6facc07bfa4ed336d3f49970366023200bd4c0456ac631edc6b6c858b095f4410195761c SHA512 f133bfc81dc0aafd31a4deae2cb6a45b9d7941b27be3027ded7ffa59efe35c0f0a313b3076f672b93acbbfeccedf4832193fafe90c0fef004fab644d1da0dadb +EBUILD kimageannotator-0.4.1.ebuild 841 BLAKE2B 9969bcfe22955dc6d1325e6041fea55a36a6b62c39b0fa66977984a58cc71b4d40b2edeb553b783e46534e66f029568f7f825af66987b6f93d2d3dadadb69834 SHA512 9887a7620a1f996a9987071f83bf7f8f3288f8d2f0fac748ddb05ea427316669459b8292e26d3b624907707fbb6dc690435717431c2003e5c7023dd45bf0d1af MISC metadata.xml 367 BLAKE2B f30c0617f7adf7b64264c40571a38b5375ac6cb00135ede7d70c0f55107caa1bd4bb3e51f1b0bb0e3f3ad123a21cceb0210cc75ff818554e7731e69d828831f1 SHA512 b32379ad213b24539da0e9efb2966792921cf98c7bdbb9903568ffde9f1fb76a5565f062c4e42ca906740d9c0f684815d9c929f6adba20d9fe6f8211f06e9da2 diff --git a/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch b/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch deleted file mode 100644 index 7944118641c3..000000000000 --- a/media-libs/kimageannotator/files/kimageannotator-0.4.0-fix-static-test-library-PR195.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 25f13f3058c79e3f4a2b1cd257b213f102931cc3 Mon Sep 17 00:00:00 2001 -From: Dave Flogeras <dflogeras2@gmail.com> -Date: Wed, 6 Jan 2021 20:07:20 -0400 -Subject: [PATCH] Make test static library explicitly link against kColorPicker - and X11. - -This was broken when those libraries were made part of a PRIVATE -interface by bbc2b6595 and af2ff6167. ---- - tests/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index b1ecc8a..9918010 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -56,7 +56,7 @@ set(TESTUTILS_SRC - - add_library(KIMAGEANNOTATOR_STATIC STATIC ${KIMAGEANNOTATOR_SRCS}) - --target_link_libraries(KIMAGEANNOTATOR_STATIC Qt5::Widgets Qt5::Svg kImageAnnotator) -+target_link_libraries(KIMAGEANNOTATOR_STATIC Qt5::Widgets Qt5::Svg kImageAnnotator kColorPicker::kColorPicker X11) - - target_compile_definitions(KIMAGEANNOTATOR_STATIC PRIVATE KIMAGEANNOTATOR_LANG_INSTALL_DIR="${KIMAGEANNOTATOR_LANG_INSTALL_DIR}") - diff --git a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild index 35a7aa80a670..7a96553458a7 100644 --- a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild +++ b/media-libs/kimageannotator/kimageannotator-0.4.1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] - >=media-libs/kcolorpicker-0.1.4 + >=media-libs/kcolorpicker-0.1.5 x11-libs/libX11 " DEPEND="${RDEPEND} @@ -32,10 +32,6 @@ DEPEND="${RDEPEND} BDEPEND=" dev-qt/linguist-tools:5 " -PATCHES=( - # https://github.com/ksnip/kImageAnnotator/pull/195 - "${FILESDIR}/${P}-fix-static-test-library-PR195.patch" -) S="${WORKDIR}/${MY_P}" |