diff options
author | Martin Väth <martin@mvath.de> | 2016-09-02 20:03:45 +0200 |
---|---|---|
committer | Martin Väth <martin@mvath.de> | 2016-09-02 20:03:45 +0200 |
commit | 7f61bff3236cb957b1993724efb963fe41009d0f (patch) | |
tree | 85a77e0982df8d19b13d3328011d8c43a5a6dc0f /x11-libs | |
parent | dev-libs/glib, dev-util/gdbus-codegen: Version bump (gnome-next); EAPI=6 (diff) | |
download | mv-7f61bff3236cb957b1993724efb963fe41009d0f.tar.gz mv-7f61bff3236cb957b1993724efb963fe41009d0f.tar.bz2 mv-7f61bff3236cb957b1993724efb963fe41009d0f.zip |
x11-libs/gtk+: Add from gnome-next, but with sane dependencies
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gtk+/Manifest | 1 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch | 24 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch | 21 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch | 16 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch | 25 | ||||
-rw-r--r-- | x11-libs/gtk+/files/settings.ini | 4 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-3.21.4.ebuild | 242 | ||||
-rw-r--r-- | x11-libs/gtk+/metadata.xml | 29 |
8 files changed, 362 insertions, 0 deletions
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 <tranquility@gentoo.org> +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 <gtk/gtkaccessible.h> + + #ifdef GDK_WINDOWING_X11 ++#ifdef HAVE_ATK_BRIDGE + #include <atk-bridge.h> + #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} + !<gnome-base/gail-1000 + !<x11-libs/vte-0.31.0:2.90 + adwaita-icon-theme? ( >=x11-themes/adwaita-icon-theme-3.14 ) + !adwaita-icon-theme? ( x11-themes/hicolor-icon-theme virtual/freedesktop-icon-theme ) + X? ( !<x11-base/xorg-server-1.11.4 ) +" +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 +PDEPEND=" + adwaita-icon-theme? ( gnome-base/librsvg[${MULTILIB_USEDEP}] ) + vim-syntax? ( app-vim/gtk-syntax ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gtk-query-immodules-3.0 +) + +strip_builddir() { + local rule=$1 + shift + local directory=$1 + shift + sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ + || die "Could not strip director ${directory} from build." +} + +src_prepare() { + # -O3 and company cause random crashes in applications. Bug #133469 + replace-flags -O3 -O2 + strip-flags + + if ! use test ; then + # don't waste time building tests + strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} + + # the tests dir needs to be build now because since commit + # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there + # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} + fi + + if ! use examples; then + # don't waste time building demos + strip_builddir SRC_SUBDIRS demos Makefile.{am,in} + strip_builddir SRC_SUBDIRS examples Makefile.{am,in} + fi + + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + eapply "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch + + # Use patches from BSD to make gtk3-atk-bridge (at-spi2-atk) a true option- + # This was intentionally removed by upstream, see + # https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html + eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch + eapply "${FILESDIR}"/${PN}-atk-bridge-config.h.in.patch + eapply "${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch + + gnome2_src_prepare + AT_NOELIBTOOLIZE=yes eautoreconf +} + +multilib_src_configure() { + # need libdir here to avoid a double slash in a path that libtool doesn't + # grok so well during install (// between $EPREFIX and usr ...) + ECONF_SOURCE=${S} \ + gnome2_src_configure \ + $(use_enable aqua quartz-backend) \ + $(use_enable broadway broadway-backend) \ + $(use_enable cloudprint) \ + $(use_enable colord) \ + $(use_enable cups cups auto) \ + $(multilib_native_use_enable introspection) \ + $(use_enable wayland wayland-backend) \ + $(use_enable X x11-backend) \ + $(use_enable X xcomposite) \ + $(use_enable X xdamage) \ + $(use_enable X xfixes) \ + $(use_enable X xkb) \ + $(use_enable X xrandr) \ + $(use_enable xinerama) \ + $(use_with at-spi2-atk atk-bridge) \ + --disable-papi \ + --disable-mir-backend \ + --enable-man \ + --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" + + # work-around gtk-doc out-of-source brokedness + if multilib_is_native_abi; then + local d + for d in gdk gtk libgail-util; do + ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die + done + fi +} + +multilib_src_test() { + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die + GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + einstalldocs +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make immodules.cache belongs to gtk+ alone + local cache="usr/$(get_libdir)/gtk-3.0/3.0.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_gtk3 \ + || die "Update immodules cache failed (for ${ABI})" + } + multilib_parallel_foreach_abi multilib_pkg_postinst + + 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 settings.ini file." + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache + } + multilib_foreach_abi multilib_pkg_postrm + fi +} diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml new file mode 100644 index 00000000..2d1d6f8b --- /dev/null +++ b/x11-libs/gtk+/metadata.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>martin@mvath.de</email> + <name>Martin Väth</name> + <description>maintainer of the updates in the mv overlay</description> + </maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription> + 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. + </longdescription> + <use> + <flag name="adwaita-icon-theme">Force the adwaita-icon-theme</flag> + <flag name="at-spi2-atk">Enable the gtk3-atk-bridge, hard depending on app-accessibility/at-spi2-atk and thus on sys-apps/dbus</flag> + <flag name="broadway">Enable the GDK Broadway backend.</flag> + <flag name="cloudprint">Enable printing via Google Cloud Print.</flag> + <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management in printing</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id> + </upstream> +</pkgmetadata> |