Subject: [alpine-aports] [PATCH 01/16] community/mate-desktop: upgrade to 1.22.1

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:17 +0100

Remove patch, is applied upstream.

Remove unnecessary "cd" commands.
---
 community/mate-desktop/APKBUILD         | 12 +++---------
 community/mate-desktop/install-sh.patch | 10 ----------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 community/mate-desktop/install-sh.patch

diff --git a/community/mate-desktop/APKBUILD b/community/mate-desktop/APKBUILD
index 1d0bae5edd..a731fca92f 100644
--- a/community/mate-desktop/APKBUILD
+++ b/community/mate-desktop/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=mate-desktop
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="The MATE Desktop Environment"
 url="http://wiki.mate-desktop.org/mate-desktop"
@@ -11,13 +11,10 @@ depends="mate-common yelp-tools"
 makedepends="startup-notification itstool intltool dconf-dev gtk+3.0-dev
 	libxrandr-dev libxml2-utils iso-codes-dev"
 subpackages="$pkgname-lang $pkgname-dev $pkgname-doc"
-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 +25,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="3950249c0bc026163da7f38a6fd5551c0e1e863e298e9d2ca224679b6c802d1deaf12e16ea873a2ea0539a7989a523d0495fb0dc4c556857203c0b04ab6edf7a  mate-desktop-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="bb2bf9de05439a0fcd4ab01ac628a2a235808cd07c1b7ce9abfbf2e64f98dc572603dfbd4a52bca5f03446825fba199715d7e08fcdc84f0df8d2ffeb4c87da62  mate-desktop-1.22.1.tar.xz"
diff --git a/community/mate-desktop/install-sh.patch b/community/mate-desktop/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/mate-desktop/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
-- 
2.22.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:27 +0100

Remove unnecessary "cd" commands.
---
 community/mate-control-center/APKBUILD         | 11 +++--------
 community/mate-control-center/install-sh.patch | 10 ----------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 community/mate-control-center/install-sh.patch

diff --git a/community/mate-control-center/APKBUILD b/community/mate-control-center/APKBUILD
index 0c96ddc638..bc4846a619 100644
--- a/community/mate-control-center/APKBUILD
+++ b/community/mate-control-center/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=mate-control-center
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="MATE's main interface for configuration of various aspects of your desktop"
 url="https://github.com/mate-desktop/mate-control-center"
@@ -12,12 +12,10 @@ makedepends="dbus-glib-dev libtool intltool itstool gtk+3.0-dev
 	dconf-dev mate-menus-dev libunique-dev marco-dev mate-settings-daemon-dev
 	libmatekbd-dev libxklavier-dev mate-desktop-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 \
@@ -29,14 +27,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="3b2b88458848862a4c819d54104e9394817b29feb3d05117fe69441023ec5e6c922012395f24b5f70c9f9dbf6f8044f769840ec9996b1495441c4cb690f68371  mate-control-center-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="92390bf5eea459effbd94f0488cdaf3d7b6ff4f548f1aafead928d75e064e85ec1ac7796289f96af2ca8f6cbf3ef57bd2ae37058192af0ec976f4770ec8abeca  mate-control-center-1.22.1.tar.xz"
diff --git a/community/mate-control-center/install-sh.patch b/community/mate-control-center/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/mate-control-center/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:25 +0100

Remove patches, are applied upstream.

Remove unnecessary "cd" commands.
---
 community/mate-session-manager/APKBUILD       | 14 +---
 .../mate-session-manager/install-sh.patch     | 10 ---
 .../systemd-dependency.patch                  | 67 -------------------
 3 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 community/mate-session-manager/install-sh.patch
 delete mode 100644 community/mate-session-manager/systemd-dependency.patch

diff --git a/community/mate-session-manager/APKBUILD b/community/mate-session-manager/APKBUILD
index 12e709d2ed..31eb049a28 100644
--- a/community/mate-session-manager/APKBUILD
+++ b/community/mate-session-manager/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=mate-session-manager
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="The MATE session manager"
 url="https://github.com/mate-desktop/mate-session-manager"
@@ -11,14 +11,10 @@ depends="mate-common mate-desktop"
 makedepends="intltool libtool dconf-dev dbus-glib-dev gtk+3.0-dev
 	libsm-dev mate-desktop-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-	systemd-dependency.patch
