gentoo auto-resync : 29:02:2024 - 05:41:15

8 files changed, 96 insertions, 105 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b11f611a2412..43b73115e2aa 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 8aaaef67b34c..b5791857d0ec 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -4,8 +4,10 @@ AUX exempi-2.6.3-clang16-binary_function.patch 1083 BLAKE2B 8b2ff17c17d2b695e56d
 DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a
 DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4
 DIST exempi-2.6.4.tar.xz 2843304 BLAKE2B 35ae01db243825eea05fe946a958be78ee75c3e6bc3cd02bf5596bd0c9543ccecb285c93e2533c7ceba1e42b25266834bddfd6eda4fef351b384298cc638cfb2 SHA512 86e41e24e34150f398dffe3219f1530fbf14606feeee9953395bfedb335316ec90ac88e2843f2c037a564909fc3cc82a5cce53edb18219663a1b454cda6bef72
+DIST exempi-2.6.5.tar.xz 2843132 BLAKE2B bc8c347af4c9c7bf085311ce055bd1c7cd5c2b845c723dd74bbcdf104be018885a82180333dbdda3cf9a64a4125dfe0fa0904fbd05663c3a6c32e6a60a8ca2d3 SHA512 71a0830c7a547bd7304e38f307a17a5ca70d6d22bb94db93f7e6c0903d1a1a1e211487cd530ec81fb058d0b45224018d23aab9a9394b6cfa025c50f0d77b5002
 EBUILD exempi-2.6.2.ebuild 1367 BLAKE2B 8738f7f492a553b0f830914f22f05c00c1ebd3c478fdd7118ce8f1a689ce23c24e5c02f1ed34c3d8f6e6a6fd67fb8c0da5332e75e1fd86150074bacf86509451 SHA512 e8472f8f50666d5efbf666a2c3745f5167cb16dbfa00e7c73a3c6744c4cd17079afb5b81f8e8b1dadf119f9a41a4cbfd62fcbc913d484e489e7a60322882b208
 EBUILD exempi-2.6.3-r1.ebuild 1376 BLAKE2B dd331b2e1b6f3366def0392e106173958c3ede11af169f228dff4c2c7e2bac2c4b21cf6eb3e84f5d86769a15c8fe1dbbd4df60b92b40a3e3fe276447a526bce0 SHA512 6c11e732158df93e9b7771c61d2ccf471d98c1a8885bc243141f6da68c8bb3de9aa2da7b5987950bf31ef1808aeed977b901c51a6c7b871eebd47ee59bc61fb3
 EBUILD exempi-2.6.3.ebuild 1311 BLAKE2B c42857488f654fcc01378e0796752d9b2291b3d80be06161f30c639c128ec5cac55b5801be9ada1afbd5da75cd4a937d497d2777207b61a61f5278cbea96c49a SHA512 ee7967090af3b175de3d0eb5429cd7b35b576fba48c95b45d170a1874d0a2b5e9f72ab0f2841e70ae28216d0abf5acb79b4e3a8611686ac53b9287cea813a151
 EBUILD exempi-2.6.4.ebuild 1376 BLAKE2B dd331b2e1b6f3366def0392e106173958c3ede11af169f228dff4c2c7e2bac2c4b21cf6eb3e84f5d86769a15c8fe1dbbd4df60b92b40a3e3fe276447a526bce0 SHA512 6c11e732158df93e9b7771c61d2ccf471d98c1a8885bc243141f6da68c8bb3de9aa2da7b5987950bf31ef1808aeed977b901c51a6c7b871eebd47ee59bc61fb3
+EBUILD exempi-2.6.5.ebuild 1403 BLAKE2B 580460466a847bc21ba981768079304e1ce17183f7d59c9d91295b7353de994fa3e946e90563967d442aefbae4971b1e5a3c3565f89ce8c0990e5c9f784b77f2 SHA512 9d1d24c54f2d356c4333f2644e6bcc1cad42b632991b5e1d11c7b0e539a45df791bf92a8f447488eca66f6d9250cbb338d38c5ca46a998a28ec5931c26e0a072
 MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392
