callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refresh patches & drop upstream ones

Browse Source 
debian/patches/Revert-Update-a11y-test-output.patch,
 debian/patches/Update-css-node-tests.patch: Dropped, now upstream.
This commit is contained in:
Iain Lane
2019-03-13 13:11:30 +00:00
parent 0fb8c339ab
commit 0a9d2be774
5 changed files with 5 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/patches/018_gdkenumtypes.c_location.patch vendored
View File

@ -19,7 +19,7 @@ Forwarded: yes
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 9550187..21c1c50 100644
index e25b57b..d3b9d32 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -243,8 +243,8 @@ if HAVE_INTROSPECTION

4
debian/patches/022_disable-viqr-im-for-vi-locale.patch vendored
View File

@ -9,6 +9,10 @@ MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
In the Vietnamese Quoted-Readable input method, punctuation following a
base letter is converted into diacritical marks, for example a( → ă.
(See <https://en.wikipedia.org/wiki/Vietnamese_Quoted-Readable>.)

280
debian/patches/Revert-Update-a11y-test-output.patch vendored
View File

@ -1,280 +0,0 @@
From: Jeremy Bicha <jbicha@debian.org>
Date: Mon, 14 Jan 2019 12:29:19 -0500
Subject: Revert "Update a11y test output"
This reverts commit c5d824d6c90bc6a7d72ac35a580fba7b9762d8cb.
---
testsuite/a11y/menu.txt | 8 --------
testsuite/a11y/menubutton.txt | 8 --------
testsuite/a11y/menubutton2.txt | 34 +++++++++++++---------------------
testsuite/a11y/menubutton3.txt | 34 +++++++++++++---------------------
testsuite/a11y/scale-drawvalue.txt | 8 --------
testsuite/a11y/tooltips.txt | 8 --------
6 files changed, 26 insertions(+), 74 deletions(-)
diff --git a/testsuite/a11y/menu.txt b/testsuite/a11y/menu.txt
index 1bcc611..3f5ba0d 100644
--- a/testsuite/a11y/menu.txt
+++ b/testsuite/a11y/menu.txt
@@ -7,14 +7,6 @@ window1
<AtkComponent>
layer: window
alpha: 1
- unnamed-GtkContainerAccessible-0
- "panel"
- parent: window1
- state: enabled sensitive showing visible
- toolkit: gtk
- <AtkComponent>
- layer: widget
- alpha: 1
menubar1
"menu bar"
parent: window1
diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index f896294..9bd6f3e 100644
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -7,14 +7,6 @@ window1
<AtkComponent>
layer: window
alpha: 1
- unnamed-GtkContainerAccessible-0
- "panel"
- parent: window1
- state: enabled sensitive showing visible
- toolkit: gtk
- <AtkComponent>
- layer: widget
- alpha: 1
menubutton
"toggle button"
parent: window1
diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index 32b6b73..d683449 100644
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -7,14 +7,6 @@ window1
<AtkComponent>
layer: window
alpha: 1
- unnamed-GtkContainerAccessible-0
- "panel"
- parent: window1
- state: enabled sensitive showing visible
- toolkit: gtk
- <AtkComponent>
- layer: widget
- alpha: 1
menubutton
"toggle button"
parent: window1
@@ -31,7 +23,7 @@ window1
<AtkAction>
action 0 name: click
action 0 description: Clicks the button
- unnamed-GtkPopoverAccessible-1
+ unnamed-GtkPopoverAccessible-0
"panel"
parent: menubutton
popup-for: menubutton
@@ -40,54 +32,54 @@ window1
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkStackAccessible-2
+ unnamed-GtkStackAccessible-1
"panel"
- parent: unnamed-GtkPopoverAccessible-1
+ parent: unnamed-GtkPopoverAccessible-0
index: 0
state: enabled sensitive visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkContainerAccessible-3
+ unnamed-GtkContainerAccessible-2
"filler"
- parent: unnamed-GtkStackAccessible-2
+ parent: unnamed-GtkStackAccessible-1
index: 0
state: enabled sensitive vertical visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkContainerAccessible-4
+ unnamed-GtkContainerAccessible-3
"filler"
- parent: unnamed-GtkContainerAccessible-3
+ parent: unnamed-GtkContainerAccessible-2
index: 0
state: enabled sensitive vertical visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkContainerAccessible-5
+ unnamed-GtkContainerAccessible-4
"filler"
- parent: unnamed-GtkContainerAccessible-4
+ parent: unnamed-GtkContainerAccessible-3
index: 0
state: enabled sensitive vertical visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkContainerAccessible-6
+ unnamed-GtkContainerAccessible-5
"filler"
- parent: unnamed-GtkContainerAccessible-5
+ parent: unnamed-GtkContainerAccessible-4
index: 0
state: enabled sensitive vertical visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkButtonAccessible-7
+ unnamed-GtkButtonAccessible-6
"push button"
- parent: unnamed-GtkContainerAccessible-6
+ parent: unnamed-GtkContainerAccessible-5
index: 0
name: New
state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index 32b6b73..d683449 100644
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -7,14 +7,6 @@ window1
<AtkComponent>
layer: window
alpha: 1
- unnamed-GtkContainerAccessible-0
- "panel"
- parent: window1
- state: enabled sensitive showing visible
- toolkit: gtk
- <AtkComponent>
- layer: widget
- alpha: 1
menubutton
"toggle button"
parent: window1
@@ -31,7 +23,7 @@ window1
<AtkAction>
action 0 name: click
action 0 description: Clicks the button
- unnamed-GtkPopoverAccessible-1
+ unnamed-GtkPopoverAccessible-0
"panel"
parent: menubutton
popup-for: menubutton
@@ -40,54 +32,54 @@ window1
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkStackAccessible-2
+ unnamed-GtkStackAccessible-1
"panel"
- parent: unnamed-GtkPopoverAccessible-1
+ parent: unnamed-GtkPopoverAccessible-0
index: 0
state: enabled sensitive visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkContainerAccessible-3
+ unnamed-GtkContainerAccessible-2
"filler"
- parent: unnamed-GtkStackAccessible-2
+ parent: unnamed-GtkStackAccessible-1
index: 0
state: enabled sensitive vertical visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkContainerAccessible-4
+ unnamed-GtkContainerAccessible-3
"filler"
- parent: unnamed-GtkContainerAccessible-3
+ parent: unnamed-GtkContainerAccessible-2
index: 0
state: enabled sensitive vertical visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkContainerAccessible-5
+ unnamed-GtkContainerAccessible-4
"filler"
- parent: unnamed-GtkContainerAccessible-4
+ parent: unnamed-GtkContainerAccessible-3
index: 0
state: enabled sensitive vertical visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkContainerAccessible-6
+ unnamed-GtkContainerAccessible-5
"filler"
- parent: unnamed-GtkContainerAccessible-5
+ parent: unnamed-GtkContainerAccessible-4
index: 0
state: enabled sensitive vertical visible
toolkit: gtk
<AtkComponent>
layer: widget
alpha: 1
- unnamed-GtkButtonAccessible-7
+ unnamed-GtkButtonAccessible-6
"push button"
- parent: unnamed-GtkContainerAccessible-6
+ parent: unnamed-GtkContainerAccessible-5
index: 0
name: New
state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index 327b819..3467462 100644
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -7,14 +7,6 @@ window1
<AtkComponent>
layer: window
alpha: 1
- unnamed-GtkContainerAccessible-0
- "panel"
- parent: window1
- state: enabled sensitive showing visible
- toolkit: gtk
- <AtkComponent>
- layer: widget
- alpha: 1
scale1
"slider"
parent: window1
diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
index e2a0f3e..2b250e6 100644
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -7,14 +7,6 @@ window1
<AtkComponent>
layer: window
alpha: 1
- unnamed-GtkContainerAccessible-0
- "panel"
- parent: window1
- state: enabled sensitive showing visible
- toolkit: gtk
- <AtkComponent>
- layer: widget
- alpha: 1
box1
"filler"
parent: window1

30
debian/patches/Update-css-node-tests.patch vendored
View File

@ -1,30 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 5 Feb 2019 09:32:57 -0500
Subject: Update css node tests
The GtkSwitch now has two image nodes.
(cherry picked from commit df77965153c1f1940407c167e92b56b19e0a3769)
---
testsuite/css/nodes/buttons.nodes | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/testsuite/css/nodes/buttons.nodes b/testsuite/css/nodes/buttons.nodes
index 418a132..e19da6a 100644
--- a/testsuite/css/nodes/buttons.nodes
+++ b/testsuite/css/nodes/buttons.nodes
@@ -13,9 +13,13 @@
radio:dir(ltr)
label:dir(ltr)
switch:dir(ltr):checked
- slider
+ slider:dir(ltr):checked
+ image:dir(ltr):checked
+ image:dir(ltr):checked
switch:dir(ltr)
slider
+ image:dir(ltr)
+ image:dir(ltr)
button.text-button:dir(ltr)
label:dir(ltr)
button.image-button:dir(ltr)

2
debian/patches/series vendored
View File

@ -6,5 +6,3 @@
reftest-known-fail.patch
Don-t-test-default-constructed-GdkPixbuf-properties.patch
Revert-Update-some-a11y-test-results.patch
Revert-Update-a11y-test-output.patch
Update-css-node-tests.patch