upgraded to qt 3.0.2 and added a few additions, like QSettings, QUuid

and others

6 files changed, 154 insertions, 67 deletions

diff --git a/x11-libs/tinyqt/files/configure.patch b/x11-libs/tinyqt/files/configure.patch
index 9f681e4e9055..e221c6cf98a8 100644
--- a/x11-libs/tinyqt/files/configure.patch
+++ b/x11-libs/tinyqt/files/configure.patch
@@ -1,39 +1,42 @@
---- configure_orig	2002-02-22 00:23:34.000000000 +0100
-+++ configure	2002-02-22 00:24:28.000000000 +0100
-@@ -994,44 +994,6 @@
- #unix
- unixtests=$relpath/config.tests/unix
+--- configure_orig	2002-02-26 11:28:25.000000000 +0100
++++ configure	2002-02-26 11:42:31.000000000 +0100
+@@ -1053,127 +1053,6 @@
+ # tests that don't need qmake (must be run before displaying help)
+ #-------------------------------------------------------------------------------
  
--# Auto-detect SQL-modules support
+-# unix
+-unixtests=$relpath/config.tests/unix
+-
+-# auto-detect SQL-modules support
 -if echo $MODULES | grep sql >/dev/null
 -then
--    SQL_AVAIL=`find $relpath/plugins/src/sqldrivers/* -prune -type d -print | awk -F/ '{print $NF}'`
--    SQL_AVAIL=`echo $SQL_AVAIL`
+-    CFG_SQL_AVAILABLE=`find $relpath/plugins/src/sqldrivers/* -prune -type d -print | awk -F/ '{print $NF}'`
+-    CFG_SQL_AVAILABLE=`echo $CFG_SQL_AVAILABLE` ### is this really needed???
 -    MYSQL_REQ="-lmysqlclient mysql.h"
 -    OCI_REQ="-lclntsh -lwtc8 oci.h"
 -    PSQL_REQ="-lpq postgres.h libpq/libpq-fs.h catalog/pg_type.h libpq-fe.h"
 -    ODBC_REQ="-lodbc sql.h sqlext.h"
 -    TDS_REQ="-lsybdb sybfront.h sybdb.h"
--    for _SQLDR in $SQL_AVAIL
+-    for _SQLDR in $CFG_SQL_AVAILABLE
 -    do
 -	case $_SQLDR in
 -	mysql)
--	    $unixtests/checkavail "MySQL" $VERBOSE $MYSQL_REQ $L_FLAGS $I_FLAGS && SQL_AUTODETECTED="$SQL_AUTODETECTED mysql"
+-	    $unixtests/checkavail "MySQL" $OPT_VERBOSE $MYSQL_REQ $L_FLAGS $I_FLAGS && CFG_SQL_AUTODETECTED="$CFG_SQL_AUTODETECTED mysql"
 -	;;
 -	psql)
--	    $unixtests/checkavail "PostgreSQL" $VERBOSE $PSQL_REQ $L_FLAGS $I_FLAGS && SQL_AUTODETECTED="$SQL_AUTODETECTED psql"
+-	    $unixtests/checkavail "PostgreSQL" $OPT_VERBOSE $PSQL_REQ $L_FLAGS $I_FLAGS && CFG_SQL_AUTODETECTED="$CFG_SQL_AUTODETECTED psql"
 -	    ;;
 -	odbc)
--	    $unixtests/checkavail "ODBC" $VERBOSE $ODBC_REQ $L_FLAGS $I_FLAGS && SQL_AUTODETECTED="$SQL_AUTODETECTED odbc"
+-	    $unixtests/checkavail "ODBC" $OPT_VERBOSE $ODBC_REQ $L_FLAGS $I_FLAGS && CFG_SQL_AUTODETECTED="$CFG_SQL_AUTODETECTED odbc"
 -	    ;;
 -	oci)
--	    $unixtests/checkavail "OCI" $VERBOSE $OCI_REQ $L_FLAGS $I_FLAGS && SQL_AUTODETECTED="$SQL_AUTODETECTED oci"
+-	    $unixtests/checkavail "OCI" $OPT_VERBOSE $OCI_REQ $L_FLAGS $I_FLAGS && CFG_SQL_AUTODETECTED="$CFG_SQL_AUTODETECTED oci"
 -	    ;;
 -	tds)