diff --git a/media-libs/exempi/exempi-2.6.5.ebuild b/media-libs/exempi/exempi-2.6.5.ebuild
new file mode 100644
index 000000000000..d11c41d688fd
--- /dev/null
+++ b/media-libs/exempi/exempi-2.6.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX"
+HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
+SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="2/8"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/expat-2:=
+	sys-libs/zlib
+	virtual/libiconv
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-libs/boost )
+"
+BDEPEND="
+	dev-build/autoconf-archive
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for autoconf 2.71
+	config_rpath_update .
+	eautoreconf
+}
+
+src_configure() {
+	# ODR & SA violations
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	# - --enable-static as --disable-static breaks build
+	# - Valgrind detection is "disabled" due to bug #295875
+	econf \
+		--enable-static \
+		$(use_enable test unittest) \
+		VALGRIND=""
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		emake -C samples/source distclean
+		rm samples/{,source,testfiles}/Makefile* || die
+		docinto examples
+		dodoc -r samples/.
+	fi
+
+	# --disable-static breaks tests
+	rm -rf "${ED}/usr/$(get_libdir)/libexempi.a" || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index cffc7d64b408..238c93150ac5 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,10 +1,9 @@
-AUX libpng-1.6.41-png_check_sig-abi.patch 3351 BLAKE2B e82003b3ff543754aabedfea7e1d7911e1918598c1e8bf0c31b937403790d08fe12003281020b93195be8bcd01bf5269b0ec9200ac17a4c5d4e9da621929ac69 SHA512 d613724d09b3780e6afb6b2c34b146bd3c919cedf29619a6faea9cc62d70d5175d649450d10954ddc78c599bffd121eae36ceaf7feb97a603e2d8f7b8e6532c9
 DIST libpng-1.6.40-apng-apng.patch.gz 10330 BLAKE2B e2a5ff10ebaf75019d20edb148ea26fd6b255842aa34e8af31a919ae3c059b28eb827831289f47428e5f55c239f23a600677fde58e74bf0a2db27b5001f9ccb1 SHA512 803c45c2bbaf6c12863a09fb4d307c629680835b11a01c456512c81ef705e4f96c29e98c2486970ff1d86335cb4bd7568a30482c3e69601275d2a31d294058db
 DIST libpng-1.6.40-libpng-apng-apng.patch.gz 10815 BLAKE2B 47b09d730d6be1d481ab48e511068a38fc3448339aaeab1d8ad21f26de6cb79006c64785de2e0514ff820a75101c0010b84cce923d10e8f6198e4e99916d08f2 SHA512 373cc9f0df15f7c77c0a59ddaac22374cfae37174b63a642e68e3a17a6d0bb1015399d771998c7eb6b356b634f157f0009743f4cc659f3b8e480a9533010ef9c
 DIST libpng-1.6.40.tar.xz 1021332 BLAKE2B 4dd2df57791ca68cc31ba966b9176ecb37458572c60eef34e31ff0d3266d25ad6ea9d2e8cae6bfaf7932b5c7bc231047d3ed139b3464304c41cc4d89611f5ba8 SHA512 a2ec37c529bf80f3fee3798191d080d06e14d6a1ffecd3c1a02845cb9693b5e308a1d82598a376101f9312d989d19f1fb6735b225d4b0b9f1b73f9f8a3edb17f
-DIST libpng-1.6.41.tar.xz 1035328 BLAKE2B 43d8d1c563d9df46b663f706dca9563e31e6e47a2809a77a5d059de8cfa348721054df724d08ac24ef4717ffc101989941127df2d026c9537532375d9b432b68 SHA512 046d0328255572ee2ccab7e751ed457b07e0aedc72474c2f4675a8303e628de3ef8afa1a00c60d768eb788546d1cda1e8b800b2497d9c352694faba6dde2c5b4
 DIST libpng-1.6.42.tar.xz 1035484 BLAKE2B 8a8895b673ff90416a00c9ff775d7bdc38ab1ab0d83fd6e70cfffea2ed78bd42896950a64bf48ad9a00ea50d8c5d5702975b0bae7bb3300d4de4c82b334e513e SHA512 a9e8641f79ebc811e8e1e94c4966737f8d0f3aef33c86834c419ca76050567891c065899c3bc0c945c59b5d50c5ff7d693cc51089d06efe92e71ae8014fa157c
+DIST libpng-1.6.43.tar.xz 1044076 BLAKE2B e8781001f001e6f514ca01ceafc51557e6cdedcbed3aa64df213d02635eec937cac4ccc0f34b636f582a7d141b67ec6c8d90a6ffb15c679ab0c3f4f8798be791 SHA512 c95d661fed548708ce7de5d80621a432272bdfe991f0d4db3695036e5fafb8a717b4e4314991bdd3227d7aa07f8c6afb6037c57fa0fe3349334a0b6c58268487
 EBUILD libpng-1.6.40-r1.ebuild 1911 BLAKE2B e95dd7c1dd841404513628bda79780fd77ffb33f6f08ef138c31f47bc2ecf42bfccbd6f4b678e61af9a0bf2c1269990692affe45c91c93260e1737d17fcf73a3 SHA512 f4a910abd65acd9445e0f393b2c354bbd9539c3860fe311582de19eb43930e23eaff41675676c2a1816d8b4d069852ad84e84eedcf06df2894ea6c3487871388
-EBUILD libpng-1.6.41-r1.ebuild 2076 BLAKE2B 2341b8d974ea6b42115ef28646788b3d98b91e835d628425e17882063643285246ba92eba01c9894c202ef0af51da8aa4ceb72bdbb4e8c04fa3ffafc2cc22e8e SHA512 e31cda268166830a5919030000b6f56115152eddf067ecc10d01981c6bb52982011c87cda19127f634ad0f9229e10be3309a6a12bc9c99d14f1be7a648fba696
 EBUILD libpng-1.6.42.ebuild 2019 BLAKE2B f29620569a4a23e3a1e552520e76754c43820f70f31324a0341cf2f9c0f69d192eec221d222d94092d48bcedf14f84ae90f6d850fb87d7cb5381c321310028a3 SHA512 d1a2f30d1f00dba9a21adc5225e659ec62b542dabff39bd987f3dd5f46e70f603d85997c1c7b417e96718f33013ed577c47e45aaccbdd58f47703257c29c4276
+EBUILD libpng-1.6.43.ebuild 2019 BLAKE2B f29620569a4a23e3a1e552520e76754c43820f70f31324a0341cf2f9c0f69d192eec221d222d94092d48bcedf14f84ae90f6d850fb87d7cb5381c321310028a3 SHA512 d1a2f30d1f00dba9a21adc5225e659ec62b542dabff39bd987f3dd5f46e70f603d85997c1c7b417e96718f33013ed577c47e45aaccbdd58f47703257c29c4276
 MISC metadata.xml 958 BLAKE2B 6d7a0f6ea2903876e7df7b07f0a5f116d83b188ca1acba2dd6664ecda03a9695c9e3b76b26649dd5198e49d950d91e31f5aa792b3abd7109b76aedbf43cfc843 SHA512 15269d4c49e08bfd993b4248cbef9ea095f0254c68177bc498ddf622a8fdcda01e6e6f17550c698ab79e896d9f3b4af01ef7966006d4902d9101b39844c1670d
diff --git a/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch b/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch
deleted file mode 100644
index d2913b062f26..000000000000
--- a/media-libs/libpng/files/libpng-1.6.41-png_check_sig-abi.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-https://bugs.gentoo.org/923298
-https://github.com/pnggroup/libpng/commit/ac944e2b364cff96e8458110c2ad06a63f8543b3
-
-From ac944e2b364cff96e8458110c2ad06a63f8543b3 Mon Sep 17 00:00:00 2001
-From: Cosmin Truta <ctruta@gmail.com>
-Date: Mon, 29 Jan 2024 15:30:10 +0200
-Subject: [PATCH] Fix a regression introduced in "chore: Clean up the return
- statements"
-
-This fixes commit 27e548af2518ff8d278b45c40d11ad1bdd68eaa0.
-
-The macro `png_check_sig` has been deprecated and remained untested
-for decades. And yet, somehow it escaped from all past API cleanups.
-
-Also update the libpng manual.
-
-Reported-by: Matthieu Darbois
---- a/libpng-manual.txt
-+++ b/libpng-manual.txt
-@@ -357,7 +357,7 @@ Customizing libpng.
-        return ERROR;
-     }
- 
--    is_png = !png_sig_cmp(header, 0, number);
-+    is_png = (png_sig_cmp(header, 0, number) == 0);
-     if (!is_png)
-     {
-        return NOT_PNG;
-@@ -4692,7 +4692,7 @@ deprecated since libpng-1.0.16 and libpng-1.2.6.
- The function
-     png_check_sig(sig, num)
- was replaced with
--    !png_sig_cmp(sig, 0, num)
-+    png_sig_cmp(sig, 0, num) == 0
- It has been deprecated since libpng-0.90.
- 
- The function
-@@ -4756,8 +4756,8 @@ png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),
- png_set_asm_flags(), and png_mmx_supported()
- 
- We removed the obsolete png_check_sig(), png_memcpy_check(), and
--png_memset_check() functions.  Instead use !png_sig_cmp(), memcpy(),
--and memset(), respectively.
-+png_memset_check() functions.  Instead use png_sig_cmp() == 0,
-+memcpy(), and memset(), respectively.
- 
- The function png_set_gray_1_2_4_to_8() was removed. It has been
- deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
---- a/libpng.3
-+++ b/libpng.3
-@@ -876,7 +876,7 @@ Customizing libpng.
-        return ERROR;
-     }
- 
--    is_png = !png_sig_cmp(header, 0, number);
-+    is_png = (png_sig_cmp(header, 0, number) == 0);
-     if (!is_png)
-     {
-        return NOT_PNG;
-@@ -5211,7 +5211,7 @@ deprecated since libpng-1.0.16 and libpng-1.2.6.
- The function
-     png_check_sig(sig, num)
- was replaced with
--    !png_sig_cmp(sig, 0, num)
-+    png_sig_cmp(sig, 0, num) == 0
- It has been deprecated since libpng-0.90.
- 
- The function
-@@ -5275,8 +5275,8 @@ png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),
- png_set_asm_flags(), and png_mmx_supported()
- 
- We removed the obsolete png_check_sig(), png_memcpy_check(), and
--png_memset_check() functions.  Instead use !png_sig_cmp(), memcpy(),
--and memset(), respectively.
-+png_memset_check() functions.  Instead use png_sig_cmp() == 0,
-+memcpy(), and memset(), respectively.
- 
- The function png_set_gray_1_2_4_to_8() was removed. It has been
- deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
---- a/png.h
-+++ b/png.h
-@@ -914,9 +914,9 @@ PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
-     size_t num_to_check));
- 
- /* Simple signature checking function.  This is the same as calling
-- * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) != 0).
-+ * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) == 0).
-  */
--#define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) != 0)
-+#define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) == 0) /* DEPRECATED */
- 
- /* Allocate and initialize png_ptr struct for reading, and any other memory. */
- PNG_EXPORTA(4, png_structp, png_create_read_struct,
-
diff --git a/media-libs/libpng/libpng-1.6.41-r1.ebuild b/media-libs/libpng/libpng-1.6.43.ebuild
index e82599595cdf..b198fcd653b4 100644
--- a/media-libs/libpng/libpng-1.6.41-r1.ebuild
+++ b/media-libs/libpng/libpng-1.6.43.ebuild
@@ -28,10 +28,6 @@ DEPEND="${RDEPEND}"
 
 DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-png_check_sig-abi.patch
-)
-
 src_prepare() {
 	default
 
diff --git a/media-libs/quarter/Manifest b/media-libs/quarter/Manifest
index 5ffa54ad67ee..3d608296b7b0 100644
--- a/media-libs/quarter/Manifest
+++ b/media-libs/quarter/Manifest
@@ -1,6 +1,6 @@
 AUX quarter-1.1.0-cmake.patch 535 BLAKE2B b800b87ff88a824170700f37599bd425c08d2defdd515f98314de531710ff56f916a7619cd9eac35c74664bc7dd55f4320234ac96b0e1c6b08ff64b04c312918 SHA512 fbd981e1af9003ee6f92a6218a2d150b110f3e86c580b2a57a7d5e496f3e7a36e0ee8b5e664ef38b7d5db7294b2500c64e1c8c4adf9a8ee3b877173f409bb411
 AUX quarter-1.1.0-find-qhelpgenerator-binary.patch 864 BLAKE2B dbffc6c53bb6834b8825b4c515c749a1fbaf378a7b03b9f9d2509ba72ca9ba363b800f26eed68421e4bca0a68f721e0ef360cd29ca95f465f4fca7ee3054b99d SHA512 23e9a0bb5a3cabe7f2c4e1b977d5a01973331416633fa3f44c1869d22d420a5e60c1d3d61853f422b6ce4340a8b3352031e4a6841fcb4be5c3b0cdf416087ae3
-AUX quarter-1.2.1-cmake.patch 982 BLAKE2B 3916ebf858e7ef0485c89ac10af431ec4e798d8519751a5a70879df44b02fdc14d9a4bcd5a23e98364a91c24bf209073d358ae6003af58c10ac103d21ee9d77c SHA512 ca5450cdd00964dc38603f8a68beff42f41a64f30cc5255ee01be50865753ec1480d36192b0ec8ab0036a4abaeabd86604b42760324736097b145807ea5f1759
+AUX quarter-1.2.1-cmake.patch 2049 BLAKE2B eec271da9ff2eab955f13f3a64abe862b316880d4f9c563a0ffdd799ea812bd61ef3f24796e9e35046e390e778234fcfe063a06441c13c2be7bc4e9e882289bc SHA512 e6542e5840cbbc7319e7844dd8303f75084af72aa8bb0530968dd1bc64abc439b5e6edf9161b8db90b2a17c626e4128befbf86434a9bf1d8949b3db08391b625
 DIST quarter-1.1.0-src.tar.gz 724762 BLAKE2B 8f1f0025706c4502ea178c09204e442b9c52148371863a5a49640ba751084cca9ca464398ee171729d85e8fc2f3fe3ea9d5f0492d114d810527601936abbd1e0 SHA512 2b2649132c66c709e3d5df2a99d621fb9cf61424c5376a5ca6a016ee5c7514841f8bbe390d1acc7b94688a86b56304ed12fb98840e11933162ac6ccb3f3d681c
 DIST quarter-1.2.1-src.tar.gz 737236 BLAKE2B 91b332eb36ac1911449b923aabf6913a1901306c258f8e430f0c589774d1ad5991916863f14d6c3d35898a9756f7c68bd30287defe5deb04036f2dce4b8f135f SHA512 454e99ae8f65c9d8e425aaabc02f218357db4e4447a481680f75301d4102864c77da58a48144f2a9211d4de0bd9962b394ad48a832e89674291b94778e5ff96d
 EBUILD quarter-1.1.0-r1.ebuild 1547 BLAKE2B ec44d9880ed0ad339e8cf3d5791718488e9797068d4689baf03e15a7fcd2408cdf0f15c63540264a201e72abcbad182c3d646621da215de4d7ca1612b05f80b2 SHA512 a071ab106915e7f83e0dc27abe494bfeb5a2384900a66ee2b4e9bcc12231a39a79243e1e6463b4fa83cdeecc6f0ba66c213b2432b76d9488e28f085212c119e7
diff --git a/media-libs/quarter/files/quarter-1.2.1-cmake.patch b/media-libs/quarter/files/quarter-1.2.1-cmake.patch
index 761ba4fb5081..88770dc384d8 100644
--- a/media-libs/quarter/files/quarter-1.2.1-cmake.patch
+++ b/media-libs/quarter/files/quarter-1.2.1-cmake.patch
@@ -1,6 +1,6 @@
 diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
 --- quarter/CMakeLists.txt	2024-02-05 00:29:17.000000000 +0100
-+++ my/CMakeLists.txt	2024-02-24 05:23:51.451634039 +0100
++++ my/CMakeLists.txt	2024-02-29 02:46:06.768299838 +0100
 @@ -96,17 +96,17 @@
  
  if(QUARTER_USE_QT6)
@@ -9,7 +9,7 @@ diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
 +    find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets Designer REQUIRED)
    else()
 -    find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets QUIET)
