qiv: update to 2.3.2
Changelog: https://spiegl.de/qiv/changes.shtml While here, move HOMEPAGE to https, and add some patches to silence warnings emitted by clang-10 (upstreamed). OK pamela@
This commit is contained in:
cwen
parent
cd4916553c
commit
e9e6a8a57b
@ -1,24 +1,23 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2019/07/12 20:47:09 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2020/12/31 20:16:54 cwen Exp $
|
||||
|
||||
COMMENT= very small and pretty fast gdk/Imlib image viewer
|
||||
|
||||
DISTNAME= qiv-2.3.1
|
||||
DISTNAME= qiv-2.3.2
|
||||
CATEGORIES= graphics
|
||||
REVISION= 0
|
||||
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
||||
HOMEPAGE= http://spiegl.de/qiv/
|
||||
HOMEPAGE= https://spiegl.de/qiv/
|
||||
|
||||
MASTER_SITES= ${HOMEPAGE}/download/
|
||||
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB = Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
|
||||
WANTLIB += Xrandr Xrender c cairo exif fontconfig freetype gdk-x11-2.0
|
||||
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 iconv intl jpeg
|
||||
WANTLIB += lcms2 m magic pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
|
||||
WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
|
||||
WANTLIB += Xinerama Xrandr Xrender c cairo exif fontconfig freetype
|
||||
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
|
||||
WANTLIB += harfbuzz intl jpeg lcms2 magic pango-1.0 pangocairo-1.0
|
||||
WANTLIB += tiff z
|
||||
|
||||
LIB_DEPENDS= devel/libmagic \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (qiv-2.3.1.tgz) = Z1OWtTnmURE1/nPIZ/n91tkSwkx1Ynl8sEfCfQwsjuY=
|
||||
SIZE (qiv-2.3.1.tgz) = 130621
|
||||
SHA256 (qiv-2.3.2.tgz) = SOCgiKDVz1+sIxSmCzrtYsSRPnkmJ/ZPA5hoZa1wgNU=
|
||||
SIZE (qiv-2.3.2.tgz) = 133614
|
||||
|
||||
@ -1,6 +1,11 @@
|
||||
$OpenBSD: patch-Makefile,v 1.8 2014/08/23 14:33:07 kirby Exp $
|
||||
--- Makefile.orig Fri Dec 20 04:50:37 2013
|
||||
+++ Makefile Thu Aug 14 14:06:52 2014
|
||||
$OpenBSD: patch-Makefile,v 1.9 2020/12/31 20:16:54 cwen Exp $
|
||||
|
||||
Hunk #4 is a fix for bogus manpaths that can be removed for qiv>2.3.2,
|
||||
see https://codeberg.org/ciberandy/qiv/commit/195fe9d5
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -4,7 +4,7 @@
|
||||
#######################################################################
|
||||
|
||||
@ -8,9 +13,9 @@ $OpenBSD: patch-Makefile,v 1.8 2014/08/23 14:33:07 kirby Exp $
|
||||
-PREFIX = /usr/local
|
||||
+PREFIX ?= /usr/local
|
||||
|
||||
# Font to use for statusbar in fullscreen mode
|
||||
# Fonts to use for statusbar and comments
|
||||
STATUSBAR_FONT = "Monospace 9"
|
||||
@@ -30,7 +30,7 @@ GETOPT_LONG = -DHAVE_GETOPT_LONG
|
||||
@@ -31,7 +31,7 @@ GETOPT_LONG = -DHAVE_GETOPT_LONG
|
||||
|
||||
# This program will be run on the manual page after it is installed.
|
||||
# If you don't want to compress the manpage, change it to 'true'.
|
||||
@ -19,23 +24,35 @@ $OpenBSD: patch-Makefile,v 1.8 2014/08/23 14:33:07 kirby Exp $
|
||||
|
||||
# Comment this line out if your system doesn't have lcms2 installed
|
||||
# (for minimal Color Management support)
|
||||
@@ -49,11 +49,11 @@ EXIF = -DHAVE_EXIF
|
||||
# Do not edit below here!
|
||||
@@ -51,14 +51,12 @@ EXIF = -DHAVE_EXIF
|
||||
######################################################################
|
||||
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
ifeq ($(origin CC),default)
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
endif
|
||||
|
||||
PKG_CONFIG ?= pkg-config
|
||||
#CFLAGS = -O0 -g -Wall
|
||||
-CFLAGS = -O2 -Wall \
|
||||
- -fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
+#CFLAGS = -O2 -Wall \
|
||||
+# -fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
+# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
+CFLAGS = -Wall
|
||||
#CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
|
||||
# -fcaller-saves -ffast-math -fno-strength-reduce \
|
||||
# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
|
||||
@@ -159,10 +159,6 @@ install: $(PROGRAM)
|
||||
@@ -153,8 +151,8 @@ install: $(PROGRAM)
|
||||
echo install -d -m 0755 $(PREFIX)/man/man1; \
|
||||
install -d -m 0755 $(PREFIX)/man/man1; \
|
||||
fi
|
||||
- install -m 0644 $(PROGRAM).1 $(PREFIX)/share/man/man1
|
||||
- $(COMPRESS_PROG) $(PREFIX)/share/man/man1/$(PROGRAM).1
|
||||
+ install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
|
||||
+ $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
|
||||
@if [ ! -e $(PREFIX)/share/pixmaps ]; then \
|
||||
echo install -d -m 0755 $(PREFIX)/share/pixmaps; \
|
||||
install -d -m 0755 $(PREFIX)/share/pixmaps; \
|
||||
@@ -165,10 +163,6 @@ install: $(PROGRAM)
|
||||
install -d -m 0755 $(PREFIX)/share/applications; \
|
||||
fi
|
||||
install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
|
||||
|
||||
18
graphics/qiv/patches/patch-options_c
Normal file
18
graphics/qiv/patches/patch-options_c
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-options_c,v 1.1 2020/12/31 20:16:54 cwen Exp $
|
||||
|
||||
Fix "implicit conversion from 'int' to 'float' changes value from
|
||||
2147483647 to 2147483648"
|
||||
From https://codeberg.org/ciberandy/qiv/commit/195fe9d5
|
||||
|
||||
Index: options.c
|
||||
--- options.c.orig
|
||||
+++ options.c
|
||||
@@ -395,7 +395,7 @@ void options_read(int argc, char **argv, qiv_image *q)
|
||||
char *fn;
|
||||
int i, p;
|
||||
for (i=0;i<images;i++) { /* simple insertion sort, fine for small num */
|
||||
- p = (int)(((float)rand()/RAND_MAX) * (images-i)) + i;
|
||||
+ p = (int)(((float)rand()/(float)RAND_MAX) * (images-i)) + i;
|
||||
fn = image_names[i];
|
||||
image_names[i] = image_names[p];
|
||||
image_names[p] = fn;
|
||||
@ -1,7 +1,8 @@
|
||||
$OpenBSD: patch-qiv_1,v 1.1 2014/08/23 14:33:07 kirby Exp $
|
||||
--- qiv.1.orig Thu Aug 14 14:33:47 2014
|
||||
+++ qiv.1 Thu Aug 14 14:37:26 2014
|
||||
@@ -307,6 +307,7 @@ changed to this new name and updates its internal file
|
||||
$OpenBSD: patch-qiv_1,v 1.2 2020/12/31 20:16:54 cwen Exp $
|
||||
Index: qiv.1
|
||||
--- qiv.1.orig
|
||||
+++ qiv.1
|
||||
@@ -322,6 +322,7 @@ changed to this new name and updates its internal file
|
||||
This is very useful when using qiv-command to rename files.
|
||||
.P
|
||||
Please also see the example that came together with qiv.
|
||||
|
||||
18
graphics/qiv/patches/patch-utils_c
Normal file
18
graphics/qiv/patches/patch-utils_c
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-utils_c,v 1.5 2020/12/31 20:16:54 cwen Exp $
|
||||
|
||||
Fix "implicit conversion from 'int' to 'float' changes value from
|
||||
2147483647 to 2147483648"
|
||||
From https://codeberg.org/ciberandy/qiv/commit/195fe9d5
|
||||
|
||||
Index: utils.c
|
||||
--- utils.c.orig
|
||||
+++ utils.c
|
||||
@@ -608,7 +608,7 @@ int get_random(int replace, int num, int direction)
|
||||
|
||||
for (n=0;n<num;n++) /* simple insertion sort, fine for num small */
|
||||
{
|
||||
- p=(int)(((float)rand()/RAND_MAX) * (num-n)) + n ; /* n <= p < num */
|
||||
+ p=(int)(((float)rand()/(float)RAND_MAX) * (num-n)) + n ; /* n <= p < num */
|
||||
q=rindices[n];
|
||||
rindices[n]=rindices[p]; /* Switch the two numbers to make random order */
|
||||
rindices[p]=q;
|
||||
Loading…
Reference in New Issue
Block a user