From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 18C8A138A1F for ; Sun, 20 Apr 2014 18:17:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 579CCE09D2; Sun, 20 Apr 2014 18:17:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B3E1E09BE for ; Sun, 20 Apr 2014 18:17:40 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E51133FE60 for ; Sun, 20 Apr 2014 18:17:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0ED40187A9 for ; Sun, 20 Apr 2014 18:17:36 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1398008910.ce681553520b9ea3372eb3d7c9aa360a2f2b8c94.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch x11-libs/gtk+/gtk+-3.12.0.ebuild x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/files/ x11-libs/gtk+/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: ce681553520b9ea3372eb3d7c9aa360a2f2b8c94 X-VCS-Branch: master Date: Sun, 20 Apr 2014 18:17:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f4f9dceb-2c81-42f5-9667-4aa3b96c2321 X-Archives-Hash: 8839290fe1dd75ce48a81890ae607e71 commit: ce681553520b9ea3372eb3d7c9aa360a2f2b8c94 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Apr 20 15:38:08 2014 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 20 15:48:30 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ce681553 x11-libs/gtk+: QAed * Packagekit support was dropped. * Cosmetic changes to dependencies. * Fix keywords. * Sync live ebuild. --- .../gtk+/files/gtk+-3.3.18-fallback-theme.patch | 81 ---------------------- x11-libs/gtk+/gtk+-3.12.0.ebuild | 17 +++-- x11-libs/gtk+/gtk+-9999.ebuild | 41 ++++++----- 3 files changed, 28 insertions(+), 111 deletions(-) diff --git a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch deleted file mode 100644 index 7f5d0a1..0000000 --- a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 1a3f790830c2db70eb3369e684c3cd8ac3b8051b Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Wed, 14 Mar 2012 23:08:53 -0400 -Subject: [PATCH] settings: fall back to settings.ini gtk theme if requested - theme fails - -If a gtk3 application is run in gnome2 and the settings daemon uses -xsettings to request a gtk2 theme with no gtk3 version (which is the -case by default), then instead of failing to load any theme, we should -attempt to fall back to the theme specified in settings.ini files. - -https://bugzilla.gnome.org/show_bug.cgi?id=654108 ---- - gtk/gtksettings.c | 23 +++++++++++++++++++++++ - 1 files changed, 23 insertions(+), 0 deletions(-) - -diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c -index 2e17430..354ba34 100644 ---- a/gtk/gtksettings.c -+++ b/gtk/gtksettings.c -@@ -115,6 +115,7 @@ struct _GtkSettingsPrivate - GtkCssProvider *theme_provider; - GtkCssProvider *key_theme_provider; - GtkStyleProperties *style; -+ gchar *fallback_gtk_theme_name; - }; - - typedef enum -@@ -1528,6 +1529,8 @@ gtk_settings_finalize (GObject *object) - if (priv->style) - g_object_unref (priv->style); - -+ g_free (priv->fallback_gtk_theme_name); -+ - G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object); - } - -@@ -1889,6 +1892,12 @@ apply_queued_setting (GtkSettings *settings, - if (pspec->param_id == PROP_COLOR_SCHEME) - merge_color_scheme (settings, &tmp_value, qvalue->source); - -+ if (!g_strcmp0 (pspec->name, "gtk-theme-name") && qvalue->source == GTK_SETTINGS_SOURCE_DEFAULT) -+ { -+ g_free (priv->fallback_gtk_theme_name); -+ priv->fallback_gtk_theme_name = g_value_dup_string (&tmp_value); -+ } -+ - if (priv->property_values[pspec->param_id - 1].source <= qvalue->source) - { - g_value_copy (&tmp_value, &priv->property_values[pspec->param_id - 1].value); -@@ -2594,6 +2603,10 @@ _gtk_settings_reset_rc_values (GtkSettings *settings) - } - i++; - } -+ -+ g_free (priv->fallback_gtk_theme_name); -+ priv->fallback_gtk_theme_name = NULL; -+ - g_object_thaw_notify (G_OBJECT (settings)); - g_free (pspecs); - } -@@ -2881,6 +2894,16 @@ settings_update_theme (GtkSettings *settings) - - if (!provider) - provider = gtk_css_provider_get_named (theme_name, NULL); -+ -+ /* If we failed, fall back to the theme from settings.ini */ -+ if (!provider && priv->fallback_gtk_theme_name && *priv->fallback_gtk_theme_name -+ && g_strcmp0 (theme_name, priv->fallback_gtk_theme_name)) -+ { -+ provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL); -+ -+ if (!provider) -+ provider = gtk_css_provider_get_named (priv->fallback_gtk_theme_name, NULL); -+ } - } - - /* If we didn't find the named theme, fall back */ --- -1.7.8.5 - diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.0.ebuild index d891bcc..ee97028 100644 --- a/x11-libs/gtk+/gtk+-3.12.0.ebuild +++ b/x11-libs/gtk+/gtk+-3.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.10.8.ebuild,v 1.4 2014/04/16 07:49:22 ago Exp $ +# $Header: $ EAPI="5" GCONF_DEBUG="no" @@ -18,12 +18,12 @@ SLOT="3" # * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html # I tried this and got it all compiling, but the end result is unusable as it # horribly mixes up the backends -- grobian -IUSE="aqua cloudprint colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama" +IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama" REQUIRED_USE=" || ( aqua wayland X ) xinerama? ( X )" -KEYWORDS="~alpha amd64 ~arm ~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" +KEYWORDS="~alpha ~amd64 ~arm ~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" # FIXME: introspection data is built against system installation of gtk+:3 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) @@ -38,10 +38,11 @@ COMMON_DEPEND=" >=x11-libs/pango-1.32.4[introspection?] x11-misc/shared-mime-info + cloudprint? ( + >=net-libs/rest-0.7 + >=dev-libs/json-glib-1.0 ) colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2 ) - cloudprint? ( >=net-libs/rest-0.7 - >=dev-libs/json-glib-1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.39 ) wayland? ( >=dev-libs/wayland-1.3.90 @@ -87,7 +88,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !=x11-libs/pango-1.32.4[introspection?] x11-misc/shared-mime-info + cloudprint? ( + >=net-libs/rest-0.7 + >=dev-libs/json-glib-1.0 ) colord? ( >=x11-misc/colord-0.1.9 ) cups? ( >=net-print/cups-1.2 ) - introspection? ( >=dev-libs/gobject-introspection-1.32 ) + introspection? ( >=dev-libs/gobject-introspection-1.39 ) wayland? ( - >=dev-libs/wayland-1.2 + >=dev-libs/wayland-1.3.90 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) @@ -71,7 +76,7 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.11 + >=dev-util/gtk-doc-am-1.20 virtual/pkgconfig X? ( x11-proto/xextproto @@ -87,7 +92,7 @@ DEPEND="${COMMON_DEPEND} if [[ ${PV} = 9999 ]]; then DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.11 )" + doc? ( >=dev-util/gtk-doc-1.20 )" fi # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 @@ -97,7 +102,6 @@ fi RDEPEND="${COMMON_DEPEND} !