pkg/32130: Psi doesn"t compile with qt-3.3.5

[zul%netbsd-fr.org@localhost]

>Number:         32130
>Category:       pkg
>Synopsis:       Psi doesn"t compile with qt-3.3.5
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 20 14:15:00 +0000 2005
>Originator:     zul
>Release:        current
>Organization:
>Environment:
NetBSD Hermes.at.home 3.99.11 NetBSD 3.99.11 (HERMES) #0: Fri Nov 18 22:15:07 
CET 2005  
zul%Hermes.at.home@localhost:/usr/build_tmp/objdir/sys/arch/i386/compile/HERMES 
i386

>Description:
The compilation of psi-0.9.3nb1 fails with the last qt-3.3.5. It here fails 
with the failed assertion following.

c++ -c -O2 -march=pentium4 -mfpmath=sse,387 -mmmx -msse2 -pipe -funroll-loops 
-ftracer -O2 -I/usr/pkgsrc/chat/psi/work/.buildlink/include 
-I/usr/pkg/qt3/include -DGLX_GLXEXT_LEGACY 
-I/usr/pkgsrc/chat/psi/work/.buildlink/include/freetype2 
-I/usr/pkgsrc/chat/psi/work/.x11-buildlink/include -march=pentium4 
-mfpmath=sse,387 -mmmx -msse2 -pipe -funroll-loops -ftracer -O2 
-DQ_TRAILING_DIR_SEP -g -D_REENTRANT -DHAVE_CONFIG -DXMPP_TEST 
-DQT_THREAD_SUPPORT -I/usr/pkg/qt3/mkspecs/netbsd-g++ -I. 
-I../../../../../../pkg/include -I../cutestuff/util -I../cutestuff/network 
-I../cutestuff/trayicon -I../cutestuff/idle -I../cutestuff/zip 
-I../cutestuff/dirwatch -I../cutestuff/openpgp -I../iris/include 
-I../iris/xmpp-core -I../iris/xmpp-im -I../iris/jabber -I../libpsi/iconset 
-I../libpsi/psiwidgets -I../libpsi/psipng -I../../../../../../X11R6/include 
-I.ui/ -Ioptions -I.moc/ .ui/ui_about.cpp  -fPIC -DPIC -o .obj/.libs/ui_about.o
.ui/ui_about.cpp:29:22: urllabel.h: No such file or directory
gmake[1]: *** [.obj/ui_about.o] Error 1
gmake[1]: Leaving directory `/usr/pkgsrc/chat/psi/work/psi-0.9.3/src'
gmake: *** [sub-src] Error 2
*** Error code 2

It seems to be a uic bug, see 
http://www.trolltech.com/developer/tasktracker.html?id=85440&method=entry. I 
apply the solution written in this document.
>How-To-Repeat:
cd /usr/pkgsrc/chat/psi && make ( with qt-3.3.5 installed )
>Fix:
The following patches solve the problem

$NetBSD$

--- src/options/opt_appearance-ui.ui.orig       2005-11-20 15:10:01.000000000 
+0100
+++ src/options/opt_appearance-ui.ui
@@ -458,9 +458,5 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>fontlabel.h</includehint>
-    <includehint>fontlabel.h</includehint>
-    <includehint>fontlabel.h</includehint>
-    <includehint>fontlabel.h</includehint>
 </includehints>
 </UI>

$NetBSD$

--- src/ui_about.ui.orig        2005-11-20 15:10:31.000000000 +0100
+++ src/ui_about.ui
@@ -333,11 +333,5 @@ Now that this is out of the way, enjoy P
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>fancylabel.h</includehint>
-    <includehint>urllabel.h</includehint>
-    <includehint>psitextview.h</includehint>
-    <includehint>psitextview.h</includehint>
-    <includehint>psitextview.h</includehint>
-    <includehint>iconwidget.h</includehint>
 </includehints>
 </UI>

$NetBSD$

--- src/ui_profilenew.ui.orig   2005-11-20 15:11:05.000000000 +0100
+++ src/ui_profilenew.ui
@@ -244,7 +244,5 @@ Check the &lt;i&gt;Enable Emoticons&lt;/
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>iconwidget.h</includehint>
-    <includehint>iconwidget.h</includehint>
 </includehints>
 </UI>