From 5f024a8c505f539d6f1f75d74c0041d3ecbfc1ab Mon Sep 17 00:00:00 2001 From: kili Date: Thu, 20 Aug 2009 18:58:39 +0000 Subject: [PATCH] Update to 2.2.2. testing, tweaks and ok bernd@ --- graphics/qiv/Makefile | 27 +++++++++++++++---------- graphics/qiv/distinfo | 10 +++++----- graphics/qiv/patches/patch-Makefile | 31 ++++++++++++++++++----------- graphics/qiv/patches/patch-utils_c | 8 ++++---- graphics/qiv/pkg/PLIST | 4 ++-- 5 files changed, 46 insertions(+), 34 deletions(-) diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile index 00e4d413ccc..9918c81da01 100644 --- a/graphics/qiv/Makefile +++ b/graphics/qiv/Makefile @@ -1,27 +1,32 @@ -# $OpenBSD: Makefile,v 1.13 2009/08/10 06:31:45 kili Exp $ +# $OpenBSD: Makefile,v 1.14 2009/08/20 18:58:39 kili Exp $ COMMENT= very small and pretty fast gdk/Imlib image viewer -DISTNAME= qiv-2.0 -PKGNAME= ${DISTNAME}p0 +DISTNAME= qiv-2.2.2 CATEGORIES= graphics -EXTRACT_SUFX= -src.tgz +EXTRACT_SUFX= .tgz -HOMEPAGE= http://www.klografx.net/qiv/ +HOMEPAGE= http://spiegl.de/qiv/ -MASTER_SITES= http://www.klografx.net/qiv/download/ +MASTER_SITES= ${HOMEPAGE}download/ -LIB_DEPENDS= gdk_imlib.>=19::graphics/imlib +LIB_DEPENDS= magic::devel/libmagic \ + Imlib2::graphics/imlib2 \ + exif::graphics/libexif \ + gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext Xi c gdk glib gmodule gtk iconv intl \ - jpeg m png pthread-stubs tiff ungif xcb z - +WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ + Xext Xfixes Xi Xinerama Xrandr Xrender c \ + cairo expat fontconfig freetype gio-2.0 \ + glib-2.0 glitz gmodule-2.0 gobject-2.0 iconv \ + intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ + pixman-1 png pthread-stubs xcb z USE_GMAKE= Yes USE_X11= Yes NO_REGRESS= Yes diff --git a/graphics/qiv/distinfo b/graphics/qiv/distinfo index 2c46dbcfed3..adecaa41196 100644 --- a/graphics/qiv/distinfo +++ b/graphics/qiv/distinfo @@ -1,5 +1,5 @@ -MD5 (qiv-2.0-src.tgz) = Fl0MLyZHGIIflHMhlrf54Q== -RMD160 (qiv-2.0-src.tgz) = grF8IEaCKCWPfB58YViMgOHEAQc= -SHA1 (qiv-2.0-src.tgz) = Ru7wTEkrnwHXnqt8L+x4tO3RNVA= -SHA256 (qiv-2.0-src.tgz) = LwwD7n55ySEPBgyH1RgR5FQPEm2MPXUbMaq2kWCz0JE= -SIZE (qiv-2.0-src.tgz) = 76561 +MD5 (qiv-2.2.2.tgz) = 5BMQXJFTIu7qblgtm5tPLw== +RMD160 (qiv-2.2.2.tgz) = uIdQBnq++XHCEKVcUHcwCHQCpKs= +SHA1 (qiv-2.2.2.tgz) = SJdyMDuvhEaefbIND9Lbu1bvG9Y= +SHA256 (qiv-2.2.2.tgz) = wyyMwqAMpazeARaDPnx3ZUVoehImbRVhf3vcixvaLe8= +SIZE (qiv-2.2.2.tgz) = 99044 diff --git a/graphics/qiv/patches/patch-Makefile b/graphics/qiv/patches/patch-Makefile index 66fb03ec8c6..143b3d6ba67 100644 --- a/graphics/qiv/patches/patch-Makefile +++ b/graphics/qiv/patches/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat May 22 09:21:47 2004 -+++ Makefile Sat Feb 5 17:25:47 2005 +--- Makefile.orig Sun May 31 03:35:42 2009 ++++ Makefile Tue Jul 14 18:44:12 2009 @@ -3,9 +3,6 @@ # User Options ####################################################################### @@ -10,28 +10,35 @@ # Font to use for statusbar in fullscreen mode STATUSBAR_FONT = "fixed" -@@ -57,11 +54,6 @@ SS_RANDOMIZE = -r +@@ -49,15 +46,6 @@ MAGIC = -DHAVE_MAGIC # Do not edit below here! ###################################################################### -CC = gcc --CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ +-#CFLAGS = -O -g -Wall +-CFLAGS = -O2 -Wall \ - -fcaller-saves -ffast-math -fno-strength-reduce \ - -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN +-#CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ +-# -fcaller-saves -ffast-math -fno-strength-reduce \ +-# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN - - INCLUDES = `imlib-config --cflags-gdk` - LIBS = `imlib-config --libs-gdk` + INCLUDES := $(shell pkg-config --cflags gdk-2.0 imlib2) + LIBS := $(shell pkg-config --libs gdk-2.0 imlib2) -@@ -126,12 +118,6 @@ install: $(PROGRAM) +@@ -136,13 +124,7 @@ distclean : clean + + install: $(PROGRAM) @echo "Installing QIV..." - install -s -m 0755 $(PROGRAM) $(PREFIX)/bin - install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1 +- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin +- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1 - $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1 - @if ./qiv -f ./intro.jpg ; \ - then echo "-- Test Passed --" ; \ - else echo "-- Test Failed --" ; \ - fi -- @echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n" +- @echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n" ++ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin ++ $(BSD_INSTALL_MAN) $(PROGRAM).1 $(PREFIX)/man/man1 - install-xscreensaver: install - @echo "#!/bin/sh" > $(SS_PROG) + # the end... ;-) diff --git a/graphics/qiv/patches/patch-utils_c b/graphics/qiv/patches/patch-utils_c index 219f22a44d5..b87ec4d5af0 100644 --- a/graphics/qiv/patches/patch-utils_c +++ b/graphics/qiv/patches/patch-utils_c @@ -1,10 +1,10 @@ ---- utils.c.orig Sat May 22 09:24:23 2004 -+++ utils.c Sat Feb 5 17:25:47 2005 -@@ -272,7 +272,7 @@ void run_command(qiv_image *q, int n, ch +--- utils.c.orig Tue May 26 18:56:25 2009 ++++ utils.c Tue Jul 14 18:31:22 2009 +@@ -276,7 +276,7 @@ void run_command(qiv_image *q, char *n, char *filename dup2(pipe_stdout[1], 2); close(pipe_stdout[1]); -- execlp("qiv-command", "qiv-command", nr, filename, 0); +- execlp("qiv-command", "qiv-command", nr, filename, NULL); + execlp("qiv-command", "qiv-command", nr, filename, (void *)NULL); perror("Error calling qiv-command"); abort(); diff --git a/graphics/qiv/pkg/PLIST b/graphics/qiv/pkg/PLIST index 456e5529be8..a8a6eb17735 100644 --- a/graphics/qiv/pkg/PLIST +++ b/graphics/qiv/pkg/PLIST @@ -1,3 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:50:10 espie Exp $ -bin/qiv +@comment $OpenBSD: PLIST,v 1.3 2009/08/20 18:58:39 kili Exp $ +@bin bin/qiv @man man/man1/qiv.1