gentoo auto-resync : 14:02:2025 - 00:13:14

3 files changed, 140 insertions, 0 deletions

diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index acb76a84d90d..75964f45078c 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -3,9 +3,11 @@ AUX gtk-engines-2.20.2-automake-1.14.patch 2105 BLAKE2B 281714d925f0f0d4f65069cc
 AUX gtk-engines-2.20.2-change-bullet.patch 372 BLAKE2B e8618b970c139924a1b223fe0a93b0f6628eb4300be3e724ff6eba328e5cb7ad86eaf151b3355b51264c6c2ed2f51491f9a26e2d09bef18103b190033482ce30 SHA512 b9848c95d40fd18e0a9877d1f4d314330b806fce101f6032761d61afc1303ff9b6ffaeb9502ce8c5d867553b4fdad17981b811a175dcc84feb10509c6edf88a5
 AUX gtk-engines-2.20.2-glib.h.patch 729 BLAKE2B c5aee267866e93fa3c806ac02df9822fbe8871e1c9ac0160a90ad3f42ba85a43e2ebef149c0e6c25b133edf3fb0bd4f3f41e2aad821f12713ad30b06e2d6bf63 SHA512 4e9f6bdf42b5c4a8695f2d529ed57d345539eec1af8672181dc8c050b507f492d92fb0b902246b8ecaa8cd8e2c14042207ef36fa25d86e4792a8e51a7579a4af
 AUX gtk-engines-2.20.2-java-look.patch 602 BLAKE2B bd9625acae0c7ce7f81089c716b2d1d662ef97ace9124e15b50d6bee9553de41a6bd7790e4e648e4ce1464da9a308ea2a70852bf030420718d8497c248a39ecc SHA512 b2ff1ecd1981d704e86802a878286ddc153317796d805578da7f7a8c411257c964a18aafa93e47e75f8753b207e40495c30c13f2d56c092e9f0bfd9bb07fca2e
+AUX gtk-engines-2.20.2-lua.patch 1759 BLAKE2B d05866094c6f7fe2ee2143c71a20cdff0475f19ca134d1de783ad6e905ee05e02b1a52f1be9caa38c766214a668d580252e9283cce020c14fe15e4811f1ce23b SHA512 4f811073361bad8b0eb23df7f4f2ebf283e546b75199c26698ec131e1ae5e823a40f13416fd7ca3ce8281bbfa1f352f38efb8818907efecc16cfb0530eede9b0
 AUX gtk-engines-2.20.2-slibtool.patch 2028 BLAKE2B 83074886d6eec40aa2c7bb6dd3738c5fa58146ab5cc6faec4385730e6c6ba4b4c96402f1a353abe907b1faeb4ec3c8f0ed6543ecee1c25d55ccb3add6f071f6d SHA512 09310afa9d24b0031da3d7240c98dfb8efcbefac2e1fab8fd89f660ff0fbc998ce6ddd5852c3a84f801f9432918c76c12f6a520b86d8ea59e8eebf0b518be8f1
 AUX gtk-engines-2.20.2-tooltips.patch 1116 BLAKE2B ad050dbff4bba6c7172a449eec7b001d3f9cffc0c79043356ad1fda851d94aac8c1322caa1aedde9cb8931e6f73ac8e1f411e17c9e363a420f7612c8a6ad3ecf SHA512 0e89d704f883f0dce086f83b4dc27decc3e022f1ad7ec46e9a0ca9d5ab2e3a997826c8ca3d1340e3e51ed3e4433c7e30eac833b02f76409f66a08b178cdd3b30
 AUX gtk-engines-2.20.2-window-dragging.patch 466 BLAKE2B 851f633db234986b9855dffae2cdda3b812f48e9e221f14b601c1f65764fac0d88f5dd70cc96a50949725da52e64fb60ba59ab491856279b468dc255201cdebb SHA512 4f3f20c007a1b3fc001485fdd0c84450f8bbf3c2e95decd058b552adfeecc75a84ae2be7da3984c058df940bcb87ce6cd149d24a5e86486befd085d339c65a77
 DIST gtk-engines-2.20.2.tar.bz2 688171 BLAKE2B 1eb80f1bfa7f58cdcde6d461bcd6a41d7fe8b7ca20e11f1f59b350b3b5ce8c196c5f35330ec027d0ff1d9de19f28d412e0e3c6460487ac7ea61284fc1858a90c SHA512 049ae20d47a28b60fe5b0484e3c11bc6cd62d6167478f1d83df3066d618827ca9204767ab1b7a9ca02f542c3fc7929efc1bb85f65d66aaf5d5b15718b6de19e9
 EBUILD gtk-engines-2.20.2-r101.ebuild 1740 BLAKE2B 10d250a92aa99c07705107022809a25f799f02d07f88688ea8f28c7f0a3adebb6f3b134d322b271d4fe9f13226246d5b57ee07e568ac6e0aebb8eeec86cb3dd3 SHA512 da61f320a3e220ef20c10531067d0ce4bca88b021aca50e2d622eb9f0825f498f5388a41629e8edb934ed4da68fcfa38268647f50590a1412f88d048a7001c21
