gentoo auto-resync : 17:06:2024 - 00:09:46

9 files changed, 53 insertions, 13 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 47400b81f63d..7e3042196d80 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index a913769338e7..447ea03c4523 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -1,5 +1,6 @@
+AUX goocanvas-3.0.0-fix-gcc14.patch 1353 BLAKE2B 1f5fbd44ebafc3c54509ef7ff1a306183313132eadeca65a2087632ef0c84c3548ac95ab793674bb14f79dd0443e8500c6966f7ce88d2da9674657cbf452bca4 SHA512 e3eb0a187a24cc6e3867ed303d46a02139cb1ffedaf03c6057c625eef470fd24593fd1b75d9b7d2601d9274cfb05c32892f805d1e2700e535404da14078eb41d
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
 DIST goocanvas-3.0.0.tar.xz 556832 BLAKE2B 4ee632a614b6b881000bbee8d5e21a166151a94667c603c92b94c5e076fab78a6df44fe1d45fb4d7c4d65c0e060b599abf3970313542836a63efbca33d6a075b SHA512 a53839af4d98afdfc0f92531bdb09013dd71e964185dc2670af077bb7b41b9ff5c75f2801f6e77c99055b38f3603d8cf197f84affb8d7c3196526ce824b228e3
-EBUILD goocanvas-2.0.4-r2.ebuild 1285 BLAKE2B dc5505f2d481aef2b7d0b2db009a51dd521c22303caf5ee75c8d454902b9d4c876592c02b1aae9b60a0e367aeaad0d21d280afd2e8dab4f1291bc1ff881262d6 SHA512 53099e2373f25f55efb6f71fe39834f593edf55f8bbc014bba374b8c8fd039793c9c798605578c78c6070c6ce3036ea4640085f376325529be398ae2b41f6d2b
-EBUILD goocanvas-3.0.0.ebuild 1285 BLAKE2B a69268031dbbc33745cd392cac308b184ea2ca01abff9c15b9760c2e7f529e992c6c5137209b1f1dd2d78ef81c7548b5da21ca78034054e8092dc00005f486c5 SHA512 b2774284040739c516c511bf44531d965e13e8728162f68e13f8eaa838154847e0b0844952e9664a9f43e12ad0409eb3e8660c1154a84f1a00268342577d9a23
+EBUILD goocanvas-2.0.4-r2.ebuild 1345 BLAKE2B 358e4b2b34de453576cd83dc56305498a81b2fc173b199fc0e7360553cad171da28a216623e7b1e57c1eebbee04fdd413bd2f77d246fe3f78aaa51775d80e0df SHA512 1cc63e4e8c27a4a9c01ee282bf26268ddd2a5a9f0a928d30be175aef05bc6e6ead6a1932e898b592079c473e9eb3b6bb4b10016668cf37f198eadd7fa77a8912
+EBUILD goocanvas-3.0.0.ebuild 1345 BLAKE2B dfa4c8caae9d3b89a3c1a2ee5f70959fc4d73f295754edc1fcc113516a04fe2b3779bb4d616e5f6b37f08fdcb2e328bd1bcb03ea77762768884feeb7fa129533 SHA512 4906009d27ee2764538c58ea197b80ee8f6ec4f138100ec2cb91537fce6e39b69ed4cf1081aa941dbe463e0d9a099e99db380742ebe586ec3cbfa0bd4bd00db5
 MISC metadata.xml 350 BLAKE2B 901385c2f470228637138fe2c370e5dfa452935150231e6e339756865b520560670c7783f1a854d2e4bf19f86db7e09830255c951129ac8bd859fc20a4a6041b SHA512 459b79087fe033de51d207aca5a440d53c760506289ea8b46e6bdfe84f602e3b58cb4e1dc78bcc088ce508040d1c313f553a7c0ed9426274f02785b6e43e2762
