summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Semkin2019-11-26 05:08:21 +0300
committerIvan Semkin2019-11-26 05:08:21 +0300
commit7b2fa3e01c3634f622c435c00813448bafe05c41 (patch)
treea67f6b6ea853c94d9c3eb41a13ab39c22ad19762
parent6039d73e6cbd843f6fe09a09ffb901a7423c77f7 (diff)
downloadaur-7b2fa3e01c3634f622c435c00813448bafe05c41.tar.gz
Remove upstreamed patches
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
2 files changed, 6 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd527ec01fc0..b7c3d7d44e47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mir-git
pkgdesc = Canonical's display server
- pkgver = 1.5.0+120+g5fdc44755a
- pkgrel = 3
+ pkgver = 1.5.0+146+gd42981b4a6
+ pkgrel = 1
url = https://mir-server.io
arch = x86_64
arch = i686
@@ -51,10 +51,6 @@ pkgbase = mir-git
provides = mir
conflicts = mir
source = git+https://github.com/MirServer/mir.git
- source = https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1087.patch
- source = https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1088.patch
- sha256sums = SKIP
- sha256sums = SKIP
sha256sums = SKIP
pkgname = mir-git
diff --git a/PKGBUILD b/PKGBUILD
index 4cd3bb0170ca..142b4f467fbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
pkgname=mir-git
_pkgname=mir
-pkgver=1.5.0+120+g5fdc44755a
-pkgrel=3
+pkgver=1.5.0+146+gd42981b4a6
+pkgrel=1
pkgdesc="Canonical's display server"
url='https://mir-server.io'
arch=(x86_64 i686 armv7h aarch64)
@@ -18,12 +18,8 @@ optdepends=('qterminal: required for miral demos'
'qt5-wayland: required for miral demos'
'xcursor-dmz: opt requirement for miral demos'
'qtubuntu: opt requirement for miral demos')
-source=('git+https://github.com/MirServer/mir.git'
- 'https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1087.patch'
- 'https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1088.patch')
-sha256sums=('SKIP'
- 'SKIP'
- 'SKIP')
+source=('git+https://github.com/MirServer/mir.git')
+sha256sums=('SKIP')
BUILD_DIR=build
@@ -31,8 +27,6 @@ prepare() {
cd ${_pkgname}
git submodule init
git submodule update
- patch -Np1 -i "${srcdir}/1087.patch"
- patch -Np1 -i "${srcdir}/1088.patch"
}
pkgver() {