numerous fixes and improvements

10 files changed, 157 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11d2a3764a87..3fd67a7c1fea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,32 @@
 pkgbase = gnome-shell-extension-pop-shell
-	pkgdesc = Pop Shell - Tiling window management in Gnome (WIP)
-	pkgver = 1.2.0
-	pkgrel = 2
+	pkgdesc = GNOME Shell extension for advanced tiling window management
+	pkgver = 1.2.0+292+g0e09473
+	pkgrel = 1
 	url = https://github.com/pop-os/shell
-	install = pop-shell.install
 	arch = any
-	license = GPLv3
+	license = GPL3
 	makedepends = typescript
 	makedepends = git
+	depends = fd
 	depends = gnome-shell
-	depends = pop-shell-shortcuts-git
-	optdepends = gnome-shell-extensions: native-window extension for improved window placement
-	conflicts = gnome-shell-extension-pop-shell
-	source = shell-1.2.0.tar.gz::https://github.com/pop-os/shell/archive/1.2.0.tar.gz
+	depends = pop-launcher
+	depends = pop-shell-shortcuts
+	depends = xorg-xprop
+	optdepends = gnome-control-center: keybinding categories
+	optdepends = gnome-shell-extensions: for Native Window Placment extension
+	source = git+https://github.com/pop-os/shell.git#commit=0e09473c9d8a1de7476ccf128c028188206c9bb1
+	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 = cb5d5652fc2d15bd7c60f8cb38f1ed67cd551db36fbed8603b930d6f024de167
+	sha256sums = 3528ecf59d625eeb83a909f3e4cd3775e2f3ef7d27dc85dc1c8dc980317fad99
+	sha256sums = 08f99d7b7721c25a43cd24ce71830e57256daa6995e2500cd9e6cfe219a661e1
+	sha256sums = 16a372347d46f9079047557ba09a7a2335e5e64d3fa40118dbc6b0d53d8e686c
+	sha256sums = cb2f53c3c19ed2123373cd3183c3aad1e85d9a661c9e967c6888b7eae3bb18f0
+	sha256sums = 59cf3799036e22718577d0a89468605b6ca1e253d9d7133a8afd640188e2ea9d
 
 pkgname = gnome-shell-extension-pop-shell
-
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..eb41bed4d583
--- /dev/null
+++ b/0001-Remove-schema-handling-from-transpile.sh.patch
@@ -0,0 +1,34 @@
+From 3f8b19139bf3f13b4285fd9d949cb5460a0909df Mon Sep 17 00:00:00 2001
+From: Carl George <carl@george.computer>
+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/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..204069703309
--- /dev/null
+++ b/50_org.gnome.desktop.wm.keybindings.pop-shell.gschema.override
@@ -0,0 +1,16 @@
+[org.gnome.desktop.wm.keybindings]
+close=['<Super>q', '<Alt>F4']
+maximize=@as []
+minimize=@as ['<Super>comma']
+move-to-monitor-down=@as []
+move-to-monitor-left=@as []
+move-to-monitor-right=@as []
+move-to-monitor-up=@as []
+move-to-workspace-down=@as []
+move-to-workspace-up=@as []
+switch-to-workspace-down=['<Primary><Super>Down','<Primary><Super>${down}']
+switch-to-workspace-left=@as []
+switch-to-workspace-right=@as []
+switch-to-workspace-up=['<Primary><Super>Up','<Primary><Super>${up}']
+toggle-maximized=['<Super>m']
+unmaximize=@as []
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..2925adc0bcbb
--- /dev/null
+++ b/50_org.gnome.mutter.pop-shell.gschema.override
@@ -0,0 +1,6 @@
+[org.gnome.mutter:GNOME]
+workspaces-only-on-primary=false
+
+[org.gnome.mutter.keybindings]
+toggle-tiled-left=@as []
+toggle-tiled-right=@as []
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..aa3bbab1bf14
--- /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..338e273cf3cf
--- /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']
+rotate-video-lock-static=['XF86RotationLockToggle']
+screensaver=['<Super>Escape']
+www=['<Super>b']
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..ac0c7a09f68c
--- /dev/null
+++ b/50_org.gnome.shell.pop-shell.gschema.override
@@ -0,0 +1,7 @@
+[org.gnome.shell.keybindings]
+open-application-menu=@as []
+toggle-message-tray=@as ['<Super>v']
+toggle-overview=@as []
+
+[org.gnome.shell.overrides]
+workspaces-only-on-primary=false
diff --git a/PKGBUILD b/PKGBUILD
index 18ebdb8f3861..a3b9b3ed807a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,62 @@
-# Maintainer: Vincent.Ducamps <aur@ducamps.win>
+# Maintainer: Mark Wagie <mark dot wagie at proton dot me>
+# Contributor: Vincent.Ducamps <aur@ducamps.win>
 pkgname=gnome-shell-extension-pop-shell
-pkgdesc="Pop Shell - Tiling window management in Gnome (WIP)"
-pkgver=1.2.0
-pkgrel=2
-_gitorg=pop-os
-_gitname=shell
-arch=(any)
+pkgver=1.2.0+292+g0e09473
+pkgrel=1
+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")
+license=('GPL3')
+depends=('fd' 'gnome-shell' 'pop-launcher' 'pop-shell-shortcuts' 'xorg-xprop')
+makedepends=('typescript' 'git')
+optdepends=('gnome-control-center: keybinding categories'
+            'gnome-shell-extensions: for Native Window Placment extension')
+_commit=0e09473c9d8a1de7476ccf128c028188206c9bb1  # master_jammy
+source=("git+${url}.git#commit=${_commit}"
+        '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'
+            'cb5d5652fc2d15bd7c60f8cb38f1ed67cd551db36fbed8603b930d6f024de167'
+            '3528ecf59d625eeb83a909f3e4cd3775e2f3ef7d27dc85dc1c8dc980317fad99'
+            '08f99d7b7721c25a43cd24ce71830e57256daa6995e2500cd9e6cfe219a661e1'
+            '16a372347d46f9079047557ba09a7a2335e5e64d3fa40118dbc6b0d53d8e686c'
+            'cb2f53c3c19ed2123373cd3183c3aad1e85d9a661c9e967c6888b7eae3bb18f0'
+            '59cf3799036e22718577d0a89468605b6ca1e253d9d7133a8afd640188e2ea9d')
+#validpgpkeys=('2A8CB607A1D3332C18E86652B2732D4240C9212C') # Michael Aaron Murphy <michael@system76.com>
 
+pkgver() {
+  cd "${srcdir}/shell"
+  git describe --tags | sed 's/-/+/g'
+}
 
-_dir="${_gitname}-${pkgver}"
-source=("${_dir}.tar.gz::https://github.com/${_gitorg}/${_gitname}/archive/${pkgver}.tar.gz")
-sha256sums=("SKIP")
-
+prepare() {
+  cd "${srcdir}/shell"
+  patch -Np1 -i ../0001-Remove-schema-handling-from-transpile.sh.patch
+}
 
 build() {
-    cd "${srcdir}/${_dir}"
-    make all
+  cd "${srcdir}/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 "${srcdir}/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