-	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,15 +24,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a  mate-session-manager-1.22.0.tar.xz
-0291b0c9f1bc07043ab8ec6f209d46b85e5cfea6bc057f87da9e0db15f61374cb063d57e809ea2c236489e2eb2bca0b0ef289507d4ace9eee47d77e1c0359385  systemd-dependency.patch
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="1c47134813d24abef7b2f5df098120a2cd138f822ea3d687a1a2566224bbde21482bf40ac47ba08a39ed0899ff35eeac3c3690c83c006774c47f22189688990b  mate-session-manager-1.22.1.tar.xz"
diff --git a/community/mate-session-manager/install-sh.patch b/community/mate-session-manager/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/mate-session-manager/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
diff --git a/community/mate-session-manager/systemd-dependency.patch b/community/mate-session-manager/systemd-dependency.patch
deleted file mode 100644
index 912a5e1b50..0000000000
--- a/community/mate-session-manager/systemd-dependency.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From https://github.com/mate-desktop/mate-session-manager/commit/254a091b31517a25bc037b31daff27fbb74ac90d
-
-From 254a091b31517a25bc037b31daff27fbb74ac90d Mon Sep 17 00:00:00 2001
-From: Victor Kareh <[email-masked]>
-Date: Wed, 6 Mar 2019 09:20:36 -0500
-Subject: [PATCH] Guard against missing systemd
-
----
- mate-session/gsm-systemd.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c
-index da3f23b..d03cafd 100644
---- a/mate-session/gsm-systemd.c
-+++ b/mate-session/gsm-systemd.c
-@@ -429,16 +429,31 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager)
-         gboolean is_last_session;
-         int ret, i;
- 
-+#ifdef HAVE_SYSTEMD
-         ret = sd_pid_get_session (getpid (), &session);
-+#endif
-+
-+        if (session == NULL) {
-+                return FALSE;
-+        }
- 
-         if (ret != 0) {
-+                free (session);
-                 return FALSE;
-         }
- 
-+#ifdef HAVE_SYSTEMD
-         ret = sd_uid_get_sessions (getuid (), FALSE, &sessions);
-+#endif
-+
-+        if (sessions == NULL) {
-+                free (session);
-+                return FALSE;
-+        }
- 
-         if (ret <= 0) {
-                 free (session);
-+                free (sessions);
-                 return FALSE;
-         }
- 
-@@ -450,7 +465,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager)
-                 if (g_strcmp0 (sessions[i], session) == 0)
-                         continue;
- 
-+#ifdef HAVE_SYSTEMD
-                 ret = sd_session_get_state (sessions[i], &state);
-+#endif
- 
-                 if (ret != 0)
-                         continue;
-@@ -461,7 +478,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager)
-                 }
-                 free (state);
- 
-+#ifdef HAVE_SYSTEMD
-                 ret = sd_session_get_type (sessions[i], &type);
-+#endif
- 
-                 if (ret != 0)
-                         continue;
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:30 +0100

Add support for XPS files.

Remove unnecessary "cd" commands.
---
 community/atril/APKBUILD         | 19 ++++++-------------
 community/atril/install-sh.patch | 10 ----------
 2 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 community/atril/install-sh.patch

diff --git a/community/atril/APKBUILD b/community/atril/APKBUILD
index c54e3bd412..b50b79fb59 100644
--- a/community/atril/APKBUILD
+++ b/community/atril/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=atril
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="A document viewer for MATE"
 url="https://github.com/mate-desktop/atril"
@@ -10,37 +10,30 @@ license="GPL-2.0-or-later"
 depends="mate-icon-theme"
 # make check is broken: https://github.com/mate-desktop/atril/issues/167
 options="!check"
-makedepends="intltool glib-dev gtk+3.0-dev  mate-desktop-dev
+makedepends="intltool glib-dev gtk+3.0-dev mate-desktop-dev
 	dconf-dev libsm-dev libsecret-dev caja-extensions-dev caja-dev
-	poppler-dev tiff-dev itstool libxml2-utils libxml2-dev python2-dev
-	libspectre-dev webkit2gtk-dev"
+	poppler-dev tiff-dev itstool libgxps-dev libxml2-utils libxml2-dev
+	libspectre-dev python2-dev webkit2gtk-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 \
 		--sysconfdir=/etc \
 		--enable-static=no \
