gentoo auto-resync : 15:02:2024 - 23:36:26

4 files changed, 144 insertions, 0 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 947d1ba989f1..212f35b91529 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/t4k-common/Manifest b/dev-games/t4k-common/Manifest
index d9b9a8e55105..643cb859e708 100644
--- a/dev-games/t4k-common/Manifest
+++ b/dev-games/t4k-common/Manifest
@@ -1,9 +1,11 @@
 AUX t4k-common-0.1.1-ICONV_CONST.patch 193 BLAKE2B 9761594d7a48c44728414440247bbfc7757463c6898108d2c76ecedd9b2ad498a60cd4de4408159abc8263a3c0efd4a8d68c87f1d32fb0449862de4154d23bb7 SHA512 1f2718cd2be30436a342ef33236a4b456e8d14c104af5080a407cb770adcd5ac10575737a80ff0a1fde928bc4fb2782f747d6df976f137335cbbe37e9b42d45a
 AUX t4k-common-0.1.1-fix-declaration.patch 441 BLAKE2B 3b21c72a8f5e4609d70a0bb4edd83eba25f8032d4ae8578e9a52076783bc45f4e6023b2476faa270dd1aac1195909dea206e7ba37562b80683a28f8fa6c4c23e SHA512 92747a5d8b449425773779256b888b94dca1ffc879ac859f3cbd3a1f2bc5d5eabf2fb6e74fa8f3db079dddc3e8663bb939e90493197f4d9a2c0ddfa708bea8df
 AUX t4k-common-0.1.1-fno-common.patch 424 BLAKE2B 2a844d9d9fe8cea071b6541ef99281106c00d441bff291d7f30c467fdc5773af80e6fb5d48f2c0fa3737a4e63311a895de7f5d819b03d83b891126862df5a049 SHA512 226c4497eca10f202ac58d51b37bde004385276da6f64cf18e8737634469f524fe2ec6c34e12576b4d88e55e8c9f565231512a9fcf5111de459016e4a10df1bb
+AUX t4k-common-0.1.1-gcc14-build-fix.patch 3218 BLAKE2B 879f28842d249749db5aae697c9056462e23a6c6481b8f6f03821100aa5e054de78a27e5946ef8fc1cf1f5f3dd1154bde6727c34fce3de95257a359759f2977a SHA512 a6f582c5a7c3a278d7c7ef13da3a1bc09d28f7911362f1ac2a63b6656832e880233eb5a642f0fb22391094159ca358fae316d878328cda01899f39593ba29450
 AUX t4k-common-0.1.1-libpng.patch 685 BLAKE2B 8d6df4219586670725cba5bd8437d256d5c0ff0f372d9f0764b9456b7dd9d5b54c20a337b454249edb97251f8027d9f3c87a76f5ba741c7283c748e2b97086e4 SHA512 be6f47f6115b5da190cdfd21bf33b7e87ed5912d3300fec7cd503289acc954f15dcd997afc150b5e755510003138bd035cfec7248c12bb7af088f8d85a9660d6
 AUX t4k-common-0.1.1-missing-text.patch 532 BLAKE2B 8bc1f7803806f86f9e33fbdb0dc5bb9bbab279ad52a81833eaab1ffeb52be49bbf73a2f278fa6637cddb9a9e61bf231c40de8e6f0b80c684d3a7faef78b8fa63 SHA512 503c9d9e4ee68e5f5b869649e315ec4c3bb3630e488476424fdb1d0e86686edf6f6f4004134edac7e27c728968b8c0718ad6f9a604aeff64294fa240e81391c5
 AUX t4k-common-0.1.1-svg-libxml2.patch 2860 BLAKE2B 0a4d53638107044e9a817244dbd77231047ebc5050b13a89118c652538a0615ea508186a5fd3d1ae7a6c29089362cae3daed45e4ace0ae49a2f9773900489a76 SHA512 b6ddf673b15aecc0d7bd16d14ce1d9790ebce4884c0304a849649e87a872b67b227713694f5391491be591b84ac981e48a89585c0de93585b62698d977d962ef
 DIST t4k-common-0.1.1.tar.gz 622239 BLAKE2B f2ddbb3b8815ad05001f99b8cfd49fda3c1f59e9dc340bf9739c2072e9f4a2faf069bf9f774f95818a0cb59302e557d3d6408530e8ff82adb6b9fd84b36e2641 SHA512 d7fdb469452637187adcb4b5d2907c05687765b1b75cd3a28b75222b2a0358f1962e1a245d88129b4dbede845fde8ff718cf9a7b0f97a12cb21a8791073fbe3d
 EBUILD t4k-common-0.1.1-r1.ebuild 1333 BLAKE2B d320443f2954055ce2775cbbe7c046d652d0f50bf25958a4c45382caad6f80cf42e0784108518dbe3738c613e67af7ad8d05e2fafe4f030e05442f78d778c366 SHA512 5670ef68640bd1567198b849a5dc79d52f3d825b69025d26b7f70af856f8e8dfc73ec4e7c667517e4213c00518c1dedb985d874f266835d180bc74bb8f481ac5
+EBUILD t4k-common-0.1.1-r2.ebuild 1375 BLAKE2B 2cce884f94dd95277360ca27faa29cb9116b83bbab56b4cb5d1bc5baeca8d4051629339094c84b504d4dcc52203f73b5d28d91115a888e3e40dabe5166189918 SHA512 0403bc6578aaa5bb17d893e2f60f6d90d9369b48abbd545d072eeb176069e8fe38a34425d423821e7830ccdb13819c6dcb3965f1dcfda2849b75ad2864ad1c4a
 MISC metadata.xml 337 BLAKE2B e3108fc755f20dc4d3ef352765f120cb5a99aa0deccc96c1d94a5ed5170f88002161caea7fd255623935d446d9fafbf0796d4ade25af3d6459b91bf75d9f82e4 SHA512 415e748f5ca5023afd3b22798fed73a79b2edac4416d65efee84ede57949004563d000f4020aca88f46f6fba5a4c30a639f8d913447dab88135d366edc0e4cc1
