1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143 | diff -Nru gtk+3.0-3.14.8/debian/changelog gtk+3.0-3.14.8/debian/changelog
--- gtk+3.0-3.14.8/debian/changelog 2015-02-09 18:00:40.000000000 +0000
+++ gtk+3.0-3.14.8/debian/changelog 2015-03-05 16:54:32.000000000 +0000
@@ -1,3 +1,9 @@
+gtk+3.0 (3.14.8-0ubuntu2) UNRELEASED; urgency=medium
+
+ * test
+
+ -- Iain Lane <iain@orangesquash.org.uk> Thu, 05 Mar 2015 16:54:28 +0000
+
gtk+3.0 (3.14.8-0ubuntu1) vivid; urgency=medium
* Fallback icon themes are deprecated & ignored upstream, drop the patch and
diff -Nru gtk+3.0-3.14.8/debian/control gtk+3.0-3.14.8/debian/control
--- gtk+3.0-3.14.8/debian/control 2015-02-09 18:00:40.000000000 +0000
+++ gtk+3.0-3.14.8/debian/control 2015-03-05 17:13:42.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Dmitry Shachnev <mitya57@debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Dmitry Shachnev <mitya57@debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.11),
@@ -15,7 +15,7 @@
autotools-dev,
dbus-x11,
gsettings-desktop-schemas,
- adwaita-icon-theme (>= 3.14.0-2ubuntu3~),
+ adwaita-icon-theme (>= 3.14.0-2ubuntu7~),
at-spi2-core,
libglib2.0-dev (>= 2.41.2),
libgdk-pixbuf2.0-dev (>= 2.30.0),
diff -Nru gtk+3.0-3.14.8/debian/patches/message-dialog-restore-traditional-look-on-unity.patch gtk+3.0-3.14.8/debian/patches/message-dialog-restore-traditional-look-on-unity.patch
--- gtk+3.0-3.14.8/debian/patches/message-dialog-restore-traditional-look-on-unity.patch 2015-02-09 18:00:40.000000000 +0000
+++ gtk+3.0-3.14.8/debian/patches/message-dialog-restore-traditional-look-on-unity.patch 2015-03-05 17:13:34.000000000 +0000
@@ -9,11 +9,11 @@
testsuite/a11y/messagedialog.txt | 15 ++++++++++++++-
3 files changed, 65 insertions(+), 2 deletions(-)
-diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
-index 653f3fd..f4df43e 100644
+Index: b/gtk/gtkmessagedialog.c
+===================================================================
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
-@@ -104,6 +104,9 @@ struct _GtkMessageDialogPrivate
+@@ -104,6 +104,9 @@
GtkWidget *label;
GtkWidget *message_area; /* vbox for the primary and secondary labels, and any extra content from the caller */
GtkWidget *secondary_label;
@@ -23,7 +23,7 @@
guint has_primary_markup : 1;
guint has_secondary_text : 1;
-@@ -300,6 +303,9 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
+@@ -300,6 +303,9 @@
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkmessagedialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, label);
gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, secondary_label);
@@ -33,7 +33,7 @@
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkMessageDialog, message_area);
}
-@@ -323,7 +329,25 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
+@@ -323,7 +329,25 @@
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
G_GNUC_END_IGNORE_DEPRECATIONS
@@ -60,7 +60,7 @@
}
static void
-@@ -363,6 +387,7 @@ setup_type (GtkMessageDialog *dialog,
+@@ -363,6 +387,7 @@
{
GtkMessageDialogPrivate *priv = dialog->priv;
const gchar *name = NULL;
@@ -68,7 +68,7 @@
AtkObject *atk_obj;
if (priv->message_type == type)
-@@ -374,18 +399,22 @@ setup_type (GtkMessageDialog *dialog,
+@@ -374,18 +399,22 @@
{
case GTK_MESSAGE_INFO:
name = _("Information");
@@ -91,18 +91,20 @@
break;
case GTK_MESSAGE_OTHER:
-@@ -396,6 +425,9 @@ setup_type (GtkMessageDialog *dialog,
+@@ -396,6 +425,11 @@
break;
}
+ if (icon_name)
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), icon_name, GTK_ICON_SIZE_DIALOG);
+
++ gtk_widget_set_visible (priv->image, icon_name);
++
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog));
if (GTK_IS_ACCESSIBLE (atk_obj))
{
-diff --git a/gtk/resources/ui/gtkmessagedialog.ui b/gtk/resources/ui/gtkmessagedialog.ui
-index b3472ef..7c4577e 100644
+Index: b/gtk/resources/ui/gtkmessagedialog.ui
+===================================================================
--- a/gtk/resources/ui/gtkmessagedialog.ui
+++ b/gtk/resources/ui/gtkmessagedialog.ui
@@ -33,6 +33,24 @@
@@ -110,7 +112,7 @@
<property name="spacing">30</property>
<child>
+ <object class="GtkImage" id="image">
-+ <property name="visible">True</property>
++ <property name="visible">False</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">start</property>
@@ -130,11 +132,11 @@
<object class="GtkBox" id="message_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
-diff --git a/testsuite/a11y/messagedialog.txt b/testsuite/a11y/messagedialog.txt
-index 350a116..4e6ff7b 100644
+Index: b/testsuite/a11y/messagedialog.txt
+===================================================================
--- a/testsuite/a11y/messagedialog.txt
+++ b/testsuite/a11y/messagedialog.txt
-@@ -74,10 +74,23 @@ window1
+@@ -74,10 +74,23 @@
<AtkComponent>
layer: widget
alpha: 1
@@ -159,6 +161,3 @@
state: enabled sensitive showing vertical visible
toolkit: gtk
<AtkComponent>
---
-2.1.0
-
|