add gcc 3.4 fixlet to qt-2.3.7 (qsortedlist.h needs a this-> before clear())

1 files changed, 35 insertions, 24 deletions

diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch
index 596db2f..c71cf02 100644
--- a/qt/qt-2.3.7.patch/qte237-all.patch
+++ b/qt/qt-2.3.7.patch/qte237-all.patch
@@ -1,13 +1,13 @@
 
 #
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
 --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all	2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qapplication.cpp	2004-04-15 21:06:51.232857014 +0200
++++ qt-2.3.7/src/kernel/qapplication.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -35,6 +35,8 @@
  **
  **********************************************************************/
  
 +#define QT_WEAK_SYMBOL	__attribute__(( weak ))
 +
@@ -85,13 +85,13 @@
 +			    const char* className )
 +{
      bool all = FALSE;
      if ( !className ) {
  	if ( !app_font ) {
 --- qt-2.3.7/src/kernel/qapplication.h~qte237-all	2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qapplication.h	2004-04-15 21:06:51.232857014 +0200
++++ qt-2.3.7/src/kernel/qapplication.h	2004-04-24 17:12:59.000000000 +0200
 @@ -61,6 +61,10 @@
  class QSemaphore;
  #endif
  
 +#if !defined( QT_WEAK_SYMBOL )
 +#define QT_WEAK_SYMBOL
@@ -142,13 +142,13 @@
 +    static void      qwsSetDecoration_NonWeak( QWSDecoration *);
 +public:
  #endif
  #endif
  
 --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all	2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qapplication_qws.cpp	2004-04-15 21:06:51.234856703 +0200
++++ qt-2.3.7/src/kernel/qapplication_qws.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -2804,6 +2804,11 @@
  */
  void QApplication::qwsSetDecoration( QWSDecoration *d )
  {
 +	qwsSetDecoration_NonWeak ( d );
 +}
@@ -156,13 +156,13 @@
 +void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
 +{
      if ( d ) {
  	delete qws_decoration;
  	qws_decoration = d;
 --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all	2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qfontdatabase.cpp	2004-04-15 21:06:51.235856547 +0200
++++ qt-2.3.7/src/kernel/qfontdatabase.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -35,6 +35,8 @@
  **
  **********************************************************************/
  
 +#define QT_WEAK_SYMBOL  __attribute__(( weak ))
 +
@@ -181,13 +181,13 @@
 +                                                 const QString &charSet )
 +{
      QString cs( charSet );
      if ( charSet.isEmpty() ) {
          QStringList lst = charSets( family );
 --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all	2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qfontdatabase.h	2004-04-15 21:06:51.236856392 +0200
++++ qt-2.3.7/src/kernel/qfontdatabase.h	2004-04-24 17:12:59.000000000 +0200
 @@ -59,6 +59,10 @@
  class QDiskFont;
  #endif
  
 +#if !defined( QT_WEAK_SYMBOL )
 +#define QT_WEAK_SYMBOL
@@ -212,24 +212,24 @@
 +				const QString &charSet );
 +public:
      QStringList styles( const QString &family,
  			const QString &charSet = QString::null ) const;
      QStringList charSets( const QString &familyName,
 --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all	2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp	2004-04-15 21:06:51.238856081 +0200
++++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -4237,7 +4237,7 @@
      setAlphaType(IgnoreAlpha);
      if ( w <= 0 || h <= 0 || !ncliprect ) return;
      GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1))
 -#ifdef QWS_EXPERIMENTAL_FASTPATH
 +#if 0 // def QWS_EXPERIMENTAL_FASTPATH    !! this is crashing HancomWord on OZ !!
      // ### fix for 8bpp
      // This seems to be reliable now, at least for 16bpp
  
 --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all	2003-07-17 03:20:26.000000000 +0200
-+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp	2004-04-15 21:06:51.240855770 +0200
++++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -844,6 +844,18 @@
  {
  }
  
 +static void catchSegvSignal( int )
 +{
@@ -252,24 +252,24 @@
      signal(SIGPIPE, ignoreSignal); //we get it when we read
 +    signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
  #endif
      focusw = 0;
      mouseGrabber = 0;
 --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all	2003-07-17 03:20:26.000000000 +0200
-+++ qt-2.3.7/src/widgets/qcommonstyle.cpp	2004-04-15 21:06:51.240855770 +0200
++++ qt-2.3.7/src/widgets/qcommonstyle.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -566,7 +566,7 @@
  				    bool enabled, bool active )
  {
  #ifndef QT_NO_MENUBAR
 -#ifndef QT_NO_STYLE_SGI
 +#if 1 // #ifndef QT_NO_STYLE_SGI
      if (draw_menu_bar_impl != 0) {
  	QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
  	(this->*impl)(p, x, y, w, h, mi, g, enabled, active);
 --- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all	2003-07-17 03:20:26.000000000 +0200
-+++ qt-2.3.7/src/widgets/qlistview.cpp	2004-04-15 21:06:51.243855303 +0200
++++ qt-2.3.7/src/widgets/qlistview.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -4968,9 +4968,9 @@
  	l = l->childItem ? l->childItem : l->siblingItem;
  
      if ( l && l->height() )
 -	s.setHeight( s.height() + 10 * l->height() );
 -    else
@@ -278,13 +278,13 @@
 +    else                      // ^v much too big for handhelds
 +	s.setHeight( s.height() + 30 /*140*/ );
  
      if ( s.width() > s.height() * 3 )
  	s.setHeight( s.width() / 3 );
 --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all	2003-07-17 03:20:27.000000000 +0200
-+++ qt-2.3.7/src/widgets/qtoolbutton.cpp	2004-04-15 21:06:51.243855303 +0200
++++ qt-2.3.7/src/widgets/qtoolbutton.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -230,7 +230,7 @@
  	else
  	    QToolTip::add( this, textLabel );
      }
 -#endif	
 +#endif
@@ -307,159 +307,170 @@
 -	w = h = 16;
 +	w = h = 14;
  	QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
  	w = pm.width();
  	h = pm.height();
 --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all	2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp	2004-04-15 21:06:51.244855148 +0200
++++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -238,7 +238,7 @@
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 63
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 64
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 65
 -    {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 66
 +    {   Qt::Key_F14,    0xffff  , 0xffff  , 0xffff  }, // 66
      {	Qt::Key_Meta,		0xffff  , 0xffff  , 0xffff  }, // 67
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 68
      {	Qt::Key_unknown,	0xffff  , 0xffff  , 0xffff  }, // 69
 --- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all	2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic-g++-shared	2004-04-15 21:06:51.244855148 +0200
++++ qt-2.3.7/configs/linux-generic-g++-shared	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
 --- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all	2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic-g++-shared-debug	2004-04-15 21:06:51.244855148 +0200
++++ qt-2.3.7/configs/linux-generic-g++-shared-debug	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
 --- qt-2.3.7/configs/linux-generic-g++-static~qte237-all	2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic-g++-static	2004-04-15 21:06:51.244855148 +0200
++++ qt-2.3.7/configs/linux-generic-g++-static	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
 --- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all	2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic-g++-static-debug	2004-04-15 21:06:51.245854992 +0200
++++ qt-2.3.7/configs/linux-generic-g++-static-debug	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all	2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared	2004-04-15 21:06:51.245854992 +0200
++++ qt-2.3.7/configs/linux-generic_rtti-g++-shared	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all	2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug	2004-04-15 21:06:51.245854992 +0200
++++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
 --- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all	2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic_rtti-g++-static	2004-04-15 21:06:51.245854992 +0200
++++ qt-2.3.7/configs/linux-generic_rtti-g++-static	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
 --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all	2003-07-17 03:23:08.000000000 +0200
-+++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug	2004-04-15 21:06:51.245854992 +0200
++++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= 
  
 --- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all	2003-07-17 03:23:10.000000000 +0200
-+++ qt-2.3.7/configs/linux-x86rtti-g++-shared	2004-04-15 21:06:51.245854992 +0200
++++ qt-2.3.7/configs/linux-x86rtti-g++-shared	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= -lm
  
 --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all	2003-07-17 03:23:10.000000000 +0200
-+++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug	2004-04-15 21:06:51.245854992 +0200
++++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= -lm
  
 --- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all	2003-07-17 03:23:10.000000000 +0200
-+++ qt-2.3.7/configs/linux-x86rtti-g++-static	2004-04-15 21:06:51.246854837 +0200
++++ qt-2.3.7/configs/linux-x86rtti-g++-static	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= -lm
  
 --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all	2003-07-17 03:23:10.000000000 +0200
-+++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug	2004-04-15 21:06:51.246854837 +0200
++++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug	2004-04-24 17:12:59.000000000 +0200
 @@ -36,7 +36,7 @@
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= gcc
 +SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
  SYSCONF_LIBS		= -lm
  
 --- qt-2.3.7/src/kernel/qimage.cpp~qte237-all	2003-07-17 03:20:25.000000000 +0200
-+++ qt-2.3.7/src/kernel/qimage.cpp	2004-04-15 21:07:23.293869923 +0200
++++ qt-2.3.7/src/kernel/qimage.cpp	2004-04-24 17:12:59.000000000 +0200
 @@ -2201,7 +2201,7 @@
      t2 = srcHeight * dstWidth;
  
      if (((sModeQStr == "ScaleMin") && (t1 > t2)) ||
 -	    ((sModeQStr == "ScaleMax") && (t2 < t2))) {
 +	    ((sModeQStr == "ScaleMax") && (t1 < t2))) {
  	dstHeight = t2 / srcWidth;
      } else if (sModeQStr != "ScaleFree") {
  	dstWidth = t1 / srcHeight;
+--- qt-2.3.7/src/tools/qsortedlist.h~qte237-all	2003-07-17 03:20:26.000000000 +0200
++++ qt-2.3.7/src/tools/qsortedlist.h	2004-04-24 17:13:57.000000000 +0200
+@@ -48,7 +48,7 @@
+ public:
+     QSortedList() {}
+     QSortedList( const QSortedList<type> &l ) : QList<type>(l) {}
+-    ~QSortedList() { clear(); }
++    ~QSortedList() { this->clear(); }
+     QSortedList<type> &operator=(const QSortedList<type> &l)
+       { return (QSortedList<type>&)QList<type>::operator=(l); }
+