Skip to content
Commits on Source (46)
gnome-shell (3.36.1-5ubuntu1) focal; urgency=medium
* Merge with debian
* debian/patches: appDisplay: Look up directory- instead of category
translations (LP: #1872434)
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 15 Apr 2020 03:00:46 +0200
gnome-shell (3.36.1-5) unstable; urgency=medium
* Team upload
* Merge changelog from unstable
* Upload to unstable (transition: #954422)
* d/gbp.conf: Follow upstream/3.36.x branch
-- Simon McVittie <smcv@debian.org> Fri, 10 Apr 2020 17:56:07 +0100
gnome-shell (3.34.4-1) unstable; urgency=medium
* Team upload
* d/gbp.conf: Switch to debian/unstable branch.
debian/master is now in use for 3.35.x.
* New upstream release
* Apply post-release fixes up to 3.34.4-1-g99d948559
* Bump Standards-Version to 4.5.0
-- Simon McVittie <smcv@debian.org> Tue, 25 Feb 2020 16:26:07 +0000
gnome-shell (3.36.1-4ubuntu1) focal; urgency=medium
* Merge with debian, with new upstream releases and cherry-picked fixes:
......
[DEFAULT]
pristine-tar = True
debian-branch=ubuntu/master
upstream-branch = upstream/latest
upstream-branch = upstream/3.36.x
debian-tag=ubuntu/%(version)s
upstream-vcs-tag = %(version)s
......
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 13 Apr 2020 15:41:54 +0200
Subject: Revert "app-cache: Fix cache for folder translations"
Existing folders as created by gnome-software (including the
default ones) all have the .directory suffix, so dropping
the suffix from the keys broke those folders.
This reverts commit 343b3351f172e112e1a70b54956ab3444140fbf4.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2623
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1872434
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1196
---
src/shell-app-cache.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/shell-app-cache.c b/src/shell-app-cache.c
index 9b33c7a..15d4734 100644
--- a/src/shell-app-cache.c
+++ b/src/shell-app-cache.c
@@ -109,17 +109,11 @@ load_folder (GHashTable *folders,
while ((name = g_dir_read_name (dir)))
{
- g_autofree gchar *stripped_name = NULL;
g_autofree gchar *filename = NULL;
g_autoptr(GKeyFile) keyfile = NULL;
- if (!g_str_has_suffix (name, ".directory"))
- continue;
-
- stripped_name = g_strndup (name, strlen (name) - strlen (".directory"));
-
/* First added wins */
- if (g_hash_table_contains (folders, stripped_name))
+ if (g_hash_table_contains (folders, name))
continue;
filename = g_build_filename (path, name, NULL);
@@ -134,8 +128,7 @@ load_folder (GHashTable *folders,
NULL, NULL);
if (translated != NULL)
- g_hash_table_insert (folders, g_steal_pointer (&stripped_name),
- translated);
+ g_hash_table_insert (folders, g_strdup (name), translated);
}
}
}
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 12 Apr 2020 17:15:48 +0200
Subject: appDisplay: Look up directory- instead of category translations
Translations are provided by .directory files, so trying to look
up a category name without the suffix will always fail.
Commit 343b3351f1 tried to fix this previously by changing the
saved keys, but that broke existing translatable folders.
Appending the .directory suffix for the lookup instead fixes the
issue without regressing non-custom folders.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2623
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1872434
Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1196
---
js/ui/appDisplay.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 991ab2a..2bc7d93 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -114,7 +114,8 @@ function _findBestFolderName(apps) {
}, commonCategories);
for (let category of commonCategories) {
- let translated = Shell.util_get_translated_folder_name(category);
+ const directory = '%s.directory'.format(category);
+ const translated = Shell.util_get_translated_folder_name(directory);
if (translated !== null)
return translated;
}
......@@ -43,6 +43,8 @@ main-add-backtrace-crashes-all-and-backtrace-all.patch
sessionMode-add-support-for-debugFlags-parameter.patch
st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
Revert-app-cache-Fix-cache-for-folder-translations.patch
appDisplay-Look-up-directory-instead-of-category-translat.patch
ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
ubuntu/resolve_alternate_theme_path.patch
ubuntu/secure_mode_extension.patch
......