[Pkg-kde-commits] rev 1759 - trunk/packages/qt-x11-free/debian/patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-09-10 23:41:06 +0000 (Sat, 10 Sep 2005)
New Revision: 1759

Removed:
   trunk/packages/qt-x11-free/debian/patches/07_gcc4_workarounds_fixes_postscript.dpatch
   trunk/packages/qt-x11-free/debian/patches/33_qtc_qlistbox-crash.dpatch
   trunk/packages/qt-x11-free/debian/patches/36_qtc_dnd-timestamp-fix.dpatch
Modified:
   trunk/packages/qt-x11-free/debian/patches/00list
   trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
   trunk/packages/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
   trunk/packages/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
Log:
Sync patches for Qt 3.3.5. A few removed, a few modified.

04_qsql_odbc looks iffy, but builds.
24_qtc_qscrollview was onlypartly applied by upstream, oddly enough.

And our buildkey is diferent from upstream's now (they chose "4" for
gcc 4.x, and we have "4.*". Not something we can change until the next
ABI transition.


Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2005-09-10 22:57:53 UTC (rev 1758)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2005-09-10 23:41:06 UTC (rev 1759)
@@ -3,7 +3,6 @@
 04_qsql_odbc
 05_qvfb_cpp
 06_disable_rpath
-07_gcc4_workarounds_fixes_postscript
 08_thread_default
 09_amd64_lib64
 10_arm_gcc4
@@ -22,10 +21,8 @@
 30_qtc_qtoolbar_77047
 31_gcc4_buildkey
 32_gtkstyle
-33_qtc_qlistbox-crash
 34_qtc_dnd_optimization
 35_qtc_dnd_active_window_fix
-36_qtc_dnd-timestamp-fix
 37_qtc_dragobject-dont-prefer-unknown
 38_qtc_khotkeys_input_84434
 39_qtc_qpopup_has_mouse

Modified: trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.dpatch	2005-09-10 22:57:53 UTC (rev 1758)
+++ trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.dpatch	2005-09-10 23:41:06 UTC (rev 1759)
@@ -77,15 +77,3 @@
  			}
  		}
  
-diff -ruN qt-x11-free-3.3.3.old/src/sql/drivers/odbc/qsql_odbc.cpp qt-x11-free-3.3.3/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.3.old/src/sql/drivers/odbc/qsql_odbc.cpp	2004-05-27 15:43:13.000000000 +0000
-+++ qt-x11-free-3.3.3/src/sql/drivers/odbc/qsql_odbc.cpp	2004-10-31 09:35:06.000000000 +0000
-@@ -57,7 +57,7 @@
- # define QSQLLEN SQLINTEGER
- # define QSQLULEN SQLUINTEGER
- #else
--# ifndef Q_OS_WIN64
-+# if 0
- #  define SQLLEN SQLINTEGER
- #  define SQLULEN SQLUINTEGER
- # endif

Deleted: trunk/packages/qt-x11-free/debian/patches/07_gcc4_workarounds_fixes_postscript.dpatch

Modified: trunk/packages/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch	2005-09-10 22:57:53 UTC (rev 1758)
+++ trunk/packages/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch	2005-09-10 23:41:06 UTC (rev 1759)
@@ -23,15 +23,6 @@
 diff -u -3 -p -r1.65 qscrollview.cpp
 --- bla/src/widgets/qscrollview.cpp	29 Apr 2004 22:31:28 -0000	1.65
 +++ bla/src/widgets/qscrollview.cpp	25 Jan 2005 12:07:04 -0000
-@@ -1180,7 +1180,7 @@ void  QScrollView::mouseMoveEvent( QMous
- void QScrollView::wheelEvent( QWheelEvent *e )
- {
-     QWheelEvent ce( viewport()->mapFromGlobal( e->globalPos() ),
--                    e->globalPos(), e->delta(), e->state());
-+                    e->globalPos(), e->delta(), e->state(), e->orientation() );
-     viewportWheelEvent(&ce);
-     if ( !ce.isAccepted() ) {
- 	if ( e->orientation() == Horizontal && horizontalScrollBar() )
 @@ -1863,7 +1863,7 @@ void QScrollView::viewportWheelEvent( QW
         the event itself.
      */

Modified: trunk/packages/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch	2005-09-10 22:57:53 UTC (rev 1758)
+++ trunk/packages/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch	2005-09-10 23:41:06 UTC (rev 1759)
@@ -21,13 +21,12 @@
 @DPATCH@
 --- qt.orig/configure
 +++ qt.patched/configure
-@@ -3092,6 +3092,9 @@
-     *3.*)
+@@ -3031,7 +3031,7 @@
  	COMPILER_VERSION="3.*"
  	;;
-+    *4.*)
-+        COMPILER_VERSION="4.*"
-+        ;;
+     *4.*)
+-	COMPILER_VERSION="4"
++	COMPILER_VERSION="4.*"
+ 	;;
      *)
  	;;
-     esac

Deleted: trunk/packages/qt-x11-free/debian/patches/33_qtc_qlistbox-crash.dpatch

Deleted: trunk/packages/qt-x11-free/debian/patches/36_qtc_dnd-timestamp-fix.dpatch