Drop patches that were applied upstream
This commit is contained in:
Simon McVittie
@ -1,26 +0,0 @@
|
||||
From: Thomas Zajic <zlatko-github@zlatk0.net>
|
||||
Date: Wed, 17 Nov 2021 17:12:04 +0000
|
||||
Subject: Flush drawable surface when getting a pixbuf
|
||||
|
||||
When getting the drawable surface to get its pixels we should be
|
||||
flushing the Cairo state, not mark it dirty.
|
||||
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4456
|
||||
Origin: upstream, 3.24.36, commit:e413f5c43259a22269aa1e75767dd545e10119b5
|
||||
---
|
||||
gdk/gdkpixbuf-drawable.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
|
||||
index 603c8ff..e63c3a8 100644
|
||||
--- a/gdk/gdkpixbuf-drawable.c
|
||||
+++ b/gdk/gdkpixbuf-drawable.c
|
||||
@@ -104,7 +104,7 @@ gdk_pixbuf_get_from_window (GdkWindow *src,
|
||||
* by external applications.
|
||||
* So be on the safe side and:
|
||||
*/
|
||||
- cairo_surface_mark_dirty (surface);
|
||||
+ cairo_surface_flush (surface);
|
||||
|
||||
if (cairo_surface_get_content (surface) & CAIRO_CONTENT_ALPHA)
|
||||
copy = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width * scale, height * scale);
|
||||
@ -1,293 +0,0 @@
|
||||
From: Rafael Fontenelle <rafaelff@gnome.org>
|
||||
Date: Mon, 28 Nov 2022 12:13:58 +0000
|
||||
Subject: Update Brazilian Portuguese translation
|
||||
|
||||
Origin: upstream, 3.24.36, commit:7d89e5e92aebf0f3f683f1fbd61b5b1730c4b75b
|
||||
---
|
||||
po/pt_BR.po | 99 +++++++++++++++++++++++++++++++++----------------------------
|
||||
1 file changed, 54 insertions(+), 45 deletions(-)
|
||||
|
||||
diff --git a/po/pt_BR.po b/po/pt_BR.po
|
||||
index b66b486..655e64b 100644
|
||||
--- a/po/pt_BR.po
|
||||
+++ b/po/pt_BR.po
|
||||
@@ -21,22 +21,22 @@
|
||||
# Artur de Aquino Morais <artur.morais93@outlook.com>, 2016.
|
||||
# Ricardo Silva Veloso <ricvelozo@gmail.com>, 2018-2020.
|
||||
# Enrico Nicoletto <liverig@gmail.com>, 2013, 2020.
|
||||
-# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2021.
|
||||
+# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2022.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: GTK\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
-"POT-Creation-Date: 2022-02-17 22:11+0000\n"
|
||||
-"PO-Revision-Date: 2022-02-17 21:04-0300\n"
|
||||
+"POT-Creation-Date: 2022-10-28 06:34+0000\n"
|
||||
+"PO-Revision-Date: 2022-10-28 10:21-0300\n"
|
||||
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
|
||||
"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
|
||||
"Language: pt_BR\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
-"X-Generator: Poedit 3.0.1\n"
|
||||
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
|
||||
+"X-Generator: Gtranslator 42.0\n"
|
||||
|
||||
# Não encontrei tradução melhor para broadway
|
||||
#: gdk/broadway/gdkbroadway-server.c:144
|
||||
@@ -675,15 +675,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Fechar"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9320
|
||||
+#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9345
|
||||
msgid "Minimize"
|
||||
msgstr "Minimizar"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9329
|
||||
+#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9354
|
||||
msgid "Maximize"
|
||||
msgstr "Maximizar"
|
||||
|
||||
-#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9286
|
||||
+#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9311
|
||||
msgid "Restore"
|
||||
msgstr "Restaurar"
|
||||
|
||||
@@ -1242,7 +1242,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:594 gtk/gtkpagesetupunixdialog.c:197
|
||||
#: gtk/gtkprintbackend.c:779 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:674 gtk/gtkprintunixdialog.c:747
|
||||
-#: gtk/gtkwindow.c:12790 gtk/inspector/css-editor.c:201
|
||||
+#: gtk/gtkwindow.c:12815 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1291,7 +1291,7 @@ msgid "_Apply"
|
||||
msgstr "_Aplicar"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
-#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12791
|
||||
+#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:780 gtk/gtkwindow.c:12816
|
||||
msgid "_OK"
|
||||
msgstr "_OK"
|
||||
|
||||
@@ -1648,14 +1648,23 @@ msgctxt "keyboard label"
|
||||
msgid "Meta"
|
||||
msgstr "Meta"
|
||||
|
||||
-#: gtk/gtkaccellabel.c:889
|
||||
+#. Translators: "KP" means "numeric key pad". This string will
|
||||
+#. * be used in accelerators such as "Ctrl+Shift+KP 1" in menus,
|
||||
+#. * and therefore the translation needs to be very short.
|
||||
+#.
|
||||
+#: gtk/gtkaccellabel.c:893
|
||||
+msgctxt "keyboard label"
|
||||
+msgid "KP"
|
||||
+msgstr "KP"
|
||||
+
|
||||
+#: gtk/gtkaccellabel.c:900
|
||||
msgctxt "keyboard label"
|
||||
msgid "Space"
|
||||
msgstr "Espaço"
|
||||
|
||||
# Espaços são permitidos?
|
||||
# Acelerador é usado?
|
||||
-#: gtk/gtkaccellabel.c:892 gtk/gtkshortcutlabel.c:181
|
||||
+#: gtk/gtkaccellabel.c:903 gtk/gtkshortcutlabel.c:181
|
||||
msgctxt "keyboard label"
|
||||
msgid "Backslash"
|
||||
msgstr "Barra invertida"
|
||||
@@ -2267,52 +2276,52 @@ msgstr "_Direita:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Margens do papel"
|
||||
|
||||
-#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6687 gtk/gtktextview.c:9525
|
||||
+#: gtk/gtkentry.c:9596 gtk/gtklabel.c:6687 gtk/gtktextview.c:9528
|
||||
msgid "Cu_t"
|
||||
msgstr "Recor_tar"
|
||||
|
||||
-#: gtk/gtkentry.c:9595 gtk/gtklabel.c:6688 gtk/gtktextview.c:9529
|
||||
+#: gtk/gtkentry.c:9600 gtk/gtklabel.c:6688 gtk/gtktextview.c:9532
|
||||
msgid "_Copy"
|
||||
msgstr "_Copiar"
|
||||
|
||||
-#: gtk/gtkentry.c:9599 gtk/gtklabel.c:6689 gtk/gtktextview.c:9531
|
||||
+#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6689 gtk/gtktextview.c:9534
|
||||
msgid "_Paste"
|
||||
msgstr "C_olar"
|
||||
|
||||
-#: gtk/gtkentry.c:9602 gtk/gtkfilechooserwidget.c:1500
|
||||
-#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9534
|
||||
+#: gtk/gtkentry.c:9607 gtk/gtkfilechooserwidget.c:1500
|
||||
+#: gtk/gtkfilechooserwidget.c:2335 gtk/gtklabel.c:6691 gtk/gtktextview.c:9537
|
||||
msgid "_Delete"
|
||||
msgstr "E_xcluir"
|
||||
|
||||
-#: gtk/gtkentry.c:9613 gtk/gtklabel.c:6700 gtk/gtktextview.c:9548
|
||||
+#: gtk/gtkentry.c:9618 gtk/gtklabel.c:6700 gtk/gtktextview.c:9551
|
||||
msgid "Select _All"
|
||||
msgstr "_Selecionar tudo"
|
||||
|
||||
-#: gtk/gtkentry.c:9623 gtk/gtktextview.c:9558
|
||||
+#: gtk/gtkentry.c:9628 gtk/gtktextview.c:9561
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Inserir _emoji"
|
||||
|
||||
-#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9782
|
||||
+#: gtk/gtkentry.c:9804 gtk/gtktextview.c:9785
|
||||
msgid "Select all"
|
||||
msgstr "Selecionar tudo"
|
||||
|
||||
-#: gtk/gtkentry.c:9802 gtk/gtktextview.c:9785
|
||||
+#: gtk/gtkentry.c:9807 gtk/gtktextview.c:9788
|
||||
msgid "Cut"
|
||||
msgstr "Recortar"
|
||||
|
||||
-#: gtk/gtkentry.c:9805 gtk/gtktextview.c:9788
|
||||
+#: gtk/gtkentry.c:9810 gtk/gtktextview.c:9791
|
||||
msgid "Copy"
|
||||
msgstr "Copiar"
|
||||
|
||||
-#: gtk/gtkentry.c:9808 gtk/gtktextview.c:9791
|
||||
+#: gtk/gtkentry.c:9813 gtk/gtktextview.c:9794
|
||||
msgid "Paste"
|
||||
msgstr "Colar"
|
||||
|
||||
-#: gtk/gtkentry.c:10880
|
||||
+#: gtk/gtkentry.c:10885
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "A tecla Caps Lock está ativa"
|
||||
|
||||
-#: gtk/gtkentry.c:11158
|
||||
+#: gtk/gtkentry.c:11163
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Inserir emoji"
|
||||
|
||||
@@ -2725,53 +2734,53 @@ msgctxt "font"
|
||||
msgid "None"
|
||||
msgstr "Nenhuma"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1602
|
||||
+#: gtk/gtkfontchooserwidget.c:1604
|
||||
msgid "Width"
|
||||
msgstr "Largura"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1603
|
||||
+#: gtk/gtkfontchooserwidget.c:1605
|
||||
msgid "Weight"
|
||||
msgstr "Peso"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1604
|
||||
+#: gtk/gtkfontchooserwidget.c:1606
|
||||
msgid "Italic"
|
||||
msgstr "Itálico"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1605
|
||||
+#: gtk/gtkfontchooserwidget.c:1607
|
||||
msgid "Slant"
|
||||
msgstr "Inclinado"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:1606
|
||||
+#: gtk/gtkfontchooserwidget.c:1608
|
||||
msgid "Optical Size"
|
||||
msgstr "Tamanho ótico"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2306 gtk/inspector/prop-editor.c:1676
|
||||
+#: gtk/gtkfontchooserwidget.c:2308 gtk/inspector/prop-editor.c:1676
|
||||
msgid "Default"
|
||||
msgstr "Padrão"
|
||||
|
||||
# Drop-down item
|
||||
# https://developer.mozilla.org/en-US/docs/Web/API/Event/eventPhase
|
||||
-#: gtk/gtkfontchooserwidget.c:2353
|
||||
+#: gtk/gtkfontchooserwidget.c:2355
|
||||
msgid "Ligatures"
|
||||
msgstr "Ligaduras"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2354
|
||||
+#: gtk/gtkfontchooserwidget.c:2356
|
||||
msgid "Letter Case"
|
||||
msgstr "Caixa de letra"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2355
|
||||
+#: gtk/gtkfontchooserwidget.c:2357
|
||||
msgid "Number Case"
|
||||
msgstr "Caixa de número"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2356
|
||||
+#: gtk/gtkfontchooserwidget.c:2358
|
||||
msgid "Number Spacing"
|
||||
msgstr "Espaçamento de número"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2357
|
||||
+#: gtk/gtkfontchooserwidget.c:2359
|
||||
msgid "Number Formatting"
|
||||
msgstr "Formatação de número"
|
||||
|
||||
-#: gtk/gtkfontchooserwidget.c:2358
|
||||
+#: gtk/gtkfontchooserwidget.c:2360
|
||||
msgid "Character Variants"
|
||||
msgstr "Variantes de caractere"
|
||||
|
||||
@@ -2783,7 +2792,7 @@ msgstr "Criação de contexto OpenGL falhou"
|
||||
msgid "Application menu"
|
||||
msgstr "Menu aplicativo"
|
||||
|
||||
-#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9356
|
||||
+#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9381
|
||||
msgid "Close"
|
||||
msgstr "Fechar"
|
||||
|
||||
@@ -4093,24 +4102,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
-#: gtk/gtkwindow.c:9304
|
||||
+#: gtk/gtkwindow.c:9329
|
||||
msgid "Move"
|
||||
msgstr "Mover"
|
||||
|
||||
-#: gtk/gtkwindow.c:9312
|
||||
+#: gtk/gtkwindow.c:9337
|
||||
msgid "Resize"
|
||||
msgstr "Redimensionar"
|
||||
|
||||
-#: gtk/gtkwindow.c:9343
|
||||
+#: gtk/gtkwindow.c:9368
|
||||
msgid "Always on Top"
|
||||
msgstr "Sempre no topo"
|
||||
|
||||
-#: gtk/gtkwindow.c:12778
|
||||
+#: gtk/gtkwindow.c:12803
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "Você deseja usar Inspetor GTK+?"
|
||||
|
||||
-#: gtk/gtkwindow.c:12780
|
||||
+#: gtk/gtkwindow.c:12805
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -4121,7 +4130,7 @@ msgstr ""
|
||||
"modifique o estado interno de qualquer aplicativo GTK+. Usá-lo pode fazer "
|
||||
"que o aplicativo se encerre ou falhe."
|
||||
|
||||
-#: gtk/gtkwindow.c:12785
|
||||
+#: gtk/gtkwindow.c:12810
|
||||
msgid "Don't show this message again"
|
||||
msgstr "Não mostre essa mensagem novamente"
|
||||
|
||||
@@ -7855,7 +7864,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnamita (VIQR)"
|
||||
|
||||
#. ID
|
||||
-#: modules/input/imwayland.c:105
|
||||
+#: modules/input/imwayland.c:106
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
@ -1,24 +0,0 @@
|
||||
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Wed, 30 Nov 2022 09:54:32 +0100
|
||||
Subject: application: Switch links to gtk-3-24 branch
|
||||
|
||||
`master` doesn't exist anymore and we want to refer to a GTK3 example
|
||||
|
||||
Origin: upstream, 3.24.36, commit:fb72264a2781de5af7021e9292464746d4a8bab8
|
||||
---
|
||||
gtk/gtkapplication.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
|
||||
index 205d377..17e9205 100644
|
||||
--- a/gtk/gtkapplication.c
|
||||
+++ b/gtk/gtkapplication.c
|
||||
@@ -113,7 +113,7 @@
|
||||
*
|
||||
* ## A simple application ## {#gtkapplication}
|
||||
*
|
||||
- * [A simple example](https://git.gnome.org/browse/gtk+/tree/examples/bp/bloatpad.c)
|
||||
+ * [A simple example](https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/examples/bp/bloatpad.c)
|
||||
*
|
||||
* GtkApplication optionally registers with a session manager
|
||||
* of the users session (if you set the #GtkApplication:register-session
|
||||
@ -1,102 +0,0 @@
|
||||
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Wed, 30 Nov 2022 09:57:38 +0100
|
||||
Subject: docs: Switch example to gtk-3-24 branch
|
||||
|
||||
Let's use recent examples.
|
||||
|
||||
Origin: upstream, 3.24.36, commit:47bfc83931c57da0476ea074d970e699d1240222
|
||||
---
|
||||
docs/reference/gtk/getting_started.xml.in | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/docs/reference/gtk/getting_started.xml.in b/docs/reference/gtk/getting_started.xml.in
|
||||
index efa604c..fb9705e 100644
|
||||
--- a/docs/reference/gtk/getting_started.xml.in
|
||||
+++ b/docs/reference/gtk/getting_started.xml.in
|
||||
@@ -450,7 +450,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
|
||||
|
||||
...
|
||||
]]></programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application2/exampleappwin.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application2/exampleappwin.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>You may have noticed that we used the <literal>_from_resource(<!-- -->)</literal> variant
|
||||
@@ -518,7 +518,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
|
||||
|
||||
...
|
||||
]]></programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application3/exampleappwin.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application3/exampleappwin.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>Now we revisit the example_app_window_open() function that
|
||||
@@ -567,7 +567,7 @@ example_app_window_open (ExampleAppWindow *win,
|
||||
|
||||
...
|
||||
]]></programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application3/exampleappwin.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application3/exampleappwin.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>Note that we did not have to touch the stack switcher
|
||||
@@ -665,7 +665,7 @@ example_app_class_init (ExampleAppClass *class)
|
||||
|
||||
...
|
||||
</programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application4/exampleapp.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application4/exampleapp.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>Our preferences menu item does not do anything yet,
|
||||
@@ -731,7 +731,7 @@ example_app_window_init (ExampleAppWindow *win)
|
||||
|
||||
...
|
||||
]]></programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application5/exampleappwin.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application5/exampleappwin.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>The code to connect the font setting is a little more involved,
|
||||
@@ -780,7 +780,7 @@ preferences_activated (GSimpleAction *action,
|
||||
|
||||
...
|
||||
]]></programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application6/exampleapp.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application6/exampleapp.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>After all this work, our application can now show
|
||||
@@ -866,7 +866,7 @@ example_app_window_init (ExampleAppWindow *win)
|
||||
|
||||
...
|
||||
]]></programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application7/exampleappwin.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application7/exampleappwin.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>With the search bar, our application now looks like this:</para>
|
||||
@@ -926,7 +926,7 @@ example_app_window_init (ExampleAppWindow *win)
|
||||
|
||||
...
|
||||
]]></programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application8/exampleappwin.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application8/exampleappwin.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>What our application looks like now:</para>
|
||||
@@ -989,12 +989,12 @@ example_app_window_init (ExampleAppWindow *win)
|
||||
|
||||
...
|
||||
</programlisting>
|
||||
- <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application9/exampleappwin.c">full source</ulink>)</para>
|
||||
+ <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application9/exampleappwin.c">full source</ulink>)</para>
|
||||
</informalexample>
|
||||
|
||||
<para>We also need a function that counts the lines of the currently
|
||||
active tab, and updates the @lines label. See the
|
||||
- <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application9/exampleappwin.c">full source</ulink>
|
||||
+ <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/examples/application9/exampleappwin.c">full source</ulink>
|
||||
if you are interested in the details.</para>
|
||||
|
||||
<para>This brings our example application to this appearance:</para>
|
||||
@ -1,24 +0,0 @@
|
||||
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Wed, 30 Nov 2022 09:59:33 +0100
|
||||
Subject: docs: Use main branch instead of master
|
||||
|
||||
The old name still works but let's use the current name.
|
||||
|
||||
Origin: upstream, 3.24.36, commit:785e2ab168f025e8c4bf0250100827caffb60ba5
|
||||
---
|
||||
docs/reference/gtk/resources.sgml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/docs/reference/gtk/resources.sgml b/docs/reference/gtk/resources.sgml
|
||||
index e51e382..eeca69a 100644
|
||||
--- a/docs/reference/gtk/resources.sgml
|
||||
+++ b/docs/reference/gtk/resources.sgml
|
||||
@@ -51,7 +51,7 @@ questions will be directed to Discourse.
|
||||
|
||||
<para>
|
||||
Please, follow the instructions outlined in the
|
||||
-<ulink url="https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md">Contribution Guide</ulink> available in the GTK
|
||||
+<ulink url="https://gitlab.gnome.org/GNOME/gtk/-/blob/main/CONTRIBUTING.md">Contribution Guide</ulink> available in the GTK
|
||||
source code repository.
|
||||
</para>
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Tue, 6 Dec 2022 23:51:28 +0000
|
||||
Subject: gdk/wayland: save custom xdg-activation startup_id
|
||||
|
||||
We must save the startup id. in gdk_wayland_display_notify_startup_complete
|
||||
which was set by a previous gtk_window_set_startup_id call so we can use it
|
||||
later when presenting the window.
|
||||
|
||||
Needed for activation of gnome-terminal (also needs patches on the application
|
||||
side, see https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7952).
|
||||
|
||||
Fixes #5386
|
||||
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
|
||||
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5301
|
||||
---
|
||||
gdk/wayland/gdkdisplay-wayland.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
|
||||
index ddf2bf3..7ce279d 100644
|
||||
--- a/gdk/wayland/gdkdisplay-wayland.c
|
||||
+++ b/gdk/wayland/gdkdisplay-wayland.c
|
||||
@@ -948,7 +948,13 @@ gdk_wayland_display_notify_startup_complete (GdkDisplay *display,
|
||||
#ifdef HAVE_XDG_ACTIVATION
|
||||
/* Will be signaled with focus activation */
|
||||
if (display_wayland->xdg_activation)
|
||||
- return;
|
||||
+ {
|
||||
+ if (startup_id != NULL)
|
||||
+ {
|
||||
+ display_wayland->startup_notification_id = g_strdup (startup_id);
|
||||
+ }
|
||||
+ return;
|
||||
+ }
|
||||
#endif
|
||||
|
||||
if (startup_id == NULL)
|
||||
11
debian/patches/series
vendored
11
debian/patches/series
vendored
@ -1,17 +1,6 @@
|
||||
dist/Reinstate-gdk-wayland-cursor-meson.build.patch
|
||||
Flush-drawable-surface-when-getting-a-pixbuf.patch
|
||||
testsuite-Avoid-using-should_fail.patch
|
||||
testsuite-Try-enabling-a11y-tests-other-than-those-known-.patch
|
||||
testsuite-Don-t-create-.test-files-for-flaky-or-failing-t.patch
|
||||
wayland-Look-for-cursor-themes-in-HOME.patch
|
||||
Update-Brazilian-Portuguese-translation.patch
|
||||
application-Switch-links-to-gtk-3-24-branch.patch
|
||||
docs-Switch-example-to-gtk-3-24-branch.patch
|
||||
docs-Use-main-branch-instead-of-master.patch
|
||||
016_no_offscreen_widgets_grabbing.patch
|
||||
017_no_offscreen_device_grabbing.patch
|
||||
060_ignore-random-icons.patch
|
||||
reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
|
||||
reftests-Allow-minor-differences-to-be-tolerated.patch
|
||||
window-focus-on-window-show-for-wayland-activation.patch
|
||||
gdk-wayland-save-custom-xdg-activation-startup_id.patch
|
||||
|
||||
@ -1,165 +0,0 @@
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Wed, 23 Nov 2022 18:36:08 +0000
|
||||
Subject: testsuite: Avoid using should_fail
|
||||
|
||||
There are two possible interpretations of "expected failure": either
|
||||
the test *must* fail (exactly the inverse of an ordinary test, with
|
||||
success becoming failure and failure becoming success), or the test
|
||||
*may* fail (with success intended, but failure possible in some
|
||||
environments). Autotools had the second interpretation, which seems
|
||||
more useful in practice, but Meson has the first.
|
||||
|
||||
In GTK 3.24.35, if the environment is such that the label-sizing.ui
|
||||
reftest happens to be successful, the overall result of the test suite
|
||||
is failure. This seems unlikely to have been the intention.
|
||||
|
||||
Instead of using should_fail, put the tests in one of two new suites:
|
||||
"flaky" is intended for tests that succeed or fail unpredictably
|
||||
according to the test environment or chance, while "failing" is for
|
||||
tests that ought to succeed but currently never do as a result of a
|
||||
bug or missing functionality. With a sufficiently new version of Meson,
|
||||
the flaky and failing tests are not run by default, but can be requested
|
||||
with a command like:
|
||||
|
||||
meson test --setup=unstable_tests --suite=flaky --suite=failing
|
||||
|
||||
This arrangement is inspired by GNOME/glib!2987, which was contributed
|
||||
by Marco Trevisan.
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5249
|
||||
Applied-upstream: 3.24.36, commit:820d72ffb8b69e6f19166be736bf434a2e43c4d9
|
||||
---
|
||||
testsuite/a11y/meson.build | 4 ++--
|
||||
testsuite/gtk/meson.build | 17 +++++++++++++----
|
||||
testsuite/meson.build | 7 +++++++
|
||||
testsuite/reftests/meson.build | 17 ++++++++++++++---
|
||||
4 files changed, 36 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
|
||||
index fa8b045..85d0f5d 100644
|
||||
--- a/testsuite/a11y/meson.build
|
||||
+++ b/testsuite/a11y/meson.build
|
||||
@@ -66,7 +66,7 @@ foreach t: a11y_state_tests
|
||||
'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
|
||||
'GTK_TEST_MESON=1',
|
||||
],
|
||||
- suite: 'a11y',
|
||||
+ suite: ['a11y', 'flaky'],
|
||||
)
|
||||
endif
|
||||
endforeach
|
||||
@@ -100,7 +100,7 @@ foreach t: a11y_tests
|
||||
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
|
||||
'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
|
||||
],
|
||||
- suite: 'a11y')
|
||||
+ suite: ['a11y', 'flaky'])
|
||||
endforeach
|
||||
|
||||
installed_test_data = [
|
||||
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
|
||||
index 206af0d..137f93a 100644
|
||||
--- a/testsuite/gtk/meson.build
|
||||
+++ b/testsuite/gtk/meson.build
|
||||
@@ -50,7 +50,9 @@ tests = [
|
||||
['revealer-size'],
|
||||
]
|
||||
|
||||
-# Tests that are expected to fail
|
||||
+# Tests that are expected to fail, sometimes or always
|
||||
+flaky = [
|
||||
+]
|
||||
xfail = [
|
||||
]
|
||||
|
||||
@@ -83,7 +85,15 @@ foreach t : tests
|
||||
install: get_option('installed_tests'),
|
||||
install_dir: installed_test_bindir)
|
||||
|
||||
- expect_fail = xfail.contains(test_name)
|
||||
+ suites = ['gtk']
|
||||
+
|
||||
+ if flaky.contains(test_name)
|
||||
+ suites += 'flaky'
|
||||
+ endif
|
||||
+
|
||||
+ if xfail.contains(test_name)
|
||||
+ suites += 'failing'
|
||||
+ endif
|
||||
|
||||
test(test_name, test_exe,
|
||||
args: [ '--tap', '-k' ],
|
||||
@@ -97,8 +107,7 @@ foreach t : tests
|
||||
'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
|
||||
'GTK_TEST_MESON=1',
|
||||
],
|
||||
- suite: 'gtk',
|
||||
- should_fail: expect_fail,
|
||||
+ suite: suites,
|
||||
)
|
||||
endforeach
|
||||
|
||||
diff --git a/testsuite/meson.build b/testsuite/meson.build
|
||||
index 289f272..032baf2 100644
|
||||
--- a/testsuite/meson.build
|
||||
+++ b/testsuite/meson.build
|
||||
@@ -2,6 +2,13 @@ gtk_libexecdir = join_paths(gtk_prefix, get_option('libexecdir'))
|
||||
installed_test_bindir = join_paths(gtk_libexecdir, 'installed-tests', 'gtk+')
|
||||
installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk+')
|
||||
|
||||
+if meson.version().version_compare('>=0.57.0')
|
||||
+ add_test_setup('default',
|
||||
+ is_default: true,
|
||||
+ exclude_suites: ['flaky', 'failing'],
|
||||
+ )
|
||||
+endif
|
||||
+
|
||||
subdir('gtk')
|
||||
subdir('gdk')
|
||||
subdir('css')
|
||||
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
|
||||
index 2135ebb..8c3c3e8 100644
|
||||
--- a/testsuite/reftests/meson.build
|
||||
+++ b/testsuite/reftests/meson.build
|
||||
@@ -419,7 +419,7 @@ test_data = [
|
||||
]
|
||||
|
||||
# Depending on the environment these fail, feel free to fix them
|
||||
-somehow_broken = [
|
||||
+flaky = [
|
||||
'button-wrapping.ui',
|
||||
'cellrenderer-pixbuf-stock-rtl.ui',
|
||||
'label-sizing.ui',
|
||||
@@ -428,9 +428,21 @@ somehow_broken = [
|
||||
'symbolic-icon-translucent-color.ui',
|
||||
'window-height-for-width.ui',
|
||||
]
|
||||
+xfail = [
|
||||
+]
|
||||
|
||||
foreach testname : test_data
|
||||
if testname.endswith('.ui') and not testname.endswith('.ref.ui')
|
||||
+ suites = ['reftest']
|
||||
+
|
||||
+ if flaky.contains(testname)
|
||||
+ suites += 'flaky'
|
||||
+ endif
|
||||
+
|
||||
+ if xfail.contains(testname)
|
||||
+ suites += 'failing'
|
||||
+ endif
|
||||
+
|
||||
# reftests fail when multiple windows open at the same time stealing the focus,
|
||||
# so set is_parallel to false
|
||||
test('reftest ' + testname, gtk_reftest,
|
||||
@@ -450,8 +462,7 @@ foreach testname : test_data
|
||||
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
|
||||
'REFTEST_MODULE_DIR=@0@'.format(meson.current_build_dir()),
|
||||
],
|
||||
- suite: 'reftest',
|
||||
- should_fail: somehow_broken.contains(testname),
|
||||
+ suite: suites,
|
||||
is_parallel: false)
|
||||
endif
|
||||
endforeach
|
||||
@ -1,95 +0,0 @@
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Wed, 23 Nov 2022 21:26:50 +0000
|
||||
Subject: testsuite: Don't create .test files for flaky or failing tests
|
||||
|
||||
These tests can be run manually, but are not suitable for use as an
|
||||
acceptance test, so let's not make frameworks like Debian's autopkgtest
|
||||
run these when they run ginsttest-runner in the most obvious way.
|
||||
|
||||
a11ytests.test doesn't seem to be reliable enough to be used as a QA
|
||||
acceptance criterion, and has been disabled as a build-time test in both
|
||||
Gitlab-CI and Debian since 2019. a11ystate.test is not set up to be run
|
||||
at build time at all, and has been marked as flaky on ci.debian.net
|
||||
since 2018.
|
||||
|
||||
The rest of the testsuite/a11y directory seems to have been
|
||||
reliable in practice, at least on ci.debian.net, so try leaving them
|
||||
enabled as installed-tests.
|
||||
|
||||
In principle this could be made finer-grained by having a separate .test
|
||||
file and a separate Meson test() for each .ui file, but that would
|
||||
require more active maintenance of GTK 3.
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5249
|
||||
Applied-upstream: 3.24.36, commit:cdb598793a0bdbbbc5b6226635afefcd33f51753
|
||||
---
|
||||
testsuite/a11y/meson.build | 7 ++++++-
|
||||
testsuite/a11y/state/meson.build | 7 +++++--
|
||||
testsuite/gtk/meson.build | 7 ++++++-
|
||||
3 files changed, 17 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
|
||||
index ea6348c..2613e3c 100644
|
||||
--- a/testsuite/a11y/meson.build
|
||||
+++ b/testsuite/a11y/meson.build
|
||||
@@ -181,7 +181,12 @@ installed_test_data = [
|
||||
]
|
||||
|
||||
a11y_installed_tests = [
|
||||
- 'a11ytests.test',
|
||||
+ # This is the equivalent of a11y_state_tests above, and does not seem
|
||||
+ # to be reliable enough to act as a QA gate in practice. We install the
|
||||
+ # test executable and the data needed to run it, but don't hook it up
|
||||
+ # to ginsttest-runner.
|
||||
+ #'a11ytests.test',
|
||||
+
|
||||
'a11ychildren.test',
|
||||
'a11ytree.test',
|
||||
'a11yvalue.test',
|
||||
diff --git a/testsuite/a11y/state/meson.build b/testsuite/a11y/state/meson.build
|
||||
index 782649e..aa18a84 100644
|
||||
--- a/testsuite/a11y/state/meson.build
|
||||
+++ b/testsuite/a11y/state/meson.build
|
||||
@@ -16,7 +16,10 @@ test_data = [
|
||||
|
||||
|
||||
a11y_installed_tests = [
|
||||
- 'a11ystate.test',
|
||||
+ # This is not run at build time at all, and consistently fails on
|
||||
+ # Debian's CI infrastructure, so don't set it up to be run by
|
||||
+ # ginsttest-runner.
|
||||
+ #'a11ystate.test',
|
||||
]
|
||||
|
||||
if get_option('installed_tests')
|
||||
@@ -32,4 +35,4 @@ if get_option('installed_tests')
|
||||
endforeach
|
||||
|
||||
install_data(test_data, install_dir: join_paths(installed_test_bindir, 'state'))
|
||||
-endif
|
||||
\ No newline at end of file
|
||||
+endif
|
||||
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
|
||||
index 137f93a..84a8cfc 100644
|
||||
--- a/testsuite/gtk/meson.build
|
||||
+++ b/testsuite/gtk/meson.build
|
||||
@@ -146,6 +146,11 @@ endif
|
||||
if get_option('installed_tests')
|
||||
foreach t : tests
|
||||
test_name = t.get(0)
|
||||
+
|
||||
+ if flaky.contains(test_name) or xfail.contains(test_name)
|
||||
+ continue
|
||||
+ endif
|
||||
+
|
||||
conf = configuration_data()
|
||||
conf.set('testexecdir', installed_test_bindir)
|
||||
conf.set('test', test_name)
|
||||
@@ -158,4 +163,4 @@ if get_option('installed_tests')
|
||||
install_subdir('icons', install_dir: installed_test_bindir)
|
||||
install_subdir('icons2', install_dir: installed_test_bindir)
|
||||
install_subdir('ui', install_dir: installed_test_bindir)
|
||||
-endif
|
||||
\ No newline at end of file
|
||||
+endif
|
||||
@ -1,31 +0,0 @@
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Thu, 24 Nov 2022 12:09:12 +0000
|
||||
Subject: testsuite: Try enabling a11y tests,
|
||||
other than those known to be unstable
|
||||
|
||||
At least some of the tests implemented via the accessibility-dump
|
||||
executable are known to be unstable, but the tests based on separate
|
||||
executables (tree-performance.c, etc.) have been reasonably consistently
|
||||
passing on ci.debian.net for several years, so hopefully they are also
|
||||
reliable enough for upstream CI and we don't need to mark them as flaky?
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5249
|
||||
Applied-upstream: 3.24.36, commit:a1cd0f71d9170dcc8f0bb3579961a30d16a51e48
|
||||
---
|
||||
testsuite/a11y/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
|
||||
index 85d0f5d..ea6348c 100644
|
||||
--- a/testsuite/a11y/meson.build
|
||||
+++ b/testsuite/a11y/meson.build
|
||||
@@ -100,7 +100,7 @@ foreach t: a11y_tests
|
||||
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
|
||||
'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
|
||||
],
|
||||
- suite: ['a11y', 'flaky'])
|
||||
+ suite: ['a11y'])
|
||||
endforeach
|
||||
|
||||
installed_test_data = [
|
||||
@ -1,70 +0,0 @@
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Tue, 29 Jun 2021 16:57:15 -0400
|
||||
Subject: wayland: Look for cursor themes in $HOME
|
||||
|
||||
We should look in the same places that libXcursor does,
|
||||
so add $XDG_DATA_HOME/icons and $HOME/.icons to the list.
|
||||
|
||||
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4080
|
||||
Origin: upstream, 3.24.36, commit:3f1536632f682c355d0c3abe1afc80cf975c2cce
|
||||
---
|
||||
gdk/wayland/gdkdisplay-wayland.c | 36 +++++++++++++++++++++++++++++-------
|
||||
1 file changed, 29 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
|
||||
index f60f75a..ddf2bf3 100644
|
||||
--- a/gdk/wayland/gdkdisplay-wayland.c
|
||||
+++ b/gdk/wayland/gdkdisplay-wayland.c
|
||||
@@ -1112,6 +1112,26 @@ gdk_wayland_display_init (GdkWaylandDisplay *display)
|
||||
display->monitors = g_ptr_array_new_with_free_func (g_object_unref);
|
||||
}
|
||||
|
||||
+static struct wl_cursor_theme *
|
||||
+try_load_theme (GdkWaylandDisplay *display_wayland,
|
||||
+ const char *dir,
|
||||
+ gboolean dotdir,
|
||||
+ const char *name,
|
||||
+ int size)
|
||||
+{
|
||||
+ struct wl_cursor_theme *theme = NULL;
|
||||
+ char *path;
|
||||
+
|
||||
+ path = g_build_filename (dir, dotdir ? ".icons" : "icons", name, "cursors", NULL);
|
||||
+
|
||||
+ if (g_file_test (path, G_FILE_TEST_IS_DIR))
|
||||
+ theme = wl_cursor_theme_create (path, size, display_wayland->shm);
|
||||
+
|
||||
+ g_free (path);
|
||||
+
|
||||
+ return theme;
|
||||
+}
|
||||
+
|
||||
static struct wl_cursor_theme *
|
||||
get_cursor_theme (GdkWaylandDisplay *display_wayland,
|
||||
const char *name,
|
||||
@@ -1121,16 +1141,18 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland,
|
||||
struct wl_cursor_theme *theme = NULL;
|
||||
int i;
|
||||
|
||||
+ theme = try_load_theme (display_wayland, g_get_user_data_dir (), FALSE, name, size);
|
||||
+ if (theme)
|
||||
+ return theme;
|
||||
+
|
||||
+ theme = try_load_theme (display_wayland, g_get_home_dir (), TRUE, name, size);
|
||||
+ if (theme)
|
||||
+ return theme;
|
||||
+
|
||||
xdg_data_dirs = g_get_system_data_dirs ();
|
||||
for (i = 0; xdg_data_dirs[i]; i++)
|
||||
{
|
||||
- char *path = g_build_filename (xdg_data_dirs[i], "icons", name, "cursors", NULL);
|
||||
-
|
||||
- if (g_file_test (path, G_FILE_TEST_IS_DIR))
|
||||
- theme = wl_cursor_theme_create (path, size, display_wayland->shm);
|
||||
-
|
||||
- g_free (path);
|
||||
-
|
||||
+ theme = try_load_theme (display_wayland, xdg_data_dirs[i], FALSE, name, size);
|
||||
if (theme)
|
||||
return theme;
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Tue, 6 Dec 2022 20:55:53 +0000
|
||||
Subject: window: focus on window show for wayland activation
|
||||
|
||||
When using xdg_activation this is responsible for submitting
|
||||
the activation token / startup id to the compositor.
|
||||
|
||||
This supersedes 5dca6dce91b4413064c858ae011ea7b1e33421e2, which misses the case
|
||||
where the window is shown with gtk_widget_show instead of gtk_window_present.
|
||||
Note 5dca6dce91 was also accidentally missing on the xdg-activation GTK3 port.
|
||||
|
||||
Fixes #5386
|
||||
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
|
||||
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5301
|
||||
---
|
||||
gtk/gtkwindow.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
|
||||
index 5478e89..c87b17a 100644
|
||||
--- a/gtk/gtkwindow.c
|
||||
+++ b/gtk/gtkwindow.c
|
||||
@@ -6228,6 +6228,16 @@ gtk_window_show (GtkWidget *widget)
|
||||
|
||||
if (priv->modal)
|
||||
gtk_grab_add (widget);
|
||||
+
|
||||
+#ifdef GDK_WINDOWING_WAYLAND
|
||||
+ if (GDK_IS_WAYLAND_WINDOW (gtk_widget_get_window (widget)))
|
||||
+ {
|
||||
+ // Submits the activation token / startup id to the compositor
|
||||
+ gdk_window_focus (gtk_widget_get_window (widget), priv->initial_timestamp);
|
||||
+ // Use gtk_window_present's timestamp only once
|
||||
+ priv->initial_timestamp = GDK_CURRENT_TIME;
|
||||
+ }
|
||||
+#endif
|
||||
}
|
||||
|
||||
static void
|
||||
Reference in New Issue
Block a user