From eff2faf247416b8304218b83831296ddfbd4f2fc Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Sat, 15 Oct 2022 10:26:33 +0200 Subject: x11-libs/gtk+: Revision bump. x11-misc/gtkdialog: Copy from gentoo repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Väth --- metadata/pkg_desc_index | 3 +- profiles/use.local.desc | 1 + x11-libs/gtk+/files/gtkrc | 39 +++ x11-libs/gtk+/gtk+-2.24.33-r2.ebuild | 320 ++++++++++++++++++++ x11-libs/gtk+/gtk+-2.24.33.ebuild | 324 --------------------- x11-libs/gtk+/gtk+-3.24.34-r1.ebuild | 260 +++++++++++++++++ x11-libs/gtk+/gtk+-3.24.34.ebuild | 260 ----------------- x11-misc/gtkdialog/Manifest | 1 + ...tkdialog-0.8.3-do_variables_count_widgets.patch | 11 + .../files/gtkdialog-0.8.3-fno-common.patch | 51 ++++ .../gtkdialog/gtkdialog-0.8.3_p20200202.ebuild | 65 +++++ x11-misc/gtkdialog/metadata.xml | 20 ++ 12 files changed, 770 insertions(+), 585 deletions(-) create mode 100644 x11-libs/gtk+/files/gtkrc create mode 100644 x11-libs/gtk+/gtk+-2.24.33-r2.ebuild delete mode 100644 x11-libs/gtk+/gtk+-2.24.33.ebuild create mode 100644 x11-libs/gtk+/gtk+-3.24.34-r1.ebuild delete mode 100644 x11-libs/gtk+/gtk+-3.24.34.ebuild create mode 100644 x11-misc/gtkdialog/Manifest create mode 100644 x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch create mode 100644 x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch create mode 100644 x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild create mode 100644 x11-misc/gtkdialog/metadata.xml 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-r2.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r2.ebuild new file mode 100644 index 00000000..103b7ab7 --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.24.33-r2.ebuild @@ -0,0 +1,320 @@ +# Copyright 1999-2022 Gentoo Authors and Martin V\"ath +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME2_EAUTORECONF="yes" + +inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="https://www.gtk.org/" +SRC_URI=${SRC_URI} + +LICENSE="LGPL-2+" +SLOT="2" +IUSE="adwaita-icon-theme aqua cups doc examples +introspection test vim-syntax xinerama" +REQUIRED_USE=" + xinerama? ( !aqua ) +" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Upstream wants us to do their job: +# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1 +RESTRICT="test" + +COMMON_DEPEND=" + >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}] + >=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/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + + 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/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + !aqua? ( x11-base/xorg-proto ) + test? ( + media-fonts/font-cursor-misc + media-fonts/font-misc-misc + x11-themes/hicolor-icon-theme + ) +" + +# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0 +# Add blocker against old gtk-builder-convert to be sure we maintain both +# in sync. +RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-2 + adwaita-icon-theme? ( + >=x11-themes/adwaita-icon-theme-3.14 + x11-themes/gnome-themes-standard + ) + ! "${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 - - einstalldocs - rm "${ED}"/usr/share/doc/${P}/ChangeLog # empty file - - # dev-util/gtk-builder-convert split off into a separate package, #402905 - rm "${ED}"/usr/bin/gtk-builder-convert || die - if use doc ; then - rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die - fi - - readme.gentoo_create_doc -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make immodules.cache belongs to gtk+ alone - local cache="/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" - - if [[ -e "${EROOT}${cache}" ]]; then - cp "${EROOT}${cache}" "${ED}${cache}" || die - else - touch "${ED}${cache}" || die - fi - } - multilib_parallel_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_query_immodules_gtk2 \ - || die "Update immodules cache failed (for ${ABI})" - } - multilib_parallel_foreach_abi multilib_pkg_postinst - - set_gtk2_confdir - - if [ -e "${EROOT}/etc/gtk-2.0/gtk.immodules" ]; then - elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST" - elog "aware location. Removing deprecated file." - rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules" - fi - - if [ -e "${EROOT}${GTK2_CONFDIR}/gtk.immodules" ]; then - elog "File /etc/gtk-2.0/gtk.immodules has been moved to" - elog "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" - elog "Removing deprecated file." - rm -f "${EROOT}${GTK2_CONFDIR}/gtk.immodules" - fi - - # pixbufs are now handled by x11-libs/gdk-pixbuf - if [ -e "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then - elog "File ${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" - elog "Removing deprecated file." - rm -f "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - fi - - # two checks needed since we dropped multilib conditional - if [ -e "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then - elog "File ${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" - elog "Removing deprecated file." - rm -f "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" - fi - - if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" - fi - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your gtkrc." - fi - - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" - } - multilib_foreach_abi multilib_pkg_postrm - fi -} diff --git a/x11-libs/gtk+/gtk+-3.24.34-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.34-r1.ebuild new file mode 100644 index 00000000..ab9d5f6a --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.24.34-r1.ebuild @@ -0,0 +1,260 @@ +# Copyright 1999-2022 Gentoo Authors and Martin V\"ath +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 multilib multilib-minimal virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="https://www.gtk.org/" +SRC_URI="${SRC_URI-}" + +LICENSE="LGPL-2+" +SLOT="3" +IUSE="adwaita-icon-theme aqua atk-bridge broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + xinerama? ( X ) +" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Upstream wants us to do their job: +# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 +RESTRICT="test" + +# FIXME: introspection data is built against system installation of gtk+:3, +# bug #???? +COMMON_DEPEND=" + >=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=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/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.17 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + atk-bridge? ( >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] ) + media-libs/mesa[X(+),${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.8[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + test? ( + media-fonts/font-cursor-misc + media-fonts/font-misc-misc + ) + X? ( x11-base/xorg-proto ) +" +# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 +# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 +RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-3 + !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 @@ + + + + + + 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. + + + oshazard/gtkdialog + + + Build with GTK+2 instead of GTK+3 + + -- cgit v1.2.3-65-gdbad