diff options
| author | Daniel Peukert | 2021-03-14 17:40:24 +0100 |
|---|---|---|
| committer | Daniel Peukert | 2021-03-14 17:40:24 +0100 |
| commit | 6cc22001531b77784766934349c88c0dd42b0252 (patch) | |
| tree | 0c817af8e3d153e46ca90c17feff4beb753f1694 | |
| parent | 0ce33852639c4ff39267bce3bf80ea9e30468dce (diff) | |
| download | aur-6cc22001531b77784766934349c88c0dd42b0252.tar.gz | |
Fix up meson & cargo arguments for spot-client
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | meson-test-release.diff | 40 |
3 files changed, 58 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client pkgver = 0.1.10 - pkgrel = 1 + pkgrel = 2 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -19,7 +19,9 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.10-1.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz + source = spot-client-0.1.10-2.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz + source = meson-test-release.diff sha256sums = 9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979 + sha256sums = 4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95 pkgname = spot-client @@ -2,7 +2,7 @@ _projectname='spot' pkgname="$_projectname-client" pkgver='0.1.10' -pkgrel='1' +pkgrel='2' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -10,15 +10,25 @@ license=('MIT') depends=('alsa-lib' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') makedepends=('cargo' 'meson>=0.50.0') optdepends=('org.freedesktop.secrets') -source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979') +source=( + "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" + 'meson-test-release.diff' +) +sha256sums=('9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979' + '4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' +prepare() { + cd "$srcdir/$_sourcedirectory/" + patch --forward -p1 < '../meson-test-release.diff' +} + build() { cd "$srcdir/" - arch-meson "$_sourcedirectory" "$_builddirectory" -Doffline=false -Dbuildtype=release + meson setup --prefix '/usr' --libexecdir 'lib' --sbindir 'bin' --buildtype 'release' --wrap-mode 'nodownload' \ + -Db_lto='true' -Db_pie='true' -Doffline='false' -Dfeatures='warn-cache' "$_sourcedirectory" "$_builddirectory" meson compile -C "$_builddirectory" } diff --git a/meson-test-release.diff b/meson-test-release.diff new file mode 100644 index 000000000000..59b6bfbbb251 --- /dev/null +++ b/meson-test-release.diff @@ -0,0 +1,40 @@ +diff --git a/build-aux/test.sh b/build-aux/test.sh +index f8ca912..f3b9e8f 100644 +--- a/build-aux/test.sh ++++ b/build-aux/test.sh +@@ -2,10 +2,19 @@ + + export SRC="$1" + export CARGO_TARGET_DIR="$2"/target +-export OFFLINE="$3" ++export BUILDTYPE="$3" ++export OFFLINE="$4" ++ ++echo $BUILDTYPE ++ ++if [[ $BUILDTYPE = "release" ]]; then ++ PROFILE_ARG="--release" ++else ++ PROFILE_ARG="--verbose" ++fi + + if [[ $OFFLINE = "true" ]]; then + export CARGO_HOME="$SRC"/cargo + fi + +-cargo test --manifest-path "$SRC"/Cargo.toml +\ No newline at end of file ++cargo test --manifest-path "$SRC"/Cargo.toml "$PROFILE_ARG" +\ No newline at end of file +diff --git a/src/meson.build b/src/meson.build +index 93d7387..909e9d6 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -140,6 +140,7 @@ test('Unit tests', + args: [ + meson.source_root(), + meson.build_root(), ++ get_option('buildtype'), + get_option('offline') ? 'true' : 'false' + ] + ) |