Sun Feb 7 19:30:35 2010 UTC ()
Update to 2.2.3.  Another gtk1 user bites the dust.  Changes:

2.2.3
=====

    add 'Q' icon in qiv-window
    bring back scrollwheel functionality
      Zoom in/out with left/right scroll and forward/back buttons
    change loading of images from imlib2_loader to pixbuf_loader. Adds
      support for additional file types, e.g., pcx, ico, svg, wmf and
      better handling of transparency.
    use gdk_pixbuf to autorotate with EXIF tags instead of libexif.
    Resetting the image (pressing return) no longer destroys "transparency
      checkboard"
    Fix compilation issues with unusual linker defaults.  Update solaris
      Makefile.
    new option to start with default rotation

2.2.2
=====

    fix -x (root window needs colormap)
    patch pango code to avoid garbled output of F1
    fix wrong image size after autorotating

2.2.1
=====

    recognize changed files, using --slideshow and --watch
    sanitize infotextdisplay
    check EXIF tags only after successful file loading
    shuffle now implies not to sort filenames
    fix autorotate with EXIF-tag
    avoid crash calling qiv -x without argument
    fix behaviour of "recursivedir" switch
    added note in README and qiv.h explaining a problem of includes with
      imlib2 up to v1.2
    migrated notes in README from imlib1 to imlib2
    migrated gdk_draw_text() to gdk_draw_layout(), fixing wrong display of
      utf-8 filenames

2.2
===

    migration from imlib1 to imlib2

