add hardinfo petbuild

vanilla-dpup · Jan 15, 2023 · 5449508 · 5449508
1 parent 24291b0
commit 5449508
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 6 deletions.
diff --git a/woof-code/rootfs-petbuilds/hardinfo/pet.specs b/woof-code/rootfs-petbuilds/hardinfo/pet.specs
@@ -0,0 +1 @@
+hardinfo-a798cba|hardinfo|a798cba||System|6656K||hardinfo-a798cba.pet||System profiler and benchmark|puppy|||
diff --git a/woof-code/rootfs-petbuilds/hardinfo/petbuild b/woof-code/rootfs-petbuilds/hardinfo/petbuild
@@ -0,0 +1,16 @@
+download() {
+    [ -f hardinfo-a798cba.tar.gz ] || wget -t 3 -T 60 -O hardinfo-a798cba.tar.gz https://github.com/lpereira/hardinfo/archive/a798cbaed6f1b083cc3c26dbede74cf40947d0ef.tar.gz
+}
+
+build() {
+    tar -xzf hardinfo-a798cba.tar.gz
+    cd hardinfo-a798cbaed6f1b083cc3c26dbede74cf40947d0ef
+    if [ $PETBUILD_GTK -eq 3 ]; then
+        cmake -B build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=libexec -DHARDINFO_GTK3=1
+    else
+        cmake -B build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=libexec
+    fi
+    cmake --build build
+    cmake --install build
+    sed -i -e 's/^Name=.*/Name=HardInfo/' -e '/^Name\[.*/d' /usr/share/applications/hardinfo.desktop
+}
diff --git a/woof-code/rootfs-petbuilds/hardinfo/sha256.sum b/woof-code/rootfs-petbuilds/hardinfo/sha256.sum
@@ -0,0 +1 @@
+7dd41c133e5d5925847bdb3dcd768181447a416c873f29703537b6d13e43903b  hardinfo-a798cba.tar.gz
diff --git a/woof-distro/x86_64/debian/bookworm64/DISTRO_PKGS_SPECS-debian-bookworm b/woof-distro/x86_64/debian/bookworm64/DISTRO_PKGS_SPECS-debian-bookworm
@@ -56,7 +56,6 @@ yes|dash|dash|exe,dev,doc,nls||deps:yes
 yes|dbus|dbus,libdbus-1-dev|exe,dev,doc,nls||deps:yes
 yes|dbus-user-session|dbus-user-session|exe>null,dev>null,doc>null,nls>null
 yes|d-conf|dconf-gsettings-backend,dconf-service|exe,dev,doc,nls||deps:yes #needed by gsettings-desktop-settings
-yes|deadbeef-deps|libjansson-dev,libmpg123-dev|exe,dev,doc,nls||deps:yes
 yes|debconf|debconf|exe,dev,doc,nls
 yes|debianutils|debianutils|exe,dev,doc,nls||deps:yes
 yes|dialog|dialog|exe,dev>null,doc,nls||deps:yes
@@ -239,13 +238,15 @@ yes|gcc|gcc|exe,dev>exe,doc,nls||deps:yes # must be first
 $PKGS_SPECS_TABLE
 yes|abiword-deps|libboost-dev,libwv-dev|exe,dev,doc,nls||deps:yes
 yes|binutils|binutils|exe,dev>exe,doc,nls||deps:yes
+yes|deadbeef-deps|libjansson-dev,libmpg123-dev|exe,dev,doc,nls||deps:yes
 yes|dkms|dkms|exe,dev>exe,doc,nls||deps:yes
 yes|firefox-esr|firefox-esr,firefox-esr-l10n-all|exe,dev,doc,nls||deps:yes
 yes|flatpak|flatpak|exe,dev,doc,nls||deps:yes
 yes|fonts-noto|fonts-noto-core,fonts-noto-mono,fonts-noto-cjk,fonts-noto-color-emoji|exe,dev,doc,nls||deps:yes
 yes|goffice|libgoffice-0.10-dev|exe,dev,doc,nls||deps:yes
 yes|gpart|gpart|exe,dev,doc,nls||deps:yes
 yes|gparted-deps|libgtkmm-3.0-dev,libparted-dev|exe,dev,doc,nls||deps:yes
+yes|hardinfo-deps|libjson-glib-dev|exe,dev,doc,nls||deps:yes
 yes|libva|vainfo,va-driver-all|exe,dev,doc,nls||deps:yes
 yes|make|make|exe,dev,doc,nls||deps:yes
 yes|patch|patch|exe,dev,doc,nls||deps:yes

diff --git a/woof-distro/x86_64/debian/bookworm64/_00build.conf b/woof-distro/x86_64/debian/bookworm64/_00build.conf
@@ -55,7 +55,7 @@ BUILD_BDRV=yes
 ## packages to build from source
 PETBUILDS="busybox aaa_pup_c disktype dmz-cursor-theme geany gexec gtkdialog gtk_theme_flat_grey_rounded gtk_theme_polished_blue gtk_theme_gradient_grey gtk_theme_buntoo_ambience gtk_theme_stark_blueish gxmessage l3afpad lxtask mtpaint osmo transmission xarchiver xcur2png xdelta Xdialog yad pmaterial_icons puppy_standard_icons puppy_flat_icons ram-saver connman-puppy connman-gtk fixmenusd spot-pkexec notification-daemon-stub weechat claws-mail"
 [ "$DISTRO_TARGETARCH" = "x86_64" ] && PETBUILDS="$PETBUILDS efilinux"
-[ "$DISTRO_VARIANT" != "retro" ] && PETBUILDS="$PETBUILDS abiword gnumeric xournalpp mpv gparted deadbeef gmeasures fpm2 xpad gtkhash gdmap homebank grsync"
+[ "$DISTRO_VARIANT" != "retro" ] && PETBUILDS="$PETBUILDS abiword gnumeric xournalpp mpv gparted deadbeef gmeasures fpm2 xpad gtkhash gdmap homebank grsync hardinfo"
 if [ "$DISTRO_VARIANT" = "dwl" -o "$DISTRO_VARIANT" = "xwayland" ]; then
 	PETBUILDS="$PETBUILDS dwl-kiosk swaylock wlopm"
 fi

diff --git a/woof-distro/x86_64/debian/bullseye64/DISTRO_PKGS_SPECS-debian-bullseye b/woof-distro/x86_64/debian/bullseye64/DISTRO_PKGS_SPECS-debian-bullseye
@@ -99,6 +99,7 @@ yes|gsettings-desktop-schemas|gsettings-desktop-schemas|exe,dev,doc,nls||deps:ye
 yes|gtk+|libgtk2.0-0,libgtk2.0-dev|exe,dev,doc,nls||deps:yes
 yes|gtk2-engines-pixbuf|gtk2-engines-pixbuf|exe,dev,doc,nls||deps:yes
 yes|gtk+3|libgtk-3-0,libgtk-3-dev,libgtk-3-common,gtk-update-icon-cache,adwaita-icon-theme|exe,dev,doc,nls||deps:yes #have taken out all gtk3 apps. 140127 still have gnome-mplayer --no
+yes|hardinfo-deps|libjson-glib-dev|exe,dev,doc,nls||deps:yes
 yes|hdparm|hdparm|exe,dev>null,doc,nls||deps:yes
 yes|hicolor-icon-theme|hicolor-icon-theme|exe,dev>null,doc,nls||deps:yes
 yes|icu|libicu67,libicu-dev|exe,dev,doc,nls||deps:yes #scribus needs this though it is not listed as a dep. note, it is big, 7MB pkg. crap, better put it into main f.s. NO have manually put this dep into main db. harfbuzz needs icu also.

