diff options
-rw-r--r-- | .SRCINFO | 32 | ||||
-rw-r--r-- | .gitignore | 17 | ||||
-rw-r--r-- | 0001-Remove-schema-handling-from-transpile.sh.patch | 34 | ||||
-rw-r--r-- | 50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override | 18 | ||||
-rw-r--r-- | 50_org.gnome.mutter.pop-shell.gschema.override | 6 | ||||
-rw-r--r-- | 50_org.gnome.mutter.wayland.pop-shell.gschema.override | 2 | ||||
-rw-r--r-- | 50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override | 6 | ||||
-rw-r--r-- | 50_org.gnome.shell.pop-shell.gschema.override | 17 | ||||
-rw-r--r-- | PKGBUILD | 81 | ||||
-rwxr-xr-x | pop-shell.install | 17 |
10 files changed, 168 insertions, 62 deletions
@@ -1,20 +1,34 @@ pkgbase = gnome-shell-extension-pop-shell-git - pkgdesc = Pop Shell - Tiling window management in Gnome (WIP) - pkgver = r950.9418d0a + pkgdesc = GNOME Shell extension for advanced tiling window management + pkgver = 1.2.0.r304.g9418d0a pkgrel = 1 url = https://github.com/pop-os/shell - install = pop-shell.install arch = any - license = GPLv3 - makedepends = typescript + license = GPL-3.0-or-later makedepends = git + makedepends = typescript + depends = fd depends = gnome-shell - depends = pop-shell-shortcuts-git depends = pop-launcher-git - depends = fd - optdepends = gnome-shell-extensions: native-window extension for improved window placement + depends = pop-shell-shortcuts-git + depends = xorg-xprop + optdepends = gnome-control-center: keybinding categories + optdepends = gnome-shell-extensions: for Native Window Placment extension + provides = gnome-shell-extension-pop-shell conflicts = gnome-shell-extension-pop-shell - source = shell::git+https://github.com/pop-os/shell.git#branch=master_mantic + source = git+https://github.com/pop-os/shell.git + source = 0001-Remove-schema-handling-from-transpile.sh.patch + source = 50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override + source = 50_org.gnome.mutter.pop-shell.gschema.override + source = 50_org.gnome.mutter.wayland.pop-shell.gschema.override + source = 50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override + source = 50_org.gnome.shell.pop-shell.gschema.override sha256sums = SKIP + sha256sums = 84b5132edab34ca1af33e310838ad1e430e2ed796da4ec9d3ab646b9f61a71cf + sha256sums = 6801f3e12a539167a0c2b64c7deccc1726b51e681b0bc932e8a5f628f86e69df + sha256sums = fcddff7a7689ea0f9ac3d983d224d347e093d5eda1c7c1d875133248f8b812c0 + sha256sums = d3a4ac86303c9065fd76dace64283573079c3bdce4b9a2ca18be5f103eb6fd4c + sha256sums = 77f854c2f4509ed83d3d99a40018914f031f61f945e1acbf527fcc65adb5f252 + sha256sums = 7b729a10fe29f2af7bac3022d87fece43ed4094b3ad2a9ac3a61ffc465dadde1 pkgname = gnome-shell-extension-pop-shell-git diff --git a/.gitignore b/.gitignore index b246d59210cc..2d26bb091bd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,13 @@ -*.tar.gz -*.pkg.tar.zst -pkg/ -src/ -shell/ +# Ignore everything +* +# But not these files... +!.gitignore +!PKGBUILD +!.SRCINFO +!0001-Remove-schema-handling-from-transpile.sh.patch +!50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override +!50_org.gnome.mutter.pop-shell.gschema.override +!50_org.gnome.mutter.wayland.pop-shell.gschema.override +!50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override +!50_org.gnome.shell.pop-shell.gschema.override diff --git a/0001-Remove-schema-handling-from-transpile.sh.patch b/0001-Remove-schema-handling-from-transpile.sh.patch new file mode 100644 index 000000000000..d6e12aaa2f1c --- /dev/null +++ b/0001-Remove-schema-handling-from-transpile.sh.patch @@ -0,0 +1,34 @@ +From 43fb894ed6bc16667dbc4a7bbe09f3304dd17de6 Mon Sep 17 00:00:00 2001 +From: Carl George <carl@george.computer> +Date: Fri, 25 Jun 2021 22:26:50 -0500 +Subject: [PATCH 1/2] 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 7ad27aa..c861498 100755 +--- a/scripts/transpile.sh ++++ b/scripts/transpile.sh +@@ -16,8 +16,6 @@ transpile() { + + rm -rf _build + +-glib-compile-schemas schemas & +- + # Transpile to JavaScript + + for proj in ${PROJECTS}; do +@@ -31,7 +29,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.41.0 + diff --git a/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override b/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override new file mode 100644 index 000000000000..ca2303ab0d82 --- /dev/null +++ b/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override @@ -0,0 +1,18 @@ +[org.gnome.desktop.wm.keybindings] +close = ['<Alt>F4', '<Super>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 = ['<Primary><Super>Down', '<Primary><Super>KP_Down', '<Primary><Super>j'] +switch-to-workspace-left = [] +switch-to-workspace-right = [] +switch-to-workspace-up = ['<Primary><Super>Up', '<Primary><Super>KP_Up', '<Primary><Super>k'] +toggle-maximized = ['<Super>m'] +unmaximize = [] diff --git a/50_org.gnome.mutter.pop-shell.gschema.override b/50_org.gnome.mutter.pop-shell.gschema.override new file mode 100644 index 000000000000..2d070399028f --- /dev/null +++ b/50_org.gnome.mutter.pop-shell.gschema.override @@ -0,0 +1,6 @@ +[org.gnome.mutter:GNOME] +attach-modal-dialogs = false +workspaces-only-on-primary = false +[org.gnome.mutter.keybindings] +toggle-tiled-left = ['<Primary><Super>Left', '<Primary><Super>KP_Left', '<Primary><Super>h'] +toggle-tiled-right = ['<Primary><Super>Right', '<Primary><Super>KP_Right', '<Primary><Super>l'] diff --git a/50_org.gnome.mutter.wayland.pop-shell.gschema.override b/50_org.gnome.mutter.wayland.pop-shell.gschema.override new file mode 100644 index 000000000000..18566ed983ea --- /dev/null +++ b/50_org.gnome.mutter.wayland.pop-shell.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.mutter.wayland.keybindings] +restore-shortcuts = [] diff --git a/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override b/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override new file mode 100644 index 000000000000..bee7aa921929 --- /dev/null +++ b/50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override @@ -0,0 +1,6 @@ +[org.gnome.settings-daemon.plugins.media-keys] +email = ['<Super>e'] +home = ['<Super>f'] +screensaver = ['<Super>Escape'] +www = ['<Super>b'] +rotate-video-lock-static = ['XF86RotationLockToggle'] diff --git a/50_org.gnome.shell.pop-shell.gschema.override b/50_org.gnome.shell.pop-shell.gschema.override new file mode 100644 index 000000000000..d9b6d5a7c73c --- /dev/null +++ b/50_org.gnome.shell.pop-shell.gschema.override @@ -0,0 +1,17 @@ +[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 = ['<Super>v'] +[org.gnome.shell.overrides] +attach-modal-dialogs = false +workspaces-only-on-primary = false @@ -1,45 +1,64 @@ # Maintainer: Vincent.Ducamps <aur@ducamps.eu> +# Co-Maintainer: Mark Wagie <mark dot wagie at proton dot me> pkgname=gnome-shell-extension-pop-shell-git -pkgdesc="Pop Shell - Tiling window management in Gnome (WIP)" -pkgver=r950.9418d0a +pkgver=1.2.0.r304.g9418d0a pkgrel=1 -_gitorg=pop-os -_gitname=shell -_gitbranch=master_mantic -arch=(any) +pkgdesc="GNOME Shell extension for advanced tiling window management" +arch=('any') url="https://github.com/pop-os/shell" -license=("GPLv3") -install="pop-shell.install" -optdepends=('gnome-shell-extensions: native-window extension for improved window placement') -conflicts=("gnome-shell-extension-pop-shell") -makedepends=("typescript" "git") -depends=("gnome-shell" "pop-shell-shortcuts-git" "pop-launcher-git" "fd") - - -_dir="${_gitname}" -source=("${_dir}::git+https://github.com/${_gitorg}/${_gitname}.git#branch=${_gitbranch}") -sha256sums=("SKIP") - +license=('GPL-3.0-or-later') +depends=('fd' 'gnome-shell' 'pop-launcher-git' 'pop-shell-shortcuts-git' 'xorg-xprop') +makedepends=('git' 'typescript') +optdepends=('gnome-control-center: keybinding categories' + 'gnome-shell-extensions: for Native Window Placment extension') +provides=("${pkgname%-git}") +conflicts=("${pkgname%-git}") +source=('git+https://github.com/pop-os/shell.git' + '0001-Remove-schema-handling-from-transpile.sh.patch' + '50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override' + '50_org.gnome.mutter.pop-shell.gschema.override' + '50_org.gnome.mutter.wayland.pop-shell.gschema.override' + '50_org.gnome.settings-daemon.plugins.media-keys.pop-shell.gschema.override' + '50_org.gnome.shell.pop-shell.gschema.override') +sha256sums=('SKIP' + '84b5132edab34ca1af33e310838ad1e430e2ed796da4ec9d3ab646b9f61a71cf' + '6801f3e12a539167a0c2b64c7deccc1726b51e681b0bc932e8a5f628f86e69df' + 'fcddff7a7689ea0f9ac3d983d224d347e093d5eda1c7c1d875133248f8b812c0' + 'd3a4ac86303c9065fd76dace64283573079c3bdce4b9a2ca18be5f103eb6fd4c' + '77f854c2f4509ed83d3d99a40018914f031f61f945e1acbf527fcc65adb5f252' + '7b729a10fe29f2af7bac3022d87fece43ed4094b3ad2a9ac3a61ffc465dadde1') pkgver() { - cd "${srcdir}/${_dir}" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd shell + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } +prepare() { + cd shell + patch -Np1 -i ../0001-Remove-schema-handling-from-transpile.sh.patch -build() { - cd "${srcdir}/${_dir}" - make all + # Fix the title bar showing/hiding + git cherry-pick -n 3386f426b1750a166c767c583dcb69ed2997234f } +build() { + cd shell + make +} package() { - cd "${srcdir}/${_dir}" - make DESTDIR="${pkgdir}/" install - - install -Dm644 schemas/org.gnome.shell.extensions.pop-shell.gschema.xml -t \ - "$pkgdir/usr/share/glib-2.0/schemas" - install -Dm644 keybindings/*.xml -t \ - "$pkgdir/usr/share/gnome-control-center/keybindings" - install -Dm755 scripts/configure.sh "${pkgdir}/usr/share/gnome-shell/extensions/pop-shell@system76.com/scripts/configure.sh" + cd shell + make DESTDIR="$pkgdir" install + + # install the schema file + install -Dm644 schemas/org.gnome.shell.extensions.pop-shell.gschema.xml -t \ + "$pkgdir/usr/share/glib-2.0/schemas/" + + # install the gnome-control-center keybindings + install -Dm644 keybindings/*.xml -t \ + "$pkgdir/usr/share/gnome-control-center/keybindings/" + + # install the schema override files + install -Dm644 "$srcdir"/*.pop-shell.gschema.override -t \ + "$pkgdir/usr/share/glib-2.0/schemas/" } diff --git a/pop-shell.install b/pop-shell.install deleted file mode 100755 index 724ea933cc29..000000000000 --- a/pop-shell.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - - echo "POP-shell configuration" - echo "to configure POP-shell keybinding on user session" - echo "launch Script: /usr/share/gnome-shell/extensions/pop-shell@system76.com/scripts/configure.sh" - -} - -post_upgrade() { - post_install -} - -post_remove() { - - echo "to complete uninstalation reset keybinding in parameter pannel" - -}
\ No newline at end of file |