x11-libs/gtk+: Revision bump. x11-misc/gtkdialog: Copy from gentoo repository

Signed-off-by: Martin Väth <martin@mvath.de>

10 files changed, 199 insertions, 14 deletions

diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index fad8df2d..64a94f13 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -125,5 +125,6 @@ www-plugins/google-translator-for-firefox 3.0.3.3: Firefox webextension: transla
 www-plugins/no-color 0.9.4: Firefox webextension: remove colors and background images from the page
 www-plugins/noscript 11.4.8: Firefox webextension: restrict active contents like java/javascript/flash
 www-plugins/translate-to-me 1.1: Firefox webextension: translate the selected text with www.linguee.com
-x11-libs/gtk+ 2.24.33 3.24.34: Gimp ToolKit +
+x11-libs/gtk+ 2.24.33-r2 3.24.34-r1: Gimp ToolKit +
 x11-libs/motif 2.3.8-r3: The Motif user interface component toolkit
+x11-misc/gtkdialog 0.8.3_p20200202: A small utility for fast and easy GUI building
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d3984274..805b4547 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -143,3 +143,4 @@ x11-libs/gtk+:broadway - Enable the GDK Broadway backend.
 x11-libs/gtk+:colord - Use x11-misc/colord for color management in printing
 x11-libs/gtk+:sysprof - Enable profiling data capture support using dev-util/sysprof-capture
 x11-libs/motif:motif22-compatibility - Compatibility with Open Motif 2.2