-		--with-gtk=3.0 \
 		--prefix=/usr
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="bf940178647c348fd78e828bcb3a55c4ff6195d4020bf198ae5ba4a96e2fe582f7e30fb9d4cde4143e82ae783358373d3a9fd68413295586da9fe1b374e2f034  atril-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="838ae397c868ac417c9266e4a06525d66214650cf8647e91c1472d83d50c8954f6dbb29411384892a98f0929e1fbac9947118bd0db10d50400fc0d5270a3619d  atril-1.22.1.tar.xz"
diff --git a/community/atril/install-sh.patch b/community/atril/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/atril/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:31 +0100

Add check().

Remove unnecessary "cd" commands.
---
 community/caja/APKBUILD         | 15 +++++++--------
 community/caja/install-sh.patch | 10 ----------
 2 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 community/caja/install-sh.patch

diff --git a/community/caja/APKBUILD b/community/caja/APKBUILD
index f57663a7cd..9156bb1bc2 100644
--- a/community/caja/APKBUILD
+++ b/community/caja/APKBUILD
@@ -1,24 +1,21 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=caja
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="The file manager for the MATE desktop"
 url="https://github.com/mate-desktop/caja"
 arch="all"
 license="GPL-2.0-or-later LGPL-2.0-or-later"
 depends="mate-common mate-desktop"
-options="!check"
 makedepends="$depends_dev intltool libtool dconf-dev gtk+3.0-dev libunique3-dev
 	libsm-dev libnotify-dev mate-desktop-dev libxml2-dev gobject-introspection-dev
 	gtk-doc"
 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 \
@@ -29,10 +26,12 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 
-sha512sums="ca97a1e81cc7b061bb331d7a4574c76831dbff50bdc9ba0a162675def7278cf5dadb37aacb0e1e37a0ac2cf60df73f98353aaa36fa0e69a0097017eed5d325b6  caja-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="dea2e9cac7802df5335a716a1a7df149b637014525202600f4bf3eab293eff29bf2df66df22203aa036898149cb26ba1d05491234dc75203480925cce0333a17  caja-1.22.1.tar.xz"
diff --git a/community/caja/install-sh.patch b/community/caja/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/caja/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:28 +0100

Remove unnecessary "cd" commands.
---
 community/mate-sensors-applet/APKBUILD         | 11 +++--------
 community/mate-sensors-applet/install-sh.patch | 10 ----------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 community/mate-sensors-applet/install-sh.patch

diff --git a/community/mate-sensors-applet/APKBUILD b/community/mate-sensors-applet/APKBUILD
index aec6803522..ac149cdda0 100644
--- a/community/mate-sensors-applet/APKBUILD
+++ b/community/mate-sensors-applet/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=mate-sensors-applet
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="Applet for the MATE Panel to display readings from hardware sensors"
 url="https://github.com/mate-desktop/mate-sensors-applet"
@@ -11,12 +11,10 @@ depends="perl-xml-parser"
 makedepends="intltool glib-dev gtk+3.0-dev mate-panel-dev libxslt-dev
 	itstool libxml2-utils mdocml-dev libnotify-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 \
@@ -27,14 +25,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="f756fdff4dd8fe824fbe41956411ca1e6ce251fc1d43276c7244a8a806e91bacc283c412b831935136682971509e23c08538264963af31488bee15ce5644d5cb  mate-sensors-applet-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="4b6e608c92f03051044863f770b295d1526b19a9668513b566e81adeb28bc8524d8f458d114d2b44acf00f20c2f0a8d86b1ca7254fa165fde3b867c75a6b83e6  mate-sensors-applet-1.22.1.tar.xz"
diff --git a/community/mate-sensors-applet/install-sh.patch b/community/mate-sensors-applet/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/mate-sensors-applet/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:22 +0100

Remove unnecessary "cd" commands.
---
 community/mate-terminal/APKBUILD         | 11 +++--------
 community/mate-terminal/install-sh.patch | 10 ----------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 community/mate-terminal/install-sh.patch

diff --git a/community/mate-terminal/APKBUILD b/community/mate-terminal/APKBUILD
index a40113074f..377f880fe6 100644
--- a/community/mate-terminal/APKBUILD
+++ b/community/mate-terminal/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=mate-terminal
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="MATE terminal emulator"
 url="https://github.com/mate-desktop/mate-terminal"
