Bump to v1.6

3 files changed, 15 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d02fca0212af..5e7995f3bc7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lavalauncher
 	pkgdesc = A simple launcher panel for Wayland
-	pkgver = 1.3
+	pkgver = 1.6
 	pkgrel = 1
 	url = https://git.sr.ht/~leon_plickat/lavalauncher
 	arch = x86_64
@@ -13,9 +13,7 @@ pkgbase = lavalauncher
 	provides = lavalauncher
 	conflicts = lavalauncher-git
 	source = lavalauncher::git+https://git.sr.ht/~leon_plickat/lavalauncher
-	source = Makefile.patch
 	sha256sums = SKIP
-	sha256sums = 9015bf10858ff1743ef56d2661b14ddf929e09c3c9677be26477a41c90014655
 
 pkgname = lavalauncher
 
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index d9756a9294e1..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 418e805..96f00fc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -77,17 +77,17 @@ doc/lavalauncher.1: doc/lavalauncher.1.scd
- 
- install: lavalauncher doc/lavalauncher.1
- 	@echo Installing
--	install -D -m 755 lavalauncher $(BINPREFIX)/lavalauncher
--	install -D -m 644 doc/lavalauncher.1 $(MANPREFIX)/man1/lavalauncher.1
-+	@install -Dm755 lavalauncher ${DESTDIR}${PREFIX}/bin/lavalauncher
-+	@install -Dm644 doc/lavalauncher.1 ${DESTDIR}${MANPREFIX}/man1/lavalauncher.1
- 
- uninstall:
- 	@echo Uninstalling
--	$(RM) $(BINPREFIX)/lavalauncher
--	$(RM) $(MANPREFIX)/man1/lavalauncher.1
-+	@rm -f ${DESTDIR}${PREFIX}/bin/lavalauncher
-+	@rm -f ${DESTDIR}${MANPREFIX}/man1/lavalauncher.1
- 
- clean:
- 	@echo Cleaning
--	rm -f lavalauncher \
-+	@rm -f lavalauncher \
- 		lib/wayland-protocols/wlr-layer-shell-unstable-v1-client-protocol.h \
- 		lib/wayland-protocols/wlr-layer-shell-unstable-v1-protocol.c \
- 		lib/wayland-protocols/xdg-shell-client-protocol.h \
diff --git a/PKGBUILD b/PKGBUILD
index e9a8007ec4b9..12ee4bccd49a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,41 @@
 # Maintainer: Leon Plickat <leonhenrik.plickat@stud.uni-goettingen.de>
 
 pkgname=lavalauncher
-pkgver=1.3
+pkgver=1.6
 pkgrel=1
 pkgdesc='A simple launcher panel for Wayland'
 arch=(x86_64)
 url='https://git.sr.ht/~leon_plickat/lavalauncher'
 license=(GPL3)
 depends=(cairo wayland wayland-protocols scdoc)
-makedepends=(git gcc make)
+makedepends=(git gcc meson ninja)
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
-source=("${pkgname%-*}::git+${url}" 'Makefile.patch')
-sha256sums=('SKIP' '9015bf10858ff1743ef56d2661b14ddf929e09c3c9677be26477a41c90014655')
+source=("${pkgname%-*}::git+${url}")
+sha256sums=('SKIP')
 
 pkgver() {
-	printf "1.3"
+	printf "1.6"
 }
 
 prepare()
 {
 	cd "${pkgname%-*}"
-	patch -Np1 -i ../Makefile.patch
-	git checkout v1.3
+	git checkout v1.6
 }
 
 build()
 {
-	make -C "${pkgname%-*}"
+	cd "${pkgname%-*}"
+	rm -fr build
+	meson build \
+		--prefix /usr
+	ninja -C build
 }
 
 package()
 {
-	make -C "${pkgname%-*}" PREFIX=/usr DESTDIR="$pkgdir/" install
+	cd "${pkgname%-*}"
+	DESTDIR="${pkgdir}" ninja -C build install
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }