Commit 420baec5 authored by Mark Wagie's avatar Mark Wagie
Browse files

[prepare] cosmic-dock: add patch

parent fb659dea
From d966a967e9b1e7822113862d0ae882185d8329fc Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Thu, 12 Aug 2021 18:54:21 -0500
Subject: [PATCH] Remove schema handling from Makefile
---
Makefile | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 54600cd..4694a51 100644
--- a/Makefile
+++ b/Makefile
@@ -19,14 +19,10 @@ INSTALLNAME = cosmic-dock@system76.com
all: extension
clean:
- rm -f ./schemas/gschemas.compiled
rm -f stylesheet.css
rm -rf _build
-extension: ./schemas/gschemas.compiled ./stylesheet.css $(MSGSRC:.po=.mo)
-
-./schemas/gschemas.compiled: ./schemas/org.gnome.shell.extensions.dash-to-dock.gschema.xml
- glib-compile-schemas ./schemas/
+extension: ./stylesheet.css $(MSGSRC:.po=.mo)
potfile: ./po/dashtodock.pot
@@ -63,7 +59,7 @@ install-local: _build
cp -r ./_build/* $(INSTALLBASE)/$(INSTALLNAME)/
ifeq ($(INSTALLTYPE),system)
# system-wide settings and locale files
- rm -r $(INSTALLBASE)/$(INSTALLNAME)/schemas $(INSTALLBASE)/$(INSTALLNAME)/locale
+ rm -r $(INSTALLBASE)/$(INSTALLNAME)/locale
mkdir -p $(SHARE_PREFIX)/glib-2.0/schemas $(SHARE_PREFIX)/locale
cp -r ./schemas/*gschema.* $(SHARE_PREFIX)/glib-2.0/schemas
cp -r ./_build/locale/* $(SHARE_PREFIX)/locale
@@ -84,9 +80,6 @@ _build: all
cp stylesheet.css _build
mkdir -p _build/media
cd media ; cp $(EXTRA_MEDIA) ../_build/media/
- mkdir -p _build/schemas
- cp schemas/*.xml _build/schemas/
- cp schemas/gschemas.compiled _build/schemas/
mkdir -p _build/locale
for l in $(MSGSRC:.po=.mo) ; do \
lf=_build/locale/`basename $$l .mo`; \
--
2.31.1
......@@ -10,8 +10,10 @@ depends=('gnome-shell')
makedepends=('dpkg' 'git' 'sassc')
conflicts=('gnome-shell-extension-dash-to-dock')
_commit=1f6d0348e887ced994b0ce9f2ad326afb27609b5
source=("git+https://github.com/pop-os/cosmic-dock.git#commit=$_commit")
sha256sums=('SKIP')
source=("git+https://github.com/pop-os/cosmic-dock.git#commit=$_commit"
'0001-Remove-schema-handling-from-Makefile.patch')
sha256sums=('SKIP'
'4d63aa3351fd805c38b472be4b1adf011f7c27b430257d5da779837b4863e6d9')
pkgver() {
cd "$srcdir/cosmic-dock"
......@@ -21,6 +23,8 @@ pkgver() {
prepare() {
cd "$srcdir/cosmic-dock"
patch -Np1 -i ../0001-Remove-schema-handling-from-Makefile.patch
sed -i 's/AppIconMenu/AppMenu/g' appIcons.js
}
......@@ -32,4 +36,9 @@ build() {
package() {
cd "$srcdir/cosmic-dock"
make DESTDIR="$pkgdir/" install
_uuid=cosmic-dock@system76.com
# remove duplicate license
rm "$pkgdir/usr/share/gnome-shell/extensions/$_uuid/COPYING"
}
Markdown is supported
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