@@ -11,12 +11,10 @@ depends="mate-common yelp-tools mate-desktop"
 makedepends="libtool intltool dconf-dev libsm-dev itstool vte3-dev
 	mate-desktop-dev libxml2-utils gtk+3.0-dev"
 subpackages="$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 \
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="45932db8c50348386a58ee7acaf08af43e28bd495dac08b4dcff5defd1c10189163bdfd73c61015674d61f275dabc2f749b2e0cbf9981c7dfdef5a4060686645  mate-terminal-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="b20102c15dc140b59c93802606ca94fd108dfd5f7ac7f079b872e957794fc2c3aab40c0e6da697e8d393a67fca7b106573a4cb8014af5d6c8ad777be3a798534  mate-terminal-1.22.1.tar.xz"
diff --git a/community/mate-terminal/install-sh.patch b/community/mate-terminal/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/mate-terminal/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:21 +0100

Remove unnecessary "cd" commands.
---
 community/mate-icon-theme/APKBUILD         | 11 +++--------
 community/mate-icon-theme/install-sh.patch | 10 ----------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 community/mate-icon-theme/install-sh.patch

diff --git a/community/mate-icon-theme/APKBUILD b/community/mate-icon-theme/APKBUILD
index 7c0085f933..1d4c359f09 100644
--- a/community/mate-icon-theme/APKBUILD
+++ b/community/mate-icon-theme/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=mate-icon-theme
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="MATE desktop icons"
 url="https://github.com/mate-desktop/mate-icon-theme"
@@ -10,12 +10,10 @@ license="GPL-2.0"
 depends="mate-common"
 makedepends="icon-naming-utils intltool"
 subpackages="$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"
 	DATADIRNAME=share ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,14 +23,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="b4f0b5040e412bcbe818c14f101556cd643cc9dfce02aa676edc790f17de7da2272754235f8d9ad000551e7d92a5974cec3336712074747fcf669c0a729f8a5e  mate-icon-theme-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="640fea3dfd4d9f2edd24353e4a36d57520de356c421b24ee1aec7fca98d3f76a789808a1d005a20ed87ee089d1777376e5b3f229ce0e90b06adf242f6a79b3b9  mate-icon-theme-1.22.1.tar.xz"
diff --git a/community/mate-icon-theme/install-sh.patch b/community/mate-icon-theme/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/mate-icon-theme/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:23 +0100

Remove unnecessary "cd" commands.
---
 community/mate-system-monitor/APKBUILD         | 13 ++++---------
 community/mate-system-monitor/install-sh.patch | 10 ----------
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 community/mate-system-monitor/install-sh.patch

diff --git a/community/mate-system-monitor/APKBUILD b/community/mate-system-monitor/APKBUILD
index f0692812d4..d5caade7a6 100644
--- a/community/mate-system-monitor/APKBUILD
+++ b/community/mate-system-monitor/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=mate-system-monitor
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="A system monitor for MATE"
 url="https://github.com/mate-desktop/mate-system-monitor"
@@ -11,12 +11,10 @@ depends="mate-icon-theme"
 makedepends="gtk+3.0-dev libwnck3-dev gtkmm3-dev libgtop-dev
 	librsvg-dev glibmm-dev itstool linux-headers libxml2-utils"
 subpackages="$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 \
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-	 make DESTDIR="${pkgdir}" install
+	make DESTDIR="${pkgdir}" install
 }
 
-sha512sums="6f97f934626b49320ea0dbb4e14743c4f33b12a85671b69465f689765f3003f00e51685b616e34a482c3ec0ca09ca4e13cbdb2e3eb4719c0d1fc7b25b24436a7  mate-system-monitor-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="ce5c514c333b85d6dd94b9fa212b51ed78212781da9719f730c50fc61fcf433e1a7df1d2665fe90e9529fba08207df59858b66f982bcd070845f62b22f8bd82f  mate-system-monitor-1.22.1.tar.xz"
diff --git a/community/mate-system-monitor/install-sh.patch b/community/mate-system-monitor/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/mate-system-monitor/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:26 +0100

Remove unnecessary "cd" commands.
---
 community/marco/APKBUILD         | 11 +++--------
 community/marco/install-sh.patch | 10 ----------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 community/marco/install-sh.patch

diff --git a/community/marco/APKBUILD b/community/marco/APKBUILD
index 5cdde03543..2e6158a6b4 100644
--- a/community/marco/APKBUILD
+++ b/community/marco/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 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"
 
