From f50d60b8eb707b56133e594376e993b98e726b5d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Mar 2024 18:45:26 +0000 Subject: gentoo auto-resync : 10:03:2024 - 18:45:26 --- media-libs/Manifest.gz | Bin 69340 -> 69344 bytes media-libs/glm/Manifest | 2 +- media-libs/glm/glm-1.0.1.ebuild | 2 +- media-libs/kcolorpicker/Manifest | 4 +- media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild | 41 -------- media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild | 41 ++++++++ media-libs/kimageannotator/Manifest | 6 +- .../kimageannotator-0.7.0-fix-qt6-tests.patch | 117 --------------------- ...ageannotator-0.7.1-fix_KeyInputHelperTest.patch | 32 ++++++ .../kimageannotator-0.7.0-r1.ebuild | 54 ---------- .../kimageannotator/kimageannotator-0.7.1.ebuild | 51 +++++++++ media-libs/openjpeg/Manifest | 2 +- media-libs/openjpeg/openjpeg-2.5.2.ebuild | 1 - 13 files changed, 132 insertions(+), 221 deletions(-) delete mode 100644 media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild create mode 100644 media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild delete mode 100644 media-libs/kimageannotator/files/kimageannotator-0.7.0-fix-qt6-tests.patch create mode 100644 media-libs/kimageannotator/files/kimageannotator-0.7.1-fix_KeyInputHelperTest.patch delete mode 100644 media-libs/kimageannotator/kimageannotator-0.7.0-r1.ebuild create mode 100644 media-libs/kimageannotator/kimageannotator-0.7.1.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 321f210f62f5..21c251dc7c62 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest index 65c76984f019..b7b5a7cd8413 100644 --- a/media-libs/glm/Manifest +++ b/media-libs/glm/Manifest @@ -5,5 +5,5 @@ AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8 DIST glm-1.0.1.tar.gz 4567161 BLAKE2B 2a6f399710f5812d4060b994df454e0c0e4fc7fcaccdfa62de6de2886987349b266944313539a398733708043c887f1324fe33eef8aa2205ef77e7c0dff28fec SHA512 c6c6fa1ea7a7e97820e36ee042a78be248ae828c99c1b1111080d9bf334a5160c9993a70312351c92a867cd49907c95f9f357c8dfe2bc29946da6e83e27ba20c EBUILD glm-0.9.9.8-r1.ebuild 1597 BLAKE2B fc44edeb119342ada690a31fe3e7f627b0ed61f9deba507dcdf7e1484a252da5d2bd9a59526683bfbe5678f58b916b86595211ca531fef18247f8f12eff558a9 SHA512 6e78dbd03da031c414ed0bcde42041a662fdd25764d41afc33d7b323b88d55abfdabf657c9d4ee7212f2ecdb87afdb0f8d2202d6858b39746df982038e9f697b -EBUILD glm-1.0.1.ebuild 1646 BLAKE2B 02c2d5e25f94454793338fbf7ef91c2308606f1c8de509ddf37cd03eea7f4e4f6872c4c8af1226001024566e7a1ce6b39e0ca7e9a80e9976e88be1e002daa8ee SHA512 cb5bbe21ea7fe58ead67651e0aa4a77b2dfd1d687d03deff17a8052c7437fbabc6852cd0fd4353eda81ca62ebf7468658ef981dcb650dbafe8de9e82b83a34a3 +EBUILD glm-1.0.1.ebuild 1639 BLAKE2B 37b72f740e5d63ec116a27279b14d167ec0af0bb9b431c50013cf2791ef98ce47db55b1f90e4bc17d1bd6629f4c33b5a2396f41e07377648fa44fbf471e57068 SHA512 d37721dbf1018beeb424092bf2b38982668a96e91ffbdfed82e7b1ab2719aab81330860ac0f2c91586367fea66eca4c18fe4c87e900e33e022fe72d83b29cd52 MISC metadata.xml 545 BLAKE2B 90098d29455b2202bfce4c4ba4eb53499bbd348d477ad554d6c9561dad4ca9b3083f729dfe2f94224b5ce1b4f515ed0cd4121663c264d57bf8829e6e9c1b245f SHA512 2327ea232b899c7b8d2bf50ed3dba7cfc347c4aa9e31dfa2de50ce5815ef5105da921937081e4b1fb38b1406e65d585a50e3705d78fac39ec54e624bb27c617d diff --git a/media-libs/glm/glm-1.0.1.ebuild b/media-libs/glm/glm-1.0.1.ebuild index 0d6729f7d564..81469af7284c 100644 --- a/media-libs/glm/glm-1.0.1.ebuild +++ b/media-libs/glm/glm-1.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( HappyBunny MIT )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2" RESTRICT="!test? ( test )" diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest index b07ee22a4c35..a250ba901fd1 100644 --- a/media-libs/kcolorpicker/Manifest +++ b/media-libs/kcolorpicker/Manifest @@ -1,5 +1,5 @@ DIST kColorPicker-0.2.0.tar.gz 12735 BLAKE2B 39b0c80ec5b498800dd251901b0bd57c839693f071185afacefa8d5a715ff18f2297c50486d98871471c40e0904a07ff40198b548d9368937b120a1eef07929f SHA512 44f9f317ebe5dd3131a9e44071f9f5b397b0d5cceece566f3ecf19932c8e36dafe1a434e623239421bead9413f0859bc3380174d7f14843770691e4d15a956eb -DIST kColorPicker-0.3.0.tar.gz 12998 BLAKE2B 18c8f36b3efe1fa3c4ae9fb0e9d7497393561d66287e7ce6b5139e0182ddc69866685a85f4794afb7c861fcb824bfebb4f3c4badf148b4c8aa8b88b7b3483db2 SHA512 9f370ad8de0f23116f513e14ca22cb368cb5eaea53484388ca5ca0b7abc81d5071379cb84f8128f806c9ffa051ad29a95e42d4c1d30ba93034c0ae9fd785bb8c +DIST kColorPicker-0.3.1.tar.gz 12861 BLAKE2B 927ad41de0d9576d6fc004595a775715bcffeba7149a8111a7311fd44e8e58b01abbfda898174acefb9e0bad969420bf05eda45694cbc0cd8a3d3cf942709179 SHA512 bb91d8dfa555e60206665453cde8f4f7536154fe7660aeab276c0a509bdb19caf04276eb0935537b390657881db020ecb943de3e5b8d286f3cd7d89bf7010674 EBUILD kcolorpicker-0.2.0.ebuild 753 BLAKE2B 64d7773a51e83780ef30f2200d3d11031778560313c808164eb9fec1d7e0dabf10a3f4ff7e4a1305f295a8c18d8e0701bb6362aed12914f555547690838e815a SHA512 2e446279704de70a27f5b7d75c25e70e4cfc70bffb06afcb9c70d6495a376020640ae941dc57fc860af33749c04e7894a74672b427986b7f04df8758d424a5d4 -EBUILD kcolorpicker-0.3.0.ebuild 773 BLAKE2B 9a80fc5604c13b2bef25d32523e211e11769279a98d42b524778416f13c179f5addfc94b49b0d83426065e9277b130cc1bfab56d49576baf4793349b8b6b7ef6 SHA512 c8835f7f63181566d239724ee6f4e1dddb30dd7175b4dbe11ffb1b36d52921e074a31ba6b0efe63629f2b03e1c031aee1b9a2f53afa712686676b899b4ed412e +EBUILD kcolorpicker-0.3.1.ebuild 773 BLAKE2B 9a80fc5604c13b2bef25d32523e211e11769279a98d42b524778416f13c179f5addfc94b49b0d83426065e9277b130cc1bfab56d49576baf4793349b8b6b7ef6 SHA512 c8835f7f63181566d239724ee6f4e1dddb30dd7175b4dbe11ffb1b36d52921e074a31ba6b0efe63629f2b03e1c031aee1b9a2f53afa712686676b899b4ed412e MISC metadata.xml 806 BLAKE2B 9ba16fcdf82d0b4880fd2c77fb9ac9050ba06ef923b54fa2583eb79a7703805334b5bd098c276005d443eeb27d534f9bc890a204f30cc5569e34ed90fa34eca9 SHA512 f31ccb93db41c34d4abd890e52845ff597df8062d7efed769866329f452cc542f8b0f0f9ce6fdd91d8e590255a5c08738d1ac9b984832691c3621412e4191f7b diff --git a/media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild deleted file mode 100644 index ba108063e02c..000000000000 --- a/media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN=kColorPicker -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Qt based color picker with popup menu" -HOMEPAGE="https://github.com/ksnip/kColorPicker" -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] -" -DEPEND="${RDEPEND} - test? ( dev-qt/qtbase:6 ) -" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DBUILD_WITH_QT6=ON - ) - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - cmake_src_test -} diff --git a/media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild new file mode 100644 index 000000000000..ba108063e02c --- /dev/null +++ b/media-libs/kcolorpicker/kcolorpicker-0.3.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_PN=kColorPicker +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Qt based color picker with popup menu" +HOMEPAGE="https://github.com/ksnip/kColorPicker" +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] +" +DEPEND="${RDEPEND} + test? ( dev-qt/qtbase:6 ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DBUILD_WITH_QT6=ON + ) + cmake_src_configure +} + +src_test() { + local -x QT_QPA_PLATFORM=offscreen + cmake_src_test +} 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 -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 - - #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 +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 +--- + 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.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 -} 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 +} diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest index 97987e24c51c..c862ffd3a18d 100644 --- a/media-libs/openjpeg/Manifest +++ b/media-libs/openjpeg/Manifest @@ -6,5 +6,5 @@ DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 34a1c39379d9f8f4caad6c8263a DIST openjpeg-data_202130923.tar.gz 498600318 BLAKE2B cf595b9f8690ad0b9616f080c3bfdaf553802912cd41015f86766085c0bd021cead294372bd9925c2a569fabbd9a0f1684bcf6eb1b5ecdc14d64231a76401a3b SHA512 3e1e3bb489eac6047671395fbf92bbfb2ad7c7c0206c1a233c215ba3d5b5263a6ce65d523f98fdaa4949e28eaa179716264f89eebf73b44c71373a9c86313cc1 EBUILD openjpeg-2.5.0-r5.ebuild 3022 BLAKE2B e363174f66c1141ecfd322dbe11239ac6630e945e2a39b1595abfdb36c9bb955284ddc39078376322cb478b6eb8e5612f35e652876fb6669686a164bf09f10bf SHA512 a1445dc15c5e88e6bdd4b963ec593f01c7f92a500b6715497acf99ba3c1a23ecf5b0abc3c83d717c798b2eabc15423084ebaecf34c6dd62359f96d1bf0f78094 EBUILD openjpeg-2.5.0-r6.ebuild 3025 BLAKE2B ef9ad4b6212e6517b46e90464f56e26e6c35237e7bb37066be9f3883d39c567aa2fcfaae44df48b17cb2c1dd708d762e0f7c2397473ebe58ab4e16b56765d752 SHA512 99e54e031350d3abd469b75f4ea431446f748ad17da1386fce0d31f6ca723bca12e43edad9383f863b1dd6a23597f4109aa579f74547bedfd613b32993550dae -EBUILD openjpeg-2.5.2.ebuild 2956 BLAKE2B eb8e9f749c3890535385c5c9f1dc5577f8033c813d4007d96dc54be10566d1a38cf9b7ec49e7a6db7d6007ce0a1811bec12eb1485186325d508b3b32014fb6ab SHA512 c5a5794f0808be4aae3d1660558a689c50ad5395b25fc6f69576a0fdb1b5bfd8139bdf1f8ab8990a0b471a344367c90798a53701c3ae5cf4b5a01631984e1fc3 +EBUILD openjpeg-2.5.2.ebuild 2883 BLAKE2B 77da2d53c8aa96bdd44fd8f522c3f7237aa2399c771d19ae3a4a40805ff02e2370430e4d209f1d41c7047f5389a438e08bc442e8256acba4365f43c805ac00fd SHA512 116782c950515a47c1e761ff45f6b973901e8a931b55d8e734aa433af498b2da828055fc22ba9f67c7fce30695ea78d9ca781372c395cdd3c8b667d13e560bd5 MISC metadata.xml 612 BLAKE2B ecbdd9706b1975ad5a9f5ba9957ee7e1cc7cf42e7dfcb3e8b8f9e1f9851b035ac3d997ec9515a181b52be5112dfa44e9d2f98eeb532b21bf353afedcee035181 SHA512 243f4e9e4bc1d851c97167ab8f19ac240ea12d1e53ea59e6709b6da7a810edeb8aa287d92e0334b6b09d2df7660cc64de2dd9af739b2f3daa6ff19dcc304fa8d diff --git a/media-libs/openjpeg/openjpeg-2.5.2.ebuild b/media-libs/openjpeg/openjpeg-2.5.2.ebuild index 0e5579c13039..417e98aa4f27 100644 --- a/media-libs/openjpeg/openjpeg-2.5.2.ebuild +++ b/media-libs/openjpeg/openjpeg-2.5.2.ebuild @@ -48,7 +48,6 @@ multilib_src_configure() { append-lfs-flags local mycmakeargs=( - -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 -DBUILD_TESTING="$(multilib_native_usex test)" -DBUILD_DOC=$(multilib_native_usex doc ON OFF) -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) -- cgit v1.2.3