public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/kimageannotator/files/, media-libs/kimageannotator/
@ 2021-02-23 20:10 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-02-23 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     801e434d45674dd4a60260fae194c3478242fcd9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 20:02:48 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 20:02:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=801e434d

media-libs/kimageannotator: Drop 0.4.0

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/kimageannotator/Manifest                |  1 -
 ...tator-0.4.0-fix-static-test-library-PR195.patch | 25 -----------
 .../kimageannotator/kimageannotator-0.4.0.ebuild   | 51 ----------------------
 3 files changed, 77 deletions(-)

diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 2d16a7c5303..4dcd1bacf96 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,2 +1 @@
-DIST kImageAnnotator-0.4.0.tar.gz 164030 BLAKE2B 09ec5eb18d212739c21b30809808cdd453321bf785fd79d21ae3ad5259edfb1dcddbac4de3fc68131627f0252c67f45f22d8572d91bb8c182d68e0d3140bcad5 SHA512 4fb76ff889ad4619080246f91e92fe9683056766b96faa071e0f73efd7c3647f90716fcf94b283461cd0152bdaa647002d26ffc7bf2cd1756ecdf3111005085a
 DIST kImageAnnotator-0.4.1.tar.gz 165976 BLAKE2B e25679416b411082aeaefa8d56aba203443c5a8fedef418caf7bd48b6facc07bfa4ed336d3f49970366023200bd4c0456ac631edc6b6c858b095f4410195761c SHA512 f133bfc81dc0aafd31a4deae2cb6a45b9d7941b27be3027ded7ffa59efe35c0f0a313b3076f672b93acbbfeccedf4832193fafe90c0fef004fab644d1da0dadb

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 7944118641c..00000000000
--- 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.0.ebuild
deleted file mode 100644
index 35a7aa80a67..00000000000
--- a/media-libs/kimageannotator/kimageannotator-0.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png]
-	>=media-libs/kcolorpicker-0.1.4
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-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}"
-
-src_configure() {
-	local mycmakeargs+=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/kimageannotator/files/, media-libs/kimageannotator/
@ 2024-02-24 11:13 Alexey Shvetsov
  0 siblings, 0 replies; 4+ messages in thread
From: Alexey Shvetsov @ 2024-02-24 11:13 UTC (permalink / raw
  To: gentoo-commits

commit:     3521346f75b35bd657d18ec59049813314752ad4
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 11:09:58 2024 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 11:13:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3521346f

media-libs/kimageannotator: Version bump and restrict deps

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

 media-libs/kimageannotator/Manifest                |   1 +
 .../kimageannotator-0.7.0-fix-qt6-tests.patch      | 117 +++++++++++++++++++++
 .../kimageannotator/kimageannotator-0.6.0.ebuild   |   3 +-
 .../kimageannotator/kimageannotator-0.6.1.ebuild   |   3 +-
 ...r-0.6.1.ebuild => kimageannotator-0.7.0.ebuild} |  29 ++---
 media-libs/kimageannotator/metadata.xml            |   7 ++
 6 files changed, 145 insertions(+), 15 deletions(-)

diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 2abeecfad611..bcf546abf17a 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,2 +1,3 @@
 DIST kImageAnnotator-0.6.0.tar.gz 257662 BLAKE2B 3736d0e862f1d3f3f9728e4d4d611c7e406d40fe022a2441b1a80355997d86a194064ecade63b7657d3cbf1f63364b8b74654d9c92d809ac056b7dc999d97415 SHA512 5782acd552af2297813164c0612810ec0d2127c174773040d99ec9d281f3575832b06667736a5521e88fa2d57ea6410e42a5d95232cb2dbdd9608917e5d6e896
 DIST kImageAnnotator-0.6.1.tar.gz 264176 BLAKE2B dfbfb50d2187572b0e68f1a699e91391fbb1fbc36f9b44f3ad97cab9e4ab3329e20ae4abe7fc68f1cf8dfd1960f2b03b3d6a6c949b4a7102b0c22d35690b8e05 SHA512 92ec8ff06011856e98e5624f9c3d98227e10991385fa41e110187db9b5d7b8de075199844e886618668040b69f8910be51b8cf55a009fac8887954c5b7695b25
+DIST kImageAnnotator-0.7.0.tar.gz 266849 BLAKE2B eda6428caf37dedc24f613e513c970a94a0b25f37ea62953a9cf4b7afe3abd01b487f5a19f1c7baa34d9f31dfa0aaefed192f23ca2e3e1f06964cc6e4a951888 SHA512 e2a6d3014476fcb6e8838c0d0aa72e4bf5ccf6fbe1314ee6c1f44bb4299c6bd1b04be305e1039628f55e5e5e1626899329d9b93314c1f1fd2870bafaf0a8e2ff

diff --git a/media-libs/kimageannotator/files/kimageannotator-0.7.0-fix-qt6-tests.patch b/media-libs/kimageannotator/files/kimageannotator-0.7.0-fix-qt6-tests.patch
new file mode 100644
index 000000000000..985bf108c1a3
--- /dev/null
+++ b/media-libs/kimageannotator/files/kimageannotator-0.7.0-fix-qt6-tests.patch
@@ -0,0 +1,117 @@
+From dbcb28f4fe8deb5ce83d45907f97516eade74420 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <mail@heiko-becker.de>
+Date: Tue, 6 Feb 2024 18:47:20 +0000
+Subject: [PATCH] Fix building the tests with Qt 6 (#332)
+
+* Remove usage of QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS
+
+According to commit 641eb4a96552615d898512723e2093abcaf7fbc1 in
+qtbase.git they serve no purpose anymore and were subsequently removed
+in Qt6.
+
+Closes #331.
+
+* Replace QLatin1Literal with QStringLiteral
+
+The former is deprecated and was removed from Qt6.
+---
+ .../annotations/core/AnnotationPropertiesFactoryTest.cpp  | 2 +-
+ tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp | 6 +++---
+ tests/utils/TestRunner.h                                  | 8 --------
+ tests/widgets/settingsPicker/StickerPickerTest.cpp        | 4 ++--
+ 4 files changed, 6 insertions(+), 14 deletions(-)
+
+diff --git a/tests/annotations/core/AnnotationPropertiesFactoryTest.cpp b/tests/annotations/core/AnnotationPropertiesFactoryTest.cpp
+index 77b43057..ce5047ef 100644
+--- a/tests/annotations/core/AnnotationPropertiesFactoryTest.cpp
++++ b/tests/annotations/core/AnnotationPropertiesFactoryTest.cpp
+@@ -199,7 +199,7 @@ void AnnotationPropertiesFactoryTest::TestCreate_Should_SetToolFontBasedOnSettin
+ void AnnotationPropertiesFactoryTest::TestCreate_Should_StickerPathBasedOnSettings()
+ {
+ 	auto tool = Tools::Sticker;
+-	auto path = QLatin1Literal("/my/path/to/sticker");
++	auto path = QStringLiteral("/my/path/to/sticker");
+ 	MockDefaultParameters parameters;
+ 	auto settingsProvider = new MockSettingsProvider();
+ 	settingsProvider->setSticker(path);
+diff --git a/tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp b/tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp
+index 0c4904de..a5c86d7f 100644
+--- a/tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp
++++ b/tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp
+@@ -40,8 +40,8 @@ void AnnotationTabContextMenuTest::TestCustomActionTriggered_Should_CallInnerAct
+ void AnnotationTabContextMenuTest::TestAddCustomActions_Should_SetTextIconAndToolTipInOuterAction() 
+ {
+     QAction customAction;
+-    customAction.setText(QLatin1Literal("LaLa"));
+-    customAction.setToolTip(QLatin1Literal("Hello Hello"));
++    customAction.setText(QStringLiteral("LaLa"));
++    customAction.setToolTip(QStringLiteral("Hello Hello"));
+     customAction.setIcon(QIcon());
+     QWidget parent;
+     AnnotationTabContextMenu menu(&parent);
+@@ -68,4 +68,4 @@ void AnnotationTabContextMenuTest::TestCustomActionChanged_Should_UpdateEnabledS
+     QCOMPARE(customAction.isEnabled(), outerAction->isEnabled());
+ }
+ 
+-TEST_MAIN(AnnotationTabContextMenuTest);
+\ No newline at end of file
++TEST_MAIN(AnnotationTabContextMenuTest);
+diff --git a/tests/utils/TestRunner.h b/tests/utils/TestRunner.h
+index 214b8b02..ff742f02 100644
+--- a/tests/utils/TestRunner.h
++++ b/tests/utils/TestRunner.h
+@@ -69,9 +69,6 @@ class GoogleTestEventListener : public ::testing::EmptyTestEventListener {
+ #endif
+ 
+ #define TEST_MAIN(TestObject) \
+-QT_BEGIN_NAMESPACE \
+-QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \
+-QT_END_NAMESPACE \
+ int main(int argc, char *argv[]) \
+ {   \
+     INIT_GOOGLE_MOCKS (argc, argv); \
+@@ -79,7 +76,6 @@ int main(int argc, char *argv[]) \
+     QApplication app(argc, argv); \
+     app.setAttribute(Qt::AA_Use96Dpi, true); \
+     QTEST_DISABLE_KEYPAD_NAVIGATION \
+-    QTEST_ADD_GPU_BLACKLIST_SUPPORT \
+     TestObject tc; \
+     QTEST_SET_MAIN_SOURCE_PATH \
+     return QTest::qExec(&tc, argc, argv); \
+@@ -90,16 +86,12 @@ int main(int argc, char *argv[]) \
+ #include <QtTest/qtest_gui.h>
+ 
+ #define TEST_MAIN(TestObject) \
+-QT_BEGIN_NAMESPACE \
+-QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \
+-QT_END_NAMESPACE \
+ int main(int argc, char *argv[]) \
+ {   \
+     INIT_GOOGLE_MOCKS (argc, argv); \
+     \
+     QGuiApplication app(argc, argv); \
+     app.setAttribute(Qt::AA_Use96Dpi, true); \
+-    QTEST_ADD_GPU_BLACKLIST_SUPPORT \
+     TestObject tc; \
+     QTEST_SET_MAIN_SOURCE_PATH \
+     return QTest::qExec(&tc, argc, argv); \
+diff --git a/tests/widgets/settingsPicker/StickerPickerTest.cpp b/tests/widgets/settingsPicker/StickerPickerTest.cpp
+index 94c26802..7c539fcb 100644
+--- a/tests/widgets/settingsPicker/StickerPickerTest.cpp
++++ b/tests/widgets/settingsPicker/StickerPickerTest.cpp
+@@ -23,7 +23,7 @@ void StickerPickerTest::TestSelectSticker_Should_EmitSignal_When_StickerChanged(
+ {
+ 	StickerPicker stickerPicker(nullptr);
+ 	QSignalSpy spy(&stickerPicker, &StickerPicker::stickerSelected);
+-	auto expectedStickerPath = QLatin1Literal(":/stickers/nerd_face.svg");
++	auto expectedStickerPath = QStringLiteral(":/stickers/nerd_face.svg");
+ 
+ 	stickerPicker.setSticker(expectedStickerPath);
+ 
+@@ -32,4 +32,4 @@ void StickerPickerTest::TestSelectSticker_Should_EmitSignal_When_StickerChanged(
+ 	QCOMPARE(resultSize, expectedStickerPath);
+ }
+ 
+-TEST_MAIN(StickerPickerTest);
+\ No newline at end of file
++TEST_MAIN(StickerPickerTest);

diff --git a/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild
index c80fd7661803..fca1139e8043 100644
--- a/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5[png]
 	>=media-libs/kcolorpicker-0.2.0
+	<media-libs/kcolorpicker-0.3.0
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}

diff --git a/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild
index d8bf925f00f3..7e184fac91b8 100644
--- a/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5[png]
 	>=media-libs/kcolorpicker-0.2.0
+	<media-libs/kcolorpicker-0.3.0
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}

diff --git a/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.7.0.ebuild
similarity index 62%
copy from media-libs/kimageannotator/kimageannotator-0.6.1.ebuild
copy to media-libs/kimageannotator/kimageannotator-0.7.0.ebuild
index d8bf925f00f3..c1059b0c87d8 100644
--- a/media-libs/kimageannotator/kimageannotator-0.6.1.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.7.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
+inherit cmake
 
 MY_PN=kImageAnnotator
 MY_P="${MY_PN}-${PV}"
@@ -12,7 +12,6 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Tool for annotating images"
 HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
 SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
@@ -20,31 +19,35 @@ KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png]
-	>=media-libs/kcolorpicker-0.2.0
-	x11-libs/libX11
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
+	>=media-libs/kcolorpicker-0.3.0
 "
 DEPEND="${RDEPEND}
-	x11-base/xorg-proto
 	test? (
-			dev-qt/qttest:5
+			dev-qt/qtbase:6[test]
 			dev-cpp/gtest
 	)
 "
 BDEPEND="
-	dev-qt/linguist-tools:5
+	dev-qt/qttools:6[linguist]
 "
 
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-qt6-tests.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
+		-DBUILD_WITH_QT6=ON
 	)
 	cmake_src_configure
 }
 
 src_test() {
-	BUILD_DIR="${BUILD_DIR}/tests" virtx cmake_src_test
+	local -x QT_QPA_PLATFORM=offscreen
+	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
 }

diff --git a/media-libs/kimageannotator/metadata.xml b/media-libs/kimageannotator/metadata.xml
index 4ddb8c1adc71..f4a2088a6f74 100644
--- a/media-libs/kimageannotator/metadata.xml
+++ b/media-libs/kimageannotator/metadata.xml
@@ -9,4 +9,11 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ksnip/kImageAnnotator</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/kimageannotator/files/, media-libs/kimageannotator/
@ 2024-03-10 16:51 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-03-10 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     ab03eff9efbb6f1899898954ac8c892745fb2fe0
Author:     David Flogeras <dflogeras2 <AT> gmail <DOT> com>
AuthorDate: Fri Mar  8 15:50:23 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 16:50:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab03eff9

media-libs/kimageannotator: add 0.7.1

Closes: https://bugs.gentoo.org/921699
Closes: https://bugs.gentoo.org/925642
Closes: https://github.com/gentoo/gentoo/pull/35670
Signed-off-by: David Flogeras <dflogeras2 <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/kimageannotator/Manifest                |  1 +
 ...ageannotator-0.7.1-fix_KeyInputHelperTest.patch | 32 ++++++++++++++
 .../kimageannotator/kimageannotator-0.7.1.ebuild   | 51 ++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 0c3c5d3f502e..502b2949bb70 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,2 +1,3 @@
 DIST kImageAnnotator-0.6.1.tar.gz 264176 BLAKE2B dfbfb50d2187572b0e68f1a699e91391fbb1fbc36f9b44f3ad97cab9e4ab3329e20ae4abe7fc68f1cf8dfd1960f2b03b3d6a6c949b4a7102b0c22d35690b8e05 SHA512 92ec8ff06011856e98e5624f9c3d98227e10991385fa41e110187db9b5d7b8de075199844e886618668040b69f8910be51b8cf55a009fac8887954c5b7695b25
 DIST kImageAnnotator-0.7.0.tar.gz 266849 BLAKE2B eda6428caf37dedc24f613e513c970a94a0b25f37ea62953a9cf4b7afe3abd01b487f5a19f1c7baa34d9f31dfa0aaefed192f23ca2e3e1f06964cc6e4a951888 SHA512 e2a6d3014476fcb6e8838c0d0aa72e4bf5ccf6fbe1314ee6c1f44bb4299c6bd1b04be305e1039628f55e5e5e1626899329d9b93314c1f1fd2870bafaf0a8e2ff
+DIST kImageAnnotator-0.7.1.tar.gz 266861 BLAKE2B 861aedec7481e022db4c75bcd5d10e202da2073d7ffde7c60ab6ebe16b25d301045c6ef7ade0c69b594719e5094031842b96f62981565f7fe7252474486e41b1 SHA512 cb5e7e87f1b7c72108a8ace7fb60ef644e2de19e78b3e61e50e6d534b235710e5e62464f8d136ee46b7f96cb3235601eb80b09b41d972d8df9ef6fe09cb34c95

diff --git a/media-libs/kimageannotator/files/kimageannotator-0.7.1-fix_KeyInputHelperTest.patch b/media-libs/kimageannotator/files/kimageannotator-0.7.1-fix_KeyInputHelperTest.patch
new file mode 100644
index 000000000000..ea8d4b4181d2
--- /dev/null
+++ b/media-libs/kimageannotator/files/kimageannotator-0.7.1-fix_KeyInputHelperTest.patch
@@ -0,0 +1,32 @@
+From 81a5af864e39e8f553e79ba83871390f42c65186 Mon Sep 17 00:00:00 2001
+From: dflogeras <dflogeras2@gmail.com>
+Date: Fri, 8 Mar 2024 11:12:00 -0400
+Subject: [PATCH] Don't call XCloseDisplay on null object.  Hopefully fixes
+ Issue #335. (#337)
+
+Co-authored-by: Dave Flogeras <dflogeras@gmail.com>
+---
+ src/annotations/items/text/CapsLockStatusChecker.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/annotations/items/text/CapsLockStatusChecker.cpp b/src/annotations/items/text/CapsLockStatusChecker.cpp
+index 8bf98438..809e448a 100644
+--- a/src/annotations/items/text/CapsLockStatusChecker.cpp
++++ b/src/annotations/items/text/CapsLockStatusChecker.cpp
+@@ -46,8 +46,8 @@ bool CapsLockStatusChecker::isCapsLockEnabled()
+ 			unsigned n;
+ 			XkbGetIndicatorState(display, XkbUseCoreKbd, &n);
+ 			capsState = (n & 0x01) == 1;
++			XCloseDisplay(display);
+ 		}
+-		XCloseDisplay(display);
+ 		return capsState;
+ 	}
+ #else
+@@ -55,4 +55,4 @@ bool CapsLockStatusChecker::isCapsLockEnabled()
+ #endif
+ }
+ 
+-} // namespace kImageAnnotator
+\ No newline at end of file
++} // namespace kImageAnnotator

