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

Drop patches taken from upstream

Browse Source
This commit is contained in:
Simon McVittie
2021-04-30 10:17:42 +01:00
parent c48e13dcad
commit e2cecd6d66
21 changed files with 3 additions and 26205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/060_ignore-random-icons.patch vendored
View File

@ -20,10 +20,10 @@ Applied-upstream: no
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 6703c8b..fd66ac8 100644
index 787e718..958d155 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -684,7 +684,7 @@ scan_directory (const gchar *base_path,
@@ -683,7 +683,7 @@ scan_directory (const gchar *base_path,
directories = g_list_append (directories, g_strdup (subdir));
}
else

27
debian/patches/Fix-a-possible-crash-in-gtk_show_uri.patch vendored
View File

@ -1,27 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 19 Apr 2021 16:39:53 -0400
Subject: Fix a possible crash in gtk_show_uri
g_file_get_basename can return NULL.
Deal with it somehow.
Bug: #3883
Origin: upstream, 3.24.29, commit:536da7a15c1737bc63c8ecba5ccac40cc2170860
---
gdk/x11/gdkapplaunchcontext-x11.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index 8051229..2341bb2 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -45,6 +45,9 @@ get_display_name (GFile *file,
if (name == NULL)
{
name = g_file_get_basename (file);
+ if (name == NULL)
+ name = g_file_get_uri (file);
+
if (!g_utf8_validate (name, -1, NULL))
{
tmp = name;

230
debian/patches/Revert-Compose-sequence-changes.patch vendored
View File

@ -1,230 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 1 Apr 2021 15:15:47 -0400
Subject: Revert Compose sequence changes
This was breaking muscle memory of people with
the us intl keyboard layout, for important keys
such as '. The unfortunate side-effect is that
our handling of <dead_acute> is a bit hampered
by sequences that don't fit the pattern. But
such is life.
Bug: #3807
Origin: upstream, 3.24.29, commit:ed9b3f505718f9a877f5029a002bd097635840fc
---
gtk/compose/gtk-compose-lookaside.txt | 4 --
gtk/compose/gtk-compose-remove.txt | 14 -------
gtk/gtkimcontextsimpleseqs.h | 73 +++++++++++++++++++++--------------
3 files changed, 43 insertions(+), 48 deletions(-)
delete mode 100644 gtk/compose/gtk-compose-remove.txt
diff --git a/gtk/compose/gtk-compose-lookaside.txt b/gtk/compose/gtk-compose-lookaside.txt
index c846cc8..3f3b23c 100644
--- a/gtk/compose/gtk-compose-lookaside.txt
+++ b/gtk/compose/gtk-compose-lookaside.txt
@@ -403,7 +403,3 @@
<Multi_key> <Greek_omicron> <apostrophe> : "ό" U03CC
<Multi_key> <Greek_upsilon> <apostrophe> : "ύ" U03CD
<Multi_key> <Greek_omega> <apostrophe> : "ώ" U03CE
-
-# This sequence matches our handling of dead keys better.
-# We remove the xorg sequence that maps this to '
-<dead_acute> <space> : "´" acute # ACUTE ACCENT
diff --git a/gtk/compose/gtk-compose-remove.txt b/gtk/compose/gtk-compose-remove.txt
deleted file mode 100644
index 620df9e..0000000
--- a/gtk/compose/gtk-compose-remove.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-<dead_tilde> <dead_tilde> : "~" asciitilde # TILDE
-<dead_acute> <space> : "'" apostrophe # APOSTROPHE
-<dead_acute> <dead_acute> : "´" acute # ACUTE ACCENT
-<dead_grave> <dead_grave> : "`" grave # GRAVE ACCENT
-<dead_abovering> <dead_abovering> : "°" degree # DEGREE SIGN
-<dead_macron> <dead_macron> : "¯" macron # MACRON
-<dead_breve> <dead_breve> : "˘" breve # BREVE
-<dead_abovedot> <dead_abovedot> : "˙" abovedot # DOT ABOVE
-<dead_diaeresis> <dead_diaeresis> : "¨" diaeresis # DIAERESIS
-<dead_doubleacute> <dead_doubleacute> : "˝" U2dd # DOUBLE ACUTE ACCENT
-<dead_caron> <dead_caron> : "ˇ" caron # CARON
-<dead_cedilla> <dead_cedilla> : "¸" cedilla # CEDILLA
-<dead_ogonek> <dead_ogonek> : "˛" ogonek # OGONEK
-<dead_iota> <dead_iota> : "ͺ" U37a # GREEK YPOGEGRAMMENI
diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h
index 9cbf37d..b480ca1 100644
--- a/gtk/gtkimcontextsimpleseqs.h
+++ b/gtk/gtkimcontextsimpleseqs.h
@@ -66,35 +66,35 @@
static const guint16 gtk_compose_seqs_compact[] = {
GDK_KEY_Greek_accentdieresis, 180, 184, 184, 184, 184,
-GDK_KEY_dead_grave, 184, 244, 331, 543, 543,
-GDK_KEY_dead_acute, 543, 605, 701, 977, 977,
-GDK_KEY_dead_circumflex, 977, 1101, 1101, 1301, 1301,
-GDK_KEY_dead_tilde, 1301, 1383, 1446, 1586, 1586,
-GDK_KEY_dead_macron, 1586, 1630, 1648, 1720, 1720,
-GDK_KEY_dead_breve, 1720, 1768, 1768, 1792, 1792,
-GDK_KEY_dead_abovedot, 1792, 1820, 1823, 1859, 1859,
-GDK_KEY_dead_diaeresis, 1859, 1945, 1957, 1981, 1981,
-GDK_KEY_dead_abovering, 1981, 1989, 1989, 1989, 1989,
-GDK_KEY_dead_doubleacute, 1989, 1997, 1997, 1997, 1997,
-GDK_KEY_dead_caron, 1997, 2037, 2037, 2045, 2045,
-GDK_KEY_dead_cedilla, 2045, 2055, 2061, 2061, 2061,
-GDK_KEY_dead_ogonek, 2061, 2069, 2069, 2069, 2069,
-GDK_KEY_dead_iota, 2069, 2089, 2188, 2620, 3280,
-GDK_KEY_dead_voiced_sound, 3280, 3326, 3326, 3326, 3326,
-GDK_KEY_dead_semivoiced_sound, 3326, 3336, 3336, 3336, 3336,
-GDK_KEY_dead_belowdot, 3336, 3352, 3352, 3368, 3368,
-GDK_KEY_dead_hook, 3368, 3446, 3449, 3505, 3505,
-GDK_KEY_dead_horn, 3505, 3515, 3515, 3515, 3515,
-GDK_KEY_dead_stroke, 3515, 3603, 3615, 3615, 3615,
-GDK_KEY_dead_psili, 3615, 3643, 3643, 3643, 3643,
-GDK_KEY_dead_dasia, 3643, 3675, 3675, 3675, 3675,
-GDK_KEY_dead_belowring, 3675, 3677, 3677, 3677, 3677,
-GDK_KEY_dead_belowtilde, 3677, 3679, 3679, 3679, 3679,
-GDK_KEY_dead_belowdiaeresis, 3679, 3679, 3682, 3682, 3682,
-GDK_KEY_dead_belowcomma, 3682, 3696, 3696, 3696, 3696,
-GDK_KEY_dead_currency, 3696, 3794, 3800, 3800, 3800,
-GDK_KEY_dead_greek, 3800, 3902, 3926, 3926, 3926,
-GDK_KEY_Multi_key, 3926, 3926, 10637, 14345, 16220,
+GDK_KEY_dead_grave, 184, 246, 333, 545, 545,
+GDK_KEY_dead_acute, 545, 609, 705, 981, 981,
+GDK_KEY_dead_circumflex, 981, 1105, 1105, 1305, 1305,
+GDK_KEY_dead_tilde, 1305, 1389, 1452, 1592, 1592,
+GDK_KEY_dead_macron, 1592, 1638, 1656, 1728, 1728,
+GDK_KEY_dead_breve, 1728, 1778, 1778, 1802, 1802,
+GDK_KEY_dead_abovedot, 1802, 1832, 1835, 1871, 1871,
+GDK_KEY_dead_diaeresis, 1871, 1959, 1971, 1995, 1995,
+GDK_KEY_dead_abovering, 1995, 2005, 2005, 2005, 2005,
+GDK_KEY_dead_doubleacute, 2005, 2015, 2015, 2015, 2015,
+GDK_KEY_dead_caron, 2015, 2057, 2057, 2065, 2065,
+GDK_KEY_dead_cedilla, 2065, 2077, 2083, 2083, 2083,
+GDK_KEY_dead_ogonek, 2083, 2093, 2093, 2093, 2093,
+GDK_KEY_dead_iota, 2093, 2115, 2214, 2646, 3306,
+GDK_KEY_dead_voiced_sound, 3306, 3352, 3352, 3352, 3352,
+GDK_KEY_dead_semivoiced_sound, 3352, 3362, 3362, 3362, 3362,
+GDK_KEY_dead_belowdot, 3362, 3378, 3378, 3394, 3394,
+GDK_KEY_dead_hook, 3394, 3472, 3475, 3531, 3531,
+GDK_KEY_dead_horn, 3531, 3541, 3541, 3541, 3541,
+GDK_KEY_dead_stroke, 3541, 3629, 3641, 3641, 3641,
+GDK_KEY_dead_psili, 3641, 3669, 3669, 3669, 3669,
+GDK_KEY_dead_dasia, 3669, 3701, 3701, 3701, 3701,
+GDK_KEY_dead_belowring, 3701, 3703, 3703, 3703, 3703,
+GDK_KEY_dead_belowtilde, 3703, 3705, 3705, 3705, 3705,
+GDK_KEY_dead_belowdiaeresis, 3705, 3705, 3708, 3708, 3708,
+GDK_KEY_dead_belowcomma, 3708, 3722, 3722, 3722, 3722,
+GDK_KEY_dead_currency, 3722, 3820, 3826, 3826, 3826,
+GDK_KEY_dead_greek, 3826, 3928, 3952, 3952, 3952,
+GDK_KEY_Multi_key, 3952, 3952, 10663, 14371, 16246,
GDK_KEY_Greek_iota, 0x0390,
GDK_KEY_Greek_upsilon, 0x03B0,
GDK_KEY_space, 0x0060,
@@ -127,6 +127,7 @@ GDK_KEY_Greek_iota, 0x1F76,
GDK_KEY_Greek_omicron, 0x1F78,
GDK_KEY_Greek_upsilon, 0x1F7A,
GDK_KEY_Greek_omega, 0x1F7C,
+GDK_KEY_dead_grave, 0x0060,
GDK_KEY_dead_diaeresis, GDK_KEY_Greek_iota, 0x1FD2,
GDK_KEY_dead_diaeresis, GDK_KEY_Greek_upsilon, 0x1FE2,
GDK_KEY_dead_psili, GDK_KEY_Greek_ALPHA, 0x1F0A,
@@ -209,7 +210,7 @@ GDK_KEY_Multi_key, GDK_KEY_macron, GDK_KEY_E, 0x1E14,
GDK_KEY_Multi_key, GDK_KEY_macron, GDK_KEY_O, 0x1E50,
GDK_KEY_Multi_key, GDK_KEY_macron, GDK_KEY_e, 0x1E15,
GDK_KEY_Multi_key, GDK_KEY_macron, GDK_KEY_o, 0x1E51,
-GDK_KEY_space, 0x00B4,
+GDK_KEY_space, 0x0027,
GDK_KEY_V, 0x01D7,
GDK_KEY_v, 0x01D8,
GDK_KEY_nobreakspace, 0x0301,
@@ -240,6 +241,7 @@ GDK_KEY_Greek_iota, 0x03AF,
GDK_KEY_Greek_omicron, 0x03CC,
GDK_KEY_Greek_upsilon, 0x03CD,
GDK_KEY_Greek_omega, 0x03CE,
+GDK_KEY_dead_acute, 0x00B4,
GDK_KEY_dead_diaeresis, GDK_KEY_space, 0x0385,
GDK_KEY_dead_diaeresis, GDK_KEY_Greek_iota, 0x0390,
GDK_KEY_dead_diaeresis, GDK_KEY_Greek_upsilon, 0x03B0,
@@ -494,6 +496,7 @@ GDK_KEY_Greek_omega, 0x1FF6,
0x1F61, 0x1F67,
0x1F68, 0x1F6E,
0x1F69, 0x1F6F,
+GDK_KEY_dead_tilde, 0x007E,
GDK_KEY_dead_diaeresis, GDK_KEY_Greek_iota, 0x1FD7,
GDK_KEY_dead_diaeresis, GDK_KEY_Greek_upsilon, 0x1FE7,
GDK_KEY_dead_psili, GDK_KEY_Greek_ALPHA, 0x1F0E,
@@ -572,6 +575,7 @@ GDK_KEY_Greek_UPSILON, 0x1FE9,
GDK_KEY_Greek_alpha, 0x1FB1,
GDK_KEY_Greek_iota, 0x1FD1,
GDK_KEY_Greek_upsilon, 0x1FE1,
+GDK_KEY_dead_macron, 0x00AF,
GDK_KEY_dead_greek, GDK_KEY_A, 0x1FB9,
GDK_KEY_dead_greek, GDK_KEY_I, 0x1FD9,
GDK_KEY_dead_greek, GDK_KEY_U, 0x1FE9,
@@ -620,6 +624,7 @@ GDK_KEY_Greek_UPSILON, 0x1FE8,
GDK_KEY_Greek_alpha, 0x1FB0,
GDK_KEY_Greek_iota, 0x1FD0,
GDK_KEY_Greek_upsilon, 0x1FE0,
+GDK_KEY_dead_breve, 0x02D8,
GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_A, 0x1EB6,
GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_a, 0x1EB7,
GDK_KEY_Multi_key, GDK_KEY_comma, GDK_KEY_E, 0x1E1C,
@@ -640,6 +645,7 @@ GDK_KEY_Amacron, 0x01E0,
GDK_KEY_Omacron, 0x0230,
GDK_KEY_amacron, 0x01E1,
GDK_KEY_omacron, 0x0231,
+GDK_KEY_dead_abovedot, 0x02D9,
GDK_KEY_dead_stroke, GDK_KEY_j, 0x025F,
GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_S, 0x1E68,
GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_s, 0x1E69,
@@ -693,6 +699,7 @@ GDK_KEY_Greek_IOTA, 0x03AA,
GDK_KEY_Greek_UPSILON, 0x03AB,
GDK_KEY_Greek_iota, 0x03CA,
GDK_KEY_Greek_upsilon, 0x03CB,
+GDK_KEY_dead_diaeresis, 0x00A8,
GDK_KEY_dead_acute, GDK_KEY_space, 0x0385,
GDK_KEY_dead_acute, GDK_KEY_Greek_iota, 0x0390,
GDK_KEY_dead_acute, GDK_KEY_Greek_upsilon, 0x03B0,
@@ -707,10 +714,12 @@ GDK_KEY_space, 0x00B0,
GDK_KEY_nobreakspace, 0x030A,
GDK_KEY_Aacute, 0x01FA,
GDK_KEY_aacute, 0x01FB,
+GDK_KEY_dead_abovering, 0x00B0,
GDK_KEY_space, 0x02DD,
GDK_KEY_nobreakspace, 0x030B,
GDK_KEY_Cyrillic_u, 0x04F3,
GDK_KEY_Cyrillic_U, 0x04F2,
+GDK_KEY_dead_doubleacute, 0x02DD,
GDK_KEY_space, 0x02C7,
GDK_KEY_parenleft, 0x208D,
GDK_KEY_parenright, 0x208E,
@@ -731,6 +740,7 @@ GDK_KEY_V, 0x01D9,
GDK_KEY_v, 0x01DA,
GDK_KEY_nobreakspace, 0x030C,
0x01F2, 0x01C5,
+GDK_KEY_dead_caron, 0x02C7,
GDK_KEY_Multi_key, GDK_KEY_quotedbl, GDK_KEY_U, 0x01D9,
GDK_KEY_Multi_key, GDK_KEY_quotedbl, GDK_KEY_u, 0x01DA,
GDK_KEY_space, 0x00B8,
@@ -738,12 +748,14 @@ GDK_KEY_nobreakspace, 0x0327,
GDK_KEY_cent, 0x20B5,
GDK_KEY_Cacute, 0x1E08,
GDK_KEY_cacute, 0x1E09,
+GDK_KEY_dead_cedilla, 0x00B8,
GDK_KEY_dead_currency, GDK_KEY_C, 0x20B5,
GDK_KEY_dead_currency, GDK_KEY_c, 0x20B5,
GDK_KEY_space, 0x02DB,
GDK_KEY_nobreakspace, 0x0328,
GDK_KEY_Omacron, 0x01EC,
GDK_KEY_omacron, 0x01ED,
+GDK_KEY_dead_ogonek, 0x02DB,
GDK_KEY_space, 0x037A,
GDK_KEY_Greek_alphaaccent, 0x1FB4,
GDK_KEY_Greek_etaaccent, 0x1FC4,
@@ -754,6 +766,7 @@ GDK_KEY_Greek_OMEGA, 0x1FFC,
GDK_KEY_Greek_alpha, 0x1FB3,
GDK_KEY_Greek_eta, 0x1FC3,
GDK_KEY_Greek_omega, 0x1FF3,
+GDK_KEY_dead_iota, 0x037A,
GDK_KEY_dead_grave, GDK_KEY_Greek_alpha, 0x1FB2,
GDK_KEY_dead_grave, GDK_KEY_Greek_eta, 0x1FC2,
GDK_KEY_dead_grave, GDK_KEY_Greek_omega, 0x1FF2,

4234
debian/patches/Update-Chinese-Taiwan-translation.patch vendored
View File

File diff suppressed because it is too large Load Diff

1494
debian/patches/Update-Dutch-translation.patch vendored
View File

File diff suppressed because it is too large Load Diff

9915
debian/patches/Update-Nepali-translation-1.patch vendored
View File

File diff suppressed because it is too large Load Diff

9200
debian/patches/Update-Nepali-translation.patch vendored
View File

File diff suppressed because it is too large Load Diff

398
debian/patches/Update-Swedish-translation.patch vendored
View File

@ -1,398 +0,0 @@
From: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date: Sat, 27 Mar 2021 21:11:16 +0000
Subject: Update Swedish translation
---
po-properties/sv.po | 123 ++++++++++++++++++++++++++--------------------------
1 file changed, 62 insertions(+), 61 deletions(-)
diff --git a/po-properties/sv.po b/po-properties/sv.po
index 0fa61d6..cfb68df 100644
--- a/po-properties/sv.po
+++ b/po-properties/sv.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gtk+ properties\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 06:30+0000\n"
-"PO-Revision-Date: 2020-06-25 21:59+0200\n"
+"POT-Creation-Date: 2021-03-27 02:23+0000\n"
+"PO-Revision-Date: 2021-03-27 22:08+0100\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-08-03 20:41+0000\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.2\n"
#: gdk/gdkapplaunchcontext.c:127 gdk/gdkcursor.c:139 gdk/gdkdevicemanager.c:185
#: gdk/gdkglcontext.c:317 gdk/gdkseat.c:202 gdk/gdkseat.c:203
@@ -880,7 +880,7 @@ msgstr "Skärmen där denna statusikon kommer att visas"
msgid "Whether the status icon is visible"
msgstr "Huruvida statusikonen är synlig"
-#: gtk/deprecated/gtkstatusicon.c:330 gtk/gtkplug.c:196
+#: gtk/deprecated/gtkstatusicon.c:330 gtk/gtkplug.c:198
msgid "Embedded"
msgstr "Inbäddad"
@@ -2400,7 +2400,7 @@ msgstr "Justering"
#: gtk/gtkcellrendererspin.c:114 gtk/gtkspinbutton.c:380
msgid "The adjustment that holds the value of the spin button"
-msgstr "Justeringen som håller värdet på snurrknappen"
+msgstr "Justeringen som håller värdet på stegningsrutan"
#: gtk/gtkcellrendererspin.c:129
msgid "Climb rate"
@@ -2902,7 +2902,7 @@ msgstr ""
msgid "Indicator Size"
msgstr "Indikatorstorlek"
-#: gtk/gtkcheckbutton.c:249 gtk/gtkexpander.c:406
+#: gtk/gtkcheckbutton.c:249 gtk/gtkexpander.c:413
msgid "Indicator Spacing"
msgstr "Indikatorutrymme"
@@ -2980,7 +2980,7 @@ msgstr "Aktuell färg, som en GdkRGBA"
msgid "Whether alpha should be shown"
msgstr "Huruvida alfa ska visas"
-#: gtk/gtkcolorchooserdialog.c:213 gtk/gtkcolorchooserwidget.c:704
+#: gtk/gtkcolorchooserdialog.c:213 gtk/gtkcolorchooserwidget.c:695
msgid "Show editor"
msgstr "Visa redigerare"
@@ -3850,20 +3850,20 @@ msgid "A widget to display in place of the usual expander label"
msgstr ""
"En gränssnittskomponent att visa istället för den vanliga expanderaretiketten"
-#: gtk/gtkexpander.c:359
+#: gtk/gtkexpander.c:366
msgid "Label fill"
msgstr "Etikettfyllning"
-#: gtk/gtkexpander.c:360
+#: gtk/gtkexpander.c:367
msgid "Whether the label widget should fill all available horizontal space"
msgstr ""
"Huruvida etikettkomponenten ska fylla allt tillgängligt vågrätt utrymme"
-#: gtk/gtkexpander.c:375
+#: gtk/gtkexpander.c:382
msgid "Resize toplevel"
msgstr "Storleksändra toppnivå"
-#: gtk/gtkexpander.c:376
+#: gtk/gtkexpander.c:383
msgid ""
"Whether the expander will resize the toplevel window upon expanding and "
"collapsing"
@@ -3871,15 +3871,15 @@ msgstr ""
"Huruvida expanderaren kommer att storleksändra toppnivåfönstret vid "
"utfällning och infällning"
-#: gtk/gtkexpander.c:389 gtk/gtktoolitemgroup.c:1674 gtk/gtktreeview.c:1234
+#: gtk/gtkexpander.c:396 gtk/gtktoolitemgroup.c:1674 gtk/gtktreeview.c:1234
msgid "Expander Size"
msgstr "Storlek på expanderare"
-#: gtk/gtkexpander.c:390 gtk/gtktoolitemgroup.c:1675 gtk/gtktreeview.c:1235
+#: gtk/gtkexpander.c:397 gtk/gtktoolitemgroup.c:1675 gtk/gtktreeview.c:1235
msgid "Size of the expander arrow"
msgstr "Storlek på expanderarpilen"
-#: gtk/gtkexpander.c:407
+#: gtk/gtkexpander.c:414
msgid "Spacing around expander arrow"
msgstr "Avstånd runt expanderarpil"
@@ -3916,7 +3916,7 @@ msgid "The current filter for selecting which files are displayed"
msgstr "Det aktuella filtret för val av vilka filer som visas"
#: gtk/gtkfilechooser.c:388 gtk/gtkplacessidebar.c:4836
-#: gtk/gtkplacesview.c:2322
+#: gtk/gtkplacesview.c:2336
msgid "Local Only"
msgstr "Endast lokala"
@@ -5641,11 +5641,11 @@ msgstr "Plats att välja"
msgid "The location to highlight in the sidebar"
msgstr "Plats att markera i sidopanelen"
-#: gtk/gtkplacessidebar.c:4805 gtk/gtkplacesview.c:2343
+#: gtk/gtkplacessidebar.c:4805 gtk/gtkplacesview.c:2357
msgid "Open Flags"
msgstr "Öppna flaggor"
-#: gtk/gtkplacessidebar.c:4806 gtk/gtkplacesview.c:2344
+#: gtk/gtkplacessidebar.c:4806 gtk/gtkplacesview.c:2358
msgid ""
"Modes in which the calling application can open locations selected in the "
"sidebar"
@@ -5693,7 +5693,7 @@ msgstr ""
"Huruvida sidopanelen innehåller en inbyggd genväg för att manuellt ange en "
"plats"
-#: gtk/gtkplacessidebar.c:4837 gtk/gtkplacesview.c:2323
+#: gtk/gtkplacessidebar.c:4837 gtk/gtkplacesview.c:2337
msgid "Whether the sidebar only includes local files"
msgstr "Huruvida sidopanelen bara innehåller lokala filer"
@@ -5729,19 +5729,19 @@ msgid "Whether to emit ::populate-popup for popups that are not menus"
msgstr ""
"Huruvida ::populate-popup ska signaleras för poppupper som inte är menyer"
-#: gtk/gtkplacesview.c:2329
+#: gtk/gtkplacesview.c:2343
msgid "Loading"
msgstr "Läser in"
-#: gtk/gtkplacesview.c:2330
+#: gtk/gtkplacesview.c:2344
msgid "Whether the view is loading locations"
msgstr "Huruvida vyn läser in platser"
-#: gtk/gtkplacesview.c:2336
+#: gtk/gtkplacesview.c:2350
msgid "Fetching networks"
msgstr "Hämtar nätverk"
-#: gtk/gtkplacesview.c:2337
+#: gtk/gtkplacesview.c:2351
msgid "Whether the view is fetching networks"
msgstr "Huruvida vyn hämtar nätverk"
@@ -5797,15 +5797,15 @@ msgstr "Filen representerad av raden, om någon"
msgid "Whether the row represents a network location"
msgstr "Huruvida raden representerar en nätverkplats"
-#: gtk/gtkplug.c:197
+#: gtk/gtkplug.c:199
msgid "Whether the plug is embedded"
msgstr "Huruvida pluggen är inbäddad"
-#: gtk/gtkplug.c:211
+#: gtk/gtkplug.c:213
msgid "Socket Window"
msgstr "Uttagsfönster"
-#: gtk/gtkplug.c:212
+#: gtk/gtkplug.c:214
msgid "The window of the socket the plug is embedded in"
msgstr "Fönstret för uttaget som pluggen är inbäddad i"
@@ -6646,51 +6646,51 @@ msgid ""
"Display a second forward arrow button on the opposite end of the scrollbar"
msgstr "Visa en andra framåtpil-knapp på motsatt sida av rullningslisten"
-#: gtk/gtkscrolledwindow.c:569
+#: gtk/gtkscrolledwindow.c:567
msgid "Horizontal Adjustment"
msgstr "Vågrät justering"
-#: gtk/gtkscrolledwindow.c:570
+#: gtk/gtkscrolledwindow.c:568
msgid "The GtkAdjustment for the horizontal position"
msgstr "GtkAdjustment på den vågräta positionen"
-#: gtk/gtkscrolledwindow.c:576
+#: gtk/gtkscrolledwindow.c:574
msgid "Vertical Adjustment"
msgstr "Lodrät justering"
-#: gtk/gtkscrolledwindow.c:577
+#: gtk/gtkscrolledwindow.c:575
msgid "The GtkAdjustment for the vertical position"
msgstr "GtkAdjustment på den lodräta positionen"
-#: gtk/gtkscrolledwindow.c:583
+#: gtk/gtkscrolledwindow.c:581
msgid "Horizontal Scrollbar Policy"
msgstr "Policy för vågräta rullningslister"
-#: gtk/gtkscrolledwindow.c:584
+#: gtk/gtkscrolledwindow.c:582
msgid "When the horizontal scrollbar is displayed"
msgstr "När den vågräta rullningslisten visas"
-#: gtk/gtkscrolledwindow.c:591
+#: gtk/gtkscrolledwindow.c:589
msgid "Vertical Scrollbar Policy"
msgstr "Policy för lodrät rullningslist"
-#: gtk/gtkscrolledwindow.c:592
+#: gtk/gtkscrolledwindow.c:590
msgid "When the vertical scrollbar is displayed"
msgstr "När den lodräta rullningslisten visas"
-#: gtk/gtkscrolledwindow.c:599
+#: gtk/gtkscrolledwindow.c:597
msgid "Window Placement"
msgstr "Fönsterplacering"
-#: gtk/gtkscrolledwindow.c:600
+#: gtk/gtkscrolledwindow.c:598
msgid "Where the contents are located with respect to the scrollbars."
msgstr "Var innehållet är placerat beroende på rullisterna."
-#: gtk/gtkscrolledwindow.c:618
+#: gtk/gtkscrolledwindow.c:616
msgid "Window Placement Set"
msgstr "Fönsterplacering"
-#: gtk/gtkscrolledwindow.c:619
+#: gtk/gtkscrolledwindow.c:617
msgid ""
"Whether \"window-placement\" should be used to determine the location of the "
"contents with respect to the scrollbars."
@@ -6698,89 +6698,89 @@ msgstr ""
"Huruvida ”window-placement” ska används för att fastställa platsen för "
"innehållet i förhållande till rullningslisterna."
-#: gtk/gtkscrolledwindow.c:625 gtk/gtkspinbutton.c:455
+#: gtk/gtkscrolledwindow.c:623 gtk/gtkspinbutton.c:455
msgid "Shadow Type"
msgstr "Skuggtyp"
-#: gtk/gtkscrolledwindow.c:626
+#: gtk/gtkscrolledwindow.c:624
msgid "Style of bevel around the contents"
msgstr "Stil på avfasning runt innehållet"
-#: gtk/gtkscrolledwindow.c:642
+#: gtk/gtkscrolledwindow.c:640
msgid "Scrollbars within bevel"
msgstr "Rullningslist inom avfasning"
-#: gtk/gtkscrolledwindow.c:643
+#: gtk/gtkscrolledwindow.c:641
msgid "Place scrollbars within the scrolled window's bevel"
msgstr "Placera rullningslister inom det rullade fönstrets avrundning"
-#: gtk/gtkscrolledwindow.c:649
+#: gtk/gtkscrolledwindow.c:647
msgid "Scrollbar spacing"
msgstr "Rullningslistutrymme"
-#: gtk/gtkscrolledwindow.c:650
+#: gtk/gtkscrolledwindow.c:648
msgid "Number of pixels between the scrollbars and the scrolled window"
msgstr "Antalet bildpunkter mellan rullningslisterna och det rullade fönstret"
-#: gtk/gtkscrolledwindow.c:665
+#: gtk/gtkscrolledwindow.c:663
msgid "Minimum Content Width"
msgstr "Minsta innehållsbredd"
-#: gtk/gtkscrolledwindow.c:666
+#: gtk/gtkscrolledwindow.c:664
msgid "The minimum width that the scrolled window will allocate to its content"
msgstr ""
"Minsta bredd som det rullningsbara fönstret kan allokera till dess innehåll"
-#: gtk/gtkscrolledwindow.c:679
+#: gtk/gtkscrolledwindow.c:677
msgid "Minimum Content Height"
msgstr "Minsta innehållshöjd"
-#: gtk/gtkscrolledwindow.c:680
+#: gtk/gtkscrolledwindow.c:678
msgid ""
"The minimum height that the scrolled window will allocate to its content"
msgstr ""
"Minsta höjd som det rullningsbara fönstret kan allokera till dess innehåll"
-#: gtk/gtkscrolledwindow.c:694
+#: gtk/gtkscrolledwindow.c:692
msgid "Kinetic Scrolling"
msgstr "Kinetisk rullning"
-#: gtk/gtkscrolledwindow.c:695
+#: gtk/gtkscrolledwindow.c:693
msgid "Kinetic scrolling mode."
msgstr "Kinetiskt rullningsläge."
-#: gtk/gtkscrolledwindow.c:714
+#: gtk/gtkscrolledwindow.c:712
msgid "Overlay Scrolling"
msgstr "Överdragen rullning"
-#: gtk/gtkscrolledwindow.c:715
+#: gtk/gtkscrolledwindow.c:713
msgid "Overlay scrolling mode"
msgstr "Överdraget rullningsläge"
-#: gtk/gtkscrolledwindow.c:728
+#: gtk/gtkscrolledwindow.c:726
msgid "Maximum Content Width"
msgstr "Största innehållsbredd"
-#: gtk/gtkscrolledwindow.c:729
+#: gtk/gtkscrolledwindow.c:727
msgid "The maximum width that the scrolled window will allocate to its content"
msgstr ""
"Största bredd som det rullningsbara fönstret kan allokera till dess innehåll"
-#: gtk/gtkscrolledwindow.c:742
+#: gtk/gtkscrolledwindow.c:740
msgid "Maximum Content Height"
msgstr "Största innehållshöjd"
-#: gtk/gtkscrolledwindow.c:743
+#: gtk/gtkscrolledwindow.c:741
msgid ""
"The maximum height that the scrolled window will allocate to its content"
msgstr ""
"Största höjd som det rullningsbara fönstret kan allokera till dess innehåll"
-#: gtk/gtkscrolledwindow.c:760 gtk/gtkscrolledwindow.c:761
+#: gtk/gtkscrolledwindow.c:758 gtk/gtkscrolledwindow.c:759
msgid "Propagate Natural Width"
msgstr "Propagera naturlig bredd"
-#: gtk/gtkscrolledwindow.c:778 gtk/gtkscrolledwindow.c:779
+#: gtk/gtkscrolledwindow.c:776 gtk/gtkscrolledwindow.c:777
msgid "Propagate Natural Height"
msgstr "Propagera naturlig höjd"
@@ -7679,7 +7679,7 @@ msgid ""
"Whether erroneous values are automatically changed to a spin button's "
"nearest step increment"
msgstr ""
-"Huruvida felaktiga värden automatiskt korrigeras till en snurrknapps "
+"Huruvida felaktiga värden automatiskt korrigeras till en stegningsrutas "
"närmaste stegökning"
#: gtk/gtkspinbutton.c:411
@@ -7696,7 +7696,7 @@ msgstr "Börja om"
#: gtk/gtkspinbutton.c:420
msgid "Whether a spin button should wrap upon reaching its limits"
-msgstr "Huruvida en snurrknapp ska börja om då dess gränser nås"
+msgstr "Huruvida en stegningsruta ska börja om då dess gränser nås"
#: gtk/gtkspinbutton.c:427
msgid "Update Policy"
@@ -7706,7 +7706,8 @@ msgstr "Uppdateringspolicy"
msgid ""
"Whether the spin button should update always, or only when the value is legal"
msgstr ""
-"Huruvida snurrknappen alltid ska uppdatera, eller endast då värdet är giltigt"
+"Huruvida stegningsrutan alltid ska uppdatera, eller endast då värdet är "
+"giltigt"
#: gtk/gtkspinbutton.c:437
msgid "Reads the current value, or sets a new value"
@@ -7714,7 +7715,7 @@ msgstr "Läser aktuellt värde, eller ställer in ett nytt värde"
#: gtk/gtkspinbutton.c:456
msgid "Style of bevel around the spin button"
-msgstr "Stil på avfasning runt snurrknappen"
+msgstr "Stil på avfasning runt stegningsrutan"
#: gtk/gtkspinner.c:222
msgid "Whether the spinner is active"

85
debian/patches/gdk-wayland-Defer-processing-of-globals-closures.patch vendored
View File

@ -1,85 +0,0 @@
From: Robert Mader <robert.mader@posteo.de>
Date: Sat, 27 Mar 2021 15:48:00 +0100
Subject: gdk/wayland: Defer processing of globals closures
... until all globals have been received.
The dependency tracking introduced in 4e9be39518 only allows to
specify required globals and processes the closures as soon as
the requirements have been met. There are, however, also optional
dependencies - most notably the primary_selection protocol.
Currently we rely on the fact that compositors like Mutter announce
it before `wl_seat`, even though the order is not specified in
the spec.
Process globals closures only after all globals have been announced,
so optional dependencies can be accommodated.
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/3791
Origin: upstream, 3.24.29, commit:86ef0e6094bc3e76a79b382c873148931d4d5682
---
gdk/wayland/gdkdisplay-wayland.c | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 7e924fd..fc5e408 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -434,26 +434,19 @@ gdk_registry_handle_global (void *data,
}
else if (strcmp (interface, "wl_seat") == 0)
{
+ SeatAddedClosure *closure;
static const char *required_device_manager_globals[] = {
"wl_compositor",
"wl_data_device_manager",
NULL
};
- if (has_required_globals (display_wayland,
- required_device_manager_globals))
- _gdk_wayland_display_add_seat (display_wayland, id, version);
- else
- {
- SeatAddedClosure *closure;
-
- closure = g_new0 (SeatAddedClosure, 1);
- closure->base.handler = seat_added_closure_run;
- closure->base.required_globals = required_device_manager_globals;
- closure->id = id;
- closure->version = version;
- postpone_on_globals_closure (display_wayland, &closure->base);
- }
+ closure = g_new0 (SeatAddedClosure, 1);
+ closure->base.handler = seat_added_closure_run;
+ closure->base.required_globals = required_device_manager_globals;
+ closure->id = id;
+ closure->version = version;
+ postpone_on_globals_closure (display_wayland, &closure->base);
}
else if (strcmp (interface, "wl_data_device_manager") == 0)
{
@@ -533,8 +526,6 @@ gdk_registry_handle_global (void *data,
g_hash_table_insert (display_wayland->known_globals,
GUINT_TO_POINTER (id), g_strdup (interface));
-
- process_on_globals_closures (display_wayland);
}
static void
@@ -625,8 +616,13 @@ _gdk_wayland_display_open (const gchar *display_name)
display_wayland->wl_registry = wl_display_get_registry (display_wayland->wl_display);
wl_registry_add_listener (display_wayland->wl_registry, &registry_listener, display_wayland);
+ if (wl_display_roundtrip (display_wayland->wl_display) < 0)
+ {
+ g_object_unref (display);
+ return NULL;
+ }
- _gdk_wayland_display_async_roundtrip (display_wayland);
+ process_on_globals_closures (display_wayland);
/* Wait for initializing to complete. This means waiting for all
* asynchrounous roundtrips that were triggered during initial roundtrip. */

2
debian/patches/gtk-Really-don-t-distribute-built-files.patch vendored
View File

@ -12,7 +12,7 @@ Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 454075b..fa355da 100644
index c9d644d..119277a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -553,7 +553,6 @@ gtk_private_h_sources = \

73
debian/patches/imcontext-Eat-key-events-during-preedit.patch vendored
View File

@ -1,73 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 15 Apr 2021 17:46:19 -0400
Subject: imcontext: Eat key events during preedit
Avoid passing through random key press or release
events while we are showing preedit. That prevents
'accidents' like typing Ctrl-. bringing up the
Emoji chooser during preedit, or hitting Ctrl-a
after the Compose key moving the 'dot' around in
vim in terminals.
Origin: upstream, 3.24.29, commit:a926f217d77ac33017e5c6d90dc5beb746449650
---
gtk/gtkimcontextsimple.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 7ab3e43..89221ce 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -731,13 +731,21 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
}
}
+ if (priv->in_hex_sequence || priv->in_compose_sequence)
+ return TRUE; /* Don't leak random key events during preedit */
+
return FALSE;
}
/* Ignore modifier key presses */
for (i = 0; i < G_N_ELEMENTS (gtk_compose_ignore); i++)
if (event->keyval == gtk_compose_ignore[i])
- return FALSE;
+ {
+ if (priv->in_hex_sequence || priv->in_compose_sequence)
+ return TRUE; /* Don't leak random key events during preedit */
+
+ return FALSE;
+ }
hex_mod_mask = gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR);
@@ -776,16 +784,23 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
GDK_MODIFIER_INTENT_NO_TEXT_INPUT);
- if (event->state & no_text_input_mask ||
- (priv->in_hex_sequence && priv->modifiers_dropped &&
- (event->keyval == GDK_KEY_Return ||
- event->keyval == GDK_KEY_ISO_Enter ||
- event->keyval == GDK_KEY_KP_Enter)))
+ if (priv->in_hex_sequence && priv->modifiers_dropped &&
+ (event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_ISO_Enter ||
+ event->keyval == GDK_KEY_KP_Enter))
{
return FALSE;
}
+
+ if (event->state & no_text_input_mask)
+ {
+ if (priv->in_hex_sequence || priv->in_compose_sequence)
+ return TRUE; /* Don't leak random key events during preedit */
+
+ return FALSE;
+ }
}
-
+
/* Handle backspace */
if (priv->in_hex_sequence && have_hex_mods && is_backspace)
{

27
debian/patches/imcontext-Look-for-Compose-file-in-the-right-place.patch vendored
View File

@ -1,27 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 29 Mar 2021 18:31:23 -0400
Subject: imcontext: Look for Compose file in the right place
The documentation states that GTK will load a Compose
file from ~/.config/gtk-3.0/Compose. Unfortunately,
backports changed this unintentionally to look in
the gtk-4.0 directory. Change it back.
Origin: upstream, 3.24.29, commit:ba8c18019d4258a9fb056ce84d1df8d510a7e444
---
gtk/gtkimcontextsimple.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 60ddbc3..7ab3e43 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -162,7 +162,7 @@ gtk_im_context_simple_init_compose_table (void)
const char * const *sys_lang = NULL;
char *x11_compose_file_dir = get_x11_compose_file_dir ();
- path = g_build_filename (g_get_user_config_dir (), "gtk-4.0", "Compose", NULL);
+ path = g_build_filename (g_get_user_config_dir (), "gtk-3.0", "Compose", NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS))
{
G_LOCK (global_tables);

29
debian/patches/label-Fix-reacting-to-screen-resolution-changes.patch vendored
View File

@ -1,29 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 29 Mar 2021 20:48:15 -0400
Subject: label: Fix reacting to screen resolution changes
Labels were not reacting when the screen resolution
changes, as e.g. when turning "Large Text" on of off.
Origin: upstream, 3.24.29, commit:316aa85b8dadff8c1b621cb179e43aba0d232d6a
---
gtk/gtklabel.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 4bb92fd..bd5c397 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -4228,6 +4228,12 @@ gtk_label_style_updated (GtkWidget *widget)
context = gtk_widget_get_style_context (widget);
change = gtk_style_context_get_change (context);
+ if (change == NULL || gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_FONT))
+ {
+ gtk_label_clear_layout (GTK_LABEL (widget));
+ gtk_widget_queue_resize (label);
+ }
+
if (change == NULL || gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_ATTRS) ||
(priv->select_info && priv->select_info->links))
gtk_label_update_layout_attributes (label);