+EBUILD gtk-engines-2.20.2-r102.ebuild 1774 BLAKE2B a7373a4b2a2e768c26fcd760b1f14d2253a2a5603397679fb0a1e0fc894f7c7ce8ffe1f7444bb62684b82deb300353bfcd3523bf25563a1ff6ebe590693840b5 SHA512 ef3c36a2ed194c2696c494cbfe2d5a87506758854e07ff74df50241679b218fdc60b3b56f400ea1c96eb303f86185e13b0c9440e666517a86590b3204d5ce4ad
 MISC metadata.xml 668 BLAKE2B 8853ddc66f457c1e4485dfe5814f19852c77d6832fd1ebf18a12909b49b1c5ba53a888f7acc751328c3d253caa7c859cbc6c55ff5e1175c4184b6397abe918e4 SHA512 bb38b4471833825934db36d630ab4f0c0b1ed3d5ba6d508a254d8fbc25b92c86d011e8e6736aeb4de0f5c82fdcd62b5967a5784622d068843f5825f2f8a6c477
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-lua.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-lua.patch
new file mode 100644
index 000000000000..683fe7505dfe
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-lua.patch
@@ -0,0 +1,69 @@
+Change non-returning gtk macros to returning gtk macros and add correct values
+to them.
+Deal with bad "convenience" redefine of lua API function, so it works with system
+lua.
+Add missing includes, both from system gtk-2 and this library.
+https://bugs.gentoo.org/919421
+--- a/engines/lua/src/lua_style.c
++++ b/engines/lua/src/lua_style.c
+@@ -21,6 +21,7 @@
+ 
+ 
+ #include <gtk/gtk.h>
++#include <glib/gprintf.h>
+ #include <cairo.h>
+ #include <math.h>
+ #include <string.h>
+@@ -34,6 +35,7 @@
+ 
+ #include "lua_utils.h"
+ #include "misc_utils.h"
++#include "draw_lib.h"
+ 
+ /* #define DEBUG 1 */
+ 
+@@ -142,8 +144,8 @@
+ lua_style_draw (LuaStyle *style, GtkWidget *widget, GtkStateType state_type,
+                 gchar *name, gint width, gint height)
+ {
+-	g_return_if_fail (style);
+-	g_return_if_fail (style->L);
++	g_return_val_if_fail (style, FALSE);
++	g_return_val_if_fail (style->L, FALSE);
+ 
+ 	lua_style_push_widget_params (style, widget, state_type);
+ 
+@@ -175,9 +177,9 @@
+ 	gchar *state;
+ 	int i;
+ 
+-	g_return_if_fail (style);
++	g_return_val_if_fail (style, NULL);
+ 	
+-	L = lua_open ();
++	L = luaL_newstate ();
+ 	luaopen_base (L);
+ 	luaopen_math (L);
+ 	luaopen_draw (L);
+@@ -233,8 +235,8 @@
+ lua_style_prepare_cairo (LuaStyle *style, GdkWindow *window, GdkRectangle *area, gint x, gint y)
+ {
+ 	cairo_t *cr;
+-	g_return_if_fail (style);
+-	g_return_if_fail (style->L);
++	g_return_val_if_fail (style, FALSE);
++	g_return_val_if_fail (style->L, FALSE);
+ 	
+ 	cr = gdk_cairo_create (window);
+ 	cairo_set_source_rgb (cr, 0, 0, 0);
+--- a/engines/lua/src/lua_utils.c
++++ b/engines/lua/src/lua_utils.c
+@@ -27,7 +27,7 @@
+ {
+ 	void *res;
+ 	
+-	g_return_if_fail (L);
++	g_return_val_if_fail (L, NULL);
+ 	
+ 	lua_getfield (L, LUA_REGISTRYINDEX, name);
+ 	if (!lua_isuserdata (L, -1))
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r102.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r102.ebuild
new file mode 100644
index 000000000000..9ed41c811d45
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r102.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit gnome2 lua-single multilib-minimal
+
+DESCRIPTION="GTK+2 standard engines and themes"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="accessibility lua"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+# Lua dependency uses lua_gen_impl_dep() because LUA_REQ_USE doesn't seem
+# to play nicely with MULTILIB_USEDEP.
+RDEPEND="
+	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+	lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.31
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glib.h.patch
+	"${FILESDIR}"/${P}-java-look.patch
+	"${FILESDIR}"/${P}-auto-mnemonics.patch
+	"${FILESDIR}"/${P}-change-bullet.patch
+	"${FILESDIR}"/${P}-tooltips.patch
+	"${FILESDIR}"/${P}-window-dragging.patch
+	"${FILESDIR}"/${P}-slibtool.patch #766680
+	"${FILESDIR}"/${P}-automake-1.14.patch # taken from Debian
+	"${FILESDIR}/${P}-lua.patch" #919421
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	# pkgconfig wrapper set up by lua-single.eclass is not multilib-compatible
+	# at present so point Autoconf directly to the correct implementation.
+	sed -i -e "/PKG_CHECK_MODULES(LUA,/s|lua|${ELUA}|" configure.ac || die
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local confopts=(
+		--enable-animation
+		$(multilib_native_use_enable lua)
+		$(multilib_native_use_with lua system-lua)
+	)
+	ECONF_SOURCE=${S} gnome2_src_configure "${confopts[@]}"
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}