From 98ca370c79b35ea35cb7fe473f7ee6083307e12d Mon Sep 17 00:00:00 2001 From: Sergio Costas Rodriguez Date: Mon, 14 Oct 2024 17:55:53 +0200 Subject: [PATCH] Updated all parts to the last stable version Didn't update gobject-introspection to 1.82.0 because it breaks libportal introspection. Also didn't update neither libadwaita to 1.6.1 nor gtk to 4.16 because I think that we should discuss it before. --- patches/libadwaita-add-thai-translation.patch | 475 ---------------- ...-skip-middle-clicks-on-different-tab.patch | 105 ---- .../libadwaita-update-thai-translation.patch | 506 ------------------ ...e-manager-Support-Yaru-accent-colors.patch | 26 +- snapcraft.yaml | 108 ++-- 5 files changed, 72 insertions(+), 1148 deletions(-) delete mode 100644 patches/libadwaita-add-thai-translation.patch delete mode 100644 patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch delete mode 100644 patches/libadwaita-update-thai-translation.patch diff --git a/patches/libadwaita-add-thai-translation.patch b/patches/libadwaita-add-thai-translation.patch deleted file mode 100644 index e667eaf..0000000 --- a/patches/libadwaita-add-thai-translation.patch +++ /dev/null @@ -1,475 +0,0 @@ -From f0cf339fb264965e968122cf184d8795e10178d7 Mon Sep 17 00:00:00 2001 -From: Aefgh Threenine -Date: Sat, 21 Sep 2024 14:17:18 +0000 -Subject: [PATCH] Add Thai translation - - -diff --git a/po/LINGUAS b/po/LINGUAS -index 121af409..f46e699b 100644 ---- a/po/LINGUAS -+++ b/po/LINGUAS -@@ -42,6 +42,7 @@ sk - sl - sr - sv -+th - tr - uk - vi -diff --git a/po/th.po b/po/th.po -new file mode 100644 -index 00000000..61bdeebd ---- /dev/null -+++ b/po/th.po -@@ -0,0 +1,451 @@ -+# Thai translation for libadwaita. -+# Copyright (C) 2024 libadwaita's COPYRIGHT HOLDER -+# This file is distributed under the same license as the libadwaita package. -+# Atirut Wattanamongkol , 2024. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: libadwaita libadwaita-1-6\n" -+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libadwaita/issues\n" -+"POT-Creation-Date: 2024-09-21 14:15+0000\n" -+"PO-Revision-Date: 2024-09-21 21:14+0700\n" -+"Last-Translator: Atirut Wattanamongkol \n" -+"Language-Team: Thai \n" -+"Language: th\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0;\n" -+"X-Generator: Poedit 3.5\n" -+ -+#: src/adw-about-dialog.c:207 src/adw-about-window.c:207 -+msgid "GNU General Public License, version 2 or later" -+msgstr "" -+ -+#: src/adw-about-dialog.c:208 src/adw-about-window.c:208 -+msgid "GNU General Public License, version 3 or later" -+msgstr "" -+ -+#: src/adw-about-dialog.c:209 src/adw-about-window.c:209 -+msgid "GNU Lesser General Public License, version 2.1 or later" -+msgstr "" -+ -+#: src/adw-about-dialog.c:210 src/adw-about-window.c:210 -+msgid "GNU Lesser General Public License, version 3 or later" -+msgstr "" -+ -+#: src/adw-about-dialog.c:211 src/adw-about-window.c:211 -+msgid "BSD 2-Clause License" -+msgstr "" -+ -+#: src/adw-about-dialog.c:212 src/adw-about-window.c:212 -+msgid "The MIT License (MIT)" -+msgstr "" -+ -+#: src/adw-about-dialog.c:213 src/adw-about-window.c:213 -+msgid "Artistic License 2.0" -+msgstr "" -+ -+#: src/adw-about-dialog.c:214 src/adw-about-window.c:214 -+msgid "GNU General Public License, version 2 only" -+msgstr "" -+ -+#: src/adw-about-dialog.c:215 src/adw-about-window.c:215 -+msgid "GNU General Public License, version 3 only" -+msgstr "" -+ -+#: src/adw-about-dialog.c:216 src/adw-about-window.c:216 -+msgid "GNU Lesser General Public License, version 2.1 only" -+msgstr "" -+ -+#: src/adw-about-dialog.c:217 src/adw-about-window.c:217 -+msgid "GNU Lesser General Public License, version 3 only" -+msgstr "" -+ -+#: src/adw-about-dialog.c:218 src/adw-about-window.c:218 -+msgid "GNU Affero General Public License, version 3 or later" -+msgstr "" -+ -+#: src/adw-about-dialog.c:219 src/adw-about-window.c:219 -+msgid "GNU Affero General Public License, version 3 only" -+msgstr "" -+ -+#: src/adw-about-dialog.c:220 src/adw-about-window.c:220 -+msgid "BSD 3-Clause License" -+msgstr "" -+ -+#: src/adw-about-dialog.c:221 src/adw-about-window.c:221 -+msgid "Apache License, Version 2.0" -+msgstr "" -+ -+#: src/adw-about-dialog.c:222 src/adw-about-window.c:222 -+msgid "Mozilla Public License 2.0" -+msgstr "" -+ -+#: src/adw-about-dialog.c:223 src/adw-about-window.c:223 -+msgid "BSD Zero-Clause License" -+msgstr "" -+ -+#: src/adw-about-dialog.c:571 src/adw-about-window.c:570 -+msgid "Code by" -+msgstr "โค้ดโดย" -+ -+#: src/adw-about-dialog.c:572 src/adw-about-window.c:571 -+msgid "Design by" -+msgstr "ออกแบบโดย" -+ -+#: src/adw-about-dialog.c:573 src/adw-about-window.c:572 -+msgid "Artwork by" -+msgstr "งานศิลปะโดย" -+ -+#: src/adw-about-dialog.c:574 src/adw-about-window.c:573 -+msgid "Documentation by" -+msgstr "เอกสารประกอบโดย" -+ -+#: src/adw-about-dialog.c:575 src/adw-about-window.c:574 -+msgid "Translated by" -+msgstr "แปลโดย" -+ -+#. Translators: this is the license preamble; the string at the end -+#. * contains the name of the license as link text. -+#. -+#: src/adw-about-dialog.c:604 src/adw-about-window.c:603 -+#, c-format -+msgid "" -+"This application comes with absolutely no warranty. See the %s for details." -+msgstr "" -+"แอปพลิเคชันนี้ไม่มีการรับประกันใดๆ ทั้งสิ้น ดูรายละเอียดเพิ่มเติมได้ที่ %s" -+ -+#: src/adw-about-dialog.c:682 src/adw-about-window.c:681 -+msgid "This Application" -+msgstr "" -+ -+#: src/adw-about-dialog.c:984 src/adw-about-window.c:983 -+#, c-format -+msgid "Version %s" -+msgstr "" -+ -+#: src/adw-about-dialog.c:1010 src/adw-about-window.c:1009 -+msgid "Unable to parse release notes:" -+msgstr "" -+ -+#: src/adw-about-dialog.c:1016 src/adw-about-window.c:1015 -+#, c-format -+msgid "Line: %d, character: %d" -+msgstr "" -+ -+#: src/adw-about-dialog.c:1302 src/adw-about-window.c:1301 -+msgid "Copied to clipboard" -+msgstr "" -+ -+#: src/adw-about-dialog.c:1329 src/adw-about-window.c:1329 -+msgid "Unable to save debugging information" -+msgstr "" -+ -+#: src/adw-about-dialog.c:1334 src/adw-about-window.c:1334 -+#: src/adw-sheet-controls.c:127 -+msgid "Close" -+msgstr "" -+ -+#: src/adw-about-dialog.c:1351 src/adw-about-window.c:1350 -+msgid "Save debugging information" -+msgstr "" -+ -+#: src/adw-about-dialog.ui:5 src/adw-about-window.ui:5 -+msgid "About" -+msgstr "" -+ -+#: src/adw-about-dialog.ui:89 src/adw-about-window.ui:92 -+msgid "_What’s New" -+msgstr "มี_อะไรใหม่" -+ -+#: src/adw-about-dialog.ui:105 src/adw-about-window.ui:108 -+msgid "_Details" -+msgstr "_รายละเอียด" -+ -+#: src/adw-about-dialog.ui:121 src/adw-about-dialog.ui:341 -+#: src/adw-about-window.ui:124 src/adw-about-window.ui:344 -+msgid "_Website" -+msgstr "เ_ว็บไซต์" -+ -+#: src/adw-about-dialog.ui:145 src/adw-about-window.ui:148 -+msgid "_Support Questions" -+msgstr "คำถาม_ช่วยเหลือ" -+ -+#: src/adw-about-dialog.ui:162 src/adw-about-window.ui:165 -+msgid "_Report an Issue" -+msgstr "_รายงานปัญหา" -+ -+#: src/adw-about-dialog.ui:178 src/adw-about-window.ui:181 -+msgid "_Troubleshooting" -+msgstr "การแ_ก้ไขปัญหา" -+ -+#: src/adw-about-dialog.ui:198 src/adw-about-window.ui:201 -+msgid "_Credits" -+msgstr "เ_ครดิต" -+ -+#: src/adw-about-dialog.ui:214 src/adw-about-window.ui:217 -+msgid "_Legal" -+msgstr "ข้อมูลทาง_กฎหมาย" -+ -+#: src/adw-about-dialog.ui:230 src/adw-about-window.ui:233 -+msgid "_Acknowledgements" -+msgstr "คำ_ขอบคุณ" -+ -+#: src/adw-about-dialog.ui:260 src/adw-about-window.ui:263 -+msgid "What’s New" -+msgstr "มีอะไรใหม่" -+ -+#: src/adw-about-dialog.ui:303 src/adw-about-window.ui:306 -+msgid "Details" -+msgstr "รายละเอียด" -+ -+#: src/adw-about-dialog.ui:369 src/adw-about-window.ui:372 -+msgid "Troubleshooting" -+msgstr "การแก้ไขปัญหา" -+ -+#: src/adw-about-dialog.ui:392 src/adw-about-window.ui:395 -+msgid "" -+"To assist in troubleshooting, you can view your debugging information. " -+"Providing this information to the application developers can help diagnose " -+"any problems you encounter when you report an issue." -+msgstr "" -+"คุณสามารถดูข้อมูลการดีบักเพื่อช่วยในการแก้ไขปัญหาได้ " -+"การให้ข้อมูลนี้แก่ผู้พัฒนาแอปพลิเคชันจะช่วยวินิจฉัยปัญหาต่าง ๆ ที่คุณพบเมื่อคุณรายงานปัญหา" -+ -+#: src/adw-about-dialog.ui:403 src/adw-about-window.ui:406 -+msgid "_Debugging Information" -+msgstr "ข้อมูลการ_ดีบัก" -+ -+#: src/adw-about-dialog.ui:430 src/adw-about-window.ui:433 -+msgid "Debugging Information" -+msgstr "ข้อมูลการดีบัก" -+ -+#: src/adw-about-dialog.ui:475 src/adw-about-window.ui:478 -+msgid "_Copy Text" -+msgstr "_คัดลอกข้อความ" -+ -+#: src/adw-about-dialog.ui:483 src/adw-about-window.ui:486 -+msgid "_Save As…" -+msgstr "_บันทึกเป็น…" -+ -+#: src/adw-about-dialog.ui:496 src/adw-about-window.ui:499 -+msgid "Credits" -+msgstr "เครดิต" -+ -+#: src/adw-about-dialog.ui:527 src/adw-about-window.ui:530 -+msgid "Legal" -+msgstr "ข้อมูลทางกฎหมาย" -+ -+#: src/adw-about-dialog.ui:559 src/adw-about-window.ui:562 -+msgid "Acknowledgements" -+msgstr "คำขอบคุณ" -+ -+#: src/adw-back-button.c:311 src/adw-back-button.c:409 -+#: src/adw-back-button.c:519 -+msgid "Back" -+msgstr "กลับ" -+ -+#. Translators: This is a placeholder text of the search entry from AdwComboRow. It should be phrased as a verb. -+#: src/adw-combo-row.ui:50 src/adw-preferences-dialog.ui:85 -+#: src/adw-preferences-window.ui:96 -+msgid "Search" -+msgstr "ค้นหา" -+ -+#: src/adw-entry-row.ui:96 -+msgid "Apply" -+msgstr "นำไปใช้" -+ -+#: src/adw-inspector-page.c:98 -+msgid "No Preference" -+msgstr "ไม่กำหนด" -+ -+#: src/adw-inspector-page.c:100 -+msgid "Prefer Dark" -+msgstr "" -+ -+#: src/adw-inspector-page.c:102 -+msgid "Prefer Light" -+msgstr "" -+ -+#: src/adw-inspector-page.c:115 -+msgid "Blue" -+msgstr "" -+ -+#: src/adw-inspector-page.c:117 -+msgid "Teal" -+msgstr "" -+ -+#: src/adw-inspector-page.c:119 -+msgid "Green" -+msgstr "" -+ -+#: src/adw-inspector-page.c:121 -+msgid "Yellow" -+msgstr "" -+ -+#: src/adw-inspector-page.c:123 -+msgid "Orange" -+msgstr "" -+ -+#: src/adw-inspector-page.c:125 -+msgid "Red" -+msgstr "" -+ -+#: src/adw-inspector-page.c:127 -+msgid "Pink" -+msgstr "" -+ -+#: src/adw-inspector-page.c:129 -+msgid "Purple" -+msgstr "" -+ -+#: src/adw-inspector-page.c:131 -+msgid "Slate" -+msgstr "" -+ -+#. Translators: The name of the library, not the stylesheet -+#: src/adw-inspector-page.c:270 -+msgid "Adwaita" -+msgstr "" -+ -+#: src/adw-inspector-page.ui:10 -+msgid "System Appearance" -+msgstr "" -+ -+#: src/adw-inspector-page.ui:11 -+msgid "" -+"Override settings for this application. They will be reset upon closing the " -+"inspector." -+msgstr "" -+ -+#: src/adw-inspector-page.ui:14 -+msgid "System Supports Color Schemes" -+msgstr "" -+ -+#: src/adw-inspector-page.ui:20 -+msgid "Preferred Color Scheme" -+msgstr "" -+ -+#: src/adw-inspector-page.ui:39 -+msgid "Accent Color" -+msgstr "" -+ -+#: src/adw-inspector-page.ui:42 -+msgid "System Supports Accent Colors" -+msgstr "" -+ -+#: src/adw-inspector-page.ui:48 -+msgid "Preferred Accent Color" -+msgstr "" -+ -+#: src/adw-inspector-page.ui:77 -+msgid "Accessibility" -+msgstr "" -+ -+#: src/adw-inspector-page.ui:80 -+msgid "High Contrast" -+msgstr "" -+ -+#: src/adw-password-entry-row.c:70 -+msgid "Hide Password" -+msgstr "" -+ -+#: src/adw-password-entry-row.c:74 -+msgid "Show Password" -+msgstr "" -+ -+#: src/adw-password-entry-row.c:168 -+msgid "Caps Lock is on" -+msgstr "" -+ -+#: src/adw-password-entry-row.c:176 -+msgid "_Show Password" -+msgstr "" -+ -+#: src/adw-preferences-dialog.c:256 src/adw-preferences-window.c:261 -+msgid "Untitled page" -+msgstr "" -+ -+#: src/adw-preferences-dialog.ui:5 src/adw-preferences-window.ui:8 -+msgid "Preferences" -+msgstr "" -+ -+#: src/adw-preferences-dialog.ui:70 src/adw-preferences-window.ui:81 -+msgid "Search preferences" -+msgstr "" -+ -+#: src/adw-preferences-dialog.ui:152 src/adw-preferences-window.ui:163 -+msgid "No Results Found" -+msgstr "" -+ -+#: src/adw-preferences-dialog.ui:153 src/adw-tab-overview.ui:111 -+msgid "Try a different search" -+msgstr "" -+ -+#: src/adw-preferences-window.ui:164 -+msgid "Try a different search." -+msgstr "" -+ -+#: src/adw-sheet-controls.c:129 -+msgid "Close the window" -+msgstr "" -+ -+#: src/adw-split-button.c:530 src/adw-split-button.c:1044 -+msgid "More Options" -+msgstr "" -+ -+#: src/adw-tab-button.ui:7 -+msgid "View Open Tabs" -+msgstr "" -+ -+#. Translators: Tab overview title, %u is the number of open tabs -+#: src/adw-tab-overview.c:928 -+#, c-format -+msgid "%u Tab" -+msgid_plural "%u Tabs" -+msgstr[0] "" -+ -+#: src/adw-tab-overview.ui:21 -+msgid "Search Tabs" -+msgstr "" -+ -+#: src/adw-tab-overview.ui:51 -+msgid "Search tabs" -+msgstr "" -+ -+#: src/adw-tab-overview.ui:97 -+msgid "No Open Tabs" -+msgstr "" -+ -+#: src/adw-tab-overview.ui:110 -+msgid "No Tabs Found" -+msgstr "" -+ -+#: src/adw-tab-overview.ui:131 -+msgid "New _Tab" -+msgstr "" -+ -+#: src/adw-tab-thumbnail.ui:39 src/adw-tab.ui:75 -+msgid "Close Tab" -+msgstr "" -+ -+#: src/adw-toast-overlay.c:271 -+#, c-format -+msgid "A toast appeared: %s, has a button: %s" -+msgstr "" -+ -+#: src/adw-toast-overlay.c:274 -+#, c-format -+msgid "A toast appeared: %s" -+msgstr "" -+ -+#: src/adw-toast-overlay.c:276 -+#, c-format -+msgid "A toast appeared, has a button: %s" -+msgstr "" -+ -+#: src/adw-toast-overlay.c:279 -+msgid "A toast appeared" -+msgstr "" diff --git a/patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch b/patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch deleted file mode 100644 index f0ecec5..0000000 --- a/patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 66ba72b22864f38c36c542bfdfaf0ae469fc5ae7 Mon Sep 17 00:00:00 2001 -From: Alice Mikhaylenko -Date: Thu, 19 Sep 2024 19:55:34 +0400 -Subject: [PATCH] tab-box/grid: Skip middle clicks if hovering different tab - between press/release - -Fixes https://gitlab.gnome.org/GNOME/libadwaita/-/issues/915 - - -(cherry picked from commit 9079584dd997200a60f046b26949fc761748ce13) - -(cherry picked from commit 21739d348029b53227dd47c82944ce9e3dd7e771) - -diff --git a/src/adw-tab-box.c b/src/adw-tab-box.c -index 0bb6bb2b..8fb570d8 100644 ---- a/src/adw-tab-box.c -+++ b/src/adw-tab-box.c -@@ -163,6 +163,8 @@ struct _AdwTabBox - - GtkWidget *needs_attention_left; - GtkWidget *needs_attention_right; -+ -+ TabInfo *middle_clicked_tab; - }; - - G_DEFINE_FINAL_TYPE_WITH_CODE (AdwTabBox, adw_tab_box, GTK_TYPE_WIDGET, -@@ -1933,6 +1935,9 @@ close_animation_done_cb (TabInfo *info) - if (self->reordered_tab == info) - self->reordered_tab = NULL; - -+ if (self->middle_clicked_tab == info) -+ self->pressed_tab = NULL; -+ - remove_and_free_tab_info (info); - - self->n_tabs--; -@@ -2974,6 +2979,7 @@ pressed_cb (AdwTabBox *self, - button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); - - if (button == GDK_BUTTON_MIDDLE) { -+ self->middle_clicked_tab = info; - gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_CLAIMED); - - return; -@@ -3017,7 +3023,14 @@ released_cb (AdwTabBox *self, - button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); - - if (button == GDK_BUTTON_MIDDLE) { -+ if (info != self->middle_clicked_tab) { -+ self->middle_clicked_tab = NULL; -+ gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED); -+ return; -+ } -+ - adw_tab_view_close_page (self->view, info->page); -+ self->middle_clicked_tab = NULL; - - return; - } -diff --git a/src/adw-tab-grid.c b/src/adw-tab-grid.c -index 93c72324..1cc88e37 100644 ---- a/src/adw-tab-grid.c -+++ b/src/adw-tab-grid.c -@@ -199,6 +199,8 @@ struct _AdwTabGrid - gboolean searching; - - gboolean empty; -+ -+ TabInfo *middle_clicked_tab; - }; - - G_DEFINE_FINAL_TYPE (AdwTabGrid, adw_tab_grid, GTK_TYPE_WIDGET) -@@ -1945,6 +1947,9 @@ close_animation_done_cb (TabInfo *info) - if (self->reordered_tab == info) - self->reordered_tab = NULL; - -+ if (self->middle_clicked_tab == info) -+ self->pressed_tab = NULL; -+ - remove_and_free_tab_info (info); - - self->n_tabs--; -@@ -2925,6 +2930,7 @@ pressed_cb (AdwTabGrid *self, - button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); - - if (button == GDK_BUTTON_MIDDLE) { -+ self->middle_clicked_tab = info; - gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_CLAIMED); - - return; -@@ -2964,7 +2970,14 @@ released_cb (AdwTabGrid *self, - button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); - - if (button == GDK_BUTTON_MIDDLE) { -+ if (info != self->middle_clicked_tab) { -+ self->middle_clicked_tab = NULL; -+ gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED); -+ return; -+ } -+ - adw_tab_view_close_page (self->view, info->page); -+ self->middle_clicked_tab = NULL; - - return; - } diff --git a/patches/libadwaita-update-thai-translation.patch b/patches/libadwaita-update-thai-translation.patch deleted file mode 100644 index efe2ef6..0000000 --- a/patches/libadwaita-update-thai-translation.patch +++ /dev/null @@ -1,506 +0,0 @@ -From 1b6c766553a6b9888f540763d1725041dda86800 Mon Sep 17 00:00:00 2001 -From: Aefgh Threenine -Date: Mon, 23 Sep 2024 13:50:26 +0000 -Subject: [PATCH] Update Thai translation - - -diff --git a/po/th.po b/po/th.po -index 61bdeebd..08ba4f5c 100644 ---- a/po/th.po -+++ b/po/th.po -@@ -7,8 +7,8 @@ msgid "" - msgstr "" - "Project-Id-Version: libadwaita libadwaita-1-6\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libadwaita/issues\n" --"POT-Creation-Date: 2024-09-21 14:15+0000\n" --"PO-Revision-Date: 2024-09-21 21:14+0700\n" -+"POT-Creation-Date: 2024-09-21 14:17+0000\n" -+"PO-Revision-Date: 2024-09-23 05:31+0700\n" - "Last-Translator: Atirut Wattanamongkol \n" - "Language-Team: Thai \n" - "Language: th\n" -@@ -18,143 +18,142 @@ msgstr "" - "Plural-Forms: nplurals=1; plural=0;\n" - "X-Generator: Poedit 3.5\n" - --#: src/adw-about-dialog.c:207 src/adw-about-window.c:207 -+#: src/adw-about-dialog.c:207 src/adw-about-window.c:206 - msgid "GNU General Public License, version 2 or later" --msgstr "" -+msgstr "GNU General Public License เวอร์ชัน 2 ขึ้นไป" - --#: src/adw-about-dialog.c:208 src/adw-about-window.c:208 -+#: src/adw-about-dialog.c:208 src/adw-about-window.c:207 - msgid "GNU General Public License, version 3 or later" --msgstr "" -+msgstr "GNU General Public License เวอร์ชัน 3 ขึ้นไป" - --#: src/adw-about-dialog.c:209 src/adw-about-window.c:209 -+#: src/adw-about-dialog.c:209 src/adw-about-window.c:208 - msgid "GNU Lesser General Public License, version 2.1 or later" --msgstr "" -+msgstr "GNU Lesser General Public License เวอร์ชัน 2.1 ขึ้นไป" - --#: src/adw-about-dialog.c:210 src/adw-about-window.c:210 -+#: src/adw-about-dialog.c:210 src/adw-about-window.c:209 - msgid "GNU Lesser General Public License, version 3 or later" --msgstr "" -+msgstr "GNU Lesser General Public License เวอร์ชัน 3 ขึ้นไป" - --#: src/adw-about-dialog.c:211 src/adw-about-window.c:211 -+#: src/adw-about-dialog.c:211 src/adw-about-window.c:210 - msgid "BSD 2-Clause License" --msgstr "" -+msgstr "BSD 2-Clause License" - --#: src/adw-about-dialog.c:212 src/adw-about-window.c:212 -+#: src/adw-about-dialog.c:212 src/adw-about-window.c:211 - msgid "The MIT License (MIT)" --msgstr "" -+msgstr "The MIT License (MIT)" - --#: src/adw-about-dialog.c:213 src/adw-about-window.c:213 -+#: src/adw-about-dialog.c:213 src/adw-about-window.c:212 - msgid "Artistic License 2.0" --msgstr "" -+msgstr "Artistic License 2.0" - --#: src/adw-about-dialog.c:214 src/adw-about-window.c:214 -+#: src/adw-about-dialog.c:214 src/adw-about-window.c:213 - msgid "GNU General Public License, version 2 only" --msgstr "" -+msgstr "GNU General Public License เวอร์ชัน 2 เท่านั้น" - --#: src/adw-about-dialog.c:215 src/adw-about-window.c:215 -+#: src/adw-about-dialog.c:215 src/adw-about-window.c:214 - msgid "GNU General Public License, version 3 only" --msgstr "" -+msgstr "GNU General Public License เวอร์ชัน 3 เท่านั้น" - --#: src/adw-about-dialog.c:216 src/adw-about-window.c:216 -+#: src/adw-about-dialog.c:216 src/adw-about-window.c:215 - msgid "GNU Lesser General Public License, version 2.1 only" --msgstr "" -+msgstr "GNU Lesser General Public License เวอร์ชัน 2.1 เท่านั้น" - --#: src/adw-about-dialog.c:217 src/adw-about-window.c:217 -+#: src/adw-about-dialog.c:217 src/adw-about-window.c:216 - msgid "GNU Lesser General Public License, version 3 only" --msgstr "" -+msgstr "GNU Lesser General Public License เวอร์ชัน 3 เท่านั้น" - --#: src/adw-about-dialog.c:218 src/adw-about-window.c:218 -+#: src/adw-about-dialog.c:218 src/adw-about-window.c:217 - msgid "GNU Affero General Public License, version 3 or later" --msgstr "" -+msgstr "GNU Affero General Public License เวอร์ชัน 3 ขึ้นไป" - --#: src/adw-about-dialog.c:219 src/adw-about-window.c:219 -+#: src/adw-about-dialog.c:219 src/adw-about-window.c:218 - msgid "GNU Affero General Public License, version 3 only" --msgstr "" -+msgstr "GNU Affero General Public License เวอร์ชัน 3 เท่านั้น" - --#: src/adw-about-dialog.c:220 src/adw-about-window.c:220 -+#: src/adw-about-dialog.c:220 src/adw-about-window.c:219 - msgid "BSD 3-Clause License" --msgstr "" -+msgstr "BSD 3-Clause License" - --#: src/adw-about-dialog.c:221 src/adw-about-window.c:221 -+#: src/adw-about-dialog.c:221 src/adw-about-window.c:220 - msgid "Apache License, Version 2.0" --msgstr "" -+msgstr "Apache License เวอร์ชัน 2.0" - --#: src/adw-about-dialog.c:222 src/adw-about-window.c:222 -+#: src/adw-about-dialog.c:222 src/adw-about-window.c:221 - msgid "Mozilla Public License 2.0" --msgstr "" -+msgstr "Mozilla Public License 2.0" - --#: src/adw-about-dialog.c:223 src/adw-about-window.c:223 -+#: src/adw-about-dialog.c:223 src/adw-about-window.c:222 - msgid "BSD Zero-Clause License" --msgstr "" -+msgstr "BSD Zero-Clause License" - --#: src/adw-about-dialog.c:571 src/adw-about-window.c:570 -+#: src/adw-about-dialog.c:571 src/adw-about-window.c:569 - msgid "Code by" - msgstr "โค้ดโดย" - --#: src/adw-about-dialog.c:572 src/adw-about-window.c:571 -+#: src/adw-about-dialog.c:572 src/adw-about-window.c:570 - msgid "Design by" - msgstr "ออกแบบโดย" - --#: src/adw-about-dialog.c:573 src/adw-about-window.c:572 -+#: src/adw-about-dialog.c:573 src/adw-about-window.c:571 - msgid "Artwork by" - msgstr "งานศิลปะโดย" - --#: src/adw-about-dialog.c:574 src/adw-about-window.c:573 -+#: src/adw-about-dialog.c:574 src/adw-about-window.c:572 - msgid "Documentation by" - msgstr "เอกสารประกอบโดย" - --#: src/adw-about-dialog.c:575 src/adw-about-window.c:574 -+#: src/adw-about-dialog.c:575 src/adw-about-window.c:573 - msgid "Translated by" - msgstr "แปลโดย" - - #. Translators: this is the license preamble; the string at the end - #. * contains the name of the license as link text. - #. --#: src/adw-about-dialog.c:604 src/adw-about-window.c:603 -+#: src/adw-about-dialog.c:604 src/adw-about-window.c:602 - #, c-format - msgid "" --"This application comes with absolutely no warranty. See the %s for details." --msgstr "" --"แอปพลิเคชันนี้ไม่มีการรับประกันใดๆ ทั้งสิ้น ดูรายละเอียดเพิ่มเติมได้ที่ %s" -+"This application comes with absolutely no warranty. See the %s for " -+"details." -+msgstr "แอปพลิเคชันนี้ไม่มีการรับประกันใดๆ ทั้งสิ้น ดูรายละเอียดเพิ่มเติมได้ที่ %s" - --#: src/adw-about-dialog.c:682 src/adw-about-window.c:681 -+#: src/adw-about-dialog.c:682 src/adw-about-window.c:680 - msgid "This Application" --msgstr "" -+msgstr "แอปพลิเคชันนี้" - --#: src/adw-about-dialog.c:984 src/adw-about-window.c:983 -+#: src/adw-about-dialog.c:984 src/adw-about-window.c:982 - #, c-format - msgid "Version %s" --msgstr "" -+msgstr "เวอร์ชัน %s" - --#: src/adw-about-dialog.c:1010 src/adw-about-window.c:1009 -+#: src/adw-about-dialog.c:1010 src/adw-about-window.c:1008 - msgid "Unable to parse release notes:" --msgstr "" -+msgstr "ไม่สามารถแจงบันทึกการออกรุ่น:" - --#: src/adw-about-dialog.c:1016 src/adw-about-window.c:1015 -+#: src/adw-about-dialog.c:1016 src/adw-about-window.c:1014 - #, c-format - msgid "Line: %d, character: %d" --msgstr "" -+msgstr "บรรทัด: %d, อักขระ: %d" - --#: src/adw-about-dialog.c:1302 src/adw-about-window.c:1301 -+#: src/adw-about-dialog.c:1302 src/adw-about-window.c:1300 - msgid "Copied to clipboard" --msgstr "" -+msgstr "คัดลอกไปยังคลิปบอร์ดแล้ว" - --#: src/adw-about-dialog.c:1329 src/adw-about-window.c:1329 -+#: src/adw-about-dialog.c:1329 src/adw-about-window.c:1328 - msgid "Unable to save debugging information" --msgstr "" -+msgstr "ไม่สามารถบันทึกข้อมูลการดีบักได้" - --#: src/adw-about-dialog.c:1334 src/adw-about-window.c:1334 --#: src/adw-sheet-controls.c:127 -+#: src/adw-about-dialog.c:1334 src/adw-about-window.c:1333 src/adw-sheet-controls.c:127 -+#: src/adw-sheet-controls.c:129 - msgid "Close" --msgstr "" -+msgstr "ปิด" - --#: src/adw-about-dialog.c:1351 src/adw-about-window.c:1350 -+#: src/adw-about-dialog.c:1351 src/adw-about-window.c:1349 - msgid "Save debugging information" --msgstr "" -+msgstr "ข้อมูลการดีบัก" - - #: src/adw-about-dialog.ui:5 src/adw-about-window.ui:5 - msgid "About" --msgstr "" -+msgstr "เกี่ยวกับ" - - #: src/adw-about-dialog.ui:89 src/adw-about-window.ui:92 - msgid "_What’s New" -@@ -164,8 +163,8 @@ msgstr "มี_อะไรใหม่" - msgid "_Details" - msgstr "_รายละเอียด" - --#: src/adw-about-dialog.ui:121 src/adw-about-dialog.ui:341 --#: src/adw-about-window.ui:124 src/adw-about-window.ui:344 -+#: src/adw-about-dialog.ui:121 src/adw-about-dialog.ui:341 src/adw-about-window.ui:124 -+#: src/adw-about-window.ui:344 - msgid "_Website" - msgstr "เ_ว็บไซต์" - -@@ -207,12 +206,12 @@ msgstr "การแก้ไขปัญหา" - - #: src/adw-about-dialog.ui:392 src/adw-about-window.ui:395 - msgid "" --"To assist in troubleshooting, you can view your debugging information. " --"Providing this information to the application developers can help diagnose " --"any problems you encounter when you report an issue." -+"To assist in troubleshooting, you can view your debugging information. Providing this " -+"information to the application developers can help diagnose any problems you encounter when " -+"you report an issue." - msgstr "" --"คุณสามารถดูข้อมูลการดีบักเพื่อช่วยในการแก้ไขปัญหาได้ " --"การให้ข้อมูลนี้แก่ผู้พัฒนาแอปพลิเคชันจะช่วยวินิจฉัยปัญหาต่าง ๆ ที่คุณพบเมื่อคุณรายงานปัญหา" -+"คุณสามารถดูข้อมูลการดีบักเพื่อช่วยในการแก้ไขปัญหาได้ การให้ข้อมูลนี้แก่ผู้พัฒนาแอปพลิเคชันจะช่วยวินิจฉัยปัญหาต่าง ๆ " -+"ที่คุณพบเมื่อคุณรายงานปัญหา" - - #: src/adw-about-dialog.ui:403 src/adw-about-window.ui:406 - msgid "_Debugging Information" -@@ -242,210 +241,128 @@ msgstr "ข้อมูลทางกฎหมาย" - msgid "Acknowledgements" - msgstr "คำขอบคุณ" - --#: src/adw-back-button.c:311 src/adw-back-button.c:409 --#: src/adw-back-button.c:519 -+#: src/adw-back-button.c:327 src/adw-back-button.c:425 src/adw-back-button.c:535 - msgid "Back" - msgstr "กลับ" - - #. Translators: This is a placeholder text of the search entry from AdwComboRow. It should be phrased as a verb. --#: src/adw-combo-row.ui:50 src/adw-preferences-dialog.ui:85 --#: src/adw-preferences-window.ui:96 -+#: src/adw-combo-row.ui:50 src/adw-preferences-dialog.ui:85 src/adw-preferences-window.ui:96 - msgid "Search" - msgstr "ค้นหา" - --#: src/adw-entry-row.ui:96 -+#: src/adw-entry-row.ui:97 - msgid "Apply" - msgstr "นำไปใช้" - --#: src/adw-inspector-page.c:98 -+#: src/adw-inspector-page.c:75 - msgid "No Preference" - msgstr "ไม่กำหนด" - --#: src/adw-inspector-page.c:100 -+#: src/adw-inspector-page.c:77 - msgid "Prefer Dark" --msgstr "" -+msgstr "ใช้แบบมืด" - --#: src/adw-inspector-page.c:102 -+#: src/adw-inspector-page.c:79 - msgid "Prefer Light" --msgstr "" -- --#: src/adw-inspector-page.c:115 --msgid "Blue" --msgstr "" -- --#: src/adw-inspector-page.c:117 --msgid "Teal" --msgstr "" -- --#: src/adw-inspector-page.c:119 --msgid "Green" --msgstr "" -- --#: src/adw-inspector-page.c:121 --msgid "Yellow" --msgstr "" -- --#: src/adw-inspector-page.c:123 --msgid "Orange" --msgstr "" -- --#: src/adw-inspector-page.c:125 --msgid "Red" --msgstr "" -- --#: src/adw-inspector-page.c:127 --msgid "Pink" --msgstr "" -- --#: src/adw-inspector-page.c:129 --msgid "Purple" --msgstr "" -- --#: src/adw-inspector-page.c:131 --msgid "Slate" --msgstr "" -+msgstr "ใช้แบบสว่าง" - - #. Translators: The name of the library, not the stylesheet --#: src/adw-inspector-page.c:270 -+#: src/adw-inspector-page.c:97 - msgid "Adwaita" --msgstr "" -+msgstr "อัทไวตะ" - - #: src/adw-inspector-page.ui:10 - msgid "System Appearance" --msgstr "" -+msgstr "รูปโฉมของระบบ" - - #: src/adw-inspector-page.ui:11 --msgid "" --"Override settings for this application. They will be reset upon closing the " --"inspector." --msgstr "" -+msgid "Override settings for this application. They will be reset upon closing the inspector." -+msgstr "เขียนทับการตั้งค่าสำหรับแอปพลิเคชันนี้ การตั้งค่าจะถูกล้างเมื่อปิดตัวตรวจสอบ" - - #: src/adw-inspector-page.ui:14 - msgid "System Supports Color Schemes" --msgstr "" -+msgstr "ระบบรองรับการใช้ชุดรูปแบบสี" - - #: src/adw-inspector-page.ui:20 - msgid "Preferred Color Scheme" --msgstr "" -- --#: src/adw-inspector-page.ui:39 --msgid "Accent Color" --msgstr "" -- --#: src/adw-inspector-page.ui:42 --msgid "System Supports Accent Colors" --msgstr "" -- --#: src/adw-inspector-page.ui:48 --msgid "Preferred Accent Color" --msgstr "" -+msgstr "ชุดรูปแบบสีที่ต้องการ" - --#: src/adw-inspector-page.ui:77 --msgid "Accessibility" --msgstr "" -- --#: src/adw-inspector-page.ui:80 -+#: src/adw-inspector-page.ui:37 - msgid "High Contrast" --msgstr "" -+msgstr "สีตัดกัน" - - #: src/adw-password-entry-row.c:70 - msgid "Hide Password" --msgstr "" -+msgstr "ซ่อนรหัสผ่าน" - - #: src/adw-password-entry-row.c:74 - msgid "Show Password" --msgstr "" -+msgstr "แสดงรหัสผ่าน" - - #: src/adw-password-entry-row.c:168 - msgid "Caps Lock is on" --msgstr "" -+msgstr "Caps Lock เปิดอยู่" - - #: src/adw-password-entry-row.c:176 - msgid "_Show Password" --msgstr "" -+msgstr "แ_สดงรหัสผ่าน" - --#: src/adw-preferences-dialog.c:256 src/adw-preferences-window.c:261 -+#: src/adw-preferences-dialog.c:256 src/adw-preferences-window.c:259 - msgid "Untitled page" --msgstr "" -+msgstr "หน้าไม่มีชื่อ" - - #: src/adw-preferences-dialog.ui:5 src/adw-preferences-window.ui:8 - msgid "Preferences" --msgstr "" -+msgstr "การปรับแต่ง" - - #: src/adw-preferences-dialog.ui:70 src/adw-preferences-window.ui:81 - msgid "Search preferences" --msgstr "" -+msgstr "ค้นหาการปรับแต่ง" - - #: src/adw-preferences-dialog.ui:152 src/adw-preferences-window.ui:163 - msgid "No Results Found" --msgstr "" -- --#: src/adw-preferences-dialog.ui:153 src/adw-tab-overview.ui:111 --msgid "Try a different search" --msgstr "" -+msgstr "ไม่พบผลลัพธ์" - --#: src/adw-preferences-window.ui:164 -+#: src/adw-preferences-dialog.ui:153 src/adw-preferences-window.ui:164 -+#: src/adw-tab-overview.ui:111 - msgid "Try a different search." --msgstr "" -- --#: src/adw-sheet-controls.c:129 --msgid "Close the window" --msgstr "" -+msgstr "ลองค้นหาด้วยคำอื่น" - --#: src/adw-split-button.c:530 src/adw-split-button.c:1044 -+#: src/adw-split-button.c:519 src/adw-split-button.c:1033 - msgid "More Options" --msgstr "" -+msgstr "ตัวเลือกเพิ่มเติม" - - #: src/adw-tab-button.ui:7 - msgid "View Open Tabs" --msgstr "" -+msgstr "ดูแท็บที่เปิด" - - #. Translators: Tab overview title, %u is the number of open tabs - #: src/adw-tab-overview.c:928 - #, c-format - msgid "%u Tab" - msgid_plural "%u Tabs" --msgstr[0] "" -+msgstr[0] "%u แท็บ" - - #: src/adw-tab-overview.ui:21 - msgid "Search Tabs" --msgstr "" -+msgstr "ค้นหาแท็บ" - - #: src/adw-tab-overview.ui:51 - msgid "Search tabs" --msgstr "" -+msgstr "ค้นหาแท็บ" - - #: src/adw-tab-overview.ui:97 - msgid "No Open Tabs" --msgstr "" -+msgstr "ไม่มีแท็บที่เปิด" - - #: src/adw-tab-overview.ui:110 - msgid "No Tabs Found" --msgstr "" -+msgstr "ไม่พบแท็บ" - - #: src/adw-tab-overview.ui:131 - msgid "New _Tab" --msgstr "" -+msgstr "เปิดแ_ท็บใหม่" - --#: src/adw-tab-thumbnail.ui:39 src/adw-tab.ui:75 -+#: src/adw-tab-thumbnail.ui:39 src/adw-tab.ui:95 - msgid "Close Tab" --msgstr "" -- --#: src/adw-toast-overlay.c:271 --#, c-format --msgid "A toast appeared: %s, has a button: %s" --msgstr "" -- --#: src/adw-toast-overlay.c:274 --#, c-format --msgid "A toast appeared: %s" --msgstr "" -- --#: src/adw-toast-overlay.c:276 --#, c-format --msgid "A toast appeared, has a button: %s" --msgstr "" -- --#: src/adw-toast-overlay.c:279 --msgid "A toast appeared" --msgstr "" -+msgstr "ปิดแท็บ" diff --git a/patches/style-manager-Support-Yaru-accent-colors.patch b/patches/style-manager-Support-Yaru-accent-colors.patch index f03c7d4..838a27f 100644 --- a/patches/style-manager-Support-Yaru-accent-colors.patch +++ b/patches/style-manager-Support-Yaru-accent-colors.patch @@ -14,7 +14,7 @@ the yaru ones. Forwarded: not-needed diff --git a/meson_options.txt b/meson_options.txt -index b95d0ae4..4c51f2a3 100644 +index b95d0ae4..2ef97791 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,3 +20,7 @@ option('tests', @@ -25,7 +25,6 @@ index b95d0ae4..4c51f2a3 100644 +option('yaru-accent-colors', + type: 'boolean', value: true, + description: 'Mimic Yaru accent colors') -\ No newline at end of file diff --git a/src/adw-settings-impl-portal.c b/src/adw-settings-impl-portal.c index 7f50a79c..585117fe 100644 --- a/src/adw-settings-impl-portal.c @@ -93,7 +92,7 @@ index dc11df58..427470b9 100644 + G_END_DECLS diff --git a/src/adw-settings.c b/src/adw-settings.c -index cf0e81c0..74977791 100644 +index cf0e81c0..c537765b 100644 --- a/src/adw-settings.c +++ b/src/adw-settings.c @@ -26,6 +26,9 @@ struct _AdwSettings @@ -114,7 +113,7 @@ index cf0e81c0..74977791 100644 LAST_PROP, }; -@@ -132,6 +136,198 @@ register_impl (AdwSettings *self, +@@ -132,6 +136,199 @@ register_impl (AdwSettings *self, } } @@ -309,11 +308,12 @@ index cf0e81c0..74977791 100644 +} + + ++ + static void adw_settings_constructed (GObject *object) { -@@ -155,17 +351,7 @@ adw_settings_constructed (GObject *object) +@@ -155,17 +352,7 @@ adw_settings_constructed (GObject *object) register_impl (self, self->platform_impl, &found_color_scheme, &found_high_contrast); } @@ -332,7 +332,7 @@ index cf0e81c0..74977791 100644 } static void -@@ -176,6 +362,8 @@ adw_settings_dispose (GObject *object) +@@ -176,6 +363,8 @@ adw_settings_dispose (GObject *object) g_clear_object (&self->platform_impl); g_clear_object (&self->gsettings_impl); g_clear_object (&self->legacy_impl); @@ -341,7 +341,7 @@ index cf0e81c0..74977791 100644 G_OBJECT_CLASS (adw_settings_parent_class)->dispose (object); } -@@ -201,6 +389,10 @@ adw_settings_get_property (GObject *object, +@@ -201,6 +390,10 @@ adw_settings_get_property (GObject *object, g_value_set_boolean (value, adw_settings_get_high_contrast (self)); break; @@ -352,7 +352,7 @@ index cf0e81c0..74977791 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } -@@ -231,6 +423,13 @@ adw_settings_class_init (AdwSettingsClass *klass) +@@ -231,6 +424,13 @@ adw_settings_class_init (AdwSettingsClass *klass) FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); @@ -366,7 +366,7 @@ index cf0e81c0..74977791 100644 g_object_class_install_properties (object_class, LAST_PROP, props); } -@@ -321,6 +520,8 @@ adw_settings_end_override (AdwSettings *self) +@@ -321,6 +521,8 @@ adw_settings_end_override (AdwSettings *self) g_object_notify_by_pspec (G_OBJECT (self), props[PROP_COLOR_SCHEME]); if (notify_hc) g_object_notify_by_pspec (G_OBJECT (self), props[PROP_HIGH_CONTRAST]); @@ -375,7 +375,7 @@ index cf0e81c0..74977791 100644 } void -@@ -375,3 +576,9 @@ adw_settings_override_high_contrast (AdwSettings *self, +@@ -375,3 +577,9 @@ adw_settings_override_high_contrast (AdwSettings *self, g_object_notify_by_pspec (G_OBJECT (self), props[PROP_HIGH_CONTRAST]); } @@ -510,7 +510,7 @@ index d27ebda5..59da0dcb 100644 } diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss -index 614055c5..e246c2f9 100644 +index 614055c5..8997a579 100644 --- a/src/stylesheet/_colors.scss +++ b/src/stylesheet/_colors.scss @@ -129,3 +129,9 @@ $strong_disabled_opacity: 0.3; @@ -523,7 +523,6 @@ index 614055c5..e246c2f9 100644 + $link_color: gtkcolor(yaru_link_color); + $link_visited_color: gtkcolor(yaru_link_visited_color); +} -\ No newline at end of file diff --git a/src/stylesheet/_defaults.scss b/src/stylesheet/_defaults.scss index a262a989..1d926ebc 100644 --- a/src/stylesheet/_defaults.scss @@ -546,7 +545,7 @@ index a262a989..1d926ebc 100644 @define-color destructive_bg_color #{if($variant == 'dark', "@red_4", "@red_3")}; diff --git a/src/stylesheet/_palette-yaru.scss b/src/stylesheet/_palette-yaru.scss new file mode 100644 -index 00000000..6b335a22 +index 00000000..a943a2eb --- /dev/null +++ b/src/stylesheet/_palette-yaru.scss @@ -0,0 +1,118 @@ @@ -668,7 +667,6 @@ index 00000000..6b335a22 +@define-color dark_3 #{$dark_3}; +@define-color dark_4 #{$dark_4}; +@define-color dark_5 #{$dark_5}; -\ No newline at end of file diff --git a/src/stylesheet/adwaita-stylesheet.gresources.xml b/src/stylesheet/adwaita-stylesheet.gresources.xml index 98a07acf..0d86a06f 100644 --- a/src/stylesheet/adwaita-stylesheet.gresources.xml diff --git a/snapcraft.yaml b/snapcraft.yaml index f0ba452..2ac3fda 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -58,7 +58,7 @@ parts: after: [ ninja ] plugin: nil source: https://github.com/mesonbuild/meson.git - source-tag: '1.4.1' + source-tag: '1.5.2' source-depth: 1 override-build: | python3 -m pip install --break-system-packages . @@ -108,7 +108,7 @@ parts: glib: after: [ libffi, meson-deps ] source: https://gitlab.gnome.org/GNOME/glib.git - source-tag: '2.80.3' + source-tag: '2.82.1' # ext:updatesnap # version-format: # ignore-odd-minor: true @@ -154,7 +154,7 @@ parts: cairo: after: [ pixman, meson-deps ] source: https://gitlab.freedesktop.org/cairo/cairo.git - source-tag: '1.18.0' # 1.17.8 fails to build, so... maybe in core24, or 1.17.9 + source-tag: '1.18.2' # ext:updatesnap # version-format: # ignore-version: '1.17.8' @@ -169,6 +169,7 @@ parts: - -Dxcb=enabled - -Dtee=enabled - -Dzlib=enabled + - -Dtests=disabled build-environment: *buildenv build-packages: - libfontconfig1-dev @@ -185,6 +186,7 @@ parts: gobject-introspection: after: [ cairo, meson-deps ] source: https://gitlab.gnome.org/GNOME/gobject-introspection.git + # using 1.82.0 breaks libportal source-tag: '1.80.1' # ext:updatesnap # version-format: @@ -246,7 +248,7 @@ parts: fribidi: after: [ meson-deps ] source: https://github.com/fribidi/fribidi.git - source-tag: 'v1.0.15' + source-tag: 'v1.0.16' source-depth: 1 plugin: meson meson-parameters: @@ -259,7 +261,7 @@ parts: harfbuzz: after: [ fribidi, meson-deps ] source: https://github.com/harfbuzz/harfbuzz.git - source-tag: '9.0.0' # developers declared that they won't break ABI + source-tag: '10.0.1' # developers declared that they won't break ABI source-depth: 1 plugin: meson meson-parameters: @@ -288,7 +290,7 @@ parts: - libgraphite2-dev pango: - after: [ harfbuzz, meson-deps ] + after: [ libffi, harfbuzz, meson-deps ] source: https://gitlab.gnome.org/GNOME/pango.git source-tag: '1.54.0' source-depth: 1 @@ -298,7 +300,7 @@ parts: - -Doptimization=3 - -Ddebug=true - -Dbuild-testsuite=false - - -Dgtk_doc=false + - -Ddocumentation=false - -Dintrospection=enabled - -Dbuild-examples=false build-environment: *buildenv @@ -343,28 +345,35 @@ parts: - libtiff-dev librsvg: - after: [ gdk-pixbuf, vala ] + after: [ gdk-pixbuf, vala, meson-deps ] source: https://gitlab.gnome.org/GNOME/librsvg.git - source-tag: '2.58.1' # they left the odd->unstable even->stable scheme, and now tags are stable + source-tag: '2.59.1' # they left the odd->unstable even->stable scheme, and now tags are stable # ext:updatesnap # version-format: # no-9x-revisions: true source-depth: 1 - plugin: autotools - autotools-configure-parameters: + plugin: meson + meson-parameters: - --prefix=/usr - - --enable-introspection=yes - - --enable-vala=yes - - --enable-pixbuf-loader + - -Doptimization=3 + - -Ddebug=true + - -Dintrospection=enabled + - -Dvala=enabled + - -Dpixbuf=enabled + - -Dpixbuf-loader=enabled + - -Ddocs=disabled + - -Dtests=false build-environment: *buildenv build-packages: - - cargo - #- libcroco3-dev - override-stage: | - set -eux + - libssl-dev + override-pull: | craftctl default - # snapcraft is adding twice $CRAFT_STAGE - cp -a $CRAFT_STAGE/$CRAFT_STAGE/* $CRAFT_STAGE/ + # cargo version in .deb is too old + curl https://sh.rustup.rs -sSf > cargo.sh + sh ./cargo.sh -y + export PATH=$PATH:$HOME/.cargo/bin + ~/.cargo/bin/cargo install cargo-c + cp ~/.cargo/bin/* /usr/local/bin epoxy: after: [ librsvg, meson-deps ] @@ -385,7 +394,7 @@ parts: json-glib: after: [ epoxy, meson-deps ] source: https://gitlab.gnome.org/GNOME/json-glib.git - source-tag: '1.9.2' + source-tag: '1.10.0' source-depth: 1 plugin: meson meson-parameters: @@ -440,7 +449,7 @@ parts: libsoup3: after: [ libsoup2, meson-deps ] source: https://gitlab.gnome.org/GNOME/libsoup.git - source-tag: '3.4.4' + source-tag: '3.6.0' source-depth: 1 plugin: meson meson-parameters: @@ -474,7 +483,7 @@ parts: wayland-protocols: after: [ meson-deps ] source: https://gitlab.freedesktop.org/wayland/wayland-protocols.git - source-tag: '1.36' + source-tag: '1.38' source-depth: 1 build-packages: - libwayland-dev @@ -483,12 +492,13 @@ parts: - --prefix=/usr - -Doptimization=3 - -Ddebug=true + - -Dtests=false build-environment: *buildenv gtk3: after: [ wayland-protocols, meson-deps ] source: https://gitlab.gnome.org/GNOME/gtk.git - source-tag: '3.24.42' + source-tag: '3.24.43' # ext:updatesnap # version-format: # ignore-odd-minor: true @@ -534,7 +544,7 @@ parts: gtk4: after: [ wayland-protocols, meson-deps ] source: https://gitlab.gnome.org/GNOME/gtk.git - source-tag: '4.14.4' + source-tag: '4.16.3' # ext:updatesnap # version-format: # ignore-odd-minor: true @@ -550,12 +560,11 @@ parts: - -Dwin32-backend=false - -Dmacos-backend=false - -Dintrospection=enabled - - -Dgtk_doc=false - - -Ddemos=false + - -Ddocumentation=false - -Dbuild-examples=false - -Dbuild-tests=false - -Dmedia-gstreamer=enabled - - -Ddemos=false + - -Dbuild-demos=false - -Dbuild-testsuite=false - -Dbuild-examples=false - -Dbuild-tests=false @@ -601,7 +610,7 @@ parts: libadwaita: source: https://gitlab.gnome.org/GNOME/libadwaita.git - source-tag: '1.5.4' + source-tag: '1.5.5' source-depth: 1 after: [ meson-deps, gtk4 ] plugin: meson @@ -624,9 +633,6 @@ parts: - libappstream-dev override-pull: | craftctl default - patch -p1 < $CRAFT_PROJECT_DIR/patches/libadwaita-tab-box-skip-middle-clicks-on-different-tab.patch - patch -p1 < $CRAFT_PROJECT_DIR/patches/libadwaita-add-thai-translation.patch - patch -p1 < $CRAFT_PROJECT_DIR/patches/libadwaita-update-thai-translation.patch patch -p1 < $CRAFT_PROJECT_DIR/patches/style-manager-Support-Yaru-accent-colors.patch patch -p1 < $CRAFT_PROJECT_DIR/patches/stylesheet-Add-wartybrown-accent-color.patch @@ -634,7 +640,7 @@ parts: after: [gtk3, gtk4, gtk-locales, meson-deps ] plugin: meson source: https://github.com/flatpak/libportal.git - source-tag: '0.7.1' + source-tag: '0.8.1' source-depth: 1 build-environment: *buildenv meson-parameters: @@ -671,7 +677,7 @@ parts: glibmm: after: [ mm-common ] source: https://gitlab.gnome.org/GNOME/glibmm.git - source-tag: '2.80.0' + source-tag: '2.82.0' source-depth: 1 plugin: autotools override-build: | @@ -719,9 +725,9 @@ parts: - doxygen pangomm: - after: [ cairomm, meson-deps ] + after: [ pango, libffi, cairomm, meson-deps ] source: https://gitlab.gnome.org/GNOME/pangomm.git - source-tag: '2.52.0' + source-tag: '2.54.0' source-depth: 1 plugin: meson meson-parameters: @@ -733,8 +739,10 @@ parts: build-environment: - ACLOCAL_PATH: $CRAFT_STAGE/usr/share/aclocal - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share - - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/2.10.0/loaders.cache + - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:$CRAFT_STAGE/usr/lib/pkgconfig:$CRAFT_STAGE/usr/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} + - CRAFT_EXT_CORE_LEVEL: core24 - M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.68/proc/m4 override-build: | set -eux @@ -760,14 +768,16 @@ parts: build-environment: - ACLOCAL_PATH: $CRAFT_STAGE/usr/share/aclocal - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share - - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$CRAFT_STAGE/usr/lib/vala-0.56${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/2.10.0/loaders.cache + - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:$CRAFT_STAGE/usr/lib/pkgconfig:$CRAFT_STAGE/usr/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} + - CRAFT_EXT_CORE_LEVEL: core24 - M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.68/proc/m4 gtkmm: after: [ atkmm, meson-deps ] source: https://gitlab.gnome.org/GNOME/gtkmm.git - source-tag: '4.14.0' + source-tag: '4.16.0' source-depth: 1 # ext:updatesnap # version-format: @@ -788,6 +798,8 @@ parts: - XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/usr/share - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/vala-0.56:$CRAFT_STAGE/usr/lib:$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - GDK_PIXBUF_MODULE_FILE: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/2.10.0/loaders.cache + - PKG_CONFIG_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig:$CRAFT_STAGE/usr/lib/pkgconfig:$CRAFT_STAGE/usr/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH} + - CRAFT_EXT_CORE_LEVEL: core24 - M4PATH: $CRAFT_STAGE/usr/lib/glibmm-2.68/proc/m4 override-build: | set -eux @@ -798,7 +810,7 @@ parts: gtksourceview: after: [ gtkmm, meson-deps ] source: https://gitlab.gnome.org/GNOME/gtksourceview.git - source-tag: '5.12.1' + source-tag: '5.14.1' # ext:updatesnap # version-format: # ignore-odd-minor: true @@ -871,7 +883,7 @@ parts: gsettings-desktop-schemas: after: [ gsound, meson-deps ] source: https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git - source-tag: '46.0' + source-tag: '46.1' # ext:updatesnap # version-format: # same-major: true @@ -891,7 +903,7 @@ parts: gnome-desktop: after: [ gsettings-desktop-schemas, meson-deps ] source: https://gitlab.gnome.org/GNOME/gnome-desktop.git - source-tag: '44.0' + source-tag: '44.1' # ext:updatesnap # version-format: # same-major: true @@ -939,7 +951,7 @@ parts: after: [ cogl, meson-deps ] source: https://github.com/linuxwacom/libwacom source-type: git - source-tag: 'libwacom-2.12.2' + source-tag: 'libwacom-2.13.0' # ext:updatesnap # version-format: # format: 'libwacom-%M.%m.%R' @@ -956,7 +968,7 @@ parts: libinput: after: [ libwacom, meson-deps ] source: https://gitlab.freedesktop.org/libinput/libinput.git - source-tag: '1.26.1' + source-tag: '1.26.2' source-depth: 1 plugin: meson meson-parameters: @@ -1091,7 +1103,7 @@ parts: pycairo: after: [ libpeas, meson-deps ] source: https://github.com/pygobject/pycairo.git - source-tag: 'v1.26.1' + source-tag: 'v1.27.0' source-depth: 1 plugin: meson meson-parameters: @@ -1103,7 +1115,7 @@ parts: pygobject: after: [ pycairo, meson-deps ] source: https://gitlab.gnome.org/GNOME/pygobject.git - source-tag: '3.48.2' + source-tag: '3.50.0' source-depth: 1 plugin: meson meson-parameters: @@ -1220,7 +1232,7 @@ parts: libgweather: after: [ libgeocode, meson-deps, gobject-introspection ] source: https://gitlab.gnome.org/GNOME/libgweather.git - source-tag: '4.4.2' + source-tag: '4.4.4' # ext:updatesnap # version-format: # ignore-odd-minor: true @@ -1259,7 +1271,7 @@ parts: libayatana-ido: after: [glib, gtk3] source: https://github.com/AyatanaIndicators/ayatana-ido.git - source-tag: '0.10.2' + source-tag: '0.10.4' source-depth: 1 plugin: cmake build-environment: *buildenv