52
debian/patches/scale-Fix-sporadic-criticals.patch vendored
View File

@ -1,52 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 10 Apr 2021 10:07:55 -0400
Subject: scale: Fix sporadic criticals
gtk_css_node_update_layout_attributes can cause us to
free priv->layout, and then bad things happen. Therefore,
we must call that function on a new layout *before* setting
priv->layout.
Origin: upstream, 3.24.29, commit:eaabc3722eb65b726da3ff1184061b7a66499740
---
gtk/gtkscale.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index ea30a8c..529fb3d 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -2020,23 +2020,26 @@ gtk_scale_get_layout (GtkScale *scale)
if (!priv->layout && priv->draw_value)
{
+ PangoLayout *layout;
int min_layout_width;
- priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
- gtk_css_node_update_layout_attributes (gtk_css_gadget_get_node (priv->value_gadget), priv->layout);
-
+ layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
+ gtk_css_node_update_layout_attributes (gtk_css_gadget_get_node (priv->value_gadget), layout);
gtk_css_gadget_get_preferred_size (priv->value_gadget,
GTK_ORIENTATION_HORIZONTAL, -1,
&min_layout_width, NULL,
NULL, NULL);
- pango_layout_set_width (priv->layout, min_layout_width * PANGO_SCALE);
+
+ pango_layout_set_width (layout, min_layout_width * PANGO_SCALE);
if (priv->value_pos == GTK_POS_LEFT)
- pango_layout_set_alignment (priv->layout, PANGO_ALIGN_RIGHT);
+ pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
else if (priv->value_pos == GTK_POS_RIGHT)
- pango_layout_set_alignment (priv->layout, PANGO_ALIGN_LEFT);
+ pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
else
- pango_layout_set_alignment (priv->layout, PANGO_ALIGN_CENTER);
+ pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+
+ priv->layout = layout;
}
if (priv->draw_value)

