summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Fontenelle2023-02-20 14:50:06 -0300
committerRafael Fontenelle2023-02-20 14:50:34 -0300
commitbefa18f70a12476f61a636894a2184729d6e594d (patch)
tree26df70bedce7d222e5caa58c3c5327c6932fd70e
parent74164610cbd22cbd50400d16bde902352197e48b (diff)
downloadaur-befa18f70a12476f61a636894a2184729d6e594d.tar.gz
Replace rust with cargo, and force release buildtype
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--force-release-build.diff13
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c018fb3ea307..ecf45dbf710d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
pkgbase = solanum
pkgdesc = A pomodoro timer for the GNOME desktop
pkgver = 3.0.1.r0.g3f84b1d
- pkgrel = 2
+ pkgrel = 3
url = https://gitlab.gnome.org/World/solanum
arch = x86_64
license = GPL3
checkdepends = appstream-glib
- makedepends = rust
+ makedepends = cargo
makedepends = meson
makedepends = git
depends = libadwaita
depends = gst-plugins-bad-libs
source = git+https://gitlab.gnome.org/World/solanum#commit=3f84b1d0c46fe1a3daef2940b1d0747222023984
source = meson-drop-unused-argument.patch
+ source = force-release-build.diff
sha256sums = SKIP
sha256sums = e2d30fb22bb8948659d909064df462bd74f44f2eb768757d041618aecb36b245
+ sha256sums = 6abe8cf8013af7ce2edef14dddeb35fe9be8f1e4ad854301e29f4e708f521d42
pkgname = solanum
diff --git a/PKGBUILD b/PKGBUILD
index 26034d976e7a..8abb88bfcf8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,27 @@
# Maintainer: Rafael Fontenelle <rafaelff@gnome.org>
pkgname=solanum
pkgver=3.0.1.r0.g3f84b1d
-pkgrel=2
+pkgrel=3
pkgdesc="A pomodoro timer for the GNOME desktop"
arch=(x86_64)
url="https://gitlab.gnome.org/World/solanum"
license=('GPL3')
depends=('libadwaita' 'gst-plugins-bad-libs')
-makedepends=('rust' 'meson' 'git')
+makedepends=('cargo' 'meson' 'git')
checkdepends=('appstream-glib')
_commit=3f84b1d0c46fe1a3daef2940b1d0747222023984 # tags/v3.0.1
source=("git+$url#commit=$_commit"
- meson-drop-unused-argument.patch)
+ meson-drop-unused-argument.patch
+ force-release-build.diff)
sha256sums=('SKIP'
- 'e2d30fb22bb8948659d909064df462bd74f44f2eb768757d041618aecb36b245')
+ 'e2d30fb22bb8948659d909064df462bd74f44f2eb768757d041618aecb36b245'
+ '6abe8cf8013af7ce2edef14dddeb35fe9be8f1e4ad854301e29f4e708f521d42')
prepare() {
cd $pkgname
git apply "$srcdir/meson-drop-unused-argument.patch"
+ # Make sure cargo runs as release buildtype instead of debug
+ git apply "$srcdir/force-release-build.diff"
}
pkgver() {
diff --git a/force-release-build.diff b/force-release-build.diff
new file mode 100644
index 000000000000..fb3b7e9906bb
--- /dev/null
+++ b/force-release-build.diff
@@ -0,0 +1,13 @@
+diff --git a/build-aux/cargo.sh b/build-aux/cargo.sh
+index b37435f..5b666ae 100644
+--- a/build-aux/cargo.sh
++++ b/build-aux/cargo.sh
+@@ -9,7 +9,7 @@ export BUILDTYPE="$4"
+ export APP_BIN="$5"
+
+
+-if [ $BUILDTYPE = "release" ]
++if [ $BUILDTYPE = "plain" ]
+ then
+ echo "RELEASE MODE"
+ cargo build --manifest-path \