[Pkg-kde-commits] rev 1528 - in people/chrsmrtn/qt-x11-free/debian:
. patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Sun Aug 21 21:01:24 UTC 2005
Author: chrsmrtn-guest
Date: 2005-08-21 21:01:22 +0000 (Sun, 21 Aug 2005)
New Revision: 1528
Added:
people/chrsmrtn/qt-x11-free/debian/patches/29_qtc_fix_rotated_randr.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/30_qtc_qtoolbar_77047.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/33_qtc_qlistbox-crash.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/34_qtc_dnd_optimization.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/35_qtc_dnd_active_window_fix.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/36_qtc_dnd-timestamp-fix.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/37_qtc_dragobject-dont-prefer-unknown.dpatch
Removed:
people/chrsmrtn/qt-x11-free/debian/patches/07_use_libtool.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/17_fix_qfontdatabase_cpp.dpatch
Modified:
people/chrsmrtn/qt-x11-free/debian/changelog
people/chrsmrtn/qt-x11-free/debian/patches/00list
people/chrsmrtn/qt-x11-free/debian/patches/02_various_fixes.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/08_thread_default.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/09_amd64_lib64.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/14_fix_kmenu.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch
people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
Log:
Big update to the chrsmrtn/qt-x11-free patches. Most of it is
just minor cleanups, property changes, and the rest is deleting unused patches,
or adding patches from qt-copy, which I'll describe in a changelog
update later (KDE anonsvn is down).
Modified: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/changelog 2005-08-21 21:01:22 UTC (rev 1528)
@@ -4,7 +4,7 @@
* No longer build non-threaded libraries. (Closes: #180326)
- * Added a libqt3c102-mt-dbg package. (Closes: #235396)
+ * Add a libqt3c102-mt-dbg package. (Closes: #235396, #322868)
* Make the Qt3 documentation available from /usr/share/doc/qt3-doc, and
therefore also usable in dwww and doc-central. (Closes: #185900)
@@ -16,6 +16,17 @@
* Add the gtkstyle patch, in order to better support Bluecurve.
(Closes: #316108)
+ * TODO When the server returns, describe these, and pick out other important
+ ones.
+ * Add more patches from qt-copy:
+ + 29_qtc_fix_rotated_randr.dpatch
+ + 30_qtc_qtoolbar_77047.dpatch
+ + 33_qtc_qlistbox-crash.dpatch
+ + 34_qtc_dnd_optimization.dpatch
+ + 35_qtc_dnd_active_window_fix.dpatch
+ + 36_qtc_dnd-timestamp-fix.dpatch
+ + 37_qtc_dragobject-dont-prefer-unknown.dpatch
+
* Enable tablet support.
* Build jpeg support into Qt, not as a plugin.
@@ -23,10 +34,13 @@
* Build the Qt styles as plugins. This does not affect the Qt buildkey,
so shouldn't affect other packages.
- * Revamp the OpenGL linking patch, and add patches for gcc4.
+ * Revamp the OpenGL linking patch.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 6 Jul 2005 22:36:54 -0400
+ * Re-enable InterBase support. [!!! This assumes that it will be fixed - it
+ hasn't happened yet !!!]
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 20 Aug 2005 22:36:39 -0400
+
qt-x11-free (3:3.3.4-7) unstable; urgency=low
* The "Mistakes happen; sadly, sometimes they happen all the same day" release.
Modified: people/chrsmrtn/qt-x11-free/debian/patches/00list
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/00list 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/00list 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,21 +1,28 @@
-02_various_fixes.dpatch
-03_qt_fontlist_fix.dpatch
-04_qsql_odbc.dpatch
-05_qvfb_cpp.dpatch
-06_disable_rpath.dpatch
-08_thread_default.dpatch
-09_amd64_lib64.dpatch
+02_various_fixes
+03_qt_fontlist_fix
+04_qsql_odbc
+05_qvfb_cpp
+06_disable_rpath
+08_thread_default
+09_amd64_lib64
10_arm_gcc4
-14_fix_kmenu.dpatch
-15_unify_declarations_glibc.dpatch
-16_fix_opengl_check.dpatch
-18_fix_makeqpf_qembed.dpatch
-22_fix_ftbfs_amd64.dpatch
-23_qtc_qclipboard_hack.dpatch
-24_qtc_qscrollview.dpatch
-25_qtc_qpixmap_mitshm.dpatch
-26_qtc_qpixmap_constants.dpatch
-27_qtc_qscrollview-windowactivate-fix.dpatch
-28_qtc_png-gamma-fix.dpatch
-31_gcc4_buildkey.dpatch
-32_gtkstyle.dpatch
+14_fix_kmenu
+15_unify_declarations_glibc
+16_fix_opengl_check
+18_fix_makeqpf_qembed
+22_fix_ftbfs_amd64
+23_qtc_qclipboard_hack
+24_qtc_qscrollview
+25_qtc_qpixmap_mitshm
+26_qtc_qpixmap_constants
+27_qtc_qscrollview-windowactivate-fix
+28_qtc_png-gamma-fix
+29_qtc_fix_rotated_randr
+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
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/02_various_fixes.dpatch
___________________________________________________________________
Name: svn:executable
- *
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/03_qt_fontlist_fix.dpatch
___________________________________________________________________
Name: svn:executable
- *
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/04_qsql_odbc.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,8 +1,4 @@
#! /bin/sh -e
-## 05_qvfb_cpp.dpatch by Simon Hausmann <simon at kde.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix qvfb to obey our standards
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/05_qvfb_cpp.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -23,9 +23,8 @@
exit 0
@DPATCH@
-diff -ruN qt-x11-free-3.1.1.old/mkspecs/linux-g++/qmake.conf qt-x11-free-3.1.1/mkspecs/linux-g++/qmake.conf
---- qt-x11-free-3.1.1.old/mkspecs/linux-g++/qmake.conf 2002-12-09 10:41:32.000000000 +0100
-+++ qt-x11-free-3.1.1/mkspecs/linux-g++/qmake.conf 2003-02-18 19:07:18.000000000 +0100
+--- qt.orig/mkspecs/linux-g++/qmake.conf
++++ qt.patched/mkspecs/linux-g++/qmake.conf
@@ -53,7 +53,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
@@ -35,3 +34,14 @@
QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl
+--- qt.orig/mkspecs/linux-g++-64/qmake.conf
++++ qt.patched/mkspecs/linux-g++-64/qmake.conf
+@@ -56,7 +56,7 @@
+ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME = -Wl,-soname,
+ QMAKE_LFLAGS_THREAD =
+-QMAKE_RPATH = -Wl,-rpath,
++QMAKE_RPATH =
+
+ QMAKE_LIBS =
+ QMAKE_LIBS_DYNLOAD = -ldl
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/06_disable_rpath.dpatch
___________________________________________________________________
Name: svn:executable
- *
Deleted: people/chrsmrtn/qt-x11-free/debian/patches/07_use_libtool.dpatch
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/08_thread_default.dpatch
___________________________________________________________________
Name: svn:executable
- *
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/09_amd64_lib64.dpatch
___________________________________________________________________
Name: svn:executable
- *
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/14_fix_kmenu.dpatch
___________________________________________________________________
Name: svn:executable
- *
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,5 +1,4 @@
#! /bin/sh -e
-## DP: Fix handling of libGL.so.1 to not require the -dev packages
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/16_fix_opengl_check.dpatch
___________________________________________________________________
Name: svn:executable
- *
Deleted: people/chrsmrtn/qt-x11-free/debian/patches/17_fix_qfontdatabase_cpp.dpatch
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.dpatch
___________________________________________________________________
Name: svn:executable
- *
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/21_fix_mips_mipsel.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,8 +1,4 @@
#! /bin/sh -e
-## 22_fix_ftbfs_amd64.dpatch by Andreas Jochens
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS on amd64
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,8 +1,4 @@
#! /bin/sh -e
-## 23_qtc_qclipboard_hack.dpatch by Lubos Lunak
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix qclipboard
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/23_qtc_qclipboard_hack.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/24_qtc_qscrollview.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/25_qtc_qpixmap_mitshm.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/26_qtc_qpixmap_constants.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/27_qtc_qscrollview-windowactivate-fix.dpatch
___________________________________________________________________
Name: svn:executable
- *
Modified: people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -1,8 +1,5 @@
#! /bin/sh -e
-## 24_qtc_qscrollview.dpatch by Germain Garand <germain at ebooksfrance.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix the qscrollview stuff
+# Qt-Copy patch #
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/28_qtc_png-gamma-fix.dpatch
___________________________________________________________________
Name: svn:executable
- *
Added: people/chrsmrtn/qt-x11-free/debian/patches/29_qtc_fix_rotated_randr.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/29_qtc_fix_rotated_randr.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/29_qtc_fix_rotated_randr.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -0,0 +1,34 @@
+#! /bin/sh -e
+# Qt-Copy patch #
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/kernel/qapplication_x11.cpp
++++ qt.patched/src/kernel/qapplication_x11.cpp
+@@ -3399,7 +3399,8 @@ int QApplication::x11ProcessEvent( XEven
+ #endif
+
+ #ifndef QT_NO_XRANDR
+- if (event->type == xrandr_eventbase + RRScreenChangeNotify) {
++ if (event->type == xrandr_eventbase + RRScreenChangeNotify
++ || ( event->type == ConfigureNotify && event->xconfigure.window == QPaintDevice::x11AppRootWindow())) {
+ // update Xlib internals with the latest screen configuration
+ XRRUpdateConfiguration(event);
+
Added: people/chrsmrtn/qt-x11-free/debian/patches/30_qtc_qtoolbar_77047.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/30_qtc_qtoolbar_77047.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/30_qtc_qtoolbar_77047.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+# Qt-Copy patch #
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/widgets/qtoolbar.cpp
++++ qt.patched/src/widgets/qtoolbar.cpp
+@@ -648,7 +648,7 @@ void QToolBar::createPopup()
+ QString s = b->textLabel();
+ if ( s.isEmpty() )
+ s = b->text();
+- if ( b->popup() && b->popupDelay() == 0 )
++ if ( b->popup() && b->popupDelay() <= 0 )
+ id = d->extensionPopup->insertItem( b->iconSet(), s, b->popup() );
+ else
+ id = d->extensionPopup->insertItem( b->iconSet(), s, b, SLOT( emulateClick() ) ) ;
Property changes on: people/chrsmrtn/qt-x11-free/debian/patches/31_gcc4_buildkey.dpatch
___________________________________________________________________
Name: svn:executable
- *
Added: people/chrsmrtn/qt-x11-free/debian/patches/33_qtc_qlistbox-crash.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/33_qtc_qlistbox-crash.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/33_qtc_qlistbox-crash.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+# Qt-Copy patch #
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/widgets/qlistbox.cpp
++++ qt.patched/src/widgets/qlistbox.cpp
+@@ -1840,7 +1840,7 @@
+ */
+ void QListBox::setCurrentItem( QListBoxItem * i )
+ {
+- if ( !i || d->current == i )
++ if ( !i || d->current == i || numRows() == 0 )
+ return;
+
+ QRect mfrect = itemRect( i );
Added: people/chrsmrtn/qt-x11-free/debian/patches/34_qtc_dnd_optimization.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/34_qtc_dnd_optimization.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/34_qtc_dnd_optimization.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -0,0 +1,202 @@
+#! /bin/sh -e
+# Qt-Copy patch #
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/kernel/qdnd_x11.cpp
++++ qt.patched/src/kernel/qdnd_x11.cpp
+@@ -49,13 +49,15 @@
+ #include "qdragobject.h"
+ #include "qobjectlist.h"
+ #include "qcursor.h"
++#include "qbitmap.h"
++#include "qpainter.h"
+
+ #include "qt_x11_p.h"
+
+ // conflict resolution
+
+-// unused, may be used again later: const int XKeyPress = KeyPress;
+-// unused, may be used again later: const int XKeyRelease = KeyRelease;
++const int XKeyPress = KeyPress;
++const int XKeyRelease = KeyRelease;
+ #undef KeyPress
+ #undef KeyRelease
+
+@@ -249,20 +251,47 @@ class QShapedPixmapWidget : public QWidg
+ public:
+ QShapedPixmapWidget(int screen = -1) :
+ QWidget(QApplication::desktop()->screen( screen ),
+- 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM )
++ 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 )
+ {
+ }
+
+- void setPixmap(QPixmap pm)
++ void setPixmap(QPixmap pm, QPoint hot)
+ {
+- if ( pm.mask() ) {
++ int bmser = pm.mask() ? pm.mask()->serialNumber() : 0;
++ if( oldpmser == pm.serialNumber() && oldbmser == bmser
++ && oldhot == hot )
++ return;
++ oldpmser = pm.serialNumber();
++ oldbmser = bmser;
++ oldhot = hot;
++ bool hotspot_in = !(hot.x() < 0 || hot.y() < 0 || hot.x() >= pm.width() || hot.y() >= pm.height());
++// if the pixmap has hotspot in its area, make a "hole" in it at that position
++// this will allow XTranslateCoordinates() to find directly the window below the cursor instead
++// of finding this pixmap, and therefore there won't be needed any (slow) search for the window
++// using findRealWindow()
++ if( hotspot_in ) {
++ QBitmap mask = pm.mask() ? *pm.mask() : QBitmap( pm.width(), pm.height());
++ if( !pm.mask())
++ mask.fill( Qt::color1 );
++ QPainter p( &mask );
++ p.setPen( Qt::color0 );
++ p.drawPoint( hot.x(), hot.y());
++ p.end();
++ pm.setMask( mask );
++ setMask( mask );
++ } else if ( pm.mask() ) {
+ setMask( *pm.mask() );
+ } else {
+ clearMask();
+ }
+ resize(pm.width(),pm.height());
+ setErasePixmap(pm);
++ erase();
+ }
++private:
++ int oldpmser;
++ int oldbmser;
++ QPoint oldhot;
+ };
+
+ QShapedPixmapWidget * qt_xdnd_deco = 0;
+@@ -859,6 +888,45 @@ void QDragManager::timerEvent( QTimerEve
+ move( QCursor::pos() );
+ }
+
++static bool qt_xdnd_was_move = false;
++static bool qt_xdnd_found = false;
++// check whole incoming X queue for move events
++// checking whole queue is done by always returning False in the predicate
++// if there's another move event in the queue, and there's not a mouse button
++// or keyboard or ClientMessage event before it, the current move event
++// may be safely discarded
++// this helps avoiding being overloaded by being flooded from many events
++// from the XServer
++static
++Bool qt_xdnd_predicate( Display*, XEvent* ev, XPointer )
++{
++ if( qt_xdnd_found )
++ return False;
++ if( ev->type == MotionNotify )
++ {
++ qt_xdnd_was_move = true;
++ qt_xdnd_found = true;
++ }
++ if( ev->type == ButtonPress || ev->type == ButtonRelease
++ || ev->type == XKeyPress || ev->type == XKeyRelease
++ || ev->type == ClientMessage )
++ {
++ qt_xdnd_was_move = false;
++ qt_xdnd_found = true;
++ }
++ return False;
++}
++
++static
++bool qt_xdnd_another_movement()
++{
++ qt_xdnd_was_move = false;
++ qt_xdnd_found = false;
++ XEvent dummy;
++ XCheckIfEvent( qt_xdisplay(), &dummy, qt_xdnd_predicate, NULL );
++ return qt_xdnd_was_move;
++}
++
+ bool QDragManager::eventFilter( QObject * o, QEvent * e)
+ {
+ if ( beingCancelled ) {
+@@ -881,8 +949,10 @@ bool QDragManager::eventFilter( QObject
+
+ if ( e->type() == QEvent::MouseMove ) {
+ QMouseEvent* me = (QMouseEvent *)e;
+- updateMode(me->stateAfter());
+- move( me->globalPos() );
++ if( !qt_xdnd_another_movement()) {
++ updateMode(me->stateAfter());
++ move( me->globalPos() );
++ }
+ return TRUE;
+ } else if ( e->type() == QEvent::MouseButtonRelease ) {
+ qApp->removeEventFilter( this );
+@@ -1106,7 +1176,7 @@ void QDragManager::move( const QPoint &
+ delete qt_xdnd_deco;
+ qt_xdnd_deco = new QShapedPixmapWidget( screen );
+ }
+- updatePixmap();
++ updatePixmap( globalPos );
+
+ if ( qt_xdnd_source_sameanswer.contains( globalPos ) &&
+ qt_xdnd_source_sameanswer.isValid() ) {
+@@ -1679,7 +1749,7 @@ bool QDragManager::drag( QDragObject * o
+ // qt_xdnd_source_object persists until we get an xdnd_finish message
+ }
+
+-void QDragManager::updatePixmap()
++void QDragManager::updatePixmap( const QPoint& cursorPos )
+ {
+ if ( qt_xdnd_deco ) {
+ QPixmap pm;
+@@ -1694,9 +1764,8 @@ void QDragManager::updatePixmap()
+ defaultPm = new QPixmap(default_pm);
+ pm = *defaultPm;
+ }
+- qt_xdnd_deco->setPixmap(pm);
+- qt_xdnd_deco->move(QCursor::pos()-pm_hot);
+- qt_xdnd_deco->repaint(FALSE);
++ qt_xdnd_deco->setPixmap(pm, pm_hot);
++ qt_xdnd_deco->move(cursorPos-pm_hot);
+ //if ( willDrop ) {
+ qt_xdnd_deco->show();
+ //} else {
+@@ -1705,4 +1774,9 @@ void QDragManager::updatePixmap()
+ }
+ }
+
++void QDragManager::updatePixmap()
++{
++ updatePixmap( QCursor::pos());
++}
++
+ #endif // QT_NO_DRAGANDDROP
+--- qt.orig/src/kernel/qdragobject.h
++++ qt.patched/src/kernel/qdragobject.h
+@@ -245,6 +245,7 @@ private:
+ void move( const QPoint & );
+ void drop();
+ void updatePixmap();
++ void updatePixmap( const QPoint& cursorPos );
+
+ private:
+ QDragObject * object;
Added: people/chrsmrtn/qt-x11-free/debian/patches/35_qtc_dnd_active_window_fix.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/35_qtc_dnd_active_window_fix.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/35_qtc_dnd_active_window_fix.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -0,0 +1,184 @@
+#! /bin/sh -e
+# Qt-Copy patch #
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/kernel/qapplication_x11.cpp
++++ qt.patched/src/kernel/qapplication_x11.cpp
+@@ -4053,7 +4053,7 @@ void QApplication::closePopup( QWidget *
+ // Keyboard event translation
+ //
+
+-static int translateButtonState( int s )
++int qt_x11_translateButtonState( int s )
+ {
+ int bst = 0;
+ if ( s & Button1Mask )
+@@ -4119,7 +4119,7 @@ bool QETWidget::translateMouseEvent( con
+ pos.ry() = lastMotion.y;
+ globalPos.rx() = lastMotion.x_root;
+ globalPos.ry() = lastMotion.y_root;
+- state = translateButtonState( lastMotion.state );
++ state = qt_x11_translateButtonState( lastMotion.state );
+ if ( qt_button_down && (state & (LeftButton |
+ MidButton |
+ RightButton ) ) == 0 )
+@@ -4143,7 +4143,7 @@ bool QETWidget::translateMouseEvent( con
+ pos.ry() = xevent->xcrossing.y;
+ globalPos.rx() = xevent->xcrossing.x_root;
+ globalPos.ry() = xevent->xcrossing.y_root;
+- state = translateButtonState( xevent->xcrossing.state );
++ state = qt_x11_translateButtonState( xevent->xcrossing.state );
+ if ( qt_button_down && (state & (LeftButton |
+ MidButton |
+ RightButton ) ) == 0 )
+@@ -4155,7 +4155,7 @@ bool QETWidget::translateMouseEvent( con
+ pos.ry() = event->xbutton.y;
+ globalPos.rx() = event->xbutton.x_root;
+ globalPos.ry() = event->xbutton.y_root;
+- state = translateButtonState( event->xbutton.state );
++ state = qt_x11_translateButtonState( event->xbutton.state );
+ switch ( event->xbutton.button ) {
+ case Button1: button = LeftButton; break;
+ case Button2: button = MidButton; break;
+@@ -4950,7 +4950,7 @@ bool QETWidget::translateKeyEventInterna
+ XKeyEvent xkeyevent = event->xkey;
+
+ // save the modifier state, we will use the keystate uint later by passing
+- // it to translateButtonState
++ // it to qt_x11_translateButtonState
+ uint keystate = event->xkey.state;
+ // remove the modifiers where mode_switch exists... HPUX machines seem
+ // to have alt *AND* mode_switch both in Mod1Mask, which causes
+@@ -5064,7 +5064,7 @@ bool QETWidget::translateKeyEventInterna
+ }
+ #endif // !QT_NO_XIM
+
+- state = translateButtonState( keystate );
++ state = qt_x11_translateButtonState( keystate );
+
+ static int directionKeyEvent = 0;
+ if ( qt_use_rtl_extensions && type == QEvent::KeyRelease ) {
+--- qt.orig/src/kernel/qdnd_x11.cpp
++++ qt.patched/src/kernel/qdnd_x11.cpp
+@@ -114,6 +114,8 @@ Atom qt_xdnd_finished;
+ Atom qt_xdnd_type_list;
+ const int qt_xdnd_version = 4;
+
++extern int qt_x11_translateButtonState( int s );
++
+ // Actions
+ //
+ // The Xdnd spec allows for user-defined actions. This could be implemented
+@@ -198,6 +200,8 @@ static Atom qt_xdnd_source_current_time;
+ static int qt_xdnd_current_screen = -1;
+ // state of dragging... true if dragging, false if not
+ bool qt_xdnd_dragging = FALSE;
++// need to check state of keyboard modifiers
++static bool need_modifiers_check = FALSE;
+
+ // dict of payload data, sorted by type atom
+ static QIntDict<QByteArray> * qt_xdnd_target_data = 0;
+@@ -879,8 +883,20 @@ void qt_handle_xdnd_finished( QWidget *,
+
+ void QDragManager::timerEvent( QTimerEvent* e )
+ {
+- if ( e->timerId() == heartbeat && qt_xdnd_source_sameanswer.isNull() )
+- move( QCursor::pos() );
++ if ( e->timerId() == heartbeat ) {
++ if( need_modifiers_check ) {
++ Window root, child;
++ int root_x, root_y, win_x, win_y;
++ unsigned int mask;
++ XQueryPointer( qt_xdisplay(), qt_xrootwin( qt_xdnd_current_screen ),
++ &root, &child, &root_x, &root_y, &win_x, &win_y, &mask );
++ if( updateMode( (ButtonState)qt_x11_translateButtonState( mask )))
++ qt_xdnd_source_sameanswer = QRect(); // force move
++ }
++ need_modifiers_check = TRUE;
++ if( qt_xdnd_source_sameanswer.isNull() )
++ move( QCursor::pos() );
++ }
+ }
+
+ static bool qt_xdnd_was_move = false;
+@@ -948,6 +964,7 @@ bool QDragManager::eventFilter( QObject
+ updateMode(me->stateAfter());
+ move( me->globalPos() );
+ }
++ need_modifiers_check = FALSE;
+ return TRUE;
+ } else if ( e->type() == QEvent::MouseButtonRelease ) {
+ qApp->removeEventFilter( this );
+@@ -986,9 +1003,11 @@ bool QDragManager::eventFilter( QObject
+ beingCancelled = FALSE;
+ qApp->exit_loop();
+ } else {
+- updateMode(ke->stateAfter());
+- qt_xdnd_source_sameanswer = QRect(); // force move
+- move( QCursor::pos() );
++ if( updateMode(ke->stateAfter())) {
++ qt_xdnd_source_sameanswer = QRect(); // force move
++ move( QCursor::pos() );
++ }
++ need_modifiers_check = FALSE;
+ }
+ return TRUE; // Eat all key events
+ }
+@@ -1014,10 +1033,10 @@ bool QDragManager::eventFilter( QObject
+
+
+ static Qt::ButtonState oldstate;
+-void QDragManager::updateMode( ButtonState newstate )
++bool QDragManager::updateMode( ButtonState newstate )
+ {
+ if ( newstate == oldstate )
+- return;
++ return false;
+ const int both = ShiftButton|ControlButton;
+ if ( (newstate & both) == both ) {
+ global_requested_action = QDropEvent::Link;
+@@ -1041,6 +1060,7 @@ void QDragManager::updateMode( ButtonSta
+ }
+ }
+ oldstate = newstate;
++ return true;
+ }
+
+
+@@ -1707,6 +1727,7 @@ bool QDragManager::drag( QDragObject * o
+ qt_xdnd_source_sameanswer = QRect();
+ move(QCursor::pos());
+ heartbeat = startTimer(200);
++ need_modifiers_check = FALSE;
+
+ #ifndef QT_NO_CURSOR
+ qApp->setOverrideCursor( arrowCursor );
+--- qt.orig/src/kernel/qdragobject.h
++++ qt.patched/src/kernel/qdragobject.h
+@@ -248,7 +248,7 @@ private:
+
+ private:
+ QDragObject * object;
+- void updateMode( ButtonState newstate );
++ bool updateMode( ButtonState newstate );
+ void updateCursor();
+
+ QWidget * dragSource;
Added: people/chrsmrtn/qt-x11-free/debian/patches/36_qtc_dnd-timestamp-fix.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/36_qtc_dnd-timestamp-fix.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/36_qtc_dnd-timestamp-fix.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -0,0 +1,55 @@
+#! /bin/sh -e
+# Qt-Copy patch #
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/kernel/qdnd_x11.cpp
++++ qt.patched/src/kernel/qdnd_x11.cpp
+@@ -81,6 +81,7 @@ extern void qt_leave_modal( QWidget *wid
+ extern Window qt_x11_findClientWindow( Window, Atom, bool );
+ extern Atom qt_wm_state;
+ extern Time qt_x_time;
++extern Time qt_x_user_time;
+
+ // this stuff is copied from qclb_x11.cpp
+
+@@ -834,6 +835,9 @@ void qt_handle_xdnd_drop( QWidget *, con
+ // l[0], qt_xdnd_dragsource_xid );
+ return;
+ }
++
++ if( l[2] != 0 )
++ qt_x_user_time = l[2];
+ if ( qt_xdnd_source_object )
+ qt_xdnd_source_object->setTarget( qt_xdnd_current_widget );
+
+@@ -1366,9 +1370,9 @@ void QDragManager::drop()
+ drop.format = 32;
+ drop.message_type = qt_xdnd_drop;
+ drop.data.l[0] = object->source()->winId();
+- drop.data.l[1] = 1 << 24; // flags
+- drop.data.l[2] = 0; // ###
+- drop.data.l[3] = qt_x_time;
++ drop.data.l[1] = 0; // flags
++ drop.data.l[2] = qt_x_time;
++ drop.data.l[3] = 0;
+ drop.data.l[4] = 0;
+
+ QWidget * w = QWidget::find( qt_xdnd_current_proxy_target );
Added: people/chrsmrtn/qt-x11-free/debian/patches/37_qtc_dragobject-dont-prefer-unknown.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/37_qtc_dragobject-dont-prefer-unknown.dpatch 2005-08-21 13:57:45 UTC (rev 1527)
+++ people/chrsmrtn/qt-x11-free/debian/patches/37_qtc_dragobject-dont-prefer-unknown.dpatch 2005-08-21 21:01:22 UTC (rev 1528)
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+# Qt-Copy patch #
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/kernel/qdragobject.cpp
++++ qt.patched/src/kernel/qdragobject.cpp
+@@ -844,6 +844,16 @@ bool QTextDrag::decode( const QMimeSourc
+ {
+ if(!e)
+ return FALSE;
++
++ // when subtype is not specified, try text/plain first, otherwise this may read
++ // things like text/x-moz-url even though better targets are available
++ if( subtype.isNull()) {
++ QCString subtmp = "plain";
++ if( decode( e, str, subtmp )) {
++ subtype = subtmp;
++ return true;
++ }
++ }
+
+ if ( e->cacheType == QMimeSource::Text ) {
+ str = *e->cache.txt.str;
More information about the Pkg-kde-commits
mailing list