87
debian/patches/scrolledwindow-Always-add-other-scrollbar-size.patch vendored
View File

@ -1,87 +0,0 @@
From: =?utf-8?q?Timm_B=C3=A4der?= <mail@baedert.org>
Date: Mon, 19 Apr 2021 14:42:29 -0400
Subject: scrolledwindow: Always add other scrollbar size...
... if we're not using indicators and the policy may be visible. Not
doing this if the policy may be invisible is incorrect as we need to
reserve the space anyway in case the scrolledwindow is allocated at
minimum size and the child size increases to show the scrollbar.
Origin: upstream, 3.24.29, commit:25879ea37e8918a28187dd382e7704051a38f011
---
gtk/gtkscrolledwindow.c | 30 ++++++++++++++++++++++++------
testsuite/gtk/scrolledwindow.c | 4 ++--
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 1909077..a931d2b 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1900,10 +1900,19 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
*/
if (policy_may_be_visible (priv->hscrollbar_policy))
{
- minimum_req.width = MAX (minimum_req.width, hscrollbar_requisition.width + sborder.left + sborder.right);
- natural_req.width = MAX (natural_req.width, hscrollbar_requisition.width + sborder.left + sborder.right);
+ int vscrollbar_extra_size;
- if (!priv->use_indicators && priv->hscrollbar_policy == GTK_POLICY_ALWAYS)
+ if (!priv->use_indicators && policy_may_be_visible (priv->vscrollbar_policy))
+ vscrollbar_extra_size = vscrollbar_requisition.width;
+ else
+ vscrollbar_extra_size = 0;
+
+ minimum_req.width = MAX (minimum_req.width,
+ hscrollbar_requisition.width + sborder.left + sborder.right + vscrollbar_extra_size);
+ natural_req.width = MAX (natural_req.width,
+ hscrollbar_requisition.width + sborder.left + sborder.right + vscrollbar_extra_size);
+
+ if (!priv->use_indicators)
{
minimum_req.height += scrollbar_spacing + hscrollbar_requisition.height;
natural_req.height += scrollbar_spacing + hscrollbar_requisition.height;
@@ -1912,10 +1921,19 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
if (policy_may_be_visible (priv->vscrollbar_policy))
{
- minimum_req.height = MAX (minimum_req.height, vscrollbar_requisition.height + sborder.top + sborder.bottom);
- natural_req.height = MAX (natural_req.height, vscrollbar_requisition.height + sborder.top + sborder.bottom);
+ int hscrollbar_extra_size;
+
+ if (!priv->use_indicators && policy_may_be_visible (priv->hscrollbar_policy))
+ hscrollbar_extra_size = hscrollbar_requisition.height;
+ else
+ hscrollbar_extra_size = 0;
+
+ minimum_req.height = MAX (minimum_req.height,
+ vscrollbar_requisition.height + sborder.top + sborder.bottom + hscrollbar_extra_size);
+ natural_req.height = MAX (natural_req.height,
+ vscrollbar_requisition.height + sborder.top + sborder.bottom + hscrollbar_extra_size);
- if (!priv->use_indicators && priv->vscrollbar_policy == GTK_POLICY_ALWAYS)
+ if (!priv->use_indicators)
{
minimum_req.width += scrollbar_spacing + vscrollbar_requisition.width;
natural_req.width += scrollbar_spacing + vscrollbar_requisition.width;
diff --git a/testsuite/gtk/scrolledwindow.c b/testsuite/gtk/scrolledwindow.c
index c6093d8..e141fe3 100644
--- a/testsuite/gtk/scrolledwindow.c
+++ b/testsuite/gtk/scrolledwindow.c
@@ -58,7 +58,7 @@ test_size (gboolean overlay,
/* If the relevant scrollbar is non-overlay and always shown, it is added
* to the preferred size. When comparing to the expected size, we need to
* to exclude that extra, as we are only interested in the content size */
- if (!overlay && policy == GTK_POLICY_ALWAYS)
+ if (!overlay)
{
GtkWidget *scrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (scrolledwindow));
gtk_widget_get_preferred_width (scrollbar, &scrollbar_size, NULL);
@@ -87,7 +87,7 @@ test_size (gboolean overlay,
gtk_widget_get_preferred_height (box, &child_size, NULL);
}
- if (!overlay && policy == GTK_POLICY_ALWAYS)
+ if (!overlay)
{
GtkWidget *scrollbar = gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (scrolledwindow));
gtk_widget_get_preferred_height (scrollbar, &scrollbar_size, NULL);

150
debian/patches/scrolledwindow-Cancel-overshoot-on-dimension-changes.patch vendored
View File

@ -1,150 +0,0 @@
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Mon, 15 Mar 2021 17:17:01 +0500
Subject: scrolledwindow: Cancel overshoot on dimension changes
If we scroll down in a list that's still being filled, we hit the edge and
initiate overshoot, and then the adjustment's upper value increases. This
leads to an unwanted bounce back.
Additionally, if in a similar situation the upper value decreases, the
overscroll glow gets stuck.
Update kinetic scrolling upper and lower value on changes, and immediately
cancel it if dimensions on that side change.
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/3752
Origin: upstream, 3.24.29, commit:27d38eca9a14fe32893ce5e97d2f0b542458f342
---
gtk/gtkkineticscrolling.c | 29 +++++++++++++++++++++++++++++
gtk/gtkkineticscrolling.h | 11 +++++++++++
gtk/gtkscrolledwindow.c | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+)
diff --git a/gtk/gtkkineticscrolling.c b/gtk/gtkkineticscrolling.c
index 9036e15..4976270 100644
--- a/gtk/gtkkineticscrolling.c
+++ b/gtk/gtkkineticscrolling.c
@@ -124,6 +124,35 @@ gtk_kinetic_scrolling_new (gdouble lower,
return data;
}
+GtkKineticScrollingChange
+gtk_kinetic_scrolling_update_size (GtkKineticScrolling *data,
+ gdouble lower,
+ gdouble upper)
+{
+ GtkKineticScrollingChange change = GTK_KINETIC_SCROLLING_CHANGE_NONE;
+
+ if (lower != data->lower)
+ {
+ if (data->position <= lower)
+ change |= GTK_KINETIC_SCROLLING_CHANGE_LOWER;
+
+ data->lower = lower;
+ }
+
+ if (upper != data->upper)
+ {
+ if (data->position >= data->upper)
+ change |= GTK_KINETIC_SCROLLING_CHANGE_UPPER;
+
+ data->upper = upper;
+ }
+
+ if (data->phase == GTK_KINETIC_SCROLLING_PHASE_OVERSHOOTING)
+ change |= GTK_KINETIC_SCROLLING_CHANGE_IN_OVERSHOOT;
+
+ return change;
+}
+
void
gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic)
{
diff --git a/gtk/gtkkineticscrolling.h b/gtk/gtkkineticscrolling.h
index d00f1d0..8155d57 100644
--- a/gtk/gtkkineticscrolling.h
+++ b/gtk/gtkkineticscrolling.h
@@ -23,6 +23,13 @@
G_BEGIN_DECLS
+typedef enum {
+ GTK_KINETIC_SCROLLING_CHANGE_NONE = 0,
+ GTK_KINETIC_SCROLLING_CHANGE_LOWER = 1 << 0,
+ GTK_KINETIC_SCROLLING_CHANGE_UPPER = 1 << 1,
+ GTK_KINETIC_SCROLLING_CHANGE_IN_OVERSHOOT = 1 << 2,
+} GtkKineticScrollingChange;
+
typedef struct _GtkKineticScrolling GtkKineticScrolling;
GtkKineticScrolling * gtk_kinetic_scrolling_new (gdouble lower,
@@ -34,6 +41,10 @@ GtkKineticScrolling * gtk_kinetic_scrolling_new (gdouble lower
gdouble initial_velocity);
void gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic);
+GtkKineticScrollingChange gtk_kinetic_scrolling_update_size (GtkKineticScrolling *data,
+ gdouble lower,
+ gdouble upper);
+
gboolean gtk_kinetic_scrolling_tick (GtkKineticScrolling *data,
gdouble time_delta,
gdouble *position,
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index bea7339..1909077 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -3900,6 +3900,24 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
if (priv->hscrollbar_visible != visible)
gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
+
+ if (priv->hscrolling)
+ {
+ GtkKineticScrollingChange change;
+ gdouble lower = gtk_adjustment_get_lower (adjustment);
+ gdouble upper = gtk_adjustment_get_upper (adjustment);
+ upper -= gtk_adjustment_get_page_size (adjustment);
+
+ change = gtk_kinetic_scrolling_update_size (priv->hscrolling, lower, upper);
+
+ if ((change & GTK_KINETIC_SCROLLING_CHANGE_IN_OVERSHOOT) &&
+ (change & (GTK_KINETIC_SCROLLING_CHANGE_UPPER | GTK_KINETIC_SCROLLING_CHANGE_LOWER)))
+ {
+ g_clear_pointer (&priv->hscrolling, gtk_kinetic_scrolling_free);
+ priv->unclamped_hadj_value = gtk_adjustment_get_value (adjustment);
+ gtk_scrolled_window_invalidate_overshoot (scrolled_window);
+ }
+ }
}
}
else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar)))
@@ -3914,8 +3932,29 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
if (priv->vscrollbar_visible != visible)
gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
+
+ if (priv->vscrolling)
+ {
+ GtkKineticScrollingChange change;
+ gdouble lower = gtk_adjustment_get_lower (adjustment);
+ gdouble upper = gtk_adjustment_get_upper (adjustment);
+ upper -= gtk_adjustment_get_page_size (adjustment);
+
+ change = gtk_kinetic_scrolling_update_size (priv->vscrolling, lower, upper);
+
+ if ((change & GTK_KINETIC_SCROLLING_CHANGE_IN_OVERSHOOT) &&
+ (change & (GTK_KINETIC_SCROLLING_CHANGE_UPPER | GTK_KINETIC_SCROLLING_CHANGE_LOWER)))
+ {
+ g_clear_pointer (&priv->vscrolling, gtk_kinetic_scrolling_free);
+ priv->unclamped_vadj_value = gtk_adjustment_get_value (adjustment);
+ gtk_scrolled_window_invalidate_overshoot (scrolled_window);
+ }
+ }
}
}
+
+ if (!priv->hscrolling && !priv->vscrolling)
+ gtk_scrolled_window_cancel_deceleration (scrolled_window);
}
static void

