From 14ffbc1485b26fac76812184a500e30d200b52ec Mon Sep 17 00:00:00 2001 From: John McQuah Date: Fri, 10 Feb 2023 20:48:16 -0500 Subject: [PATCH] imv: 4.3.1 -> 4.4.0 --- REPO | 8 ++++---- imv/.footprint | 4 ++-- imv/.signature | 12 ++++++------ imv/.watch | 5 +++++ imv/Pkgfile | 17 ++++++++++------- imv/freeimagelite.patch | 12 ++++++------ 6 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 imv/.watch diff --git a/REPO b/REPO index 742ee3a..28f4678 100644 --- a/REPO +++ b/REPO @@ -307,7 +307,7 @@ f:1b5f776fe1fa24b56550ccc1918a9167:python3-csvkit/.footprint f:64299ab187bec0a272fd484cba5ae45e:python3-et_xmlfile/.signature f:3b903a744ae49ea8ba2295ee91e0da3b:python3-et_xmlfile/Pkgfile f:71cb950baaf9fc91d3c4c7a86ef2bd25:python3-et_xmlfile/.footprint -f:97dbd27198bc704dd2416425f082bbf6:imv/freeimagelite.patch -f:8553d39ae8319a166cc20cbe7fa8f137:imv/.signature -f:8e6f28ffc5d0ca892df94fbe324f1a22:imv/Pkgfile -f:8fbc96a3975ed2b8c31cb1fafb63344d:imv/.footprint +f:6cd469da154425a748347cdd908280ed:imv/freeimagelite.patch +f:b595fed0d5ed35b597231dbc0f055ba1:imv/.signature +f:1dae096e9a4cf3b2b76bfd8e919b06b6:imv/Pkgfile +f:f8607b6cf68f2eba028d7d1c3f71f8bd:imv/.footprint diff --git a/imv/.footprint b/imv/.footprint index 56bc3fa..628d7ca 100644 --- a/imv/.footprint +++ b/imv/.footprint @@ -3,9 +3,9 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/imv --rwxr-xr-x root/root usr/bin/imv-folder +-rwxr-xr-x root/root usr/bin/imv-dir -rwxr-xr-x root/root usr/bin/imv-msg drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ --rw-r--r-- root/root usr/share/applications/imv-folder.desktop +-rw-r--r-- root/root usr/share/applications/imv-dir.desktop -rw-r--r-- root/root usr/share/applications/imv.desktop diff --git a/imv/.signature b/imv/.signature index 9a20117..84980fa 100644 --- a/imv/.signature +++ b/imv/.signature @@ -1,6 +1,6 @@ -untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxF7kL3rHzrn8xFaPQvJBT0GLZEreQziLACoZMs1QQjvDygswShGJ+P2bEgJohpQNe0ABtQmhJ6P+17gRrYGZpQI= -SHA256 (Pkgfile) = c8a6e04ee0d88874507df5beb266a43cd77426f156871c92be86e839b3ad9cb9 -SHA256 (.footprint) = 152c3a4dbb0ef2ad4b1aef56ea63989d9e0a5ca7e7a0b8d8563ce3e72df5e82d -SHA256 (imv-4.3.1.tar.gz) = 88d16885017b74b594ddd6a03ef20294a6cc053f04ccc2e1edef69f3515f7999 -SHA256 (freeimagelite.patch) = 7554df3d950a6e4f77dce24f4991a957ac5582296150b66023a7c14b836f7a4e +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF3zI/sIwxkIpJdHaLfJ9E+ySqKs03QmGYEC8TraeeXt/CtVWuVQzsmppSZ5Gv7u9IqB1FilfESYF68tDrsJg56gI= +SHA256 (Pkgfile) = 1d7815897937b2b9db6d93b35ac910bcb330b15bce5449e23f34274689e9ad5e +SHA256 (.footprint) = bd58e38927b0fa4fcee4120d5a9d388779f7dd98632824b46252c4e3328e34fb +SHA256 (imv-4.4.0.tar.gz) = 55431c8c27fbe82d05955f61bde38ba15febf8a7fd8f0f741e504bae0b823bcf +SHA256 (freeimagelite.patch) = 2ab15a2f14df0d3d7a225da23c1f0e307339737de3de3af2a7de46afe386a4fc diff --git a/imv/.watch b/imv/.watch new file mode 100644 index 0000000..cd5917a --- /dev/null +++ b/imv/.watch @@ -0,0 +1,5 @@ +#!/bin/sh + +curl -s "https://git.sr.ht/~exec64/imv/refs" \ + | awk '/Release v/ {$0=gensub(/.*Release v(.+)[[:blank:]]*.*/,"\\1",1); print;}' \ + | head -n 1 diff --git a/imv/Pkgfile b/imv/Pkgfile index b4f6e86..f3bde03 100644 --- a/imv/Pkgfile +++ b/imv/Pkgfile @@ -5,16 +5,19 @@ # Optional: libjpeg-turbo libpng libtiff librsvg libfreeimage-lite egl-wayland xorg-libxcb asciidoc name=imv -version=4.3.1 +version=4.4.0 release=1 source=(https://git.sr.ht/~exec64/$name/archive/v$version.tar.gz freeimagelite.patch) renames=($name-$version.tar.gz SKIP) build() { - cd $name-v$version - prt-get isinst libfreeimage-lite && patch -p1 < $SRC/freeimagelite.patch - prt-get isinst asciidoc && MAN_IMV="-D man=enabled" || MAN_IMV="-D man=disabled" - meson setup build --buildtype=release --prefix=/usr $MAN_IMV - ninja -C build -j ${JOBS:-1} - DESTDIR=$PKG ninja -C build install + cd $name-v$version + + prt-get isinst libfreeimage-lite && patch -p1 -i $SRC/freeimagelite.patch + prt-get isinst asciidoc && MAN_IMV="-D man=enabled" || MAN_IMV="-D man=disabled" + + meson setup build --buildtype=release --prefix=/usr $MAN_IMV + ninja -C build -j ${JOBS:-1} + + DESTDIR=$PKG ninja -C build install } diff --git a/imv/freeimagelite.patch b/imv/freeimagelite.patch index 6b0d357..fd37cd8 100644 --- a/imv/freeimagelite.patch +++ b/imv/freeimagelite.patch @@ -1,6 +1,6 @@ -diff -ur imv-v4.3.1/meson.build imv-v4.3.1m/meson.build ---- imv-v4.3.1/meson.build 2021-12-14 04:56:12.000000000 -0500 -+++ imv-v4.3.1m/meson.build 2022-01-24 14:39:53.417479068 -0500 +diff -ur a/meson.build b/meson.build +--- a/meson.build 2021-12-14 04:56:12.000000000 -0500 ++++ b/meson.build 2022-01-24 14:39:53.417479068 -0500 @@ -109,7 +109,7 @@ enabled_backends = [] @@ -10,9 +10,9 @@ diff -ur imv-v4.3.1/meson.build imv-v4.3.1m/meson.build ['libtiff', 'dependency', 'libtiff-4', []], ['libpng', 'dependency', 'libpng', []], ['libjpeg', 'dependency', 'libturbojpeg', []], -diff -ur imv-v4.3.1/src/backend_freeimage.c imv-v4.3.1m/src/backend_freeimage.c ---- imv-v4.3.1/src/backend_freeimage.c 2021-12-14 04:56:12.000000000 -0500 -+++ imv-v4.3.1m/src/backend_freeimage.c 2022-01-24 14:42:25.054150289 -0500 +diff -ur a/src/backend_freeimage.c b/src/backend_freeimage.c +--- a/src/backend_freeimage.c 2021-12-14 04:56:12.000000000 -0500 ++++ b/src/backend_freeimage.c 2022-01-24 14:42:25.054150289 -0500 @@ -5,7 +5,7 @@ #include "source.h" #include "source_private.h"