From ee6a541234589ea0034681120a0f71f868143f4a Mon Sep 17 00:00:00 2001
From: Alexey Min <alexey.min@gmail.com>
Date: Mon, 21 Sep 2020 02:01:22 +0300
Subject: [PATCH] temp/gnome-software-plugin-apk: upgrade to 0.8.1 and sync
 with upstream (MR 1593)

* add install_if to pull in w/ gnome-software
  https://gitlab.alpinelinux.org/alpine/aports/-/commit/90b924a3346678f37b0a1a0e63daa4d677e8c662
* use abuild-meson & meson compile/test/install
  https://gitlab.alpinelinux.org/alpine/aports/-/commit/47360782abaf34cd0a1cc746a6bbbaa5966b7515
* use apk-polkit-rs instead of apk-polkit
  https://gitlab.alpinelinux.org/alpine/aports/-/commit/0f6c2d95f145cecd9a62c91dcb5be98e4fe01995
* upgrade to 0.8.1
  https://gitlab.alpinelinux.org/alpine/aports/-/commit/ce795a4d2776a088c8bc830e8fb7c9e29085e80b
* don't pull in alpinelinux-apppstream-data
  https://gitlab.alpinelinux.org/alpine/aports/-/commit/c35a1b4ba76e5eacc8db2e1fe9819334fd1211d3

NOTE: alpinelinux-apppstream-data was removed in
      https://gitlab.alpinelinux.org/alpine/aports/-/commit/946967b01f34f78719ecf0ff87e90eec30f147d7
---
 temp/gnome-software-plugin-apk/APKBUILD | 32 +++++++++++++------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/temp/gnome-software-plugin-apk/APKBUILD b/temp/gnome-software-plugin-apk/APKBUILD
index 6e1f65d59..3b16130a2 100644
--- a/temp/gnome-software-plugin-apk/APKBUILD
+++ b/temp/gnome-software-plugin-apk/APKBUILD
@@ -1,31 +1,33 @@
 # Forked from Alpine to rebuild against gnome-software with mobile patches
 pkgname=gnome-software-plugin-apk
 pkgver=9999
-_pkgver=0.7.0
-pkgrel=2
+_pkgver=0.8.1
+pkgrel=3
 pkgdesc="APK plugin for GNOME Software"
 url="https://github.com/Cogitri/gnome-software-plugin-apk"
-arch="x86_64 aarch64" # apk-polkit
+arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # apk-polkit-rs
 license="GPL-2.0-or-later"
-depends="alpinelinux-appstream-data"
-makedepends="meson gnome-software-dev gnome-software-static apk-polkit-dev"
+makedepends="meson gnome-software-dev gnome-software-static apk-polkit-rs-dev"
 options="!check" # no tests
 source="https://github.com/Cogitri/gnome-software-plugin-apk/archive/v$_pkgver/gnome-software-plugin-apk-$_pkgver.tar.gz"
+
+# override builddir, because "$_pkgver" != "$pkgver"
 builddir="$srcdir/$pkgname-$_pkgver"
 
+# We can't depend on gnome-software-plugin-apk directly in gnome-software
+# since that causes a circular dep:
+# gnome-software -> gnome-software-plugin-apk -> gnome-software-dev
+case "$CARCH" in
+	x86_64|armv7|armhf|aarch64|x86|ppc64le) install_if="gnome-software" ;;
+esac
+
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
-		. output
-	ninja -C output
+	abuild-meson . output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="fd1e470d926f795584dee2a48f55b54ae2e88d446eb6d85cbbcc98ecc6121da1c7dbb81266d927f3fa19e04fb04fed4a9512f994819f762ae56bc72c321b52db  gnome-software-plugin-apk-0.7.0.tar.gz"
+sha512sums="843387b54d846a7262175a9397811f1495870744f72b896e356321467d772f2b3b50dcdba402f528f32323f86d3a26e48a13ac15bb4ad59915d0f8659de94e22  gnome-software-plugin-apk-0.8.1.tar.gz"