CVS commit: pkgsrc/shells/oh-my-posh

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Apr  7 00:32:56 UTC 2023

Modified Files:
        pkgsrc/shells/oh-my-posh: Makefile distinfo
Added Files:
        pkgsrc/shells/oh-my-posh/patches: patch-font_install__unix.go
            patch-platform_battery_battery__unix.go

Log Message:
Get closer to building on NetBSD and Tribblix. (Someone will need to
write more platform-specific battery-reporting code at some point.) One
build failure left, I think. Still packages on Linux and macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/shells/oh-my-posh/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/shells/oh-my-posh/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/oh-my-posh/patches/patch-font_install__unix.go \
    pkgsrc/shells/oh-my-posh/patches/patch-platform_battery_battery__unix.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/oh-my-posh/Makefile
diff -u pkgsrc/shells/oh-my-posh/Makefile:1.3 pkgsrc/shells/oh-my-posh/Makefile:1.4
--- pkgsrc/shells/oh-my-posh/Makefile:1.3       Wed Apr  5 20:47:53 2023
+++ pkgsrc/shells/oh-my-posh/Makefile   Fri Apr  7 00:32:56 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/04/05 20:47:53 bsiegert Exp $
+# $NetBSD: Makefile,v 1.4 2023/04/07 00:32:56 schmonz Exp $
 
 DISTNAME=              oh-my-posh-14.14.3
 PKGREVISION=           1
@@ -22,6 +22,14 @@ SUBST_SED.version=   -e 's|"development"|"
 
 INSTALLATION_DIRS=     share/${PKGBASE}
 
+# XXX is this still fine on Darwin? Linux?
+post-extract:
+       # won't report useful battery status on non-Linux, but at least it'll compile
+       ${MV} ${WRKSRC}/platform/battery/battery_linux.go ${WRKSRC}/platform/battery/battery_unix.go
+       # NetBSD and Illumos are just weird kinds of Linux, doncha know
+       ${MV} ${WRKDIR}/github.com/gookit/goutil@v0.6.7/sysutil/sysutil_linux.go \
+               ${WRKDIR}/github.com/gookit/goutil@v0.6.7/sysutil/sysutil_unix.go
+
 post-build:
        ${MV} ${WRKDIR}/.gopath/bin/src ${WRKDIR}/.gopath/bin/oh-my-posh
 

Index: pkgsrc/shells/oh-my-posh/distinfo
diff -u pkgsrc/shells/oh-my-posh/distinfo:1.2 pkgsrc/shells/oh-my-posh/distinfo:1.3
--- pkgsrc/shells/oh-my-posh/distinfo:1.2       Fri Mar 17 11:23:57 2023
+++ pkgsrc/shells/oh-my-posh/distinfo   Fri Apr  7 00:32:56 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2023/03/17 11:23:57 schmonz Exp $
+$NetBSD: distinfo,v 1.3 2023/04/07 00:32:56 schmonz Exp $
 
 BLAKE2s (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.mod) = 574dbad9c3f38d9ccf476f1ed9a7f1ae9fd6c319709dccd144a62ec5e4c7e072
 SHA512 (dmitri.shuralyov.com_font_woff2_@v_v0.0.0-20180220214647-957792cbbdab.mod) = 
5416d8501e504414289d0a89108861278d0909dac49ace875d3826836d26680af2328397ba3e872040b4b73f21fe81606bbd45aa6ec96eba91e9a554987415c4
@@ -813,3 +813,5 @@ Size (gopkg.in_yaml.v3_@v_v3.0.1.zip) = 
 BLAKE2s (oh-my-posh-14.14.3.tar.gz) = 202f71a2fb32fb478f8e755e75593cd711ba1732e9122eb8ffa364dfc7e209c8
 SHA512 (oh-my-posh-14.14.3.tar.gz) = e0cfecfa31dba8d071f6d3d07072f3d066e6eb81682c20127c0dfaedf355ee1cc1e8b337ef3efc6554eb4490a5e964bcbb7366ba0745ba40fdefb42a153a8610
 Size (oh-my-posh-14.14.3.tar.gz) = 4170973 bytes
+SHA1 (patch-font_install__unix.go) = cca30cb0c78d1b02cd6054a74049f862ed047cd0
+SHA1 (patch-platform_battery_battery__unix.go) = 5b34b0a3b488446a043ae02f330c6b0a2b6645bd

Added files:

Index: pkgsrc/shells/oh-my-posh/patches/patch-font_install__unix.go
diff -u /dev/null pkgsrc/shells/oh-my-posh/patches/patch-font_install__unix.go:1.1
--- /dev/null   Fri Apr  7 00:32:57 2023
+++ pkgsrc/shells/oh-my-posh/patches/patch-font_install__unix.go        Fri Apr  7 00:32:56 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-font_install__unix.go,v 1.1 2023/04/07 00:32:56 schmonz Exp $
+
+Build this file also on other Unixy platforms (besides Darwin).
+
+--- font/install_unix.go.orig  2023-03-17 08:45:01.000000000 +0000
++++ font/install_unix.go
+@@ -1,4 +1,4 @@
+-//go:build linux
++//go:build !darwin && !windows
+ 
+ // Derived from https://github.com/Crosse/font-install
+ // Copyright 2020 Seth Wright <seth%crosse.org@localhost>
Index: pkgsrc/shells/oh-my-posh/patches/patch-platform_battery_battery__unix.go
diff -u /dev/null pkgsrc/shells/oh-my-posh/patches/patch-platform_battery_battery__unix.go:1.1
--- /dev/null   Fri Apr  7 00:32:57 2023
+++ pkgsrc/shells/oh-my-posh/patches/patch-platform_battery_battery__unix.go    Fri Apr  7 00:32:56 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-platform_battery_battery__unix.go,v 1.1 2023/04/07 00:32:56 schmonz Exp $
+
+Build this file only on Unixy platforms (besides Darwin).
+
+--- platform/battery/battery_unix.go.orig      2023-03-17 08:45:01.000000000 +0000
++++ platform/battery/battery_unix.go
+@@ -1,3 +1,5 @@
++//go:build !darwin && !windows
++
+ // battery
+ // Copyright (C) 2016-2017 Karol 'Kenji Takahashi' Woźniak
+ //