pool/gtk3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 197239 from home:dimstar:branches:GNOME:Factory

Browse Source 
Update to 3.9.14

OBS-URL: https://build.opensuse.org/request/show/197239
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=129
This commit is contained in:
Dominique Leuenberger 2013-09-07 13:19:37 +00:00 committed by Git OBS Bridge
parent 4d2441b3ac
commit 359a2e256c
6 changed files with 19 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk+-3.9.12.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b08a6c0816eb13c1504bdb9629bae794532854eb79a90934778a7ad9ecaa17d
size 13831736

3
gtk+-3.9.14.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17eef6b315d16191b56ec7d8daa7493192333101a79f5c92a67bb3c41a6c2cb3
size 13902572

52
gtk3-build-without-wayland.patch
View File

@ -1,52 +0,0 @@
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

91
gtk3-password-hint-timeout.patch
View File

@ -1,91 +0,0 @@
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);

15
gtk3.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Sep 3 06:44:25 UTC 2013 - dimstar@opensuse.org
- Update to version 3.9.14:
+ GtkLabel can now ellipsize just the last line, ellipsized in
multi-line labels.
+ Bugs fixed: bgo#680953, bgo#700428, bgo#701125, bgo#704278,
bgo#705980, bgo#706323, bgo#706448, bgo#706451, bgo#706493,
bgo#706529, bgo#706563, bgo#706592, bgo#706722, bgo#706728,
bgo#706740, bgo#706756, bgo#706778, bgo#706802, bgo#706870,
bgo#706922, bgo#706929, bgo#706938, bgo#707051, bgo#707201.
+ Updated translations.
- Drop gtk3-password-hint-timeout.patch: fixed upstream.
- Drop gtk3-build-without-wayland.patch: fixed upstream.
-------------------------------------------------------------------
Thu Aug 22 14:28:42 UTC 2013 - dimstar@opensuse.org

8
gtk3.spec
View File

@ -25,7 +25,7 @@
Name: gtk3
%define _name gtk+
Version: 3.9.12
Version: 3.9.14
Release: 0
Summary: The GTK+ toolkit library (version 3)
License: LGPL-2.1+
@ -44,10 +44,6 @@ Patch1: gtk3-path-local.patch
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
@ -319,8 +315,6 @@ cp -a %{S:1} .
%if %{build_wayland_backend}
%patch4 -p1
%endif
%patch5 -p1
%patch6 -p1
%build
# Needed for patch1 and patch4