commit 7cd58f2e44f6a429736a05a23581163e6924036b
parent 829d8b623a8e23e31e55e2a46a371f6135c7afce
Author: aabacchus <ben@bvnf.space>
Date: Sun, 19 Sep 2021 23:32:58 +0100
kiss: fix binary version numbers
Diffstat:
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/forks/kiss/checksums b/forks/kiss/checksums
@@ -1,3 +1,3 @@
c592788aecb7e39b88bb3d030cb35b3b040392627520e6978dc15173154f2d50
efca06d0a52037c732007f33f99cd368a836b5f9fec3ae314cfd73182f337c01
-257662eb78b0091298e66c9414a1184cc456a87197c6e88018e1ab1280023f9c
+f112e4fd8cc648ecc83332114c90f710a7cf3d2934f35fd10b9efd9522582f03
diff --git a/forks/kiss/patches/0001-kiss-continue-build.patch b/forks/kiss/patches/0001-kiss-continue-build.patch
@@ -1,17 +1,17 @@
-From 8b473b5c8dcf3d9cc14e09eaed0b1eacc4f4ed7e Mon Sep 17 00:00:00 2001
+From 8d53c1d822471a42d2ba02b2f74a8d9124f9ad50 Mon Sep 17 00:00:00 2001
From: aabacchus <ben@bvnf.space>
Date: Mon, 19 Jul 2021 21:16:40 +0100
Subject: [PATCH] kiss: continue build
---
- kiss | 52 +++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 33 insertions(+), 19 deletions(-)
+ kiss | 53 ++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 34 insertions(+), 19 deletions(-)
diff --git a/kiss b/kiss
-index 23df7d1..50a28be 100755
+index 9315565..3b86a56 100755
--- a/kiss
+++ b/kiss
-@@ -938,14 +938,7 @@ pkg_build_all() {
+@@ -937,14 +937,7 @@ pkg_build_all() {
! [ -f "$repo_dir/sources" ] || pkg_extract "$pkg"
pkg_build "$pkg"
@@ -25,16 +25,17 @@ index 23df7d1..50a28be 100755
- pkg_tar "$pkg"
+ pkg_finish_b "$pkg"
- if ok "$pkg_update" || ! contains "$explicit" "$pkg"; then
+ if equ "${prefer_cache:=0}" 1 || ! contains "$explicit" "$pkg"; then
log "$pkg" "Needed as a dependency or has an update, installing"
-@@ -963,6 +956,31 @@ pkg_build_all() {
- esac
+@@ -961,6 +954,32 @@ pkg_build_all() {
+ ! prompt "Install built packages? [$explicit]" || (args i $explicit)
}
+pkg_finish_b() {
+ # Finish building a package and create a tarball.
+ pkg="$1"
+ pkg_find "$1"
++ pkg_find_version "$1"
+
+ # Copy the repository files to the package directory.
+ cp -LRf "$repo_dir" "$pkg_dir/$1/$pkg_db/"
@@ -59,7 +60,7 @@ index 23df7d1..50a28be 100755
pkg_build() {
# Install built packages to a directory under the package name to
# avoid collisions with other packages.
-@@ -1017,16 +1035,6 @@ pkg_build() {
+@@ -1016,16 +1035,6 @@ pkg_build() {
# Delete the log file if the build succeeded to prevent the directory
# from filling very quickly with useless logs.
equ "$KISS_KEEPLOG" 1 || rm -f "$log_dir/$1-$time-$KISS_PID"
@@ -76,7 +77,7 @@ index 23df7d1..50a28be 100755
}
pkg_checksum() {
-@@ -1853,6 +1861,11 @@ args() {
+@@ -1843,6 +1852,11 @@ args() {
a|alternatives) pkg_alternatives "$@" ;;
b|build) pkg_build_all "$@" ;;
c|checksum) for pkg do pkg_checksum "$pkg"; done ;;
@@ -88,8 +89,8 @@ index 23df7d1..50a28be 100755
d|download) for pkg do pkg_source "$pkg"; done ;;
H|help-ext) pkg_help_ext "$@" ;;
i|install) for pkg do pkg_install "$pkg"; done ;;
-@@ -1864,10 +1877,11 @@ args() {
- v|version) printf '5.5.26\n' ;;
+@@ -1854,10 +1868,11 @@ args() {
+ v|version) printf '5.5.28\n' ;;
'')
- log 'kiss [a|b|c|d|i|l|r|s|u|U|v] [pkg]...'
@@ -102,5 +103,5 @@ index 23df7d1..50a28be 100755
log 'install Install packages'
log 'list List installed packages'
--
-2.32.0
+2.33.0
diff --git a/forks/kiss/version b/forks/kiss/version
@@ -1 +1 @@
-5.5.28 1
+5.5.28 2
