From 8d6f9cc016495f088ccdffc03e04d8e325c86b35 Mon Sep 17 00:00:00 2001 From: Nicolas Lorin Date: Sun, 1 Oct 2023 15:23:25 +0200 Subject: [PATCH] testing/icmake: upgrade to 9.03.01 --- testing/icmake/APKBUILD | 10 ++++----- testing/icmake/disable-clear-screen.patch | 26 ----------------------- 2 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 testing/icmake/disable-clear-screen.patch diff --git a/testing/icmake/APKBUILD b/testing/icmake/APKBUILD index 883cd81cbd7..cbbb923580d 100644 --- a/testing/icmake/APKBUILD +++ b/testing/icmake/APKBUILD @@ -1,16 +1,15 @@ # Contributor: Shiz # Maintainer: Shiz pkgname=icmake -pkgver=9.02.08 -pkgrel=4 +pkgver=9.03.01 +pkgrel=0 pkgdesc="Make utility using a C-like grammar" url="https://fbb-git.gitlab.io/icmake/" arch="all" license="GPL-3.0-or-later" makedepends="bash" subpackages="$pkgname-doc" -source="https://gitlab.com/fbb-git/icmake/-/archive/$pkgver/icmake-$pkgver.tar.bz2 - disable-clear-screen.patch" +source="https://gitlab.com/fbb-git/icmake/-/archive/$pkgver/icmake-$pkgver.tar.bz2" patch_args="-p2" builddir="$srcdir/icmake-$pkgver/icmake" @@ -32,6 +31,5 @@ package() { } sha512sums=" -d88877b7d575ce905639b5ee37008718623dfff910da547b11be9e22f1696f30809c438bf702a54a2709b9b4d6cdd929b7e28e41ae2923b8ceffbc058102b76b icmake-9.02.08.tar.bz2 -7eedfec5afca771db4253335a378aac8fa61fbdb9ce6072183e65fd303bce28bdf0bb0e1c3dd28fa6fe6ecfdb931945c56679ec7e3feb1c5980aa30aec85e66d disable-clear-screen.patch +f3c76c19bf26926306ddce9491ae432a92f097bef2cc6434cb44e849a518c3e63beebdfc8edeb3ad26586ef13a7ed7a6e6074af710eb8a6573dac1f768db8c95 icmake-9.03.01.tar.bz2 " diff --git a/testing/icmake/disable-clear-screen.patch b/testing/icmake/disable-clear-screen.patch deleted file mode 100644 index 6034df16041..00000000000 --- a/testing/icmake/disable-clear-screen.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch has been taken from ArchLinux. It should fix the yodl build -on riscv64 and it's generally very undesirable to use tput(1) for -buildlogs generated by the Alpine builders. - -commit 42d3987d08e41723a2ca8739550bbf5d58e45ea8 -Author: Baptiste Jonglez -Date: Sat Jul 7 12:58:54 2018 +0200 - - Disable screen clearing - - This tends to fail when building in a clean chroot (e.g. yodl) because of - missing terminal definition, and is of dubious interest anyway. - -diff --git a/icmake/scripts/icmbuild.in b/icmake/scripts/icmbuild.in -index c31e925..dba9607 100644 ---- a/icmake/scripts/icmbuild.in -+++ b/icmake/scripts/icmbuild.in -@@ -618,7 +618,7 @@ void install(string what, string path) - - void clearScreen(int cls) - { -- if (cls) -+ if (0) - system("tput clear"); - } -