summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Booker2022-08-24 19:48:30 +1200
committerThomas Booker2022-08-24 19:48:30 +1200
commitfe006e0d7f2aebce5151aa11041207cf2c03b2c2 (patch)
tree4d6a029aef87cb6e623010e2bcf4fbb2814900f5
parent7324f2706d29997d34ff0f46fb5fd5b1b036842d (diff)
downloadaur-fe006e0d7f2aebce5151aa11041207cf2c03b2c2.tar.gz
Updated for 0.20.0 and changed some build configs
Changed the maintainer to Thomas Booker Don't need to do anything special for GVC anymore Fix file collide in build by setting libexecdir Changed the build folder to _build
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD22
2 files changed, 11 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cb8c39c54340..1b4f0f742143 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = phosh-git
pkgdesc = A pure Wayland shell prototype for GNOME on mobile devices
- pkgver = 0.16.0.r3.gfe11f9ba
+ pkgver = 0.20.0.r22.g1c471472
pkgrel = 1
url = https://gitlab.gnome.org/World/Phosh/phosh
arch = x86_64
@@ -20,8 +20,6 @@ pkgbase = phosh-git
provides = phosh
conflicts = phosh
source = git+https://gitlab.gnome.org/World/Phosh/phosh.git
- source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
- sha256sums = SKIP
sha256sums = SKIP
pkgname = phosh-git
diff --git a/PKGBUILD b/PKGBUILD
index 1913ec7600d4..6ed4a8ff5b5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
-# Maintainer: Philip Goto <philip.goto@gmail.com>
+# Maintainer: Thomas Booker <tw.booker@outlook.com>
+# Contributor: Philip Goto <philip.goto@gmail.com>
pkgname=phosh-git
-pkgver=0.16.0.r3.gfe11f9ba
+pkgver=0.20.0.r22.g1c471472
pkgrel=1
pkgdesc='A pure Wayland shell prototype for GNOME on mobile devices'
arch=(x86_64 aarch64 armv7h)
url='https://gitlab.gnome.org/World/Phosh/phosh'
-license=('GPL3')
+license=(GPL3)
depends=(
callaudiod
feedbackd
@@ -23,11 +24,8 @@ makedepends=(
)
provides=(phosh)
conflicts=(phosh)
-source=(
- "git+${url}.git"
- "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
-)
-sha256sums=('SKIP' 'SKIP')
+source=("git+${url}.git")
+sha256sums=('SKIP')
pkgver() {
cd phosh
@@ -38,15 +36,15 @@ prepare() {
cd phosh
git submodule init
- git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
git submodule update
}
build() {
- arch-meson phosh build # -D gtk_doc=true
- meson compile -C build
+ # If we don't set `libexecdir` then meson will try and place the phosh bin in /lib/phosh and collide with the dir so we put it in /lib/phosh/phosh
+ arch-meson --libexecdir="/usr/lib/phosh" -D tests=false -D systemd=true phosh _build
+ meson compile -C _build
}
package() {
- DESTDIR="${pkgdir}" meson install -C build
+ DESTDIR="${pkgdir}" meson install -C _build
}