-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 d32f681c0e..0000000000
--- 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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:24 +0100

Remove unnecessary "cd" commands.
---
 community/mate-user-guide/APKBUILD         | 11 +++--------
 community/mate-user-guide/install-sh.patch | 10 ----------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 community/mate-user-guide/install-sh.patch

diff --git a/community/mate-user-guide/APKBUILD b/community/mate-user-guide/APKBUILD
index 4888258ffd..4ec3fb8698 100644
--- a/community/mate-user-guide/APKBUILD
+++ b/community/mate-user-guide/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=mate-user-guide
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="Documents targeted for end-users of MATE"
 url="https://github.com/mate-desktop/mate-user-guide"
@@ -9,12 +9,10 @@ arch="noarch"
 license="CC"
 makedepends="itstool libxml2-utils intltool gettext-dev"
 subpackages="$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 \
@@ -24,14 +22,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="faf82569d8289f13d31c0c3a548692194f4938dc341b5a2214ccd3bba1fafaa6b5446cc5455ade391e7172268354cf2088c2a119aee96d3d42e71ee4c094dd14  mate-user-guide-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="972f609364cb0673c3c402f6936618ba4a212d122055ea18232734cc2cc9d023e9a16cbd78ba96898d227b6db640234c98b387550504224428bfc682b6090877  mate-user-guide-1.22.1.tar.xz"
diff --git a/community/mate-user-guide/install-sh.patch b/community/mate-user-guide/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/mate-user-guide/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:32 +0100

Remove unnecessary "cd" commands.
---
 community/engrampa/APKBUILD         | 11 +++--------
 community/engrampa/install-sh.patch | 10 ----------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 community/engrampa/install-sh.patch

diff --git a/community/engrampa/APKBUILD b/community/engrampa/APKBUILD
index db320fe6a8..32f0ae958e 100644
--- a/community/engrampa/APKBUILD
+++ b/community/engrampa/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=engrampa
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="An archive manager for the MATE"
 url="https://github.com/mate-desktop/engrampa"
@@ -10,12 +10,10 @@ license="GPL-2.0"
 depends="libxml2-utils"
 makedepends="glib-dev gtk+3.0-dev caja-dev itstool libsm-dev intltool"
 subpackages="$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 \
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="7b4c3b85184c1530ec72eba174ee571cc14490c88f5fef1232acd4197f1020107f5172d6d4271753f9f6fcfadcf049273095b3dfbcef6fdd25a51ad8d2e17382  engrampa-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70  engrampa-1.22.1.tar.xz"
diff --git a/community/engrampa/install-sh.patch b/community/engrampa/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/engrampa/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
-- 
2.22.0

---

---

From: Paul Bredbury <[email-masked]>
Date: Sun, 16 Jun 2019 10:34:29 +0100

Remove unnecessary "cd" commands.
---
 community/pluma/APKBUILD         | 13 ++++---------
 community/pluma/install-sh.patch | 10 ----------
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 community/pluma/install-sh.patch

diff --git a/community/pluma/APKBUILD b/community/pluma/APKBUILD
index 826c93d01e..1fe76c1758 100644
--- a/community/pluma/APKBUILD
+++ b/community/pluma/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alan Lacerda <[email-masked]>
 # Maintainer: Alan Lacerda <[email-masked]>
 pkgname=pluma
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="A small and lightweight UTF-8 text editor for the MATE"
 url="https://github.com/mate-desktop/pluma"
@@ -13,12 +13,10 @@ makedepends="intltool enchant-dev iso-codes-dev gtk+3.0-dev
 	mate-desktop-dev gtksourceview-dev dconf-dev libsm-dev itstool
 	libxml2-utils fortify-headers libpeas-dev gsettings-desktop-schemas-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 \
@@ -29,14 +27,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 
-sha512sums="7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51  pluma-1.22.0.tar.xz
-2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3  install-sh.patch"
+sha512sums="0d3f07b2e8c736c9e1ad64ed5cb749db6088868e9bc27aa786cbb0c3fe72715f0fd4dd53999502a4333ec82110148b772c0dde81433d0936d2d3c2d04804026a  pluma-1.22.1.tar.xz"
diff --git a/community/pluma/install-sh.patch b/community/pluma/install-sh.patch
deleted file mode 100644
index d32f681c0e..0000000000
--- a/community/pluma/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
-- 
2.22.0

---