RHEL/Fedora: updates TQT3

4 files changed, 34 insertions, 31 deletions

diff --git a/redhat/dependencies/tqt3/0084-compositing-properties.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-compositing-properties.patch
index 368b6c267..8edfd996f 100644
--- a/redhat/dependencies/tqt3/0084-compositing-properties.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-compositing-properties.patch
@@ -15,8 +15,8 @@ so they can be used when compositing.
  				 &wsa );
 -	x11SetWindowType();
 +	XClassHint class_hint;
-+	class_hint.res_name = (char *) qAppName(); // application name
-+	class_hint.res_class = (char *) qAppClass();	// application class
++	class_hint.res_name = (char *) tqAppName(); // application name
++	class_hint.res_class = (char *) tqAppClass();	// application class
 +        XSetClassHint( dpy, id, &class_hint );
      } else if ( topLevel && !desktop ) {	// top-level widget
  	QWidget *p = parentWidget();	// real parent
@@ -42,7 +42,7 @@ so they can be used when compositing.
  #ifndef QT_NO_XSYNC
          // set _NET_WM_SYNC_COUNTER
          createSyncCounter();
-@@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i
+@@ -729,19 +725,31 @@ void QWidget::create( WId window, bool i
  	// when we create a toplevel widget, the frame strut should be dirty
  	fstrut_dirty = 1;
  
@@ -62,8 +62,8 @@ so they can be used when compositing.
 +
  	// declare the widget's object name as window role
  	XChangeProperty( dpy, id,
- 			 qt_window_role, XA_STRING, 8, PropModeReplace,
- 			 (unsigned char *)name(), qstrlen( name() ) );
+ 			 tqt_window_role, XA_STRING, 8, PropModeReplace,
+ 			 (unsigned char *)name(), tqstrlen( name() ) );
  
  	// set client leader property
 +	if ( !qt_x11_wm_client_leader )
diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch
index ccfd411ff..e50277e1a 100644
--- a/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch
@@ -5,7 +5,7 @@
  			     (const char*) TQFile::encodeName( old->library() ) );
  		} else {
 +/*
- 		    qWarning("%s: Feature %s already defined in %s!",
+ 		    tqWarning("%s: Feature %s already defined in %s!",
  			     (const char*) TQFile::encodeName( old->library() ),
  			     (*f).latin1(),
  			     (const char*) TQFile::encodeName( plugin->library() ) );
diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch
index cb6080ab5..101838fad 100644
--- a/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch
@@ -3,10 +3,10 @@
 @@ -394,8 +394,8 @@
  {
  #if defined(QT_CHECK_STATE)
-     if ( qApp->type() == TQApplication::Tty ) {
--	qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI "
+     if ( tqApp->type() == TQApplication::Tty ) {
+-	tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI "
 -		  "is being used" );
-+//	qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI "
++//	tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI "
 +//		  "is being used" );
      }
  #endif
diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0.spec b/redhat/dependencies/tqt3/tqt3-3.4.0.spec
index f2530f3b4..2a9beed91 100644
--- a/redhat/dependencies/tqt3/tqt3-3.4.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0.spec
@@ -13,8 +13,6 @@
 #  qt-devel
 # ...maybe others !!!!
 
-%define _default_patch_fuzz 2
-
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.4.0
 Release: 1%{?dist}
@@ -30,8 +28,6 @@ Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.troll.no
 Source0: %{name}-%{version}.tar.gz
-#Source2: qt.sh
-#Source3: qt.csh
 Source4: designer3.desktop
 Source5: assistant3.desktop
 Source6: linguist3.desktop
@@ -62,7 +58,7 @@ Patch40: qt-x11-free-3.3.8b-typo.patch
 Patch53: tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
 
 # qt-copy patches
-Patch110: 0084-compositing-properties.patch
+Patch110: tqt3-3.4.0-compositing-properties.patch
 
 # upstream patches
 Patch200: qt-x11-free-3.3.4-fullscreen.patch
@@ -238,63 +234,63 @@ Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %description
-Qt is a GUI software toolkit which simplifies the task of writing and
+TQt is a GUI software toolkit which simplifies the task of writing and
 maintaining GUI (Graphical User Interface) applications
 for the X Window System.
 
-Qt is written in C++ and is fully object-oriented.
+TQt is written in C++ and is fully object-oriented.
 
-This package contains the shared library needed to run Qt 3
-applications, as well as the README files for Qt 3.
+This package contains the shared library needed to run TQt 3
+applications, as well as the README files for TQt 3.
 
 
 %description config
-Qt is a GUI software toolkit which simplifies the task of writing and
+TQt is a GUI software toolkit which simplifies the task of writing and
 maintaining GUI (Graphical User Interface) applications
 for the X Window System.
 
-Qt is written in C++ and is fully object-oriented.
+TQt is written in C++ and is fully object-oriented.
 
-This package contains a graphical configuration tool for programs using Qt 3.
+This package contains a graphical configuration tool for programs using TQt 3.
 
 
 %description devel
 The %{name}-devel package contains the files necessary to develop
-applications using the Qt GUI toolkit: the header files, the Qt meta
+applications using the TQt GUI toolkit: the header files, the TQt meta
 object compiler.
 
-Install %{name}-devel if you want to develop GUI applications using the Qt 3
+Install %{name}-devel if you want to develop GUI applications using the TQt 3
 toolkit.
 
 
 %description devel-docs
 The %{name}-devel-docs package contains the man pages, the HTML documentation and
-example programs for Qt 3.
+example programs for TQt 3.
 
 
 %description ODBC
-ODBC driver for Qt 3's SQL classes (QSQL)
+ODBC driver for TQt 3's SQL classes (QSQL)
 
 
 %description MySQL
-MySQL driver for Qt 3's SQL classes (QSQL)
+MySQL driver for TQt 3's SQL classes (QSQL)
 
 
 %description PostgreSQL
-PostgreSQL driver for Qt 3's SQL classes (QSQL)
+PostgreSQL driver for TQt 3's SQL classes (QSQL)
 
 
 %description sqlite
-sqlite driver for Qt 3's SQL classes (QSQL)
+sqlite driver for TQt 3's SQL classes (QSQL)
 
 
 %description designer
 The %{name}-designer package contains an User Interface designer tool
-for the Qt 3 toolkit.
+for the TQt 3 toolkit.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n dependencies/%{name}
 %patch1 -p1 -b .cjk
 %patch2 -p1 -b .ndebug
 %patch3 -p1 -b .makefile
@@ -414,6 +410,13 @@ echo yes | ./configure \
   -xft \
   -tablet
 
+QTDIR="${PWD}"
+QTLIB="${QTDIR}/lib"
+QTINC="${QTDIR}/include"
+LD_LIBRARY_PATH="${QTLIB}:${LD_LIBRARY_PATH}"
+PATH="${QTDIR}/bin:${PATH}"
+export QTDIR QTLIB QTINC LD_LIBRARY_PATH PATH
+
 %__make %{?_smp_mflags} src-qmake
 
 
@@ -446,7 +449,7 @@ popd
 %__make install INSTALL_ROOT=%{buildroot}
 
 for i in findtr qt20fix qtrename140 lrelease lupdate ; do
-   %__install bin/$i %{buildroot}%{_bindir}
+  %__install bin/$i %{buildroot}%{_bindir}
 done
 
 # install man pages