--	    $unixtests/checkavail "TDS" $VERBOSE $TDS_REQ $L_FLAGS $I_FLAGS && SQL_AUTODETECTED="$SQL_AUTODETECTED tds"
+-	    $unixtests/checkavail "TDS" $OPT_VERBOSE $TDS_REQ $L_FLAGS $I_FLAGS && CFG_SQL_AUTODETECTED="$CFG_SQL_AUTODETECTED tds"
 -	    ;;
 -	*)
--	    if [ "x$VERBOSE" = "xyes" ]
+-	    if [ "$OPT_VERBOSE" = "yes" ]
 -	    then
 -		echo "unknown SQL driver: $_SQLDR"
 -	    fi
@@ -42,24 +45,103 @@
 -    done
 -fi
 -
- #x11
- if [ "$X11_PLATFORM" = "yes" ]
- then
-@@ -1396,7 +1358,7 @@
+-# auto-detect NIS support
+-    if [ "$CFG_NIS" != "no" ]
+-    then
+-	CFG_NIS=yes
+-	$unixtests/nis.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS && CFG_NIS=no
+-    else
+-	CFG_NIS=no
+-    fi
+-
+-# x11
+-if [ "$X11_PLATFORM" = "yes" ]
+-then
+-    x11tests=$relpath/config.tests/x11
+-
+-    # auto-detect OpenGL support
+-    if echo $MODULES | grep opengl >/dev/null
+-    then
+-	$x11tests/opengl.test $XQMAKESPEC $CFG_THREAD $OPT_VERBOSE $L_FLAGS $I_FLAGS && MODULES=`echo $MODULES | sed -e 's/opengl//'`
+-    fi
+-    # auto-detect XRender support
+-    if [ "$CFG_XRENDER" != "no" ]
+-    then
+-	CFG_XRENDER=yes
+-	$x11tests/xrender.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS && CFG_XRENDER=no && CFG_FREETYPE=no
+-    else
+-	CFG_FREETYPE=no
+-    fi
+-    # auto-detect XftFreeType support
+-    if [ "$CFG_XRENDER" = "yes" ] && [ "$CFG_FREETYPE" != "no" ]
+-    then
+-	CFG_FREETYPE=yes
+-	$x11tests/xfreetype.test $XQMAKESPEC $OPT_VERBOSE $x11tests $L_FLAGS $I_FLAGS && CFG_FREETYPE=no
+-    fi
+-    # add freetype2 include path
+-    if [ "$CFG_FREETYPE" = "yes" ] && [ -f $x11tests/xfreetype.inc ]
+-    then
+-	QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $x11tests/xfreetype.inc`\""
+-    fi
+-    rm -f $x11tests/xfreetype.inc
+-    # add XftFreetype specific config options
+-    if [ "$CFG_FREETYPE" = "yes" ] && [ -f $x11tests/xfreetype.cfg ]
+-    then
+-	QMAKE_CONFIG="$QMAKE_CONFIG `cat $x11tests/xfreetype.cfg`"
+-    fi
+-    rm -f $x11tests/xfreetype.cfg
+-    # auto-detect Session Management support
+-    if [ "$CFG_SM" = "auto" ]
+-    then
+-	CFG_SM=yes
+-	$x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS && SM=no
+-    fi
+-    # auto-detect Xinerama support
+-    if [ "$CFG_XINERAMA" != "no" ]
+-    then
+-	CFG_XINERAMA=yes
+-	$x11tests/xinerama.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS && CFG_XINERAMA=no
+-    fi
+-    # auto-detect tablet support (currenlty only in IRIX)
+-    if [ "$CFG_TABLET" = "auto" ]
+-    then
+-	case $PLATFORM in
+-	irix-*)
+-	    CFG_TABLET=yes
+-	    $x11tests/xinput.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS && CFG_TABLET=no
+-	    ;;
+-	*)
+-	    CFG_TABLET=no
+-	    ### add error message for the "yes" case on non-IRIX systems
+-	    ;;
+-	esac
+-    fi
+-    # auto-detect XKB support
+-    if [ "$CFG_XKB" != "no" ]
+-    then
+-	CFG_XKB=yes
+-	$x11tests/xkb.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS && CFG_XKB=no
+-    fi
+-fi
+-
+-
+ #-------------------------------------------------------------------------------
+ # help - interactive parts of the script _after_ this section please
+ #-------------------------------------------------------------------------------
+@@ -1487,7 +1366,7 @@
  	echo "Type 'no' to decline this license offer."
  	echo
- 	echo "Do you accept the terms of $QWS_EITHER license?"
+ 	echo "Do you accept the terms of $affix license?"
 -	read acceptance
 +	acceptance=yes
- 	if [ "$acceptance" = yes ]
+ 	if [ "$acceptance" = "yes" ]
  	then
  	    break
-@@ -1544,6 +1506,8 @@
-     QMAKE_VARS="$QMAKE_VARS  \"QMAKE_CXXFLAGS+=-fpermissive\""
+@@ -1662,6 +1541,7 @@
+     (cd $outpath/qmake; $MAKE || (echo "QMake failed to build. Aborting." && exit 2)) || exit 2
  fi
  
 +exit 0
-+
- # STL must be way down here after qmake has been made, because the test itself uses qmake
  
- if [ $PLATFORM = "hpux-acc" -a $STL != no ]
+ #-------------------------------------------------------------------------------
+ # tests that need qmake
diff --git a/x11-libs/tinyqt/files/digest-tinyqt-3.0.1 b/x11-libs/tinyqt/files/digest-tinyqt-3.0.1
deleted file mode 100644
index 2f3afacc4dc5..000000000000
--- a/x11-libs/tinyqt/files/digest-tinyqt-3.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf9afb61d08396c7ca9a290fc7567e92 qt-x11-free-3.0.1.tar.gz 17818374
diff --git a/x11-libs/tinyqt/files/digest-tinyqt-3.0.2 b/x11-libs/tinyqt/files/digest-tinyqt-3.0.2
new file mode 100644
index 000000000000..867ff4ee2ac1
--- /dev/null
+++ b/x11-libs/tinyqt/files/digest-tinyqt-3.0.2
@@ -0,0 +1 @@
+MD5 dc9ca180bce53018288ca75d99968bad qt-x11-free-3.0.2.tar.gz 15083583
diff --git a/x11-libs/tinyqt/files/tinyqt/qconfig.h b/x11-libs/tinyqt/files/tinyqt/qconfig.h
index 67c2311cd6bc..e42b93852cad 100644
--- a/x11-libs/tinyqt/files/tinyqt/qconfig.h
+++ b/x11-libs/tinyqt/files/tinyqt/qconfig.h
@@ -10,9 +10,9 @@
 
 
 #define QT_NO_ACTION
-#ifndef QT_NO_TEXTCODEC // moc?
-#define QT_NO_TEXTCODEC
-#endif
+//#ifndef QT_NO_TEXTCODEC // moc?
+//#define QT_NO_TEXTCODEC
+//#endif
 #define QT_NO_UNICODETABLES
 #define QT_NO_IMAGEIO_BMP
 #define QT_NO_IMAGEIO_PPM
@@ -24,10 +24,10 @@
 #define QT_NO_FREETYPE //done by configure -no-freetype
 #define QT_NO_BDF
 #define QT_NO_FONTDATABASE
-#define QT_NO_TRANSLATION
+//#define QT_NO_TRANSLATION
 #define QT_NO_MIME
 #define QT_NO_SOUND
-#define QT_NO_PROPERTIES
+//#define QT_NO_PROPERTIES
 
 #define QT_NO_QWS_GFX_SPEED
 #define QT_NO_NETWORK //??????????????
diff --git a/x11-libs/tinyqt/files/tinyqt/tinyqt.pro b/x11-libs/tinyqt/files/tinyqt/tinyqt.pro
index 5369336b866f..947b14246bd1 100644
--- a/x11-libs/tinyqt/files/tinyqt/tinyqt.pro
+++ b/x11-libs/tinyqt/files/tinyqt/tinyqt.pro
@@ -1,41 +1,47 @@
 TEMPLATE	= lib
 CONFIG = console release staticlib
-VERSION		= 3.0.1
+VERSION		= 3.0.2
 DEFINES		= QT_NO_CODECS QT_LITE_UNICODE QT_NO_STL
 INCLUDEPATH	= $(QTDIR)/include ../tools ../xml ../kernel .
 DEPENDPATH	= $(QTDIR)/include ../tools ../xml ../kernel .
 LIBS		=
 DESTDIR		= ../../lib
 OBJECTS_DIR	= .
-SOURCES		= ../tools/qbuffer.cpp	\
-    ../tools/qptrcollection.cpp		\
-    ../tools/qcstring.cpp			\
-    ../tools/qdatastream.cpp		\
-    ../tools/qdatetime.cpp			\
-    ../tools/qdir.cpp				\
-    ../tools/qfile.cpp				\
-    ../tools/qfileinfo.cpp			\
-    ../tools/qgarray.cpp			\
-    ../tools/qgdict.cpp				\
-    ../tools/qglist.cpp				\
-    ../tools/qglobal.cpp			\
-    ../tools/qgvector.cpp			\
-    ../tools/qiodevice.cpp			\
-    ../tools/qregexp.cpp			\
-    ../tools/qstring.cpp			\
-    ../tools/qstringlist.cpp		\
-    ../tools/qtextstream.cpp		\
-    ../tools/qbitarray.cpp			\
-    ../tools/qmap.cpp				\
-    ../tools/qgcache.cpp			\
-    ../codecs/qtextcodec.cpp		\
-    ../codecs/qutfcodec.cpp			\
-    ../tools/qfile_unix.cpp			\
-    ../tools/qfileinfo_unix.cpp		\
-    ../tools/qdir_unix.cpp			\
-	../xml/qdom.cpp					\
-	../xml/qxml.cpp					\
-	../kernel/qurl.cpp				\
+SOURCES		=  ../tools/qbitarray.cpp	\
+	../tools/qbuffer.cpp				\
+    ../tools/qcstring.cpp				\
+    ../tools/qdatastream.cpp			\
+    ../tools/qdatetime.cpp				\
+    ../tools/qdir.cpp					\
+    ../tools/qdir_unix.cpp				\
+    ../tools/qfile.cpp					\
+    ../tools/qfile_unix.cpp				\
+    ../tools/qfileinfo.cpp				\
+    ../tools/qfileinfo_unix.cpp			\
+    ../tools/qgarray.cpp				\
+    ../tools/qgcache.cpp				\
+    ../tools/qgdict.cpp					\
+    ../tools/qglist.cpp					\
+    ../tools/qglobal.cpp				\
+	../tools/qgpluginmanager.cpp		\
+    ../tools/qgvector.cpp				\
+    ../tools/qiodevice.cpp				\
+    ../tools/qlibrary.cpp				\
+    ../tools/qlibrary_unix.cpp			\
+    ../tools/qmap.cpp					\
+    ../tools/qptrcollection.cpp			\
+    ../tools/qregexp.cpp				\
+    ../tools/qsettings.cpp				\
+    ../tools/qsettings_unix.cpp			\
+    ../tools/qstring.cpp				\
+    ../tools/qstringlist.cpp			\
+    ../tools/qtextstream.cpp			\
+    ../tools/quuid.cpp					\
+    ../codecs/qtextcodec.cpp			\
+    ../codecs/qutfcodec.cpp				\
+	../xml/qdom.cpp						\
+	../xml/qxml.cpp						\
+	../kernel/qurl.cpp					\
 	../kernel/qurlinfo.cpp
 
 TARGET		= tinyqt
diff --git a/x11-libs/tinyqt/tinyqt-3.0.1.ebuild b/x11-libs/tinyqt/tinyqt-3.0.2.ebuild
index 77888be82122..9d89383d59a7 100644
--- a/x11-libs/tinyqt/tinyqt-3.0.1.ebuild
+++ b/x11-libs/tinyqt/tinyqt-3.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Geert Bevin <gbevin@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/tinyqt/tinyqt-3.0.1.ebuild,v 1.4 2002/02/22 20:31:41 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/tinyqt/tinyqt-3.0.2.ebuild,v 1.1 2002/02/26 10:45:09 gbevin Exp $
 
 P=qt-x11-${PV}
 S=${WORKDIR}/qt-x11-free-${PV}
@@ -24,7 +24,7 @@ src_unpack() {
     unpack ${A}
 
     cd ${S}
-	patch -p0 < ${FILESDIR}/configure.patch
+	patch -p0 < ${FILESDIR}/configure.patch || die
 	cp -a ${FILESDIR}/tinyqt ${S}/src
 	
 	mv src/kernel/qurl.cpp src/kernel/qurl.cpp_orig
@@ -62,11 +62,10 @@ src_install() {
     dobin bin/*
 
     # libraries
-#	strip lib/libtinyqt.a
     dolib lib/libtinyqt.a
-    dolib lib/libtinyqt.so.3.0.1
+    dolib lib/libtinyqt.so.${PV}
     cd ${D}$QTBASE/lib
-    ln -s libtinyqt.so.3.0.1 libtinyqt.so.3.0
+    ln -s libtinyqt.so.${PV} libtinyqt.so.3.0
     ln -s libtinyqt.so.3.0 libtinyqt.so.3
     ln -s libtinyqt.so.3 libtinyqt.so