18
debian/patches/series vendored
View File

@ -1,21 +1,3 @@
Update-Swedish-translation.patch
imcontext-Look-for-Compose-file-in-the-right-place.patch
label-Fix-reacting-to-screen-resolution-changes.patch
spinbutton-Interpret-localized-digits.patch
gdk-wayland-Defer-processing-of-globals-closures.patch
scrolledwindow-Cancel-overshoot-on-dimension-changes.patch
Revert-Compose-sequence-changes.patch
Update-Dutch-translation.patch
Update-Chinese-Taiwan-translation.patch
wayland-Improve-font-setting-fallback.patch
wayland-Improve-font-setting-fallback-more.patch
Update-Nepali-translation.patch
Update-Nepali-translation-1.patch
scale-Fix-sporadic-criticals.patch
x11-Be-quiet-on-exit-by-default.patch
imcontext-Eat-key-events-during-preedit.patch
scrolledwindow-Always-add-other-scrollbar-size.patch
Fix-a-possible-crash-in-gtk_show_uri.patch
gdk-Don-t-distribute-generated-files-in-tarballs.patch
gtk-Really-don-t-distribute-built-files.patch
demos-examples-tests-Don-t-distribute-built-files.patch

63
debian/patches/spinbutton-Interpret-localized-digits.patch vendored
View File

