It would be nice to be able to use version sort in feh so that 2.jpg
is shown before 10.jpg.
Version sort is currently disabled in the feh port because it requires
strverscmp() which is a glibc extension. However, it seems safe to copy
the code from glibc and compile it as part of feh. That's what this diff
does.
Then, to use version sort, do something like:
$ feh -S filename --version-sort
I'm not sure if and how the license marker in the port Makefile should
be updated. Right now it says "BSD", but the strverscmp() code is GPL.
Tested on amd64. OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.102
diff -p -u -r1.102 Makefile
--- Makefile 30 May 2020 02:12:35 -0000 1.102
+++ Makefile 12 Jun 2020 09:29:48 -0000
@@ -3,6 +3,7 @@
COMMENT= lightweight image viewer
DISTNAME= feh-3.4.1
+REVISION= 0
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics
FIX_EXTRACT_PERMISSIONS=Yes
@@ -32,10 +33,13 @@ LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE
MAKE_FLAGS= LDFLAGS="${LDFLAGS}" \
man_dir="${DESTDIR}${PREFIX}/man" \
example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
- exif=1 verscmp=0
+ exif=1
FAKE_FLAGS= PREFIX="${PREFIX}"
USE_GMAKE= Yes
+
+post-patch:
+ cp ${FILESDIR}/strverscmp.c ${WRKSRC}/src
pre-configure:
${SUBST_CMD} ${WRKSRC}/examples/themes ${WRKSRC}/man/feh.pre \
Index: files/strverscmp.c
===================================================================
RCS file: files/strverscmp.c
diff -N files/strverscmp.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/strverscmp.c 12 Jun 2020 09:29:48 -0000
@@ -0,0 +1,109 @@
+/* $OpenBSD */
+
+/* Source:
https://sourceware.org/git/?p=glibc.git;a=blob;f=string/strverscmp.c;hb=d614a7539657941a9201c236b2f15afac18e1213
*/
+
+/* Compare strings while treating digits characters numerically.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jean-François Bignolles <bigno...@ecoledoc.ibp.fr>, 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdint.h>
+#include <string.h>
+#include <ctype.h>
+
+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
+ fractionnal parts, S_Z: idem but with leading Zeroes only */
+#define S_N 0x0
+#define S_I 0x3
+#define S_F 0x6
+#define S_Z 0x9
+
+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
+#define CMP 2
+#define LEN 3
+
+
+/* Compare S1 and S2 as strings holding indices/version numbers,
+ returning less than, equal to or greater than zero if S1 is less than,
+ equal to or greater than S2 (for more info, see the texinfo doc).
+*/
+
+int
+strverscmp (const char *s1, const char *s2)
+{
+ const unsigned char *p1 = (const unsigned char *) s1;
+ const unsigned char *p2 = (const unsigned char *) s2;
+
+ /* Symbol(s) 0 [1-9] others
+ Transition (10) 0 (01) d (00) x */
+ static const uint8_t next_state[] =
+ {
+ /* state x d 0 */
+ /* S_N */ S_N, S_I, S_Z,
+ /* S_I */ S_N, S_I, S_I,
+ /* S_F */ S_N, S_F, S_F,
+ /* S_Z */ S_N, S_F, S_Z
+ };
+
+ static const int8_t result_type[] =
+ {
+ /* state x/x x/d x/0 d/x d/d d/0 0/x 0/d 0/0 */
+
+ /* S_N */ CMP, CMP, CMP, CMP, LEN, CMP, CMP, CMP, CMP,
+ /* S_I */ CMP, -1, -1, +1, LEN, LEN, +1, LEN, LEN,
+ /* S_F */ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+ /* S_Z */ CMP, +1, +1, -1, CMP, CMP, -1, CMP, CMP
+ };
+
+ if (p1 == p2)
+ return 0;
+
+ unsigned char c1 = *p1++;
+ unsigned char c2 = *p2++;
+ /* Hint: '0' is a digit too. */
+ int state = S_N + ((c1 == '0') + (isdigit (c1) != 0));
+
+ int diff;
+ while ((diff = c1 - c2) == 0)
+ {
+ if (c1 == '\0')
+ return diff;
+
+ state = next_state[state];
+ c1 = *p1++;
+ c2 = *p2++;
+ state += (c1 == '0') + (isdigit (c1) != 0);
+ }
+
+ state = result_type[state * 3 + (((c2 == '0') + (isdigit (c2) != 0)))];
+
+ switch (state)
+ {
+ case CMP:
+ return diff;
+
+ case LEN:
+ while (isdigit (*p1++))
+ if (!isdigit (*p2++))
+ return 1;
+
+ return isdigit (*p2) ? -1 : diff;
+
+ default:
+ return state;
+ }
+}
Index: patches/patch-src_Makefile
===================================================================
RCS file: patches/patch-src_Makefile
diff -N patches/patch-src_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile 12 Jun 2020 09:29:48 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/Makefile
+--- src/Makefile.orig
++++ src/Makefile
+@@ -21,6 +21,7 @@ TARGETS = \
+ options.c \
+ signals.c \
+ slideshow.c \
++ strverscmp.c \
+ thumbnail.c \
+ timers.c \
+ utils.c \
Index: patches/patch-src_feh_h
===================================================================
RCS file: patches/patch-src_feh_h
diff -N patches/patch-src_feh_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_feh_h 12 Jun 2020 09:29:48 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/feh.h
+--- src/feh.h.orig
++++ src/feh.h
+@@ -182,6 +182,7 @@ gib_list *feh_list_jump(gib_list * root, gib_list * l,
+ #ifdef HAVE_INOTIFY
+ void feh_event_handle_inotify(void);
+ #endif
++int strverscmp(const char *s1, const char *s2);
+
+ /* Imlib stuff */
+ extern Display *disp;
