summaryrefslogtreecommitdiff
path: root/media-libs/kimageannotator
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/kimageannotator')
-rw-r--r--media-libs/kimageannotator/Manifest6
-rw-r--r--media-libs/kimageannotator/files/kimageannotator-0.7.0-fix-qt6-tests.patch117
-rw-r--r--media-libs/kimageannotator/files/kimageannotator-0.7.1-fix_KeyInputHelperTest.patch32
-rw-r--r--media-libs/kimageannotator/kimageannotator-0.7.1.ebuild (renamed from media-libs/kimageannotator/kimageannotator-0.7.0-r1.ebuild)7
4 files changed, 37 insertions, 125 deletions
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index e4afcda5f6a9..50558d42dd78 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,6 +1,6 @@
-AUX kimageannotator-0.7.0-fix-qt6-tests.patch 4937 BLAKE2B fda79ca0f40f1b1d1b1372d0663186e117eb70f8241160a7aa7321b4817fbbc38b6b7aba26e3fe5436ce72a17883a5f97a428c95a0191db1f656724a0703f493 SHA512 8b8af05e84da61b61af015f113f9b961e581aded9b0a6e663355bf2ce9020da16418035961401c6dcd2e42ce8f2bf34f0905f5b4a0675f3ff94a18f2646c63c6
+AUX kimageannotator-0.7.1-fix_KeyInputHelperTest.patch 1115 BLAKE2B adc0a59d6f4cd6fd9f15df80d36f5a0ddaf710db7d500d6d379f3ee312e052cc37290adbd82348bc6b8661020729072bea9d4bd332f381c3a06df23a7f188746 SHA512 07f55043cfe866f8b66c3fc9284d8e1834c4c2be7deb313ee93ee9e64b26d1040fc650b86fe41b0850884409f15ea0fc7263986c469332cf1ef696a9afaf9c59
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
EBUILD kimageannotator-0.6.1.ebuild 955 BLAKE2B 8ba316ef8047fe62a0dced861ae554a2caed4c0f89d198e577a9154b544946e76f5b009f6ed31bb53b7f96e9f81a1d4b80ab71de7a989b8f03af992040149a02 SHA512 93552ceddb3980131639ec69dda0899ef24264378a08de57165f14bfe60b8cb54c833e64620b41262cc397333e0c48e40e4d0092134e926d911e601b62d84e21
-EBUILD kimageannotator-0.7.0-r1.ebuild 1103 BLAKE2B ccfbe416e57e6deca3fa40dd44898f78368ed638119e7e7be029dce4162c4dd58f5ff4e6663702b282cae1188bb51e7b5ac697476111f2a07a11589ae1490297 SHA512 73742fbdb247cbbc539fac9e82c139f893260fdb244c550bf1ae6cc9415660a765bc256a4a0c97b432fc972c1adbc62f5431c107e974894f826339df01a62eba
+EBUILD kimageannotator-0.7.1.ebuild 1003 BLAKE2B 8ed3cae172e809e3ca0588a62df30e6dc32c96af5a09240eec1aba2fb3594cf90e4183e108be346fedc0abfa76be1213d3e63d90668dc43672b38dad58114e9a SHA512 31df58baddbcf84971a682e3d0b5ddd7cbc89b72e5e0cac37c7a9c9e2af9b37b84fa39d609826e1e2e2b83eadc6cd316e9c63e8fa333c92ab22b5babe94b6645
MISC metadata.xml 594 BLAKE2B d54c8385b90271cf917c61e72900f9080dd03f83b46d0f15730af188f3965705742608cd1b54f24deba32e72416e457e86ed5d38996bb4517222808d850e9993 SHA512 680038e96337f6f8b1cd66268947431f49d1c04e71988b453f6557e1a6da2d9861b36e3c59f643a03460dc67bdd5564218a97769302b789cf040f12f619a8586
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/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.0-r1.ebuild b/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
index 1093de12ccd1..fd572618ff8e 100644
--- a/media-libs/kimageannotator/kimageannotator-0.7.0-r1.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-qt/qtbase:6[gui,widgets]
dev-qt/qtsvg:6
- >=media-libs/kcolorpicker-0.3.0
+ >=media-libs/kcolorpicker-0.3.1
x11-libs/libX11
"
DEPEND="${RDEPEND}
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="dev-qt/qttools:6[linguist]"
-PATCHES=( "${FILESDIR}/${P}-fix-qt6-tests.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix_KeyInputHelperTest.patch" )
src_configure() {
local mycmakeargs=(
@@ -45,9 +45,6 @@ src_configure() {
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 06:24:31 +0000