@ -1,63 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 24 Nov 2020 13:42:29 -0500
Subject: spinbutton: Interpret localized digits
Interpret input where the characters have numeric values.
See #3387
Origin: upstream, 3.24.29, commit:fa69e5f42ddf4cc2808a84053a002084b5f50441
---
gtk/gtkspinbutton.c | 37 +++++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 9498aad..8e65d8a 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1883,12 +1883,41 @@ gtk_spin_button_default_input (GtkSpinButton *spin_button,
gdouble *new_val)
{
gchar *err = NULL;
+ const char *text;
- *new_val = g_strtod (gtk_entry_get_text (GTK_ENTRY (spin_button)), &err);
+ text = gtk_entry_get_text (GTK_ENTRY (spin_button));
+
+ *new_val = g_strtod (text, &err);
if (*err)
- return GTK_INPUT_ERROR;
- else
- return FALSE;
+ {
+ /* try to convert with local digits */
+ gint64 val = 0;
+ int sign = 1;
+ const char *p;
+
+ for (p = text; *p; p = g_utf8_next_char (p))
+ {
+ gunichar ch = g_utf8_get_char (p);
+
+ if (p == text && ch == '-')
+ {
+ sign = -1;
+ continue;
+ }
+
+ if (!g_unichar_isdigit (ch))
+ break;
+
+ val = val * 10 + g_unichar_digit_value (ch);
+ }
+
+ if (*p)
+ return GTK_INPUT_ERROR;
+
+ *new_val = sign * val;
+ }
+
+ return FALSE;
}
static void

