pkg/40555: qiv don't work with xorg 7.3 from pkgsrc

[Dima Veselov <kab00m%lich.phys.spbu.ru@localhost>]

>Number:         40555
>Category:       pkg
>Synopsis:       qiv should work on pkgsrc Xorg, recent version does
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Feb 05 01:10:00 +0000 2009
>Originator:     Dima Veselov
>Release:        NetBSD 5.99.7
>Organization:
Sincerelly yours
>Environment:
        
        
System: NetBSD laura.aero.ru 5.99.7 NetBSD 5.99.7 (XEN3_DOM0) #0: Sat Jan 24 
00:09:05 PST 2009 
builds@wb28:/home/builds/ab/HEAD/amd64/200901240002Z-obj/home/builds/ab/HEAD/src/sys/arch/amd64/compile/XEN3_DOM0
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        Qiv is not working on recent Xorg, failing with:
qiv: Your root window's visual is not the visual Imlib chose;
     qiv cannot set the background currently.

Recent version has this fixed. I've tested this on one x86_64, but it seems not 
so much changed prior to new version, so it should work.

>How-To-Repeat:
        Run qiv on xorg-modular, built from recent pkgsrc.
>Fix:

Don't know how to post patches, so posting diff -r -U 3

diff -r -U 3 qiv.orig/Makefile qiv/Makefile
--- qiv.orig/Makefile   2009-02-05 03:24:06.000000000 +0300
+++ qiv/Makefile        2009-02-05 03:52:04.000000000 +0300
@@ -1,8 +1,6 @@
 # $NetBSD: Makefile,v 1.20 2006/04/17 13:46:35 wiz Exp $
 
-DISTNAME=      qiv-2.0-src
-PKGNAME=       ${DISTNAME:S/-src//}
-PKGREVISION=   2
+DISTNAME=      qiv-2.1-pre12
 CATEGORIES=    graphics x11
 MASTER_SITES=  http://www.klografx.net/qiv/download/
 EXTRACT_SUFX=  .tgz
diff -r -U 3 qiv.orig/distinfo qiv/distinfo
--- qiv.orig/distinfo   2009-02-05 03:24:06.000000000 +0300
+++ qiv/distinfo        2009-02-05 03:47:13.000000000 +0300
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.6 2004/11/26 22:18:27 snj Exp $
 
-SHA1 (qiv-2.0-src.tgz) = 46eef04c492b9f01d79eab7c2fec78b4edd13550
-RMD160 (qiv-2.0-src.tgz) = 82b17c20468228258f7c1e7c61588c80e1c40107
-Size (qiv-2.0-src.tgz) = 76561 bytes
-SHA1 (patch-aa) = bcf9b2b335db8235e46ec4a85df32cf945b185b5
+SHA1 (qiv-2.1-pre12.tgz) = 39b629cd0adef844238001f2685a8a7bfc7ae304
+RMD160 (qiv-2.1-pre12.tgz) = 0355989430b53a74ec29d2f46376254b70c58fe5
+Size (qiv-2.1-pre12.tgz) = 94059 bytes
+SHA1 (patch-aa) = cc6c4dfd433a51d60565be53833bef37aceaeef2
diff -r -U 3 qiv.orig/patches/patch-aa qiv/patches/patch-aa
--- qiv.orig/patches/patch-aa   2009-02-05 03:24:06.000000000 +0300
+++ qiv/patches/patch-aa        2009-02-05 03:47:01.000000000 +0300
@@ -1,29 +1,37 @@
 $NetBSD$
 
---- Makefile.orig      2004-05-22 00:21:47.000000000 -0700
-+++ Makefile   2004-11-26 14:05:41.000000000 -0800
+--- Makefile.orig      2007-04-25 04:52:39.000000000 +0400
++++ Makefile   2009-02-05 03:46:32.000000000 +0300
 @@ -4,7 +4,7 @@
  #######################################################################
  
  # Directory where qiv will be installed under.
 -PREFIX = /usr/local
-+#PREFIX = /usr/local
++# PREFIX = /usr/local
  
  # Font to use for statusbar in fullscreen mode
  STATUSBAR_FONT = "fixed"
-@@ -57,11 +57,6 @@ SS_RANDOMIZE = -r
+@@ -32,7 +32,7 @@
+ 
+ # Comment this line out if your system doesn't have libXinerama
+ # installed (for centering on dual-screen)
+-GTD_XINERAMA = -DGTD_XINERAMA
++#GTD_XINERAMA = -DGTD_XINERAMA
+ 
+ ######################################################################
+ 
+@@ -57,10 +57,6 @@
  # Do not edit below here!
  ######################################################################
  
 -CC        = gcc
--CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
+-CFLAGS    = -O2 -Wall \
 -          -fcaller-saves -ffast-math -fno-strength-reduce \
 -          -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
--
- INCLUDES  = `imlib-config --cflags-gdk`
- LIBS      = `imlib-config --libs-gdk`
- 
-@@ -96,10 +91,10 @@ SS_PROG   = $(PREFIX)/ss-qiv
+ #CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
+ #         -fcaller-saves -ffast-math -fno-strength-reduce \
+ #         -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
+@@ -106,10 +102,10 @@
  all: $(PROGRAM)
  
  $(PROGRAM): $(OBJS)
@@ -36,7 +44,7 @@
  
  main.o: main.h
  
-@@ -124,14 +119,8 @@ distclean : clean
+@@ -134,14 +130,8 @@
  
  install: $(PROGRAM)
        @echo "Installing QIV..."

-- 
Sincerelly yours

>Unformatted: