Hello community, here is the log from the commit of package gtk3 for openSUSE:Factory checked in at 2013-08-30 17:16:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk3 (Old) and /work/SRC/openSUSE:Factory/.gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtk3" Changes: -------- --- /work/SRC/openSUSE:Factory/gtk3/gtk3.changes 2013-08-16 12:22:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtk3.new/gtk3.changes 2013-08-30 17:16:32.000000000 +0200 @@ -1,0 +2,34 @@ +Thu Aug 22 14:28:42 UTC 2013 - dimstar@opensuse.org + +- Add gtk3-password-hint-timeout.patch: Revert the removal of + password-hint-timeout: We do go with upstreams defined 600ms to + show the last character of the password (stay close), but we do + want to keep the configure option. Users that are really worried + about this can change the settings in .gtkrc. +- Add the default configure value as comment in settings.ini, to + make it easier discoverable. + +------------------------------------------------------------------- +Wed Aug 21 06:47:04 UTC 2013 - dimstar@opensuse.org + +- Update to version 3.9.12: + + GtkInfoBar now uses a GtkRevealer internally to slide in place. + + GtkHeaderBar can now add a window close button. + + The fine adjustment mode for scrolling has been revamped to be + easier discoverable, and visual feedback and autoscrolling has + been added. + + GtkIconTheme now supports 2x scaled icons for hi-dpi displays. + + The Wayland and X11 clipboard implementations can now coexist. + + Bugs fixed: bgo#448637, bgo#672220, bgo#674108, bgo#680926, + bgo#688738, bgo#692548, bgo#694831, bgo#697127, bgo#697399, + bgo#700029, bgo#701571, bgo#702144, bgo#702971, bgo#704173, + bgo#704334, bgo#704703, bgo#705068, bgo#705181, bgo#705182, + bgo#705215, bgo#705320, bgo#705372, bgo#705443, bgo#705498, + bgo#705524, bgo#705529, bgo#705558, bgo#705601, bgo#705605, + bgo#705624, bgo#705640, bgo#705672, bgo#705692, bgo#705750, + bgo#705765, bgo#705809, bgo#705918, bgo#706014, bgo#706045, + bgo#706152, bgo#706220, bgo#706028, bgo#706335. + + Updated translations. +- Add gtk3-build-without-wayland.patch: Fix build without wayland. + +------------------------------------------------------------------- Old: ---- gtk+-3.9.10.tar.xz New: ---- gtk+-3.9.12.tar.xz gtk3-build-without-wayland.patch gtk3-password-hint-timeout.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3.spec ++++++ --- /var/tmp/diff_new_pack.Sa32a2/_old 2013-08-30 17:16:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Sa32a2/_new 2013-08-30 17:16:34.000000000 +0200 @@ -25,7 +25,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.9.10 +Version: 3.9.12 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ @@ -44,6 +44,10 @@ Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch # PATCH-FIX-UPSTREAM gtk3-find-wayland-includedir.patch bgo#696507 zaitor@opensuse.org -- Make configure find wayland include files. Patch4: gtk3-find-wayland-includedir.patch +# PATCH-FIX-UPSTREAM gtk3-build-without-wayland.patch bgo#706461 dimstar@opensuse.org -- fix build without wayland, taken from git. +Patch5: gtk3-build-without-wayland.patch +# PATCH-FEATURE-OPENSUSE gtk3-password-hint-timeout.patch bgo#706563 dimstar@opensuse.org -- Revert commit 4b5a38, re-introduce gtk-entry-password-hint-timeout +Patch6: gtk3-password-hint-timeout.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -53,7 +57,7 @@ BuildRequires: xsltproc BuildRequires: pkgconfig(atk) >= 2.7.5 BuildRequires: pkgconfig(atk-bridge-2.0) -BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(cairo) >= 1.12.0 BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.27.1 @@ -315,6 +319,8 @@ %if %{build_wayland_backend} %patch4 -p1 %endif +%patch5 -p1 +%patch6 -p1 %build # Needed for patch1 and patch4 ++++++ gtk+-3.9.10.tar.xz -> gtk+-3.9.12.tar.xz ++++++ /work/SRC/openSUSE:Factory/gtk3/gtk+-3.9.10.tar.xz /work/SRC/openSUSE:Factory/.gtk3.new/gtk+-3.9.12.tar.xz differ: char 25, line 1 ++++++ gtk3-build-without-wayland.patch ++++++

From ec26a909f69e12dee1d151c8795f62d794fe7b24 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool <compnerd@compnerd.org> Date: Wed, 21 Aug 2013 02:30:05 +0000 Subject: clipboard: fix build without wayland

Signed-off-by: Saleem Abdulrasool <compnerd@compnerd.org> --- diff --git a/gtk/gtkclipboard-wayland.c b/gtk/gtkclipboard-wayland.c index 8ab1730..d3eb906 100644 --- a/gtk/gtkclipboard-wayland.c +++ b/gtk/gtkclipboard-wayland.c @@ -23,6 +23,8 @@ #include "gtkclipboard-waylandprivate.h" +#ifdef GDK_WINDOWING_WAYLAND + #include <string.h> #include "gtkmain.h" @@ -30,8 +32,6 @@ #include "gtkintl.h" #include "gtkselectionprivate.h" -#ifdef GDK_WINDOWING_WAYLAND - static void gtk_clipboard_wayland_owner_change (GtkClipboard *clipboard, GdkEventOwnerChange *event); static gboolean gtk_clipboard_wayland_set_contents (GtkClipboard *clipboard, diff --git a/gtk/gtkclipboard-waylandprivate.h b/gtk/gtkclipboard-waylandprivate.h index 7a5b58e..d2d1f22 100644 --- a/gtk/gtkclipboard-waylandprivate.h +++ b/gtk/gtkclipboard-waylandprivate.h @@ -18,11 +18,13 @@ #ifndef __GTK_CLIPBOARD_WAYLAND_WAYLAND_PRIVATE_H__ #define __GTK_CLIPBOARD_WAYLAND_WAYLAND_PRIVATE_H__ -#include <gdk/wayland/gdkwayland.h> -#include <gtk/gtkclipboardprivate.h> +#include <gdk/gdk.h> #ifdef GDK_WINDOWING_WAYLAND +#include <gdk/wayland/gdkwayland.h> +#include <gtk/gtkclipboardprivate.h> + #define GTK_TYPE_CLIPBOARD_WAYLAND (gtk_clipboard_wayland_get_type ()) #define GTK_CLIPBOARD_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD_WAYLAND, GtkClipboardWayland)) #define GTK_IS_CLIPBOARD_WAYLAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD_WAYLAND)) -- cgit v0.9.2 ++++++ gtk3-password-hint-timeout.patch ++++++

From 4b5a389e88af7e7a1fa9e33294642dcfbc2832ec Mon Sep 17 00:00:00 2001 From: William Jon McCann <william.jon.mccann@gmail.com> Date: Wed, 10 Jul 2013 16:13:12 +0000 Subject: Deprecate and ignore gtk-entry-password-hint-timeout

This feature offers a number of benefits related to providing feedback to the user when the password is masked. Some experts have argued that password masking is harmful. I tend to agree with this setting providing a better and more moderate solution. Some agree: https://www.schneier.com/blog/archives/2009/07/the_pros_and_co.html In order to further lessen the impact I've only enabled the feature on the primary display since the likelyhood of a non-primary display being visible by others is higher. --- Index: gtk+-3.9.12/gtk/gtkentry.c =================================================================== --- gtk+-3.9.12.orig/gtk/gtkentry.c +++ gtk+-3.9.12/gtk/gtkentry.c @@ -117,7 +117,6 @@ #define MIN_ENTRY_WIDTH 150 #define DRAW_TIMEOUT 20 #define PASSWORD_HINT_MAX 8 -#define PASSWORD_HINT_TIMEOUT 600 #define MAX_ICONS 2 @@ -5177,6 +5176,7 @@ buffer_inserted_text (GtkEntryBuffer *bu GtkEntry *entry) { GtkEntryPrivate *priv = entry->priv; + guint password_hint_timeout; guint current_pos; gint selection_bound; @@ -5193,18 +5193,11 @@ buffer_inserted_text (GtkEntryBuffer *bu /* Calculate the password hint if it needs to be displayed. */ if (n_chars == 1 && !priv->visible) { - GdkScreen *screen; - gint primary_num; - gint monitor_num; - - screen = gtk_widget_get_screen (GTK_WIDGET (entry)); - primary_num = gdk_screen_get_primary_monitor (screen); - monitor_num = gdk_screen_get_monitor_at_window (screen, priv->text_area); - - /* Only show password hint on the primary monitor to help avoid - showing passwords on presentations and the like. Would be - better if we had an explicit presentation mode. */ - if (primary_num == monitor_num) + g_object_get (gtk_widget_get_settings (GTK_WIDGET (entry)), + "gtk-entry-password-hint-timeout", &password_hint_timeout, + NULL); + + if (password_hint_timeout > 0) { GtkEntryPasswordHint *password_hint = g_object_get_qdata (G_OBJECT (entry), quark_password_hint); @@ -5218,7 +5211,7 @@ buffer_inserted_text (GtkEntryBuffer *bu password_hint->position = position; if (password_hint->source_id) g_source_remove (password_hint->source_id); - password_hint->source_id = gdk_threads_add_timeout (PASSWORD_HINT_TIMEOUT, + password_hint->source_id = gdk_threads_add_timeout (password_hint_timeout, (GSourceFunc)gtk_entry_remove_password_hint, entry); } } Index: gtk+-3.9.12/gtk/gtksettings.c =================================================================== --- gtk+-3.9.12.orig/gtk/gtksettings.c +++ gtk+-3.9.12/gtk/gtksettings.c @@ -1327,16 +1327,14 @@ gtk_settings_class_init (GtkSettingsClas * last char. 600 is a good value for enabling it. * * Since: 2.10 - * - * Deprecated: 3.10: This setting is ignored */ result = settings_install_property_parser (class, g_param_spec_uint ("gtk-entry-password-hint-timeout", P_("Password Hint Timeout"), P_("How long to show the last input character in hidden entries"), 0, G_MAXUINT, - 600, - GTK_PARAM_READWRITE | G_PARAM_DEPRECATED), + 600, + GTK_PARAM_READWRITE), NULL); g_assert (result == PROP_ENTRY_PASSWORD_HINT_TIMEOUT); ++++++ settings.ini ++++++ --- /var/tmp/diff_new_pack.Sa32a2/_old 2013-08-30 17:16:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Sa32a2/_new 2013-08-30 17:16:34.000000000 +0200 @@ -11,3 +11,4 @@ #gtk-theme-name = #gtk-icon-theme-name = #gtk-fallback-icon-theme = gnome +#gtk-entry-password-hint-timeout = 600 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org