33
debian/patches/wayland-Improve-font-setting-fallback-more.patch vendored
View File

@ -1,33 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 7 Apr 2021 14:28:39 -0400
Subject: wayland: Improve font setting fallback more
We may get a response from the portal that contains
no useful settings at all. In that case, we should
fallback as well.
Bug: #3838
Origin: upstream, 3.24.29, commit:dfea8c31d97379ff62635474ffde0d388b4b85ac
---
gdk/wayland/gdkscreen-wayland.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index e9a4f0e..6f8b5e8 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -745,6 +745,14 @@ init_settings (GdkScreen *screen)
goto fallback;
}
+ if (g_variant_n_children (ret) == 0)
+ {
+ g_debug ("Received no portal settings");
+ g_clear_pointer (&ret, g_variant_unref);
+
+ goto fallback;
+ }
+
g_variant_get (ret, "(a{sa{sv}})", &iter);
while (g_variant_iter_loop (iter, "{s@a{sv}}", &schema, &val))

38
debian/patches/wayland-Improve-font-setting-fallback.patch vendored
View File

@ -1,38 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 7 Apr 2021 08:41:49 -0400
Subject: wayland: Improve font setting fallback
When we don't get stettings from the portal, the current
fallback is 'awful fonts'. There is no need for that. Instead,
set the fallback values to grayscale antialiasing with slight
hinting.
Origin: upstream, 3.24.29, commit:a3ff6e279c53d69d688820919875d5c1292e870c
---
gdk/wayland/gdkscreen-wayland.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index 084c1e3..e9a4f0e 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -542,13 +542,13 @@ static TranslationEntry translations[] = {
{ FALSE, "org.gnome.desktop.privacy", "remember-recent-files", "gtk-recent-files-enabled", G_TYPE_BOOLEAN, { .b = TRUE } },
{ FALSE, WM_SETTINGS_SCHEMA, "button-layout", "gtk-decoration-layout", G_TYPE_STRING, { .s = "menu:close" } },
{ FALSE, CLASSIC_WM_SETTINGS_SCHEMA, "button-layout", "gtk-decoration-layout", G_TYPE_STRING, { .s = "menu:close" } },
- { FALSE, "org.gnome.desktop.interface", "font-antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 0 } },
- { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 0 } },
- { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 0 } },
+ { FALSE, "org.gnome.desktop.interface", "font-antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 1 } },
+ { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 1 } },
+ { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 1 } },
{ FALSE, "org.gnome.desktop.interface", "font-rgba-order", "gtk-xft-rgba", G_TYPE_NONE, { .i = 0 } },
- { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 0 } },
- { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 0 } },
- { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 0 } },
+ { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 1 } },
+ { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 1 } },
+ { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 1 } },
{ FALSE, "org.gnome.settings-daemon.plugins.xsettings", "rgba-order", "gtk-xft-rgba", G_TYPE_NONE, { .i = 0 } },
{ FALSE, "org.gnome.desktop.interface", "text-scaling-factor", "gtk-xft-dpi" , G_TYPE_NONE, { .i = 0 } },
{ FALSE, "org.gnome.desktop.wm.preferences", "action-double-click-titlebar", "gtk-titlebar-double-click", G_TYPE_STRING, { .s = "toggle-maximize" } },

