From 7f61bff3236cb957b1993724efb963fe41009d0f Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Fri, 2 Sep 2016 20:03:45 +0200 Subject: x11-libs/gtk+: Add from gnome-next, but with sane dependencies --- x11-libs/gtk+/Manifest | 1 + .../gtk+-3.16.2-remove_update-icon-cache.patch | 24 ++ .../gtk+/files/gtk+-atk-bridge-config.ac.patch | 21 ++ .../gtk+/files/gtk+-atk-bridge-config.h.in.patch | 16 ++ .../files/gtk+-atk-bridge-gtkaccessibility.patch | 25 +++ x11-libs/gtk+/files/settings.ini | 4 + x11-libs/gtk+/gtk+-3.21.4.ebuild | 242 +++++++++++++++++++++ x11-libs/gtk+/metadata.xml | 29 +++ 8 files changed, 362 insertions(+) create mode 100644 x11-libs/gtk+/Manifest create mode 100644 x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch create mode 100644 x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch create mode 100644 x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch create mode 100644 x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch create mode 100644 x11-libs/gtk+/files/settings.ini create mode 100644 x11-libs/gtk+/gtk+-3.21.4.ebuild create mode 100644 x11-libs/gtk+/metadata.xml (limited to 'x11-libs') diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest new file mode 100644 index 00000000..3ceeed29 --- /dev/null +++ b/x11-libs/gtk+/Manifest @@ -0,0 +1 @@ +DIST gtk+-3.21.4.tar.xz 20507568 SHA256 46bb46c420b1406dcb7d6034a9a4c80340f0db464fb98a8c271343bf56e43cf1 diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch new file mode 100644 index 00000000..b121dd57 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch @@ -0,0 +1,24 @@ +From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001 +From: Ole Reifschneider +Date: Thu, 16 Apr 2015 23:51:51 +0200 +Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS + +--- + gtk/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 83dfe31..a5afc03 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -1380,7 +1380,6 @@ endif + # + bin_PROGRAMS = \ + gtk-query-immodules-3.0 \ +- gtk-update-icon-cache \ + gtk-encode-symbolic-svg \ + gtk-launch + +-- +2.0.5 + diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch new file mode 100644 index 00000000..8388a744 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch @@ -0,0 +1,21 @@ +$NetBSD: patch-configure.ac,v 1.2 2014/09/08 12:06:48 wiz Exp $ + +Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. + +--- 1/configure.ac ++++ 2/configure.ac +@@ -1295,8 +1295,13 @@ AC_SUBST(GDK_DEP_CFLAGS) + # Check for Accessibility Toolkit flags + ######################################## + +-if test x$enable_x11_backend = xyes; then ++AC_ARG_WITH(atk-bridge, ++ AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]), ++ :, with_atk_bridge=yes) ++ ++if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then + ATK_PACKAGES="atk atk-bridge-2.0" ++ AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0]) + else + ATK_PACKAGES="atk" + fi diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch new file mode 100644 index 00000000..6dee2e42 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch @@ -0,0 +1,16 @@ +$NetBSD: patch-config.h.in,v 1.2 2014/09/08 12:06:48 wiz Exp $ + +Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. + +--- 1/config.h.in ++++ 1/config.h.in +@@ -21,6 +21,9 @@ + /* Define the location where the catalogs will be installed */ + #undef GTK_LOCALEDIR + ++/* Define if we're using atk-bridge-2.0 */ ++#undef HAVE_ATK_BRIDGE ++ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ + #undef HAVE_BIND_TEXTDOMAIN_CODESET + diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch new file mode 100644 index 00000000..276d2d16 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch @@ -0,0 +1,25 @@ +Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. +--- 1/gtk/a11y/gtkaccessibility.c ++++ 1/gtk/a11y/gtkaccessibility.c +@@ -38,8 +38,10 @@ + #include + + #ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + #include + #endif ++#endif + + static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, + guint n_param_values, +@@ -983,8 +985,10 @@ _gtk_accessibility_init (void) + do_window_event_initialization (); + + #ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + atk_bridge_adaptor_init (NULL, NULL); + #endif ++#endif + + atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); + } diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini new file mode 100644 index 00000000..a65c0a81 --- /dev/null +++ b/x11-libs/gtk+/files/settings.ini @@ -0,0 +1,4 @@ +[Settings] +gtk-theme-name = Adwaita +gtk-icon-theme-name = gnome +gtk-cursor-theme-name = Adwaita diff --git a/x11-libs/gtk+/gtk+-3.21.4.ebuild b/x11-libs/gtk+/gtk+-3.21.4.ebuild new file mode 100644 index 00000000..751ad226 --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.21.4.ebuild @@ -0,0 +1,242 @@ +# Copyright 2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +RESTRICT="mirror" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +IUSE="adwaita-icon-theme aqua at-spi2-atk broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + xinerama? ( X ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-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 #???? +# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) +COMMON_DEPEND=" + >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/glib-2.49.3:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + + cloudprint? ( + >=net-libs/rest-0.7[${MULTILIB_USEDEP}] + >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + wayland? ( + >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.0 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + at-spi2-atk? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] ) + x11-libs/libXrender[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.1.2 + dev-libs/libxslt + dev-libs/gobject-introspection-common + >=dev-util/gdbus-codegen-2.38.2 + >=dev-util/gtk-doc-am-1.20 + >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] + virtual/pkgconfig[${MULTILIB_USEDEP}] + X? ( + x11-proto/xextproto[${MULTILIB_USEDEP}] + x11-proto/xproto[${MULTILIB_USEDEP}] + x11-proto/inputproto[${MULTILIB_USEDEP}] + x11-proto/damageproto[${MULTILIB_USEDEP}] + xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) + ) + test? ( + media-fonts/font-misc-misc + media-fonts/font-cursor-misc ) +" +# 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 +# >=xorg-server-1.11.4 needed for +# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html +RDEPEND="${COMMON_DEPEND} + !=x11-themes/adwaita-icon-theme-3.14 ) + !adwaita-icon-theme? ( x11-themes/hicolor-icon-theme virtual/freedesktop-icon-theme ) + X? ( ! + + + + martin@mvath.de + Martin Väth + maintainer of the updates in the mv overlay + + + gnome@gentoo.org + Gentoo GNOME Desktop + + + GTK+ is a multi-platform toolkit for creating graphical user + interfaces. Offering a complete set of widgets, GTK+ is suitable + for projects ranging from small one-off projects to complete + application suites. + + + Force the adwaita-icon-theme + Enable the gtk3-atk-bridge, hard depending on app-accessibility/at-spi2-atk and thus on sys-apps/dbus + Enable the GDK Broadway backend. + Enable printing via Google Cloud Print. + Use x11-misc/colord for color management in printing + + + cpe:/a:gtk:gtk%2B + + -- cgit v1.2.3-65-gdbad