-+    find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets REQUIRED)
++    find_package(Qt6 COMPONENTS Widgets OpenGL OpenGLWidgets REQUIRED)
    endif()
  endif()
  
@@ -19,7 +19,24 @@ diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
 +    find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer REQUIRED)
    else()
 -    find_package(Qt5 COMPONENTS Widgets UiTools OpenGL QUIET)
-+    find_package(Qt5 COMPONENTS Widgets UiTools OpenGL REQUIRED)
++    find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED)
    endif()
  endif()
  
+@@ -116,14 +116,14 @@
+ endif()
+ 
+ if(Qt6_FOUND)
+-  set(QUARTER_QT_TARGETS Qt6::Widgets Qt6::UiTools Qt6::OpenGL Qt6::OpenGLWidgets)
++  set(QUARTER_QT_TARGETS Qt6::Widgets Qt6::OpenGL Qt6::OpenGLWidgets)
+   set(QUARTER_PLUGIN_QT_TARGETS Qt6::Designer)
+   string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${Qt6Core_VERSION_STRING}")
+   string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${Qt6Core_VERSION_STRING}")
+   string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${Qt6Core_VERSION_STRING}")
+   set(QUARTER_PKG_DEPS "${QUARTER_PKG_DEPS} Qt6Widgets Qt6UiTools Qt6OpenGL Qt6OpenGLWidgets Qt6Designer")
+ elseif(Qt5_FOUND)
+-  set(QUARTER_QT_TARGETS Qt5::Widgets Qt5::UiTools Qt5::OpenGL)
++  set(QUARTER_QT_TARGETS Qt5::Widgets Qt5::OpenGL)
+   set(QUARTER_PLUGIN_QT_TARGETS Qt5::Designer)
+   string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${Qt5Core_VERSION_STRING}")
+   string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${Qt5Core_VERSION_STRING}")