summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Rauter2018-09-20 16:22:19 +0200
committerGabriel Rauter2018-09-20 16:22:19 +0200
commitb12e8260b01d7e00d0b3b5f82082469ed3d3e9d2 (patch)
tree1c93ce0033a239f081b122f623b5cb0128d8cf8c
parentb73914b51086515453e5f6a495a680fd17317468 (diff)
downloadaur-b12e8260b01d7e00d0b3b5f82082469ed3d3e9d2.tar.gz
remove upstreamed patch
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Fix-build-with-vala-0.42.patch25
-rw-r--r--PKGBUILD12
3 files changed, 4 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6ad7a0822882..e746326430b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gnome-usage-git
pkgdesc = GNOME application to view information about use of system resources
- pkgver = 3.28.0.26.g3e1b5bf
+ pkgver = 3.28.0.28.gf6ae59a
pkgrel = 1
url = https://wiki.gnome.org/Apps/Usage
arch = i686
@@ -17,9 +17,7 @@ pkgbase = gnome-usage-git
provides = gnome-usage
conflicts = gnome-usage
source = git+https://gitlab.gnome.org/GNOME/gnome-usage.git
- source = 0001-Fix-build-with-vala-0.42.patch
sha256sums = SKIP
- sha256sums = 9ffe8de8386f5f4aaadea3bca74509b38649ff98124e0f9b7dd37580c854ec34
pkgname = gnome-usage-git
diff --git a/0001-Fix-build-with-vala-0.42.patch b/0001-Fix-build-with-vala-0.42.patch
deleted file mode 100644
index f1dcec969a77..000000000000
--- a/0001-Fix-build-with-vala-0.42.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e3ba0c0bdb5c48b5076a327bd31b2877b1b68e00 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 22 Aug 2018 10:54:08 +0200
-Subject: [PATCH] Fix build with vala 0.42
-
----
- src/speedometer.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/speedometer.vala b/src/speedometer.vala
-index 9d3b3f6..d78a26d 100644
---- a/src/speedometer.vala
-+++ b/src/speedometer.vala
-@@ -43,7 +43,7 @@ namespace Usage
-
- _percentage = value;
- }
-- default = 0; }
-+ }
-
- construct {
- css_provider = new Gtk.CssProvider();
---
-2.17.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 8847474a6963..0ede879e2211 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=gnome-usage
pkgname=$_pkgname-git
-pkgver=3.28.0.26.g3e1b5bf
+pkgver=3.28.0.28.gf6ae59a
pkgrel=1
pkgdesc="GNOME application to view information about use of system resources"
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -14,20 +14,14 @@ makedepends=(git meson vala)
optdepends=('accountsservice: show user tags for processes')
provides=("$_pkgname")
conflicts=("$_pkgname")
-source=("git+https://gitlab.gnome.org/GNOME/$_pkgname.git"
- "0001-Fix-build-with-vala-0.42.patch")
-sha256sums=('SKIP'
- '9ffe8de8386f5f4aaadea3bca74509b38649ff98124e0f9b7dd37580c854ec34')
+source=("git+https://gitlab.gnome.org/GNOME/$_pkgname.git")
+sha256sums=('SKIP')
pkgver() {
cd $_pkgname
git describe --tags | sed 's/^v//;s/-/./g;s/_/./g;'
}
-prepare() {
- git -C $_pkgname apply $srcdir/0001-Fix-build-with-vala-0.42.patch
-}
-
build() {
arch-meson $_pkgname build
ninja -C build