2.1
===

    removed obsoleted GDK_WA_WMCLASS
      see http://library.gnome.org/devel/gdk/2.11/gdk-Windows.html#GdkWindowAttr
      and http://developer.gimp.org/api/2.0/gtk/GtkWindow.html#gtk-window-set-wmclass
    added patch from Debian gtk_includes.diff, closes: #456854
    added patch from Debian cmdbuflen.diff, closes: #441401
    added patch from Debian man_xscreensaver.diff
    remove xscreensaver left overs from Makefiles
    added autorotate patch (using libexif)
    display initial autorotation in status bar, option "autorotate"
    patch to detect image types using libmagic
    added GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK in image.c
    removed TGA and XBM because not supported by imlib anymore
    exit on unmapped mouse events
    browse option -B, useful when launching qiv from a file manager
    patch to prevent segfault on amd64
    avoid wrapper, include "XLIB_SKIP_ARGB_VISUALS=1" in main.c
    include README and README.TODO in debian package
    README.TODO: fvwm style setting has to be for "therealqiv"
    include Debian changes and package files:
      renamed README.CHANGES to Changelog
      added patch hide_therealqiv (for Debian Bug #326849)
      added patch xmalloc (Debian Bug #383113)
      added patch qiv-manpage-options (Debian Bug #383108)
      don't recurse directories given on command line (better: use -u)
      NOT added: no_background_opts (can't reproduce Debian Bug #351816)
      added patch qiv-nosort
      patch to reset bright/contrast/gamma hitting "o" (2006-06-29)
    more comments and examples in qiv-command
    option -X to set preferred xinerama screen
    key "X" cycles through available xinerama screens
    after 'X' window moves to the new screen right away
    prefix "^" instead "0" for extended call of qiv-command
    workaround-patch by Bart Martens
    for problem with X composite extension
    try keep image on the screen after zooming/rotating
    fixed centering=off behaviour in fullscreen mode
    fixed "magnifying glass" windowsize bug
    fixed compiler warnings "differ in signedness"
    fixed compiler warning "missing sentinel in function call"
    bugfix: statusbar is redrawn after size changes and moves
    "magnifying glass" patch (not perfect yet)
    call of qiv-command with "0"-prefixed option
    Added Patch by Christoph Wegscheider <cw@wegi.net> (new QIV Debian maintainer).
    Now all free Keys can be used by qiv-command
    Another Xinerama bugfix (statusbar: now displayed on the smaller screen if two are used)
    new qiv-command feature:
      if first output line is like "NEWNAME=xxxxxxx"
      then qiv understands that the filename of the currently
      displayed image has changed to this new name
      (very useful when using qiv-command to rename files)
    fix image position when zooming to avoid wild jumps
    delete files from list if they cannot be loaded
    display text popup after qiv-command not only in fullscreen mode
    qiv_display_text_window: adjust minimum width of box
    after qiv-command also check file size and ctime
    avoid file overwrites in .qiv-select (NEEDS IMPROVING)
    updated and added more examples to qiv-command
   added small patch by Nick Clifton, setting WM_CLASS name to "qiv"
     (attr.wmclass_name).
   changed a-key/copy to real copy (no links anymore)
   patch-bugfix by Christian Lademann
   adden patch by Christian Lademann
     now slideshow (-s) can also be combine with -x/y/z
   added -F Patch by Martin Fiedler
     now stdin can also be used..
   Xinerama bugfix
   small changes in delete-command

Closes PR pkg/40555.


(snj)
diff -r1.24 -r1.25 pkgsrc/graphics/qiv/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/qiv/PLIST
diff -r1.8 -r1.9 pkgsrc/graphics/qiv/distinfo
diff -r1.6 -r1.7 pkgsrc/graphics/qiv/patches/patch-aa

cvs diff -r1.24 -r1.25 pkgsrc/graphics/qiv/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/qiv/Makefile 2010/01/18 09:59:07 1.24
+++ pkgsrc/graphics/qiv/Makefile 2010/02/07 19:30:35 1.25
@@ -1,26 +1,23 @@ @@ -1,26 +1,23 @@
1# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2010/02/07 19:30:35 snj Exp $
2 2
3DISTNAME= qiv-2.0-src 3DISTNAME= qiv-2.2.3
4PKGNAME= ${DISTNAME:S/-src//} 
5PKGREVISION= 4 
6CATEGORIES= graphics x11 4CATEGORIES= graphics x11
7MASTER_SITES= http://www.klografx.net/qiv/download/ 5MASTER_SITES= http://spiegl.de/qiv/download/
8EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
9 7
10MAINTAINER= snj@NetBSD.org 8MAINTAINER= snj@NetBSD.org
11HOMEPAGE= http://www.klografx.net/qiv/ 9HOMEPAGE= http://spiegl.de/qiv/
12COMMENT= Quick image viewer 10COMMENT= Quick Image Viewer
13 11
14PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
15 13
16PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
17 15
18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 16USE_TOOLS+= gmake pkg-config
19USE_TOOLS+= gmake 
20 17
21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/qiv
22 19
23.include "../../devel/libgetopt/buildlink3.mk" 20.include "../../devel/libgetopt/buildlink3.mk"
24.include "../../graphics/imlib/buildlink3.mk" 21.include "../../graphics/imlib2/buildlink3.mk"
25.include "../../x11/gtk/buildlink3.mk" 22.include "../../x11/gtk2/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1 -r1.2 pkgsrc/graphics/qiv/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/qiv/PLIST 2002/05/20 14:41:56 1.1
+++ pkgsrc/graphics/qiv/PLIST 2010/02/07 19:30:35 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1@comment $NetBSD: PLIST,v 1.1 2002/05/20 14:41:56 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2010/02/07 19:30:35 snj Exp $
2bin/qiv 2bin/qiv
3man/man1/qiv.1 3man/man1/qiv.1
 4share/examples/qiv/qiv-command.example

cvs diff -r1.8 -r1.9 pkgsrc/graphics/qiv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/qiv/distinfo 2009/02/17 01:08:24 1.8
+++ pkgsrc/graphics/qiv/distinfo 2010/02/07 19:30:35 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2009/02/17 01:08:24 snj Exp $ 1$NetBSD: distinfo,v 1.9 2010/02/07 19:30:35 snj Exp $
2 2
3SHA1 (qiv-2.0-src.tgz) = 46eef04c492b9f01d79eab7c2fec78b4edd13550 3SHA1 (qiv-2.2.3.tgz) = 0bf8cc9a7d8bdad6bbe9e6ba970890da902a27c8
4RMD160 (qiv-2.0-src.tgz) = 82b17c20468228258f7c1e7c61588c80e1c40107 4RMD160 (qiv-2.2.3.tgz) = b52168e67e6b8c65c924b4642944aa592f0bb4a0
5Size (qiv-2.0-src.tgz) = 76561 bytes 5Size (qiv-2.2.3.tgz) = 99530 bytes
6SHA1 (patch-aa) = 5d37ccd524079fe29b2c8c295cc1f4d35dc15946 6SHA1 (patch-aa) = 9d45649771d498aafca2c21732a623e24899e961

cvs diff -r1.6 -r1.7 pkgsrc/graphics/qiv/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/qiv/patches/Attic/patch-aa 2009/02/17 01:08:24 1.6
+++ pkgsrc/graphics/qiv/patches/Attic/patch-aa 2010/02/07 19:30:35 1.7
@@ -1,55 +1,61 @@ @@ -1,55 +1,61 @@
1$NetBSD: patch-aa,v 1.6 2009/02/17 01:08:24 snj Exp $ 1$NetBSD: patch-aa,v 1.7 2010/02/07 19:30:35 snj Exp $
2 2
3--- Makefile.orig 2004-05-22 00:21:47.000000000 -0700 3--- Makefile.orig 2010-01-10 13:39:08.000000000 -0800
4+++ Makefile 2004-11-26 14:05:41.000000000 -0800 4+++ Makefile 2010-02-07 11:02:21.000000000 -0800
5@@ -4,7 +4,7 @@ 5@@ -4,7 +4,7 @@
6 ####################################################################### 6 #######################################################################
7  7
8 # Directory where qiv will be installed under. 8 # Directory where qiv will be installed under.
9-PREFIX = /usr/local 9-PREFIX = /usr/local
10+#PREFIX = /usr/local 10+#PREFIX = /usr/local
11  11
12 # Font to use for statusbar in fullscreen mode 12 # Font to use for statusbar in fullscreen mode
13 STATUSBAR_FONT = "fixed" 13 STATUSBAR_FONT = "fixed"
14@@ -57,11 +57,6 @@ SS_RANDOMIZE = -r 14@@ -45,15 +45,6 @@ MAGIC = -DHAVE_MAGIC
15 # Do not edit below here! 15 # Do not edit below here!
16 ###################################################################### 16 ######################################################################
17  17
18-CC = gcc 18-CC = gcc
19-CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ 19-#CFLAGS = -O -g -Wall
 20-CFLAGS = -O2 -Wall \
20- -fcaller-saves -ffast-math -fno-strength-reduce \ 21- -fcaller-saves -ffast-math -fno-strength-reduce \
21- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN 22- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
 23-#CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
 24-# -fcaller-saves -ffast-math -fno-strength-reduce \
 25-# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
22- 26-
23 INCLUDES = `imlib-config --cflags-gdk` 27 INCLUDES := $(shell pkg-config --cflags gdk-2.0 imlib2)
24 LIBS = `imlib-config --libs-gdk` 28 LIBS := $(shell pkg-config --libs gdk-2.0 imlib2) -lX11
25  29
26@@ -96,10 +91,10 @@ SS_PROG = $(PREFIX)/ss-qiv 30@@ -99,10 +90,10 @@ DEFINES_G = $(DEFINES) -DDEBUG
27 all: $(PROGRAM) 31 all: $(PROGRAM)
28  32
29 $(PROGRAM): $(OBJS) 33 $(PROGRAM): $(OBJS)
30- $(CC) $(CFLAGS) $(DEFINES) $(OBJS) $(LIBS) -o $(PROGRAM) 34- $(CC) $(CFLAGS) $(DEFINES) $(OBJS) $(LIBS) -o $(PROGRAM)
31+ $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM) 35+ $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
32  36
33 $(OBJS): %.o: %.c $(HEADERS) 37 $(OBJS): %.o: %.c $(HEADERS)
34- $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ 38- $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
35+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ 39+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
36  40
37 main.o: main.h 41 main.o: main.h
38  42
39@@ -124,14 +119,8 @@ distclean : clean 43@@ -126,14 +117,9 @@ distclean : clean
 44 rm -f $(PROGRAM) $(PROGRAM_G)
40  45
41 install: $(PROGRAM) 46 install: $(PROGRAM)
42 @echo "Installing QIV..." 47- @echo "Installing QIV..."
43- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin 48- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
44- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1 49- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
45- $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1 50- $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
46- @if ./qiv -f ./intro.jpg ; \ 51- @if ./qiv -f ./intro.jpg ; \
47- then echo "-- Test Passed --" ; \ 52- then echo "-- Test Passed --" ; \
48- else echo "-- Test Failed --" ; \ 53- else echo "-- Test Failed --" ; \
49- fi 54- fi
50- @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"  55- @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"
51+ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin 56+ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
52+ $(BSD_INSTALL_DATA) $(PROGRAM).1 $(DESTDIR)$(PREFIX)/man/man1 57+ $(BSD_INSTALL_DATA) $(PROGRAM).1 $(DESTDIR)$(PREFIX)/man/man1
 58+ $(BSD_INSTALL_SCRIPT) qiv-command.example \
 59+ $(DESTDIR)$(PREFIX)/share/examples/qiv
53  60
54 install-xscreensaver: install 61 # the end... ;-)
55 @echo "#!/bin/sh" > $(SS_PROG)