From e301cf99474c0a73421c324940aad851ff685db2 Mon Sep 17 00:00:00 2001
From: Miles Alan <m@milesalan.com>
Date: Thu, 4 Feb 2021 17:34:57 -0500
Subject: [PATCH] Nightly build - Thu Feb  4 17:35:02 EST 2021

Remove temp hacks for sxmo-utils & lisgd, add font-fira-mono-nerd which'll
eventually be dep of sxmo-utils
---
 .build.yml      | 10 ++++++----
 pmbootstrap.cfg |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.build.yml b/.build.yml
index 5b09b0c..71873dc 100644
--- a/.build.yml
+++ b/.build.yml
@@ -31,8 +31,7 @@ tasks:
       PKG=lisgd
       mkdir -p pmaports/sxmo/lisgd
       cd pmaports/sxmo/lisgd
-      wget 'https://gitlab.alpinelinux.org/alpine/aports/-/raw/master/testing/lisgd/APKBUILD'
-      sed -i 's/makedepends="/makedepends="libx11-dev /' APKBUILD
+      wget 'https://gitlab.alpinelinux.org/alpine/aports/-/raw/master/community/lisgd/APKBUILD'
       git clone "http://git.sr.ht/~mil/$PKG" --depth 1 $PKG-999
       tar -czvf $PKG-999.tar.gz $PKG-999/
       sed -i -E 's#^pkgver=.+#pkgver=999#' APKBUILD
@@ -71,6 +70,7 @@ tasks:
       cd pmaports/sxmo/$PKG
       git clone "http://git.sr.ht/~mil/$PKG" --depth 1 $PKG-999
       tar -czvf $PKG-999.tar.gz $PKG-999/
+      sed -i -E 's#README#README.md#' APKBUILD
       sed -i -E 's#^pkgver=.+#pkgver=999#' APKBUILD
       sed -i -E "s#^pkgrel=.+#pkgrel=$(date +%s)#" APKBUILD
       sed -i -E "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
@@ -83,6 +83,7 @@ tasks:
       cd pmaports/sxmo/$PKG
       git clone "http://git.sr.ht/~mil/$PKG" --depth 1 $PKG-999
       tar -czvf $PKG-999.tar.gz $PKG-999/
+      sed -i -E 's#README#README.md#' APKBUILD
       sed -i -E 's#^pkgver=.+#pkgver=999#' APKBUILD
       sed -i -E "s#^pkgrel=.+#pkgrel=$(date +%s)#" APKBUILD
       sed -i -E "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
@@ -94,12 +95,13 @@ tasks:
       PKG=sxmo-utils
       cd pmaports/sxmo/$PKG
       git clone "http://git.sr.ht/~mil/$PKG" --depth 1 $PKG-999
+      sed -i 's#$(DESTDIR)#$(DESTDIR)/$(PREFIX)#g' $PKG-999/Makefile
+      sed -i 's#$(PREFIX)$(PREFIX)#$(PREFIX)#g' $PKG-999/Makefile
       tar -czvf $PKG-999.tar.gz $PKG-999/
+      sed -i '/chmod/d' APKBUILD
       sed -i -E 's#^pkgver=.+#pkgver=999#' APKBUILD
       sed -i -E "s#^pkgrel=.+#pkgrel=$(date +%s)#" APKBUILD
       sed -i -E "s#^source=\"[^\"]+#source=\"$PKG-999.tar.gz#" APKBUILD
-      # pmaports patches sxmo-utils so here we undo that.., yes its a hack andll be reversed eventually
-      sed -i -E 's#[^.]+.patch##' APKBUILD
       abuild checksum
       cd
       ./pmbootstrap/pmbootstrap.py --details-to-stdout build --arch aarch64 $PKG
diff --git a/pmbootstrap.cfg b/pmbootstrap.cfg
index 3e0d728..b9dc09a 100644
--- a/pmbootstrap.cfg
+++ b/pmbootstrap.cfg
@@ -3,7 +3,7 @@ aports = pmaports
 work = pmbootstrap_work
 ccache_size = 5G
 device = pine64-DEVICE
-extra_packages = none
+extra_packages = font-fira-mono-nerd
 hostname = sxmo
 jobs = 3
 kernel = stable
-- 
2.45.2