49
debian/patches/x11-Be-quiet-on-exit-by-default.patch vendored
View File

@ -1,49 +0,0 @@
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 13 Apr 2021 14:10:27 -0400
Subject: x11: Be quiet on exit by default
The condition we check for to catch X servers going away
may not be accurate anymore, and the warning shows up in
logs, causing customers to be concerned. So, be quiet by
default, unless the user explicitly asked for a message.
Origin: upstream, 3.24.29, commit:c3503fcc84eec0bcf857cc744580aa9a4d5dc7eb
---
gdk/x11/gdkmain-x11.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 64c7cb4..cd877ce 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -240,24 +240,13 @@ gdk_x_io_error (Display *display)
/* This is basically modelled after the code in XLib. We need
* an explicit error handler here, so we can disable our atexit()
* which would otherwise cause a nice segfault.
- * We fprintf(stderr, instead of g_warning() because g_warning()
- * could possibly be redirected to a dialog
+ * We g_debug() instead of g_warning(), because g_warning()
+ * could possibly be redirected to the log
*/
- if (errno == EPIPE)
- {
- g_message ("The application '%s' lost its connection to the display %s;\n"
- "most likely the X server was shut down or you killed/destroyed\n"
- "the application.\n",
- g_get_prgname (),
- display ? DisplayString (display) : gdk_get_display_arg_name ());
- }
- else
- {
- g_message ("%s: Fatal IO error %d (%s) on X server %s.\n",
- g_get_prgname (),
- errno, g_strerror (errno),
- display ? DisplayString (display) : gdk_get_display_arg_name ());
- }
+ g_debug ("%s: Fatal IO error %d (%s) on X server %s.\n",
+ g_get_prgname (),
+ errno, g_strerror (errno),
+ display ? DisplayString (display) : gdk_get_display_arg_name ());
_exit (1);
}