Commit cecd81df authored by Mark Wagie's avatar Mark Wagie
Browse files

[pkg-upd] cosmic-workspaces: 0.1.0.r141.a06e0a7-2

- remove schema handling
parent 6e914e30
From 4cecdf1c144ae0b8837badd4176bfd3b4a0d3097 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Sun, 24 Oct 2021 19:58:14 -0500
Subject: [PATCH] Remove schema handling from Makefile
---
Makefile | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 6bd63a3..01123a6 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,7 @@ INSTALLNAME = $(UUID)
SRC = $(wildcard *.css) \
$(wildcard *.js) \
$(wildcard *.json) \
- $(wildcard *.ui) \
- $(wildcard schemas/*.gschema.xml) \
- schemas/gschemas.compiled
+ $(wildcard *.ui)
$(info UUID is "$(UUID)")
@@ -28,9 +26,6 @@ all: $(SRC)
cp $$i _build/$$i ; \
done
-schemas/gschemas.compiled: schemas/*.gschema.xml
- glib-compile-schemas schemas
-
clean:
rm -rf _build
--
2.31.1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
pkgname=gnome-shell-extension-cosmic-workspaces pkgname=gnome-shell-extension-cosmic-workspaces
pkgver=0.1.0.r141.a06e0a7 pkgver=0.1.0.r141.a06e0a7
pkgrel=1 pkgrel=2
pkgdesc="Bringing back vertically stacked workspaces (Pop!_OS Vertical Overview fork)" pkgdesc="Bringing back vertically stacked workspaces (Pop!_OS Vertical Overview fork)"
arch=('any') arch=('any')
url="https://github.com/pop-os/cosmic-workspaces" url="https://github.com/pop-os/cosmic-workspaces"
...@@ -13,8 +13,10 @@ makedepends=('dpkg' 'git') ...@@ -13,8 +13,10 @@ makedepends=('dpkg' 'git')
conflicts=('gnome-shell-extension-vertical-overview' 'gnome-shell-extension-vertical-overview-cosmic') conflicts=('gnome-shell-extension-vertical-overview' 'gnome-shell-extension-vertical-overview-cosmic')
replaces=('gnome-shell-extension-vertical-overview-cosmic') replaces=('gnome-shell-extension-vertical-overview-cosmic')
_commit=a06e0a756bc50ba2eaee8305149dcbfe1813e63c _commit=a06e0a756bc50ba2eaee8305149dcbfe1813e63c
source=("git+https://github.com/pop-os/cosmic-workspaces.git#commit=$_commit") source=("git+https://github.com/pop-os/cosmic-workspaces.git#commit=$_commit"
sha256sums=('SKIP') '0001-Remove-schema-handling-from-Makefile.patch')
sha256sums=('SKIP'
'fae0a69ef980fe2ff22e007d07b9784d291f00db47a146b5ac3a07a03106efa8')
pkgver() { pkgver() {
cd "$srcdir/cosmic-workspaces" cd "$srcdir/cosmic-workspaces"
...@@ -22,6 +24,11 @@ pkgver() { ...@@ -22,6 +24,11 @@ pkgver() {
"$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
} }
prepare() {
cd "$srcdir/cosmic-workspaces"
patch -Np1 -i ../0001-Remove-schema-handling-from-Makefile.patch
}
build() { build() {
cd "$srcdir/cosmic-workspaces" cd "$srcdir/cosmic-workspaces"
make make
...@@ -29,13 +36,8 @@ build() { ...@@ -29,13 +36,8 @@ build() {
package() { package() {
cd "$srcdir/cosmic-workspaces" cd "$srcdir/cosmic-workspaces"
_uuid='cosmic-workspaces@system76.com' make DESTDIR="$pkgdir/" install
_schema='org.gnome.shell.extensions.cosmic-workspaces.gschema.xml'
install -d "$pkgdir/usr/share/gnome-shell/extensions/$_uuid"
cp -r _build/* "$pkgdir/usr/share/gnome-shell/extensions/$_uuid"
install -d "$pkgdir/usr/share/glib-2.0/schemas" install -Dm644 schemas/org.gnome.shell.extensions.cosmic-workspaces.gschema.xml -t \
ln -s "/usr/share/gnome-shell/extensions/$_uuid/schemas/$_schema" \
"$pkgdir/usr/share/glib-2.0/schemas" "$pkgdir/usr/share/glib-2.0/schemas"
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment