add viewnior petbuild with hellosiyan/Viewnior#108

dimkr · Jan 13, 2023 · 9f9132b · 9f9132b
1 parent bb6ec7a
commit 9f9132b
Show file tree

Hide file tree

Showing 14 changed files with 1,329 additions and 5 deletions.
diff --git a/woof-code/rootfs-petbuilds/viewnior/gtk3.patch b/woof-code/rootfs-petbuilds/viewnior/gtk3.patch
diff --git a/woof-code/rootfs-petbuilds/viewnior/pet.specs b/woof-code/rootfs-petbuilds/viewnior/pet.specs
@@ -0,0 +1 @@
+viewnior-1.8|viewnior|1.8||Graphic|6656K||viewnior-1.8.pet||Elegant image viewer|puppy|||
diff --git a/woof-code/rootfs-petbuilds/viewnior/petbuild b/woof-code/rootfs-petbuilds/viewnior/petbuild
@@ -0,0 +1,13 @@
+download() {
+    [ -f viewnior-1.8.tar.gz ] || wget -t 3 -T 60 -O viewnior-1.8.tar.gz https://github.com/hellosiyan/Viewnior/archive/viewnior-1.8.tar.gz
+}
+
+build() {
+    tar -xzf viewnior-1.8.tar.gz
+    cd Viewnior-viewnior-1.8
+    [ $PETBUILD_GTK -eq 2 ] || patch -p1 < ../gtk3.patch
+    patch -p1 < ../puppy.patch
+    meson --buildtype=release --prefix=/usr build
+    ninja -C build install
+    sed 's/^Categories=.*/Categories=Presentation;/' -i /usr/share/applications/viewnior.desktop
+}
diff --git a/woof-code/rootfs-petbuilds/viewnior/pinstall.sh b/woof-code/rootfs-petbuilds/viewnior/pinstall.sh
@@ -0,0 +1,3 @@
+echo '#!/bin/sh
+exec viewnior "$@"' > usr/local/bin/defaultimageviewer
+chmod 755 usr/local/bin/defaultimageviewer
diff --git a/woof-code/rootfs-petbuilds/viewnior/puppy.patch b/woof-code/rootfs-petbuilds/viewnior/puppy.patch
@@ -0,0 +1,21 @@
+diff -rupN Viewnior-viewnior-1.8-orig/src/uni-utils.c Viewnior-viewnior-1.8/src/uni-utils.c
+--- Viewnior-viewnior-1.8-orig/src/uni-utils.c	2023-01-13 14:55:15.956336191 +0200
++++ Viewnior-viewnior-1.8/src/uni-utils.c	2023-01-13 14:55:45.984452919 +0200
+@@ -104,7 +104,7 @@ uni_rectangle_get_rects_around (GdkRecta
+ VnrPrefsDesktop
+ uni_detect_desktop_environment ()
+ {
+-    VnrPrefsDesktop environment = VNR_PREFS_DESKTOP_GNOME3;
++    VnrPrefsDesktop environment = VNR_PREFS_DESKTOP_PUPPY;
+
+     gchar *xdg_current_desktop = g_ascii_strup(g_getenv("XDG_CURRENT_DESKTOP"), -1);
+     gchar *xdg_session_desktop = g_ascii_strup(g_getenv("XDG_SESSION_DESKTOP"), -1);
+@@ -140,7 +140,7 @@ uni_detect_desktop_environment ()
+     }
+     else
+     {
+-        g_warning("Cannot detect desktop environment. Defaulting to GNOME 3.\n");
++        g_warning("Cannot detect desktop environment. Defaulting to Puppy.\n");
+     }
+
+     g_free(xdg_current_desktop);
diff --git a/woof-code/rootfs-petbuilds/viewnior/sha256.sum b/woof-code/rootfs-petbuilds/viewnior/sha256.sum
@@ -0,0 +1 @@
+b9319171ebca23929e6ea8039c194b1595d92e764db5e3890836fb5c36e233b0  viewnior-1.8.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
@@ -148,6 +148,7 @@ yes|ucf|ucf|exe,dev,doc,nls||deps:yes
 yes|unzip|unzip|exe,dev>null,doc,nls||deps:yes
 yes|usbutils|usbutils|exe,dev,doc,nls||deps:yes
 yes|util-linux|util-linux,mount,libuuid1,libblkid1,libmount1,libsmartcols1,uuid-dev|exe,dev,doc,nls||deps:yes
+yes|viewnior-deps|libexiv2-dev|exe,dev,doc,nls||deps:yes
 yes|wget|wget|exe,dev>null,doc,nls||deps:yes
 yes|wireless-tools|wireless-tools,libiw30,libiw-dev|exe,dev,doc,nls||deps:yes
 yes|wireplumber|wireplumber|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
@@ -62,7 +62,7 @@ fi
 if [ "$DISTRO_VARIANT" = "dwl" ]; then
 	PETBUILDS="$PETBUILDS foot-puppy yambar-dwl spacefm"
 else
-	PETBUILDS="$PETBUILDS firewallstatus freememapplet jwm lxterminal pa-applet powerapplet_tray xdg-puppy-jwm connman-ui gpicview rox-filer"
+	PETBUILDS="$PETBUILDS firewallstatus freememapplet jwm lxterminal pa-applet powerapplet_tray xdg-puppy-jwm connman-ui viewnior rox-filer"
 	if [ "$DISTRO_VARIANT" != "xwayland" ]; then
 		PETBUILDS="$PETBUILDS xlockmore"
 	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
@@ -167,6 +167,7 @@ yes|ucf|ucf|exe,dev,doc,nls||deps:yes
 yes|unzip|unzip|exe,dev>null,doc,nls||deps:yes
 yes|usbutils|usbutils|exe,dev,doc,nls||deps:yes
 yes|util-linux|util-linux,mount,libuuid1,libblkid1,libmount1,libsmartcols1,uuid-dev|exe,dev,doc,nls||deps:yes
+yes|viewnior-deps|libexiv2-dev|exe,dev,doc,nls||deps:yes
 yes|vte|libvte-2.91-0,libvte-2.91-common,libvte-2.91-dev|exe,dev,doc,nls||deps:yes
 yes|wget|wget|exe,dev>null,doc,nls||deps:yes
 yes|wireless-tools|wireless-tools,libiw30,libiw-dev|exe,dev,doc,nls||deps:yes

diff --git a/woof-distro/x86_64/debian/bullseye64/_00build.conf b/woof-distro/x86_64/debian/bullseye64/_00build.conf
@@ -53,7 +53,7 @@ BUILD_BDRV=yes
 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"
-PETBUILDS="$PETBUILDS firewallstatus freememapplet jwm lxterminal pa-applet powerapplet_tray xdg-puppy-jwm connman-ui gpicview rox-filer"
+PETBUILDS="$PETBUILDS firewallstatus freememapplet jwm lxterminal pa-applet powerapplet_tray xdg-puppy-jwm connman-ui viewnior rox-filer"
 PETBUILDS="$PETBUILDS xlockmore"
 
 ## GTK+ version to use when building packages that support GTK+ 2

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
@@ -169,6 +169,7 @@ yes|ucf|ucf|exe,dev,doc,nls||deps:yes
 yes|unzip|unzip|exe,dev>null,doc,nls||deps:yes
 yes|usbutils|usbutils|exe,dev,doc,nls||deps:yes
 yes|util-linux|util-linux,mount,libuuid1,libblkid1,libmount1,libsmartcols1,uuid-dev|exe,dev,doc,nls||deps:yes
+yes|viewnior-deps|libexiv2-dev|exe,dev,doc,nls||deps:yes
 yes|vte|libvte-2.91-0,libvte-2.91-common,libvte-2.91-dev|exe,dev,doc,nls||deps:yes
 yes|wget|wget|exe,dev>null,doc,nls||deps:yes
 yes|wireless-tools|wireless-tools,libiw30,libiw-dev|exe,dev,doc,nls||deps:yes

diff --git a/woof-distro/x86_64/debian/sid64/_00build.conf b/woof-distro/x86_64/debian/sid64/_00build.conf
@@ -53,7 +53,7 @@ BUILD_BDRV=yes
 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"
-PETBUILDS="$PETBUILDS labwc swaylock wlopm xdg-puppy-labwc gpicview pcmanfm pupmoon-font pup-volume-monitor"
+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
 PETBUILD_GTK=3

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
@@ -646,6 +646,7 @@ yes|util-linux|util-linux,mount,libuuid1,libblkid1,libmount1,libsmartcols1,uuid-
 no|uextract||exe,dev
 no|vala|valac,libvala-*|exe>dev,dev,doc>dev,nls
 no|vamps|vamps|exe,dev,doc,nls
+yes|viewnior-deps|libexiv2-dev|exe,dev,doc,nls||deps:yes
 no|vobcopy|vobcopy|exe,dev,doc,nls
 no|vorbis-tools|vorbis-tools|exe,dev,doc,nls
 no|vboot-kernel-utils|vboot-kernel-utils|exe->dev,dev,doc,nls||deps:yes

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 gpicview 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"
+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"
 
 ## GTK+ version to use when building packages that support GTK+ 2
 PETBUILD_GTK=3
@@ -119,7 +119,7 @@ defaulthandler=
 defaulthtmleditor=geany
 defaulthtmlviewer=defaultbrowser
 defaultimageeditor=mtpaint
-defaultimageviewer=gpicview
+defaultimageviewer=viewnior
 defaultmediaplayer=
 defaultpaint=mtpaint
 defaultpdfviewer=evince
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		viewnior-1.8\|viewnior\|1.8\|\|Graphic\|6656K\|\|viewnior-1.8.pet\|\|Elegant image viewer\|puppy\|\|\|
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		b9319171ebca23929e6ea8039c194b1595d92e764db5e3890836fb5c36e233b0 viewnior-1.8.tar.gz