diff --git a/x11-libs/goocanvas/files/goocanvas-3.0.0-fix-gcc14.patch b/x11-libs/goocanvas/files/goocanvas-3.0.0-fix-gcc14.patch
new file mode 100644
index 000000000000..ecb54b1e1d27
--- /dev/null
+++ b/x11-libs/goocanvas/files/goocanvas-3.0.0-fix-gcc14.patch
@@ -0,0 +1,33 @@
+https://gitlab.gnome.org/Archive/goocanvas/-/merge_requests/15
+https://bugs.gentoo.org/919442
+
+From d025d0eeae1c5266063bdc1476dbdff121bcfa57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 31 Jan 2024 17:44:59 +0100
+Subject: [PATCH] Fix building with GCC 14
+
+GCC 14 becomes stricter regarging pointer types:
+
+goocanvasitemsimple.c: In function 'goo_canvas_item_simple_set_model':
+goocanvasitemsimple.c:1539:15: error: assignment to 'GooCanvasItemModelSimple *' {aka 'struct _GooCanvasItemModelSimple *'} from incompatible pointer type 'GooCanvasItemModel *' {aka 'struct _GooCanvasItemModel *'} [-Wincompatible-pointer-types]
+ 1539 |   item->model = g_object_ref (model);
+      |               ^
+make[3]: *** [Makefile:595: goocanvasitemsimple.lo] Error 1
+
+It looks like missing a pointer cast.
+
+<https://bugzilla.redhat.com/2261209>
+--- a/src/goocanvasitemsimple.c
++++ b/src/goocanvasitemsimple.c
+@@ -1536,7 +1536,7 @@ goo_canvas_item_simple_set_model (GooCanvasItemSimple  *item,
+   goo_canvas_item_simple_free_data (item->simple_data);
+   g_slice_free (GooCanvasItemSimpleData, item->simple_data);
+ 
+-  item->model = g_object_ref (model);
++  item->model = (GooCanvasItemModelSimple *) g_object_ref (model);
+   item->simple_data = &item->model->simple_data;
+ 
+   if (accessibility_enabled)
+-- 
+GitLab
+
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
index b7b95ceefbab..6d81a9a9c362 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/goocanvas-3.0.0-fix-gcc14.patch
+)
+
 src_prepare() {
 	# Do not build demos
 	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
diff --git a/x11-libs/goocanvas/goocanvas-3.0.0.ebuild b/x11-libs/goocanvas/goocanvas-3.0.0.ebuild
index bf6a749e26e6..fe5a3e869818 100644
--- a/x11-libs/goocanvas/goocanvas-3.0.0.ebuild
+++ b/x11-libs/goocanvas/goocanvas-3.0.0.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/goocanvas-3.0.0-fix-gcc14.patch
+)
+
 src_prepare() {
 	# Do not build demos
 	sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index c05a4cc5e26f..5d68c043ae43 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -5,5 +5,5 @@ DIST libfm-qt-2.0.2.tar.xz 412452 BLAKE2B ce63a75722769fcef4766461bea66f26579c0a
 EBUILD libfm-qt-1.1.0.ebuild 931 BLAKE2B 7b692ffe4c5c8a5e68f5ee0aa027a67175112312a0252676072710264f50ac593f8a8452c2be4e536996234345bcf72344ecc20abe16a4fa57a96265c243db8a SHA512 271f4e854e6af084a747045d1c1aab3e27d060c9c71bd31e68e22faa392897ade82e5aa3ab542a3623c3e71d96d6020ae961d1480e2dc26c5275521c01c48fd4
 EBUILD libfm-qt-1.3.0.ebuild 931 BLAKE2B 6c42fe45d382abc369b7484ff2141bb64bccab5d28e290e62c8720688a0c38b93d5bdf7de867c06a9882d613a9898c43f78b9551f240d7147b2127db289a35c7 SHA512 6a3bb9727eac58abaadb5d27360094f039d648a851f32d5800d1d65d99ec53a10f57fe20db312be843ea8b5c6c38d38415ea4add693eb6f32de6c78417c9053c
 EBUILD libfm-qt-1.4.0.ebuild 992 BLAKE2B c52ee99411c3e2599ff52ed8d19b01a9ac0cc65f9e8919a08129d3be2e2387c015ecec3189b5fb251cc34de65a84dcfbee723aa2bce570b1f9fced82654bf65e SHA512 28de9f402c22b464940a9784ebab97f3b6a4034b2f65eef90bacf78db163d8977b0f189d3561db22a1d27736e46ec8e0969c05d186ee5c34e46f75fe977da25a
-EBUILD libfm-qt-2.0.2.ebuild 884 BLAKE2B 3534f4ecc1b5342ecf00f4e9421ca01f9289fb2dbfbbcd364e48d789f1f85d25acc9223b3c57fee6e901165af29ee8751f4d298bf893b40889ea3d931b10e639 SHA512 161aa3ccac0dadc6bc5beee837bdb9d36c507ed1414564c2cf1cc2fb68e66fc85b37d47fea80c9e1cfd70acbee0fa3f6c6c742e04b5f859bc1ba8731167b7b40
+EBUILD libfm-qt-2.0.2-r1.ebuild 886 BLAKE2B 7dc1e366e38385e1e99c1d85fcea8cd7d77f5b3f7bdb83896449db439730afedafe752ad12878df47e57b8838e19c869c23fd1176f6bc97953bfe8eedf568a66 SHA512 9a33f2212d93302b2fb92fd094faa9f215225f847a7a4edcdcb9ad0995e5bd65987657f59e85e7b41720cfdfd98d7c5b59563e3659e87c1fd23c080233378543
 MISC metadata.xml 315 BLAKE2B 1ca0894e1b787a755d024f95c4b09659b300f957f5cf69958bb3801e464eb84385303bbde99be3b491fc85e4202656dfefd40e5aa97ba47533307bfe07d40a0a SHA512 f9df6f22d74db03f845ad296b50e6d53e204867b2f00cbb04448c33f5ed3d22af6de3f9c58238f0e657aa4b963e467db74864d94266e5fa6923f2cb9c330e56c
diff --git a/x11-libs/libfm-qt/libfm-qt-2.0.2.ebuild b/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild
index 68d7b324f5d2..d62b65e910f1 100644
--- a/x11-libs/libfm-qt/libfm-qt-2.0.2.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-2.0.2-r1.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 "
 DEPEND="
 	dev-libs/glib:2
-	>=dev-qt/qtbase-6.6:6=[gui,widgets]
+	>=dev-qt/qtbase-6.6:6=[gui,widgets,X]
 	>=lxde-base/menu-cache-1.1.0:=
 	>=lxqt-base/lxqt-menu-data-2.0.0
 	media-libs/libexif
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 42dec517767d..c6f7d18b1e00 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -4,5 +4,5 @@ DIST qtermwidget-2.0.0.tar.xz 191532 BLAKE2B 87fc1365332f3adf168690fa028be87a36b
 EBUILD qtermwidget-1.3.0.ebuild 677 BLAKE2B 5d835728de94660dcd62f8707e024efe520b6938e22b5c055709260637c82627abcc2032c78b008061165c34cba4c51f2cfb81a511c3f292fd1570272c3728f2 SHA512 9bfde174ca3ec61fc61aa82fb3007c4a8fab40898b7bc55d4381161367e1645e6d2a837006d0337cd8b16abdf3f84180dd1f5f76e3f013781aad6585f980101b
 EBUILD qtermwidget-1.4.0.ebuild 677 BLAKE2B cd7bf5c8dae79471fe41e4bd2d3ef956b20bd429f26334baca88bf46f0085ce2d58cdb20b66da43fd16d3cc7e79f2f715c547b50706107c2325e406e71950b57 SHA512 65b23b6e1be03e393d6f266530ece7c1d8e617e95774624c314344602942ca1df3d8289ebabb0861dcae031acd04b9cc69fcac083e1840107f0bc3ed84d3d0c9
 EBUILD qtermwidget-2.0.0.ebuild 601 BLAKE2B 468bccdf4917e48c6c8ed23b5ad97e1ea73bb64cf8392a48220b21f81064f708d17b221457959446063f7eba61230c4a9054e095f4e48228b43a6253296b3ccf SHA512 5b05eae478c3a1b0e3b3a8133e2ee3561ecbc989e80bb5435aa3a0dfa24accfeaeb37723727891daeb7e250c1322e17ef1d3efd18cec9553ccf1b91d700f823e
-EBUILD qtermwidget-9999.ebuild 680 BLAKE2B 1e749336ed511ec7e5e9051ab144d86daa73e4a816c10deb4df0d8008399b11309b0d59bad8d02c8484da269f6148b3b7e491cc51ec735d80e98f770a8cc8326 SHA512 4f380c25f5c7e69151295fa91f904902ee2d8c1399198d6fb7549cf514f61938ddb107c21f227718851d270f21c6eeeeee49de5d623d4f782d99438e6ac6871a
+EBUILD qtermwidget-9999.ebuild 601 BLAKE2B 468bccdf4917e48c6c8ed23b5ad97e1ea73bb64cf8392a48220b21f81064f708d17b221457959446063f7eba61230c4a9054e095f4e48228b43a6253296b3ccf SHA512 5b05eae478c3a1b0e3b3a8133e2ee3561ecbc989e80bb5435aa3a0dfa24accfeaeb37723727891daeb7e250c1322e17ef1d3efd18cec9553ccf1b91d700f823e
 MISC metadata.xml 592 BLAKE2B 0d2c8417ebd737779172fa9d4f20ac7ac43b2c0f0e8af1bc78a1c1cb03931c74786093e059c42c5da4990b894c46f9b74aa53f5fd7acf361aafcc42593518ff6 SHA512 af3edbac8d3e9973f931cd480f5ad19476dbcc05580b2586b69ee86828986c4e446464c501d217c9b0f74191b0d6e5ab190daf778bff7e43af87d1a64fb5ad52
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index 1d05e00f94c1..ba12747178e9 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,24 +8,22 @@ inherit cmake
 DESCRIPTION="Qt terminal emulator widget"
 HOMEPAGE="https://lxqt-project.org/"
 
-if [[ "${PV}" == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="BSD GPL-2 LGPL-2+"
 SLOT="0/${PV}"
 
 BDEPEND="
-	>=dev-qt/linguist-tools-5.15:5
-	>=dev-util/lxqt-build-tools-0.13.0
+	>=dev-qt/qttools-6.6:6[linguist]
+	>=dev-util/lxqt-build-tools-2.0.0
 "
 DEPEND="
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtbase-6.6:6[gui,widgets]
 "
 RDEPEND="${DEPEND}"