+x11-misc/gtkdialog:gtk2 - Build with GTK+2 instead of GTK+3
diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc
new file mode 100644
index 00000000..8d178343
--- /dev/null
+++ b/x11-libs/gtk+/files/gtkrc
@@ -0,0 +1,39 @@
+style "default"
+
+{
+ font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
+}
+
+style "button" = "default"
+
+{ 
+ bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
+}
+
+style "treeitem"
+{
+bg[ACTIVE] = { 0.7, 0.7, 0.9 }
+}
+
+style "scrollbar" = "button" 
+{
+ bg[ACTIVE] = {0.6, 0.6, 0.6 }
+}
+
+style "status" {
+ bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
+}
+
+style "gtk-tooltips" {
+ bg[NORMAL] = "#ffff60"
+}
+
+class "GtkWidget" style "default" 
+class "GtkButton" style "button"
+class "GtkItem" style "button"
+class "GtkProgressBar" style "status"
+class "GtkScrollbar" style "scrollbar"
+class "GtkTreeItem" style "treeitem"
+widget "gtk-tooltips" style "gtk-tooltips"
+
+
diff --git a/x11-libs/gtk+/gtk+-2.24.33.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r2.ebuild
index 018060e6..103b7ab7 100644
--- a/x11-libs/gtk+/gtk+-2.24.33.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33-r2.ebuild
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
 	virtual/libintl[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
 	x11-misc/shared-mime-info
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	!aqua? (
-		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
+		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg(+),X,${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
@@ -219,17 +219,13 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# see bug #133241
 	# Also set more default variables in sync with gtk3 and other distributions
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
-	if use adwaita-icon-theme ; then
-		echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc"
-	else
-		echo 'gtk-icon-theme-name = "gnome"' >> "${T}/gtkrc"
-	fi
-	echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
-
 	insinto /usr/share/gtk-2.0
-	doins "${T}"/gtkrc
+	newins - gtkrc <<- 'EOF'
+	gtk-fallback-icon-theme = "gnome"
+	gtk-theme-name = "Adwaita"
+	gtk-icon-theme-name = "$(usex Adwaita gnome)"
+	gtk-cursor-theme-name = "Adwaita"
+	EOF
 
 	einstalldocs
 	rm "${ED}"/usr/share/doc/${P}/ChangeLog # empty file
diff --git a/x11-libs/gtk+/gtk+-3.24.34.ebuild b/x11-libs/gtk+/gtk+-3.24.34-r1.ebuild
index b29fdfb7..ab9d5f6a 100644
--- a/x11-libs/gtk+/gtk+-3.24.34.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.34-r1.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	>=media-libs/harfbuzz-2.2.0:=
 	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
 	virtual/libintl[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
 	x11-misc/shared-mime-info
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
new file mode 100644
index 00000000..374ad281
--- /dev/null
+++ b/x11-misc/gtkdialog/Manifest
@@ -0,0 +1 @@
+DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch
new file mode 100644
index 00000000..21697cfc
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch
@@ -0,0 +1,11 @@
+--- a/src/variables.c
++++ b/src/variables.c
+@@ -1113,7 +1113,7 @@
+ 		actual = root;
+ 
+ 	if (actual == NULL)
+-		return;
++		return 0;
+ 
+ 	if (actual->left != NULL)
+ 		n = do_variables_count_widgets(actual->left, n);
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch
new file mode 100644
index 00000000..86fa6a97
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch
@@ -0,0 +1,51 @@
+--- a/src/gtkdialog.h
++++ b/src/gtkdialog.h
+@@ -40,24 +40,24 @@
+ #define GTKD_FUNCTION_SIGNALS_BLOCK (function_signals_block++)
+ #define GTKD_FUNCTION_SIGNALS_UNBLOCK (function_signals_block--)
+ #define GTKD_FUNCTION_SIGNALS_RESET (function_signals_block = FALSE)
+-gint function_signals_block;
++extern gint function_signals_block;
+ 
+ /* Thunor: Used to control/override the widget packing expand and fill
+  * states at the project level */
+-gint project_space_expand;
+-gint project_space_fill;
++extern gint project_space_expand;
++extern gint project_space_fill;
+ 
+ /* The most recently created radiobutton widget (used for grouping) */
+-GtkWidget *lastradiowidget;
++extern GtkWidget *lastradiowidget;
+ 
+ /* An accumulated list of menu accelerator groups to be added to the window */
+-GList *accel_groups;
++extern GList *accel_groups;
+ 
+ /* A list of widgets to hide and to show */
+-GList *widget_hide_list, *widget_show_list;
++extern GList *widget_hide_list, *widget_show_list;
+ 
+ /* An auto-incremented unique id for each window created */
+-gint window_id;
++extern gint window_id;
+ 
+ void reset_program_source(void);
+ //Redundant: gint set_program_source(gchar *name);
+--- a/src/gtkdialog.c
++++ b/src/gtkdialog.c
+@@ -82,6 +82,14 @@
+ gint geometry_x = 0;
+ gint geometry_y = 0;
+ 
++gint function_signals_block;
++gint project_space_expand;
++gint project_space_fill;
++GtkWidget *lastradiowidget;
++GList *accel_groups;
++GList *widget_hide_list, *widget_show_list;
++gint window_id;
++
+ static gboolean 
+ get_geometry(const char *argument)
+ {
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
new file mode 100644
index 00000000..98d5e081
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg-utils
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="https://github.com/oshazard/gtkdialog"
+SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gtk2"
+
+RDEPEND="
+	gtk2? (
+		x11-libs/gtk+:2
+		x11-libs/vte:0=
+	)
+	!gtk2? (
+		x11-libs/gtk+:3
+		x11-libs/vte:2.91=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+	"${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex gtk2 --disable-gtk3  --enable-gtk3)
+}
+
+src_compile() {
+	emake -C doc stamp-vti
+	default
+}
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
new file mode 100644
index 00000000..756afb6f
--- /dev/null
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		gtkdialog is a GUI-creation utility that can be used with an arbitrary
+		interpreter. It enables the programmer to describe a graphical user interface
+		in a simple XML-like language, and use it with any interpreter that supports
+		either files, standard I/O, or environment variables. It can be called as an
+		external program from the interpreter, but can be used as a stand-alone
+		framework for the application as well. Stand-alone, bash, and awk examples are
+		provided.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">oshazard/gtkdialog</remote-id>
+	</upstream>
+	<use>
+		<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
+	</use>
+</pkgmetadata>