diff --git a/dev-games/t4k-common/files/t4k-common-0.1.1-gcc14-build-fix.patch b/dev-games/t4k-common/files/t4k-common-0.1.1-gcc14-build-fix.patch
new file mode 100644
index 000000000000..7c272544ea2e
--- /dev/null
+++ b/dev-games/t4k-common/files/t4k-common-0.1.1-gcc14-build-fix.patch
@@ -0,0 +1,76 @@
+https://patch-diff.githubusercontent.com/raw/tux4kids/t4kcommon/pull/16.patch
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 7 Feb 2023 16:10:36 +0100
+Subject: [PATCH 1/2] linebreak: Avoid implicit declaration of u8_mbtouc_unsafe
+ function
+
+GNULIB_UNISTR_U8_MBTOUC_UNSAFE tells the bundled unistr.h to
+provide a function prototype for u8_mbtouc_unsafe.  This prevents
+build failures with future compilers which do not support implicit
+function declarations.
+
+Upstream gnulib has split the linebreak module into multiple parts;
+it is hard to tell if it still has the same issue.
+--- a/src/linebreak/linebreak.c
++++ b/src/linebreak/linebreak.c
+@@ -35,6 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ //#include "c-ctype.h"
+ #include "ctype.h"
+ #include "xsize.h"
++#define GNULIB_UNISTR_U8_MBTOUC_UNSAFE
+ #include "unistr.h"
+ #include "uniwidth.h"
+ #include "uniwidth/cjk.h"
+-- 
+2.43.0
+
+
+Bug: https://bugs.gentoo.org/923789
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Fri, 9 Feb 2024 11:49:53 +0530
+Subject: [PATCH 2/2] t4k_menu: Fix passing incompatible pointer type
+
+First observed under Gentoo Linux with GCC 14, probably due to
+mismatching types between child (struct _xmlAttr *) and node.children
+(struct _xmlAttr *).
+
+Resulting in build errors such as
+t4k_menu.c:254:23: error: assignment to 'xmlAttr *' {aka 'struct _xmlAttr *'} from incompatible pointer type 'struct _xmlNode *' [-Wincompatible-pointer-types]
+  254 |             for(child = node->children; child; child = child->next) {
+      |                       ^
+t4k_menu.c:256:62: error: passing argument 1 of 'menu_TranslateNode' from incompatible pointer type [-Wincompatible-pointer-types]
+  256 |                     tnode->submenu[i++] = menu_TranslateNode(child);
+      |                                                              ^~~~~
+      |                                                              |
+      |                                                              xmlAttr * {aka struct _xmlAttr *}
+
+Please reffer Gentoo bug: https://bugs.gentoo.org/923789
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/src/t4k_menu.c
++++ b/src/t4k_menu.c
+@@ -251,9 +251,10 @@ MenuNode *menu_TranslateNode(xmlNode *node) {
+         /* Now add child nodes. */
+         if(xmlStrcasecmp(node->name, "menu") == 0) {
+             i = 0;
+-            for(child = node->children; child; child = child->next) {
+-                if(child->type == XML_ELEMENT_NODE) {
+-                    tnode->submenu[i++] = menu_TranslateNode(child);
++            xmlNode *childNode = NULL;
++            for(childNode = node->children; childNode; childNode = childNode->next) {
++                if(childNode->type == XML_ELEMENT_NODE) {
++                    tnode->submenu[i++] = menu_TranslateNode(childNode);
+                 }
+             }
+         }
+@@ -443,7 +444,7 @@ int T4K_RunMenu(int index, bool return_choice, void (*draw_background)(), int (*
+   int click_flag = 1;
+   int using_scroll = 0;
+ 
+-  internal_res_switch_handler(&T4K_PrerenderAll);
++  internal_res_switch_handler((ResSwitchCallback)&T4K_PrerenderAll);
+   
+   for(;;) /* one loop body execution for one menu page */
+   {
+-- 
+2.43.0
+
diff --git a/dev-games/t4k-common/t4k-common-0.1.1-r2.ebuild b/dev-games/t4k-common/t4k-common-0.1.1-r2.ebuild
new file mode 100644
index 000000000000..291feb6ce7d4
--- /dev/null
+++ b/dev-games/t4k-common/t4k-common-0.1.1-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library of code shared between tuxmath and tuxtype"
+HOMEPAGE="https://github.com/tux4kids/t4kcommon"
+SRC_URI="https://github.com/tux4kids/t4kcommon/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/t4kcommon-upstream-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="svg"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-net
+	media-libs/sdl-pango
+	svg? (
+		gnome-base/librsvg:2
+		media-libs/libpng:=
+		x11-libs/cairo
+	)"
+DEPEND="${RDEPEND}"
+# need sys-devel/gettext for AM_ICONV added to configure.ac
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libpng.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-ICONV_CONST.patch
+	"${FILESDIR}"/${P}-fix-declaration.patch
+	"${FILESDIR}"/${P}-missing-text.patch
+	"${FILESDIR}"/${P}-svg-libxml2.patch
+	"${FILESDIR}"/${P}-gcc14-build-fix.patch
+)
+
+src_prepare() {
+	default
+
+	rm m4/iconv.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	# note: sdlpango<->sdlttf breaks ABI, prefer default pango
+	local econfargs=(
+		$(usex svg '' --without-rsvg)
+		--disable-static
+	)
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}