upgrading package: qt 3.2.3 -> 3.3.1

qt/qt.patch

@@ -1,7 +1,7 @@
-diff -Naur qt-x11-free-3.2.3.orig/configure qt-x11-free-3.2.3/configure
---- qt-x11-free-3.2.3.orig/configure	2003-10-21 12:04:20.000000000 +0200
-+++ qt-x11-free-3.2.3/configure	2003-11-19 11:40:38.000000000 +0100
-@@ -1684,21 +1684,6 @@
+diff -Naur qt-x11-free-3.3.1.orig/configure qt-x11-free-3.3.1/configure
+--- qt-x11-free-3.3.1.orig/configure	2004-02-11 11:21:42.000000000 +0100
++++ qt-x11-free-3.3.1/configure	2004-03-03 12:16:46.847102980 +0100
+@@ -1754,21 +1754,6 @@
  	    CFG_FREETYPE=yes
  	fi
      fi
@@ -23,7 +23,7 @@ diff -Naur qt-x11-free-3.2.3.orig/configure qt-x11-free-3.2.3/configure
      # auto-detect Session Management support
      if [ "$CFG_SM" = "auto" ]; then
  	if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
-@@ -2692,6 +2677,21 @@
+@@ -2875,6 +2860,21 @@
      if [ "$CFG_XKB" = "yes" ]; then
          QMAKE_CONFIG="$QMAKE_CONFIG xkb"
      fi
@@ -42,23 +42,23 @@ diff -Naur qt-x11-free-3.2.3.orig/configure qt-x11-free-3.2.3/configure
 +	QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
 +    fi
 +    rm -f $outpath/config.tests/x11/xft.cfg
- fi
- 
- [ '!' -z "$D_FLAGS" ] && QMAKE_VARS="$QMAKE_VARS \"DEFINES+=$D_FLAGS\""
-diff -Naur qt-x11-free-3.2.3.orig/config.tests/x11/xfreetype.test qt-x11-free-3.2.3/config.tests/x11/xfreetype.test
---- qt-x11-free-3.2.3.orig/config.tests/x11/xfreetype.test	Wed Nov 19 11:45:11 2003
-+++ qt-x11-free-3.2.3/config.tests/x11/xfreetype.test	Wed Nov 19 12:59:54 2003
+ elif [ "$PLATFORM_MAC" = "yes" ]; then
+     if [ "$CFG_TABLET" = "yes" ]; then
+ 	QMAKE_CONFIG="$QMAKE_CONFIG tablet"
+diff -Naur qt-x11-free-3.3.1.orig/config.tests/x11/xfreetype.test qt-x11-free-3.3.1/config.tests/x11/xfreetype.test
+--- qt-x11-free-3.3.1.orig/config.tests/x11/xfreetype.test	2004-03-03 10:41:51.522773000 +0100
++++ qt-x11-free-3.3.1/config.tests/x11/xfreetype.test	2004-03-03 10:43:42.588911196 +0100
 @@ -56,7 +56,7 @@
      XFT=no
      [ "$VERBOSE" = "yes" ] && echo "  Could not find Xft lib anywhere in $LIBDIRS"
  fi
 -LIBXFT="-l$F -lfreetype"
 +LIBXFT="-l$F -lfontconfig -lexpat -lfreetype"
-     
+ 
  # check for X11/Xft/Xft.h
  XFT_H=
-@@ -89,7 +89,7 @@
-     [ "$VERBOSE" = "yes" ] && echo "  Found Xft version $XFT_MAJOR.$XFT_MINOR"
+@@ -90,7 +90,7 @@
+     [ "$VERBOSE" = "yes" ] && echo "  Found Xft version $XFT_MAJOR.$XFT_MINOR.$XFT_REVISION"
      if [ "$XFT_MAJOR" = "2" ]; then
          XFT2=yes
 -	LIBXFT="$LIBXFT -lfontconfig"

qt/qt.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        PLUS
 Group:        XWindow
 License:      GPL
-Version:      3.2.3
-Release:      20040207
+Version:      3.3.1
+Release:      20040303
 
 #   package library options (each 'yes' builds more libraries)
 %option       with_shared   no