Merge branch 'bump.aerdan.20190502' into 'master'

Packages bumped for 2 May 2019



See merge request !226

5 files changed, 25 insertions, 91 deletions

diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD
index d722a9c53..a6e8bb5e1 100644
--- a/user/libwnck/APKBUILD
+++ b/user/libwnck/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=libwnck
-pkgver=3.30.0
+pkgver=3.32.0
 _pkgmaj=${pkgver%.*}
 pkgrel=0
 pkgdesc="Window navigator construction kit library from Gnome"
@@ -9,30 +9,31 @@ url="https://gnome.org"
 arch="all"
 license="LGPL-2.0+"
 makedepends="glib-dev gtk+3.0-dev gobject-introspection-dev vala-dev
-	startup-notification-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+	startup-notification-dev meson ninja"
+subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.gnome.org/sources/libwnck/$_pkgmaj/libwnck-$pkgver.tar.xz"
 
+prepare() {
+	default_prepare
+	mkdir -p "$builddir"/build
+}
+
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
+	cd "$builddir"/build
+	meson \
+		-Dprefix=/usr \
+		..
+	ninja
 }
 
 check() {
-	cd "$builddir"
-	make check
+	cd "$builddir"/build
+	ninja test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	cd "$builddir"/build
+	DESTDIR="$pkgdir" ninja install
 }
 
-sha512sums="79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128  libwnck-3.30.0.tar.xz"
+sha512sums="a939b96feda20b0eba2b87556b97a9ba4b9aaea4c82c0e274a23796a3a9b49cb93be582d79e32a52a87b5ca6e35182a9d617cb802802b3c2ba2bff2b028aa3de  libwnck-3.32.0.tar.xz"
diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD
index 3a536a7bd..f890e8403 100644
--- a/user/luarocks/APKBUILD
+++ b/user/luarocks/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=luarocks
-pkgver=3.0.4
+pkgver=3.1.0
 pkgrel=0
 pkgdesc="Package manager for Lua software"
 url="https://luarocks.org/"
@@ -27,4 +27,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="65a28f0dca4fc45a0ee413493d0e4287de9c495b27c0366d955a16d03adf94b36cb9dbeda00fb74045809eb5048b78ea5158257b5ddafa924dc8ff0f017e95f8  luarocks-3.0.4.tar.gz"
+sha512sums="fd8b63671641b0872d91af6e3f129a3b1264c23ba71b51d523ff4382ffb005799a341c4ffc6483818ed56a9d6945115018078eea7c9228ed8cb5df69207ee846  luarocks-3.1.0.tar.gz"
diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD
index 99289220b..2f7daa034 100644
--- a/user/marco/APKBUILD
+++ b/user/marco/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=marco
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="Window manager for the MATE desktop environment"
 url="https://mate-desktop.org"
@@ -36,5 +36,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0935ca1532fde882e21ebbc67b41afe80e15e8519b413b9b8bde351196be347a8dcac2e092da818ec0bc700216e38211f192a891eafec8ac7d9bf63d3a42328d  marco-1.22.0.tar.xz
+sha512sums="18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f  marco-1.22.1.tar.xz
 b377b2a7d2af094a8b4bd6d1827c85f9675656cd8bdc6892b334c8479d188459ec8585fed3c746fdaef5820f768ce93605586693a3308f0db2d6f58e08f4df49  correctly-posix.patch"
diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD
index 09ee4cc78..82ff187a5 100644
--- a/user/mate-session-manager/APKBUILD
+++ b/user/mate-session-manager/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=mate-session-manager
-pkgver=1.22.0
+pkgver=1.22.1
 pkgrel=0
 pkgdesc="Session manager for the MATE desktop environment"
 url="https://mate-desktop.org"
@@ -10,8 +10,7 @@ license="GPL-2.0+ AND LGPL-2.0+"
 depends=""
 makedepends="dbus-glib-dev gtk+3.0-dev intltool libsm-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-session-manager-$pkgver.tar.xz
-	no-systemd.patch"
+source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-session-manager-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -35,5 +34,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a  mate-session-manager-1.22.0.tar.xz
-ea84e562b3a5d08b373f270d8d5fa9eeae9b803e3eb4ef925c31bad0e4e185eecfcff5465864a4a449fc5cade000b3ee18dea515744fcb59ac2efaf9df420a43  no-systemd.patch"
+sha512sums="1c47134813d24abef7b2f5df098120a2cd138f822ea3d687a1a2566224bbde21482bf40ac47ba08a39ed0899ff35eeac3c3690c83c006774c47f22189688990b  mate-session-manager-1.22.1.tar.xz"
diff --git a/user/mate-session-manager/no-systemd.patch b/user/mate-session-manager/no-systemd.patch
deleted file mode 100644
index 79c19f34a..000000000
--- a/user/mate-session-manager/no-systemd.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 254a091b31517a25bc037b31daff27fbb74ac90d Mon Sep 17 00:00:00 2001
-From: Victor Kareh <vkareh@redhat.com>
-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;