From 161df66f60d37230f38924bf4e6702be764cf01c Mon Sep 17 00:00:00 2001 From: sadlerm4 Date: Tue, 10 Dec 2024 21:51:20 +1100 Subject: [PATCH] rm: terra-gnome-shell-extension-pop-shell (#2522) * obsolete terra-gnome-shell-extension-pop-shell Signed-off-by: sadlerm4 * remove files Signed-off-by: sadlerm4 * Revert "obsolete terra-gnome-shell-extension-pop-shell" This reverts commit 978b87cfedfc3aa4f005eec4c0317b71c8c5f775. --------- Signed-off-by: sadlerm4 --- ...ve-schema-handling-from-transpile.sh.patch | 34 ------- ....wm.keybindings.pop-shell.gschema.override | 18 ---- ...rg.gnome.mutter.pop-shell.gschema.override | 7 -- ....mutter.wayland.pop-shell.gschema.override | 2 - ...gins.media-keys.pop-shell.gschema.override | 6 -- ...org.gnome.shell.pop-shell.gschema.override | 18 ---- .../gnome-shell-extension-pop-shell/anda.hcl | 8 -- ...terra-gnome-shell-extension-pop-shell.spec | 90 ------------------- .../update.rhai | 8 -- 9 files changed, 191 deletions(-) delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/0001-Remove-schema-handling-from-transpile.sh.patch delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.pop-shell.gschema.override delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.wayland.pop-shell.gschema.override delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.shell.pop-shell.gschema.override delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/anda.hcl delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec delete mode 100644 anda/desktops/gnome/gnome-shell-extension-pop-shell/update.rhai diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/0001-Remove-schema-handling-from-transpile.sh.patch b/anda/desktops/gnome/gnome-shell-extension-pop-shell/0001-Remove-schema-handling-from-transpile.sh.patch deleted file mode 100644 index eb41bed4d5..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/0001-Remove-schema-handling-from-transpile.sh.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f8b19139bf3f13b4285fd9d949cb5460a0909df Mon Sep 17 00:00:00 2001 -From: Carl George -Date: Fri, 25 Jun 2021 22:26:50 -0500 -Subject: [PATCH] Remove schema handling from transpile.sh - ---- - scripts/transpile.sh | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/scripts/transpile.sh b/scripts/transpile.sh -index e619a8c..8977c29 100755 ---- a/scripts/transpile.sh -+++ b/scripts/transpile.sh -@@ -15,8 +15,6 @@ transpile() { - - rm -rf _build - --glib-compile-schemas schemas & -- - # Transpile to JavaScript - - for proj in ${PROJECTS}; do -@@ -30,7 +28,7 @@ wait - - # Convert JS to GJS-compatible scripts - --cp -r metadata.json icons schemas *.css _build & -+cp -r metadata.json icons *.css _build & - - for src in $(find target -name '*.js'); do - dest=$(echo "$src" | sed s#target#_build#g) --- -2.31.1 - diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override deleted file mode 100644 index ca2303ab0d..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override +++ /dev/null @@ -1,18 +0,0 @@ -[org.gnome.desktop.wm.keybindings] -close = ['F4', 'q'] -maximize = [] -minimize = [] -move-to-monitor-down = [] -move-to-monitor-left = [] -move-to-monitor-right = [] -move-to-monitor-up = [] -move-to-workspace-down = [] -move-to-workspace-left = [] -move-to-workspace-right = [] -move-to-workspace-up = [] -switch-to-workspace-down = ['Down', 'KP_Down', 'j'] -switch-to-workspace-left = [] -switch-to-workspace-right = [] -switch-to-workspace-up = ['Up', 'KP_Up', 'k'] -toggle-maximized = ['m'] -unmaximize = [] diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.pop-shell.gschema.override deleted file mode 100644 index 4238624854..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.pop-shell.gschema.override +++ /dev/null @@ -1,7 +0,0 @@ -[org.gnome.mutter:GNOME] -attach-modal-dialogs = false -workspaces-only-on-primary = false - -[org.gnome.mutter.keybindings] -toggle-tiled-left = ['Left', 'KP_Left', 'h'] -toggle-tiled-right = ['Right', 'KP_Right', 'l'] diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.wayland.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.wayland.pop-shell.gschema.override deleted file mode 100644 index 18566ed983..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.mutter.wayland.pop-shell.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.mutter.wayland.keybindings] -restore-shortcuts = [] diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override deleted file mode 100644 index bee7aa9219..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override +++ /dev/null @@ -1,6 +0,0 @@ -[org.gnome.settings-daemon.plugins.media-keys] -email = ['e'] -home = ['f'] -screensaver = ['Escape'] -www = ['b'] -rotate-video-lock-static = ['XF86RotationLockToggle'] diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.shell.pop-shell.gschema.override b/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.shell.pop-shell.gschema.override deleted file mode 100644 index 03ba5c5f8b..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/50_org.gnome.shell.pop-shell.gschema.override +++ /dev/null @@ -1,18 +0,0 @@ -[org.gnome.shell.keybindings] -open-application-menu = [] -shift-overview-down = [] -shift-overview-up = [] -switch-to-application-1 = [] -switch-to-application-2 = [] -switch-to-application-3 = [] -switch-to-application-4 = [] -switch-to-application-5 = [] -switch-to-application-6 = [] -switch-to-application-7 = [] -switch-to-application-8 = [] -switch-to-application-9 = [] -toggle-message-tray = ['v'] - -[org.gnome.shell.overrides] -attach-modal-dialogs = false -workspaces-only-on-primary = false diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/anda.hcl b/anda/desktops/gnome/gnome-shell-extension-pop-shell/anda.hcl deleted file mode 100644 index 8acef3b5c2..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/anda.hcl +++ /dev/null @@ -1,8 +0,0 @@ -project pkg { - rpm { - spec = "terra-gnome-shell-extension-pop-shell.spec" - } - labels { - nightly = "1" - } -} diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec b/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec deleted file mode 100644 index db6e25d366..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec +++ /dev/null @@ -1,90 +0,0 @@ -# from Fedora upstream -%global extension pop-shell -%global uuid %{extension}@system76.com -%global commit e25621e2595eb5235ecb1a41167d1324a2b2a297 -%global shortcommit %{lua:print(macros.commit:sub(1,7))} -%global commit_date 20241010 -%global ver 1.2.0 - -Name: terra-gnome-shell-extension-%{extension} -Version: %{ver}^%commit_date.%{shortcommit} -Release: 2%?dist -Summary: GNOME Shell extension for advanced tiling window management -License: GPL-3.0-only -URL: https://github.com/pop-os/shell -BuildArch: noarch - -Source0: %{url}/archive/%{commit}/%{extension}-%{shortcommit}.tar.gz -Source1: 50_org.gnome.desktop.wm.keybindings.%{extension}.gschema.override -Source2: 50_org.gnome.mutter.%{extension}.gschema.override -Source3: 50_org.gnome.mutter.wayland.%{extension}.gschema.override -Source4: 50_org.gnome.settings-daemon.plugins.media-keys.%{extension}.gschema.override -Source5: 50_org.gnome.shell.%{extension}.gschema.override -# downstream-only -Patch0: 0001-Remove-schema-handling-from-transpile.sh.patch - -BuildRequires: typescript >= 3.8 -BuildRequires: make - -Requires: gnome-shell = 47~ -Recommends: gnome-extensions-app -Recommends: %{name}-shortcut-overrides = %{version}-%{release} -Provides: %{extension} = %{version}-%{release} - - -%description -Pop Shell is a keyboard-driven layer for GNOME Shell which allows for quick and -sensible navigation and management of windows. The core feature of Pop Shell -is the addition of advanced tiling window management - a feature that has been -highly sought within our community. For many - ourselves included - i3wm has -become the leading competitor to the GNOME desktop. - - -%package shortcut-overrides -Summary: Shortcut overrides for %{name} - - -%description shortcut-overrides -Shortcut overrides for %{name}. - - -%prep -%autosetup -p 1 -n shell-%{commit} - - -%build -%make_build compile - - -%install -# install main extension files -%make_install - -# install the schema file -install -D -p -m 0644 \ - schemas/org.gnome.shell.extensions.%{extension}.gschema.xml \ - %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml - -# install the gnome-control-center keybindings -install -d -m 0755 %{buildroot}%{_datadir}/gnome-control-center/keybindings -install -p -m 0644 keybindings/*.xml %{buildroot}%{_datadir}/gnome-control-center/keybindings/ - -# install the schema override files -install -d -m 0755 %{buildroot}%{_datadir}/glib-2.0/schemas -install -p -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{buildroot}%{_datadir}/glib-2.0/schemas/ - - -%files -%license LICENSE -%doc README.md -%{_datadir}/gnome-shell/extensions/%{uuid} -%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml -%{_datadir}/gnome-control-center/keybindings/*.xml - - -%files shortcut-overrides -%{_datadir}/glib-2.0/schemas/*.%{extension}.gschema.override - - -%changelog -%autochangelog diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/update.rhai b/anda/desktops/gnome/gnome-shell-extension-pop-shell/update.rhai deleted file mode 100644 index 077e121d19..0000000000 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/update.rhai +++ /dev/null @@ -1,8 +0,0 @@ -if filters.contains("nightly") { - rpm.global("commit", gh_commit("pop-os/shell")); - if rpm.changed() { - rpm.global("ver", gh("pop-os/shell")); - rpm.release(); - rpm.global("commit_date", date()); - } -}