diff --git a/woof-distro/x86_64/debian/bullseye64/_00build.conf b/woof-distro/x86_64/debian/bullseye64/_00build.conf
@@ -52,7 +52,7 @@ BUILD_BDRV=yes
 ## packages to build from source
 PETBUILDS="busybox aaa_pup_c disktype dmz-cursor-theme geany gexec gtkdialog gtk_theme_flat_grey_rounded gtk_theme_polished_blue gtk_theme_gradient_grey gtk_theme_buntoo_ambience gtk_theme_stark_blueish gxmessage l3afpad lxtask mtpaint osmo transmission xarchiver xcur2png xdelta Xdialog yad pmaterial_icons puppy_standard_icons puppy_flat_icons ram-saver connman-puppy connman-gtk fixmenusd spot-pkexec notification-daemon-stub weechat claws-mail"
 [ "$DISTRO_TARGETARCH" = "x86_64" ] && PETBUILDS="$PETBUILDS efilinux"
-PETBUILDS="$PETBUILDS abiword gnumeric xournalpp mpv gparted deadbeef gmeasures fpm2 xpad gtkhash gdmap homebank grsync"
+PETBUILDS="$PETBUILDS abiword gnumeric xournalpp mpv gparted deadbeef gmeasures fpm2 xpad gtkhash gdmap homebank grsync hardinfo"
 PETBUILDS="$PETBUILDS firewallstatus freememapplet jwm lxterminal pa-applet powerapplet_tray xdg-puppy-jwm connman-ui viewnior rox-filer"
 PETBUILDS="$PETBUILDS xlockmore"
 

diff --git a/woof-distro/x86_64/debian/sid64/DISTRO_PKGS_SPECS-debian-sid b/woof-distro/x86_64/debian/sid64/DISTRO_PKGS_SPECS-debian-sid
@@ -100,6 +100,7 @@ yes|gsettings-desktop-schemas|gsettings-desktop-schemas|exe,dev,doc,nls||deps:ye
 yes|gtk+|libgtk2.0-0,libgtk2.0-dev|exe,dev,doc,nls||deps:yes
 yes|gtk2-engines-pixbuf|gtk2-engines-pixbuf|exe,dev,doc,nls||deps:yes
 yes|gtk+3|libgtk-3-0,libgtk-3-dev,libgtk-3-common,gtk-update-icon-cache,adwaita-icon-theme|exe,dev,doc,nls||deps:yes #have taken out all gtk3 apps. 140127 still have gnome-mplayer --no
+yes|hardinfo-deps|libjson-glib-dev|exe,dev,doc,nls||deps:yes
 yes|hdparm|hdparm|exe,dev>null,doc,nls||deps:yes
 yes|hicolor-icon-theme|hicolor-icon-theme|exe,dev>null,doc,nls||deps:yes
 yes|icu|libicu72,libicu-dev|exe,dev,doc,nls||deps:yes #scribus needs this though it is not listed as a dep. note, it is big, 7MB pkg. crap, better put it into main f.s. NO have manually put this dep into main db. harfbuzz needs icu also.

diff --git a/woof-distro/x86_64/debian/sid64/_00build.conf b/woof-distro/x86_64/debian/sid64/_00build.conf
@@ -52,7 +52,7 @@ BUILD_BDRV=yes
 ## packages to build from source
 PETBUILDS="busybox aaa_pup_c disktype dmz-cursor-theme geany gexec gtkdialog gtk_theme_flat_grey_rounded gtk_theme_polished_blue gtk_theme_gradient_grey gtk_theme_buntoo_ambience gtk_theme_stark_blueish gxmessage l3afpad lxtask mtpaint osmo transmission xarchiver xcur2png xdelta Xdialog yad pmaterial_icons puppy_standard_icons puppy_flat_icons ram-saver connman-puppy connman-gtk fixmenusd spot-pkexec notification-daemon-stub weechat claws-mail"
 [ "$DISTRO_TARGETARCH" = "x86_64" ] && PETBUILDS="$PETBUILDS efilinux"
-PETBUILDS="$PETBUILDS abiword gnumeric xournalpp mpv gparted deadbeef gmeasures fpm2 xpad gtkhash gdmap homebank grsync"
+PETBUILDS="$PETBUILDS abiword gnumeric xournalpp mpv gparted deadbeef gmeasures fpm2 xpad gtkhash gdmap homebank grsync hardinfo"
 PETBUILDS="$PETBUILDS labwc swaylock wlopm xdg-puppy-labwc viewnior pcmanfm pupmoon-font pup-volume-monitor"
 
 ## GTK+ version to use when building packages that support GTK+ 2

