Merge gnomeExtensions: auto-update (#414907)
This commit is contained in:
@@ -142,7 +142,6 @@ lib.trivial.pipe super [
|
||||
xdg_utils = xdg-utils;
|
||||
gtk_update_icon_cache = "${gtk4.out}/bin/gtk4-update-icon-cache";
|
||||
update_desktop_database = "${desktop-file-utils.out}/bin/update-desktop-database";
|
||||
xdg_user_dirs = lib.getExe xdg-user-dirs;
|
||||
nautilus_gsettings_path = glib.getSchemaPath nautilus;
|
||||
})
|
||||
];
|
||||
@@ -216,4 +215,18 @@ lib.trivial.pipe super [
|
||||
--replace "GLib.build_filenamev([GLib.DIR_SEPARATOR_S, 'usr', 'share', 'touchegg', 'touchegg.conf'])" "'${touchegg}/share/touchegg/touchegg.conf'"
|
||||
'';
|
||||
}))
|
||||
|
||||
(patchExtension "pwcalc@thilomaurer.de" {
|
||||
postPatch = ''
|
||||
# remove unused dangling symlink
|
||||
rm settings-importexport.ui
|
||||
'';
|
||||
})
|
||||
|
||||
(patchExtension "TeaTimer@zener.sbg.at" {
|
||||
postPatch = ''
|
||||
# remove unused dangling symlink
|
||||
rm utilities-teatime.svg
|
||||
'';
|
||||
})
|
||||
]
|
||||
|
||||
-22
@@ -26,28 +26,6 @@ index 42cb878c..929ddce2 100755
|
||||
`${GLib.path_get_dirname(appDesktopFile)}`
|
||||
);
|
||||
|
||||
diff --git a/app/adwPreferencesWindow.js b/app/adwPreferencesWindow.js
|
||||
index 93d53554..8f5bb8fe 100644
|
||||
--- a/app/adwPreferencesWindow.js
|
||||
+++ b/app/adwPreferencesWindow.js
|
||||
@@ -540,7 +540,7 @@ const AdwPreferencesWindow = class {
|
||||
}
|
||||
|
||||
setDesktopFolder(path) {
|
||||
- const command = 'xdg-user-dirs-update --set DESKTOP';
|
||||
+ const command = '@xdg_user_dirs@/bin/xdg-user-dirs-update --set DESKTOP';
|
||||
|
||||
try {
|
||||
GLib.spawn_command_line_async(
|
||||
@@ -564,7 +564,7 @@ const AdwPreferencesWindow = class {
|
||||
}
|
||||
|
||||
getCurrentDesktopFolder() {
|
||||
- const command = 'xdg-user-dir DESKTOP';
|
||||
+ const command = '@xdg_user_dirs@/bin/xdg-user-dir DESKTOP';
|
||||
const decoder = new TextDecoder();
|
||||
const [, out,, status] = GLib.spawn_command_line_sync(command);
|
||||
|
||||
diff --git a/app/enums.js b/app/enums.js
|
||||
index 5434fa7a..e36d3670 100644
|
||||
--- a/app/enums.js
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user