Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-tweaks for openSUSE:Factory checked in at 2021-04-12 12:35:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-tweaks (Old) and /work/SRC/openSUSE:Factory/.gnome-tweaks.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-tweaks" Mon Apr 12 12:35:35 2021 rev:13 rq:881145 version:40.beta Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-tweaks/gnome-tweaks.changes 2021-01-25 18:23:05.280383191 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-tweaks.new.2401/gnome-tweaks.changes 2021-04-12 12:38:20.969437968 +0200 @@ -1,0 +2,25 @@ +Fri Mar 19 19:49:34 UTC 2021 - Dominique Leuenberger <[email protected]> + +- Add 70.patch: gshellwrapper: Fails to find Shell when its version + is not from numbers only. + +------------------------------------------------------------------- +Mon Feb 15 11:09:57 UTC 2021 - Callum Farmer <[email protected]> + +- Update to version 40.beta: + + GNOME Tweaks 40 brings several bug fixes, support for GNOME 40 + settings changes, and removes GNOME Shell Extensions support. + Extensions support can now be found in the GNOME Extensions + app. + + Port to libhandy 1.0. + + Show the back button when leaflet is folded. + + Update to new gsettings-desktop-schemas location. + + Drop unused extensions support. + + Use Gtk.HeaderBar instead of Handy.HeaderBar. + + Add notice for Extensions removal. +- Remove upstreamed patches: + + 77dde7477922f645946bfc64b1b25aeed2b01919.patch + + gnome-tweaks-port-libhandy-1.patch + + gnome-tweaks-port-new-schema-loc.patch + +------------------------------------------------------------------- @@ -5,0 +31,7 @@ + +------------------------------------------------------------------- +Tue Jan 19 19:46:26 UTC 2021 - Bj??rn Lie <[email protected]> + +- Add gnome-tweaks-port-new-schema-loc.patch: font: Update font + aa/hinting to new gsettings-desktop-schemas location: Support + new gnome-40-alpha changed location of schemas. Old: ---- 77dde7477922f645946bfc64b1b25aeed2b01919.patch gnome-tweaks-3.34.1.tar.xz gnome-tweaks-port-libhandy-1.patch New: ---- 70.patch gnome-tweaks-40.beta.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-tweaks.spec ++++++ --- /var/tmp/diff_new_pack.omM4Oy/_old 2021-04-12 12:38:21.533438624 +0200 +++ /var/tmp/diff_new_pack.omM4Oy/_new 2021-04-12 12:38:21.537438629 +0200 @@ -18,19 +18,15 @@ Name: gnome-tweaks -Version: 3.34.1 +Version: 40.beta Release: 0 Summary: A tool to customize advanced GNOME 3 options -License: GPL-3.0-or-later AND CC0-1.0 +License: CC0-1.0 AND GPL-3.0-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/Tweaks -Source0: https://download.gnome.org/sources/gnome-tweaks/3.34/%{name}-%{version}.tar.xz - -# PATCH-FIX-UPSTREAM 77dde7477922f645946bfc64b1b25aeed2b01919.patch -- Update Norwegian bokm??l translation -Patch1: 77dde7477922f645946bfc64b1b25aeed2b01919.patch -# PATCH-FEATURE-UPSTREAM gnome-tweaks-port-libhandy-1.patch -- Port to libhandy-1 -Patch2: gnome-tweaks-port-libhandy-1.patch - +Source0: https://download.gnome.org/sources/gnome-tweaks/40/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 70.patch [email protected] -- Do not fail to detect GNOME 40.rc version +Patch0: https://gitlab.gnome.org/GNOME/gnome-tweaks/-/merge_requests/70.patch BuildRequires: fdupes # GI is needed to have typelib() Requires BuildRequires: gobject-introspection @@ -91,6 +87,7 @@ %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/*/apps/org.gnome.tweak* %{_libexecdir}/gnome-tweak-tool-lid-inhibitor +%{_datadir}/glib-2.0/schemas/org.gnome.tweaks.gschema.xml %files lang -f %{name}.lang ++++++ 77dde7477922f645946bfc64b1b25aeed2b01919.patch -> 70.patch ++++++ --- /work/SRC/openSUSE:Factory/gnome-tweaks/77dde7477922f645946bfc64b1b25aeed2b01919.patch 2021-01-25 18:23:05.176383043 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-tweaks.new.2401/70.patch 2021-04-12 12:38:20.913437903 +0200 @@ -1,389 +1,48 @@ -From 77dde7477922f645946bfc64b1b25aeed2b01919 Mon Sep 17 00:00:00 2001 -From: Kjartan Maraas <[email protected]> -Date: Wed, 13 Jan 2021 13:53:40 +0000 -Subject: [PATCH] =?UTF-8?q?Update=20Norwegian=20Bokm=C3=A5l=20translation?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 8b0e3ec157e4060ebe51f1d2a8bfdf49c7da58d1 Mon Sep 17 00:00:00 2001 +From: Milan Crha <[email protected]> +Date: Thu, 18 Mar 2021 11:35:25 +0100 +Subject: [PATCH] gshellwrapper: Fails to find Shell when its version is not + from numbers only (#344) +Some tabs are hidden when Tweaks is run out of GNOME Shell, but +the detection of the Shell running also expects the version number +being only from the numbers. Since GNOME changed its version +numbering the version can be "40.beta" and similar, which breaks +Tweaks' code. + +As the version string was used only for a debug print, do not try +to decode it and use it verbatim there. + +The second part of this change adds a print about the reason why it +failed to find the Shell running. It'll help with further debugging. + +Closes https://gitlab.gnome.org/GNOME/gnome-tweaks/-/issues/344 --- - po/nb.po | 184 +++++++++++++++++++++++-------------------------------- - 1 file changed, 76 insertions(+), 108 deletions(-) + gtweak/gshellwrapper.py | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) -diff --git a/po/nb.po b/po/nb.po -index aca0b72..b125c1f 100644 ---- a/po/nb.po -+++ b/po/nb.po -@@ -2,14 +2,14 @@ - # Copyright (C) 2015 John Stowers <[email protected]> - # - # This file is distributed under the same license as the gnome-tweak-tool package. --# Kjartan Maraas <[email protected]>, 2011-2018. -+# Kjartan Maraas <[email protected]>, 2011-2020. - # - msgid "" - msgstr "" --"Project-Id-Version: gnome-tweak-tool 3.30.x\n" -+"Project-Id-Version: gnome-tweak-tool 3.38.x\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-tweaks/issues\n"; --"POT-Creation-Date: 2018-10-08 12:36+0000\n" --"PO-Revision-Date: 2018-10-15 10:40+0200\n" -+"POT-Creation-Date: 2020-12-02 01:12+0000\n" -+"PO-Revision-Date: 2021-01-13 14:52+0100\n" - "Last-Translator: Kjartan Maraas <[email protected]>\n" - "Language-Team: Norwegian bokm??l <[email protected]>\n" - "Language: nb\n" -@@ -22,8 +22,8 @@ msgstr "" - msgid "The GNOME Project" - msgstr "GNOME prosjektet" - --#: data/org.gnome.tweaks.appdata.xml.in:9 gtweak/app.py:23 gtweak/utils.py:314 --#: gtweak/utils.py:330 -+#: data/org.gnome.tweaks.appdata.xml.in:9 gtweak/app.py:40 gtweak/utils.py:318 -+#: gtweak/utils.py:335 - msgid "GNOME Tweaks" - msgstr "GNOME Tweaks" - -@@ -44,15 +44,10 @@ msgstr "" - "str??mstyring, h??ndtere oppstartsprogrammer og sl?? p?? skrivebordsikoner blant " - "andre innstillinger." - --#: data/org.gnome.tweaks.desktop.in:3 gtweak/tweakview.py:82 -+#: data/org.gnome.tweaks.desktop.in:3 gtweak/tweakview.py:109 - msgid "Tweaks" - msgstr "Konfigurasjonsendringer" - --#. Translators: Do NOT translate or transliterate this text (this is an icon file name)! --#: data/org.gnome.tweaks.desktop.in:6 --msgid "org.gnome.tweaks" --msgstr "org.gnome.tweaks" -- - #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! - #: data/org.gnome.tweaks.desktop.in:14 - msgid "" -@@ -65,57 +60,69 @@ msgstr "" - msgid "_Reset to Defaults" - msgstr "_Sett tilbake til utgangsverdier" - --#: data/shell.ui:11 --msgid "Disable All Shell Extensions" --msgstr "Sl?? av alle utvidelser for skallet" -+#: data/shell.ui:13 -+msgid "_About Tweaks" -+msgstr "_Om konfigurasjonsendringer" -+ -+#: gtweak/app.py:22 -+msgid "_Continue" -+msgstr "_Fortsett" - --#: data/shell.ui:17 --msgid "_About" --msgstr "_Om" -+#: gtweak/app.py:24 -+msgid "Extensions Has Moved" -+msgstr "Utvidelser har flyttet" - --#: data/shell.ui:21 --msgid "_Quit" --msgstr "A_vslutt" -+#: gtweak/app.py:28 -+#, python-brace-format -+msgid "Extensions management has been moved to {0}." -+msgstr "H??ndtering av utvidelser er flyttet til {0}." - --#: gtweak/app.py:67 -+#: gtweak/app.py:31 -+#, python-brace-format -+msgid "" -+"We recommend downloading GNOME Extensions from {0} if your distribution does " -+"not include it." -+msgstr "Vi anbefaler ?? laste ned GNOME utvidelser fra {0} hvis ikke distribusjonen din har dem." -+ -+#: gtweak/app.py:75 - msgid "Reset to Defaults" - msgstr "Sett tilbake til utgangsverdier" - --#: gtweak/app.py:68 -+#: gtweak/app.py:76 - msgid "Reset all tweak settings to the original default state?" - msgstr "Tilbakestill alle innstillinger til utgangsverdiene?" - --#: gtweak/app.py:89 gtweak/app.py:91 -+#: gtweak/app.py:93 gtweak/app.py:95 - msgid "GNOME Shell" - msgstr "GNOME-shell" - --#: gtweak/app.py:91 -+#: gtweak/app.py:95 - #, python-format - msgid "(%s mode)" - msgstr "(%s modus)" - --#: gtweak/app.py:94 -+#: gtweak/app.py:98 - msgid "GNOME Shell is not running" - msgstr "GNOME-shell kj??rer ikke" - --#: gtweak/app.py:96 --msgid "GTK+" --msgstr "GTK+" -+#: gtweak/app.py:100 -+msgid "GTK" -+msgstr "GTK" - --#: gtweak/app.py:103 -+#: gtweak/app.py:107 - msgid "Homepage" - msgstr "Nettside" - --#: gtweak/tweakmodel.py:30 -+#: gtweak/tweakmodel.py:31 - msgid "Miscellaneous" - msgstr "Forskjellig" - --#: gtweak/tweakview.py:98 -+#: gtweak/tweakview.py:143 - msgid "Search Tweaks???" - msgstr "S??k konfigurasjon ???" - - #. "General" needs to be first item in sidebar --#: gtweak/tweakview.py:156 gtweak/tweaks/tweak_group_general.py:50 -+#: gtweak/tweakview.py:201 gtweak/tweaks/tweak_group_general.py:53 - msgid "General" - msgstr "Generelt" - -@@ -316,20 +323,20 @@ msgstr "Gammeldagse vindustitler" - msgid "Scaling Factor" - msgstr "Skaleringsfaktor" - --#: gtweak/tweaks/tweak_group_general.py:25 -+#: gtweak/tweaks/tweak_group_general.py:28 - msgid "Suspend when laptop lid is closed" - msgstr "Hvilemodus n??r lokket lukkes" - --#: gtweak/tweaks/tweak_group_general.py:51 -+#: gtweak/tweaks/tweak_group_general.py:54 - msgid "Animations" - msgstr "Animasjoner" - - #. Don't show this setting in the Ubuntu session since this setting is in gnome-control-center there --#: gtweak/tweaks/tweak_group_general.py:54 -+#: gtweak/tweaks/tweak_group_general.py:57 - msgid "Over-Amplification" - msgstr "Overforsterking" - --#: gtweak/tweaks/tweak_group_general.py:55 -+#: gtweak/tweaks/tweak_group_general.py:58 - msgid "" - "Allows raising the volume above 100%. This can result in a loss of audio " - "quality; it is better to increase application volume settings, if possible." -@@ -341,7 +348,9 @@ msgstr "Emacs inndata" - - #: gtweak/tweaks/tweak_group_keymouse.py:24 - msgid "Overrides shortcuts to use keybindings from the Emacs editor." --msgstr "Overstyrer snarveier til ?? bruke tastaturbindinger fra Emacs redigeringsprogrammet." -+msgstr "" -+"Overstyrer snarveier til ?? bruke tastaturbindinger fra Emacs " -+"redigeringsprogrammet." - - #: gtweak/tweaks/tweak_group_keymouse.py:40 - #: gtweak/tweaks/tweak_group_keymouse.py:108 -@@ -430,16 +439,16 @@ msgstr "Venstre Super" - #: gtweak/tweaks/tweak_group_keymouse.py:223 - #: gtweak/tweaks/tweak_group_keymouse.py:231 - msgid "Additional Layout Options" --msgstr "" -+msgstr "Flere alternativer for utforming" - - #: gtweak/tweaks/tweak_group_keymouse.py:253 --#: gtweak/tweaks/tweak_group_keymouse.py:392 -+#: gtweak/tweaks/tweak_group_keymouse.py:391 - msgid "Mouse Click Emulation" --msgstr "" -+msgstr "Emulering av musklikk" - - #: gtweak/tweaks/tweak_group_keymouse.py:271 - msgid "Fingers" --msgstr "" -+msgstr "Fingre" - - #: gtweak/tweaks/tweak_group_keymouse.py:273 - msgid "" -@@ -459,7 +468,7 @@ msgstr "" - - #: gtweak/tweaks/tweak_group_keymouse.py:325 - msgid "Don???t use mouse click emulation." --msgstr "" -+msgstr "Ikke bruk emulering av musklikk" - - #: gtweak/tweaks/tweak_group_keymouse.py:362 - msgid "Keyboard & Mouse" -@@ -489,62 +498,22 @@ msgstr "Aksellerasjonsprofil" - msgid "Pointer Location" - msgstr "Pekerlokasjon" - --#: gtweak/tweaks/tweak_group_keymouse.py:382 -+#: gtweak/tweaks/tweak_group_keymouse.py:381 - msgid "Press the Ctrl key to highlight the pointer." --msgstr "" -+msgstr "Trykk Ctrl-tasten for ?? utheve pekeren." - --#: gtweak/tweaks/tweak_group_keymouse.py:383 -+#: gtweak/tweaks/tweak_group_keymouse.py:382 - msgid "Middle Click Paste" - msgstr "Lim inn med midt-klikk" - --#: gtweak/tweaks/tweak_group_keymouse.py:387 -+#: gtweak/tweaks/tweak_group_keymouse.py:386 - msgid "Touchpad" - msgstr "Pekeplate" - --#: gtweak/tweaks/tweak_group_keymouse.py:388 -+#: gtweak/tweaks/tweak_group_keymouse.py:387 - msgid "Disable While Typing" - msgstr "Sl?? av n??r man skriver" - --#: gtweak/tweaks/tweak_group_shell_extensions.py:49 --msgid "No Extensions Installed" --msgstr "Ingen utvidelser installert" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:56 --msgid "Browse in Software" --msgstr "Bla gjennom i Programvare" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:119 --msgid "Extension downloading" --msgstr "Laster ned utvidelse" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:121 --msgid "Error loading extension" --msgstr "Feil under lasting av utvidelse" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:123 --msgid "Extension does not support shell version" --msgstr "Utvidelsen st??tter ikke denne versjonen av skallet" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:125 --msgid "Unknown extension error" --msgstr "Ukjent feil med utvidelse" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:173 --msgid "Updating" --msgstr "Oppdaterer" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:193 --msgid "Error" --msgstr "Feil" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:197 --msgid "Update" --msgstr "Oppdater" -- --#: gtweak/tweaks/tweak_group_shell_extensions.py:239 --msgid "Extensions" --msgstr "Utvidelser" -- - #: gtweak/tweaks/tweak_group_startup.py:30 - msgid "Startup applications are automatically started when you log in." - msgstr "Oppstartsprogrammer startes automatisk n??r du logger inn." -@@ -636,44 +605,39 @@ msgstr "Maksimer" - msgid "Minimize" - msgstr "Minimer" - --#: gtweak/tweaks/tweak_group_top_bar.py:16 --msgid "Application Menu" --msgstr "Programmeny" -- --#: gtweak/tweaks/tweak_group_top_bar.py:59 -+#: gtweak/tweaks/tweak_group_top_bar.py:14 - msgid "Top Bar" - msgstr "Topplinje" - --#. Requires patch from https://bugzilla.gnome.org/688320 --#: gtweak/tweaks/tweak_group_top_bar.py:61 -+#: gtweak/tweaks/tweak_group_top_bar.py:15 - msgid "Activities Overview Hot Corner" - msgstr "Hj??rne for aktivitetsoversikt" - --#: gtweak/tweaks/tweak_group_top_bar.py:63 -+#: gtweak/tweaks/tweak_group_top_bar.py:16 - msgid "Battery Percentage" - msgstr "Batteriprosent" - --#: gtweak/tweaks/tweak_group_top_bar.py:64 -+#: gtweak/tweaks/tweak_group_top_bar.py:17 - msgid "Clock" - msgstr "Klokke" - --#: gtweak/tweaks/tweak_group_top_bar.py:65 -+#: gtweak/tweaks/tweak_group_top_bar.py:18 - msgid "Weekday" - msgstr "Ukedag" - --#: gtweak/tweaks/tweak_group_top_bar.py:66 -+#: gtweak/tweaks/tweak_group_top_bar.py:19 - msgid "Date" - msgstr "Dato" - --#: gtweak/tweaks/tweak_group_top_bar.py:67 -+#: gtweak/tweaks/tweak_group_top_bar.py:20 - msgid "Seconds" - msgstr "Sekunder" - --#: gtweak/tweaks/tweak_group_top_bar.py:68 -+#: gtweak/tweaks/tweak_group_top_bar.py:21 - msgid "Calendar" - msgstr "Kalender" - --#: gtweak/tweaks/tweak_group_top_bar.py:69 -+#: gtweak/tweaks/tweak_group_top_bar.py:22 - msgid "Week Numbers" - msgstr "Ukenumre" - -@@ -700,13 +664,17 @@ msgstr "Fokus n??r du henger over et punkt" - msgid "" - "Window is focused when hovered with the pointer. Windows remain focused when " - "the desktop is hovered." --msgstr "Vinduet fokuseres n??r pekeren henger over det. Vinduer beholder fokus n??r pekeren henger over skrivebordet." -+msgstr "" -+"Vinduet fokuseres n??r pekeren henger over det. Vinduer beholder fokus n??r " -+"pekeren henger over skrivebordet." - - #: gtweak/tweaks/tweak_group_windows.py:90 - msgid "" - "Window is focused when hovered with the pointer. Hovering the desktop " - "removes focus from the previous window." --msgstr "Vinduet fokuseres n??r peker henger over det. Fokus fjernes fra forrige vindu n??r peker henger over skrivebordet." -+msgstr "" -+"Vinduet fokuseres n??r peker henger over det. Fokus fjernes fra forrige vindu " -+"n??r peker henger over skrivebordet." - - #: gtweak/tweaks/tweak_group_windows.py:129 - msgid "Window scaling" -@@ -841,19 +809,19 @@ msgid "Wacom" - msgstr "Wacom" - - #. indicates the default theme, e.g Adwaita (default) --#: gtweak/utils.py:59 -+#: gtweak/utils.py:62 - #, python-format - msgid "%s <i>(default)</i>" - msgstr "%s <i>(forvalg)</i>" - --#: gtweak/utils.py:332 -+#: gtweak/utils.py:337 - msgid "Configuration changes require restart" - msgstr "Konfigurasjonsendringer krever omstart" - --#: gtweak/utils.py:333 -+#: gtweak/utils.py:338 - msgid "Your session needs to be restarted for settings to take effect" - msgstr "??kten m?? startes p?? nytt for at endringene skal tre i kraft" +diff --git a/gtweak/gshellwrapper.py b/gtweak/gshellwrapper.py +index cfd478e..71ea453 100644 +--- a/gtweak/gshellwrapper.py ++++ b/gtweak/gshellwrapper.py +@@ -90,14 +90,13 @@ class GnomeShellFactory: + try: + proxy = _ShellProxy() + settings = GSettingsSetting("org.gnome.shell") +- v = list(map(int, proxy.version.split("."))) + + self.shell = GnomeShell(proxy, settings) + +- logging.debug("Shell version: %s", str(v)) +- except: ++ logging.debug("Shell version: %s", proxy.version) ++ except Exception as e: + self.shell = None +- logging.warn("Shell not installed or running") ++ logging.warn("Shell not installed or running (error: %s)", e) --#: gtweak/utils.py:337 -+#: gtweak/utils.py:342 - msgid "Restart Session" - msgstr "Start ??kt p?? nytt" + def get_shell(self): + return self.shell -- GitLab
