aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bredbury <brebs@sent.com>2019-06-16 10:34:26 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2019-06-17 12:19:44 +0000
commitb161d19e57eb5b3dbf9bd99f8ff141c32016a0ac (patch)
tree9ecacf593fbd693d24cdab1d4e1c8810d396df25
parent7f5587f87424430a11a522e24332254eb7392d0e (diff)
community/marco: upgrade to 1.22.1
Remove patch, is applied upstream. Remove unnecessary "cd" commands.
-rw-r--r--community/marco/APKBUILD11
-rw-r--r--community/marco/install-sh.patch10
2 files changed, 3 insertions, 18 deletions
diff --git a/community/marco/APKBUILD b/community/marco/APKBUILD
index 5cdde035439..2e6158a6b44 100644
--- a/community/marco/APKBUILD
+++ b/community/marco/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Alan Lacerda <alacerda@alpinelinux.org>
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=marco
-pkgver=1.22.0
+pkgver=1.22.1
pkgrel=0
pkgdesc="MATE window manager"
url="https://github.com/mate-desktop/marco"
@@ -11,12 +11,10 @@ depends="mate-common yelp-tools libxml2-utils"
makedepends="libtool itstool zenity intltool glib-dev gtk+3.0-dev
libxcomposite-dev libxpresent-dev libcanberra-dev startup-notification-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- install-sh.patch"
+source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,14 +26,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="${pkgdir}" install
}
-sha512sums="0935ca1532fde882e21ebbc67b41afe80e15e8519b413b9b8bde351196be347a8dcac2e092da818ec0bc700216e38211f192a891eafec8ac7d9bf63d3a42328d marco-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3 install-sh.patch"
+sha512sums="18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f marco-1.22.1.tar.xz"
diff --git a/community/marco/install-sh.patch b/community/marco/install-sh.patch
deleted file mode 100644
index d32f681c0e4..00000000000
--- a/community/marco/install-sh.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/install-sh b/install-sh
-index defb86a..8175c64 100755
---- a/install-sh
-+++ b/install-sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
- # install - install a program, script, or datafile
-
- scriptversion=2018-03-11.20; # UTC