diff --git a/woof-distro/x86_64/ubuntu/jammy64/DISTRO_PKGS_SPECS-ubuntu-jammy b/woof-distro/x86_64/ubuntu/jammy64/DISTRO_PKGS_SPECS-ubuntu-jammy
@@ -234,7 +234,7 @@ no|gview||exe,dev,dev>null,doc,nls
 no|gwhere||exe,dev,dev>null,doc,nls
 no|gxmessage||exe #use my pet, as has xmessage symlink to gxmessage.
 no|gzip|gzip|exe,dev>null,doc,nls||deps:yes
-no|hardinfo|hardinfo|exe,dev #our pet is patched to recognise puppy linux distro.
+yes|hardinfo-deps|libjson-glib-dev|exe,dev,doc,nls||deps:yes
 yes|harfbuzz|libharfbuzz0b,libharfbuzz-dev|exe,dev,doc,nls||deps:yes
 yes|hdparm|hdparm|exe,dev>null,doc,nls||deps:yes
 no|heimdal|heimdal-dev,heimdal-multidev,libasn1-8-heimdal,libsl0-heimdal,libgssapi3-heimdal,libhcrypto4-heimdal,libhdb9-heimdal,libheimbase1-heimdal,libhx509-5-heimdal,libkadm5clnt7-heimdal,libkadm5srv8-heimdal,libkafs0-heimdal,libkdc2-heimdal,libkrb5-26-heimdal,libwind0-heimdal,libroken18-heimdal,libheimntlm0-heimdal|exe,dev,doc,nls||deps:yes #all this crap needed by cupsd.

diff --git a/woof-distro/x86_64/ubuntu/jammy64/_00build.conf b/woof-distro/x86_64/ubuntu/jammy64/_00build.conf
@@ -41,7 +41,7 @@ USR_SYMLINKS=yes
 BUILD_BDRV=yes
 
 ## packages to build from source
-PETBUILDS="busybox aaa_pup_c disktype dmz-cursor-theme firewallstatus freememapplet geany gexec viewnior gtkdialog gtk_theme_flat_grey_rounded gtk_theme_polished_blue gtk_theme_gradient_grey gtk_theme_buntoo_ambience gtk_theme_stark_blueish gxmessage jwm l3afpad lxtask lxterminal mtpaint pa-applet powerapplet_tray rox-filer claws-mail transmission xarchiver xcur2png xdelta xdg-puppy-jwm Xdialog xlockmore yad pmaterial_icons puppy_standard_icons puppy_flat_icons ram-saver connman-puppy connman-ui connman-gtk fixmenusd spot-pkexec notification-daemon-stub palemoon weechat osmo abiword gnumeric xournalpp mpv efilinux gparted deadbeef gmeasures fpm2 xpad gtkhash gdmap homebank grsync"
+PETBUILDS="busybox aaa_pup_c disktype dmz-cursor-theme firewallstatus freememapplet geany gexec viewnior gtkdialog gtk_theme_flat_grey_rounded gtk_theme_polished_blue gtk_theme_gradient_grey gtk_theme_buntoo_ambience gtk_theme_stark_blueish gxmessage jwm l3afpad lxtask lxterminal mtpaint pa-applet powerapplet_tray rox-filer claws-mail transmission xarchiver xcur2png xdelta xdg-puppy-jwm Xdialog xlockmore yad pmaterial_icons puppy_standard_icons puppy_flat_icons ram-saver connman-puppy connman-ui connman-gtk fixmenusd spot-pkexec notification-daemon-stub palemoon weechat osmo abiword gnumeric xournalpp mpv efilinux gparted deadbeef gmeasures fpm2 xpad gtkhash gdmap homebank grsync hardinfo"
 
 ## GTK+ version to use when building packages that support GTK+ 2
 PETBUILD_GTK=3