diff --git a/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild b/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
new file mode 100644
index 000000000000..fd572618ff8e
--- /dev/null
+++ b/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=kImageAnnotator
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for annotating images"
+HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
+SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtsvg:6
+	>=media-libs/kcolorpicker-0.3.1
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	test? (
+		dev-cpp/gtest
+		dev-qt/qtbase:6
+	)
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+PATCHES=( "${FILESDIR}/${P}-fix_KeyInputHelperTest.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_WITH_QT6=ON
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/kimageannotator/files/, media-libs/kimageannotator/
@ 2024-03-10 16:51 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-03-10 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     37aa9d3f18d64bae39dfe9193f6351e47fc7f6f6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 16:49:56 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 16:50:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37aa9d3f

media-libs/kimageannotator: drop 0.7.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/kimageannotator/Manifest                |   1 -
 .../kimageannotator-0.7.0-fix-qt6-tests.patch      | 117 ---------------------
 .../kimageannotator-0.7.0-r1.ebuild                |  54 ----------
 3 files changed, 172 deletions(-)

diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 502b2949bb70..6241ab01a5f5 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,3 +1,2 @@
 DIST kImageAnnotator-0.6.1.tar.gz 264176 BLAKE2B dfbfb50d2187572b0e68f1a699e91391fbb1fbc36f9b44f3ad97cab9e4ab3329e20ae4abe7fc68f1cf8dfd1960f2b03b3d6a6c949b4a7102b0c22d35690b8e05 SHA512 92ec8ff06011856e98e5624f9c3d98227e10991385fa41e110187db9b5d7b8de075199844e886618668040b69f8910be51b8cf55a009fac8887954c5b7695b25
-DIST kImageAnnotator-0.7.0.tar.gz 266849 BLAKE2B eda6428caf37dedc24f613e513c970a94a0b25f37ea62953a9cf4b7afe3abd01b487f5a19f1c7baa34d9f31dfa0aaefed192f23ca2e3e1f06964cc6e4a951888 SHA512 e2a6d3014476fcb6e8838c0d0aa72e4bf5ccf6fbe1314ee6c1f44bb4299c6bd1b04be305e1039628f55e5e5e1626899329d9b93314c1f1fd2870bafaf0a8e2ff
 DIST kImageAnnotator-0.7.1.tar.gz 266861 BLAKE2B 861aedec7481e022db4c75bcd5d10e202da2073d7ffde7c60ab6ebe16b25d301045c6ef7ade0c69b594719e5094031842b96f62981565f7fe7252474486e41b1 SHA512 cb5e7e87f1b7c72108a8ace7fb60ef644e2de19e78b3e61e50e6d534b235710e5e62464f8d136ee46b7f96cb3235601eb80b09b41d972d8df9ef6fe09cb34c95

diff --git a/media-libs/kimageannotator/files/kimageannotator-0.7.0-fix-qt6-tests.patch b/media-libs/kimageannotator/files/kimageannotator-0.7.0-fix-qt6-tests.patch
deleted file mode 100644
index 985bf108c1a3..000000000000
--- a/media-libs/kimageannotator/files/kimageannotator-0.7.0-fix-qt6-tests.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From dbcb28f4fe8deb5ce83d45907f97516eade74420 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <mail@heiko-becker.de>
-Date: Tue, 6 Feb 2024 18:47:20 +0000
-Subject: [PATCH] Fix building the tests with Qt 6 (#332)
-
-* Remove usage of QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS
-
-According to commit 641eb4a96552615d898512723e2093abcaf7fbc1 in
-qtbase.git they serve no purpose anymore and were subsequently removed
-in Qt6.
-
-Closes #331.
-
-* Replace QLatin1Literal with QStringLiteral
-
-The former is deprecated and was removed from Qt6.
----
- .../annotations/core/AnnotationPropertiesFactoryTest.cpp  | 2 +-
- tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp | 6 +++---
- tests/utils/TestRunner.h                                  | 8 --------
- tests/widgets/settingsPicker/StickerPickerTest.cpp        | 4 ++--
- 4 files changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/tests/annotations/core/AnnotationPropertiesFactoryTest.cpp b/tests/annotations/core/AnnotationPropertiesFactoryTest.cpp
-index 77b43057..ce5047ef 100644
---- a/tests/annotations/core/AnnotationPropertiesFactoryTest.cpp
-+++ b/tests/annotations/core/AnnotationPropertiesFactoryTest.cpp
-@@ -199,7 +199,7 @@ void AnnotationPropertiesFactoryTest::TestCreate_Should_SetToolFontBasedOnSettin
- void AnnotationPropertiesFactoryTest::TestCreate_Should_StickerPathBasedOnSettings()
- {
- 	auto tool = Tools::Sticker;
--	auto path = QLatin1Literal("/my/path/to/sticker");
-+	auto path = QStringLiteral("/my/path/to/sticker");
- 	MockDefaultParameters parameters;
- 	auto settingsProvider = new MockSettingsProvider();
- 	settingsProvider->setSticker(path);
-diff --git a/tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp b/tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp
-index 0c4904de..a5c86d7f 100644
---- a/tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp
-+++ b/tests/gui/annotator/tabs/AnnotationTabContextMenuTest.cpp
-@@ -40,8 +40,8 @@ void AnnotationTabContextMenuTest::TestCustomActionTriggered_Should_CallInnerAct
- void AnnotationTabContextMenuTest::TestAddCustomActions_Should_SetTextIconAndToolTipInOuterAction() 
- {
-     QAction customAction;
--    customAction.setText(QLatin1Literal("LaLa"));
--    customAction.setToolTip(QLatin1Literal("Hello Hello"));
-+    customAction.setText(QStringLiteral("LaLa"));
-+    customAction.setToolTip(QStringLiteral("Hello Hello"));
-     customAction.setIcon(QIcon());
-     QWidget parent;
-     AnnotationTabContextMenu menu(&parent);
-@@ -68,4 +68,4 @@ void AnnotationTabContextMenuTest::TestCustomActionChanged_Should_UpdateEnabledS
-     QCOMPARE(customAction.isEnabled(), outerAction->isEnabled());
- }
- 
--TEST_MAIN(AnnotationTabContextMenuTest);
-\ No newline at end of file
-+TEST_MAIN(AnnotationTabContextMenuTest);
-diff --git a/tests/utils/TestRunner.h b/tests/utils/TestRunner.h
-index 214b8b02..ff742f02 100644
---- a/tests/utils/TestRunner.h
-+++ b/tests/utils/TestRunner.h
-@@ -69,9 +69,6 @@ class GoogleTestEventListener : public ::testing::EmptyTestEventListener {
- #endif
- 
- #define TEST_MAIN(TestObject) \
--QT_BEGIN_NAMESPACE \
--QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \
--QT_END_NAMESPACE \
- int main(int argc, char *argv[]) \
- {   \
-     INIT_GOOGLE_MOCKS (argc, argv); \
-@@ -79,7 +76,6 @@ int main(int argc, char *argv[]) \
-     QApplication app(argc, argv); \
-     app.setAttribute(Qt::AA_Use96Dpi, true); \
-     QTEST_DISABLE_KEYPAD_NAVIGATION \
--    QTEST_ADD_GPU_BLACKLIST_SUPPORT \
-     TestObject tc; \
-     QTEST_SET_MAIN_SOURCE_PATH \
-     return QTest::qExec(&tc, argc, argv); \
-@@ -90,16 +86,12 @@ int main(int argc, char *argv[]) \
- #include <QtTest/qtest_gui.h>
- 
- #define TEST_MAIN(TestObject) \
--QT_BEGIN_NAMESPACE \
--QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \
--QT_END_NAMESPACE \
- int main(int argc, char *argv[]) \
- {   \
-     INIT_GOOGLE_MOCKS (argc, argv); \
-     \
-     QGuiApplication app(argc, argv); \
-     app.setAttribute(Qt::AA_Use96Dpi, true); \
--    QTEST_ADD_GPU_BLACKLIST_SUPPORT \
-     TestObject tc; \
-     QTEST_SET_MAIN_SOURCE_PATH \
-     return QTest::qExec(&tc, argc, argv); \
-diff --git a/tests/widgets/settingsPicker/StickerPickerTest.cpp b/tests/widgets/settingsPicker/StickerPickerTest.cpp
-index 94c26802..7c539fcb 100644
---- a/tests/widgets/settingsPicker/StickerPickerTest.cpp
-+++ b/tests/widgets/settingsPicker/StickerPickerTest.cpp
-@@ -23,7 +23,7 @@ void StickerPickerTest::TestSelectSticker_Should_EmitSignal_When_StickerChanged(
- {
- 	StickerPicker stickerPicker(nullptr);
- 	QSignalSpy spy(&stickerPicker, &StickerPicker::stickerSelected);
--	auto expectedStickerPath = QLatin1Literal(":/stickers/nerd_face.svg");
-+	auto expectedStickerPath = QStringLiteral(":/stickers/nerd_face.svg");
- 
- 	stickerPicker.setSticker(expectedStickerPath);
- 
-@@ -32,4 +32,4 @@ void StickerPickerTest::TestSelectSticker_Should_EmitSignal_When_StickerChanged(
- 	QCOMPARE(resultSize, expectedStickerPath);
- }
- 
--TEST_MAIN(StickerPickerTest);
-\ No newline at end of file
-+TEST_MAIN(StickerPickerTest);

diff --git a/media-libs/kimageannotator/kimageannotator-0.7.0-r1.ebuild b/media-libs/kimageannotator/kimageannotator-0.7.0-r1.ebuild
deleted file mode 100644
index 1093de12ccd1..000000000000
--- a/media-libs/kimageannotator/kimageannotator-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtbase:6[gui,widgets]
-	dev-qt/qtsvg:6
-	>=media-libs/kcolorpicker-0.3.0
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	test? (
-		dev-cpp/gtest
-		dev-qt/qtbase:6
-	)
-"
-BDEPEND="dev-qt/qttools:6[linguist]"
-
-PATCHES=( "${FILESDIR}/${P}-fix-qt6-tests.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_WITH_QT6=ON
-	)
-	cmake_src_configure
-}
-
-# one test is failing KeyInputHelperTest
-# upstream bug https://github.com/ksnip/kImageAnnotator/issues/335
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-10 16:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-10 16:51 [gentoo-commits] repo/gentoo:master commit in: media-libs/kimageannotator/files/, media-libs/kimageannotator/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-03-10 16:51 Andreas Sturmlechner
2024-02-24 11:13 Alexey Shvetsov
2021-02-23 20:10 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox