rev 15801 - in trunk/packages/qt-x11-free/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Wed Aug 26 22:10:27 UTC 2009
Author: fabo
Date: 2009-08-26 22:10:27 +0000 (Wed, 26 Aug 2009)
New Revision: 15801
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/control
trunk/packages/qt-x11-free/debian/patches/0001-dnd_optimization.diff
trunk/packages/qt-x11-free/debian/patches/0002-dnd_active_window_fix.diff
trunk/packages/qt-x11-free/debian/patches/0005-qpixmap_mitshm.diff
trunk/packages/qt-x11-free/debian/patches/0007-qpixmap_constants.diff
trunk/packages/qt-x11-free/debian/patches/0032-fix_rotated_randr.diff
trunk/packages/qt-x11-free/debian/patches/0038-dragobject-dont-prefer-unknown.diff
trunk/packages/qt-x11-free/debian/patches/0044-qscrollview-windowactivate-fix.diff
trunk/packages/qt-x11-free/debian/patches/0047-fix-kmenu-width.diff
trunk/packages/qt-x11-free/debian/patches/0048-qclipboard_hack_80072.diff
trunk/packages/qt-x11-free/debian/patches/0056-khotkeys_input_84434.diff
trunk/packages/qt-x11-free/debian/patches/0059-qpopup_has_mouse.diff
trunk/packages/qt-x11-free/debian/patches/0060-qpopup_ignore_mousepos.diff
trunk/packages/qt-x11-free/debian/patches/0061-qscrollview-propagate-horizontal-wheelevent.diff
trunk/packages/qt-x11-free/debian/patches/0073-xinerama-aware-qpopup.diff
trunk/packages/qt-x11-free/debian/patches/0079-compositing-types.diff
trunk/packages/qt-x11-free/debian/patches/0080-net-wm-sync-request.diff
trunk/packages/qt-x11-free/debian/patches/0083-CVE-2007-4137.diff
trunk/packages/qt-x11-free/debian/patches/0085-fix-buildkey.diff
trunk/packages/qt-x11-free/debian/patches/0086-revert-qt-khmer-fix.diff
trunk/packages/qt-x11-free/debian/patches/0087-use-xrandr-1.2.diff
trunk/packages/qt-x11-free/debian/patches/00_qmake_debian_compliant_release_target.diff
trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff
trunk/packages/qt-x11-free/debian/patches/02_various_fixes.diff
trunk/packages/qt-x11-free/debian/patches/03_qt_fontlist_fix.diff
trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.diff
trunk/packages/qt-x11-free/debian/patches/05_qvfb_cpp.diff
trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.diff
trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.diff
trunk/packages/qt-x11-free/debian/patches/10_arm_gcc4.diff
trunk/packages/qt-x11-free/debian/patches/11_qt_rubberband.diff
trunk/packages/qt-x11-free/debian/patches/12_disable_includehints.diff
trunk/packages/qt-x11-free/debian/patches/13_qt335_qlistview_crash_fix.diff
trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.diff
trunk/packages/qt-x11-free/debian/patches/16_fix_opengl_check.diff
trunk/packages/qt-x11-free/debian/patches/17_qlistview_crash_iterator.diff
trunk/packages/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.diff
trunk/packages/qt-x11-free/debian/patches/19_qfontdatabase_hack.diff
trunk/packages/qt-x11-free/debian/patches/20_hppa_FTBFS.diff
trunk/packages/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.diff
trunk/packages/qt-x11-free/debian/patches/32_gtkstyle.diff
trunk/packages/qt-x11-free/debian/patches/45_immodule_unified.diff
trunk/packages/qt-x11-free/debian/patches/46_immodule_keyrelease_fix.diff
trunk/packages/qt-x11-free/debian/patches/47_immodule_nodebug_fix.diff
trunk/packages/qt-x11-free/debian/patches/48_immodule_xim_fix.diff
trunk/packages/qt-x11-free/debian/patches/53_xinerama_dialog_placement_fix.diff
trunk/packages/qt-x11-free/debian/patches/54_seli_xinerama.diff
trunk/packages/qt-x11-free/debian/patches/60_gnu_hurd_support.diff
trunk/packages/qt-x11-free/debian/patches/61_eastern_asian_languagues.diff
trunk/packages/qt-x11-free/debian/patches/63_qmake_hurd.diff
trunk/packages/qt-x11-free/debian/patches/65_gcc-4.2_qbuttons.h-fix.diff
trunk/packages/qt-x11-free/debian/patches/66_gcc-4.3_compile-fix.diff
trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.diff
trunk/packages/qt-x11-free/debian/patches/70_bad_typecast_amd64.diff
trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
trunk/packages/qt-x11-free/debian/patches/73_configure_quilt_compat.diff
trunk/packages/qt-x11-free/debian/rules
Log:
* Refresh patches.
* Add firebird2-dev as alternative build-dependency for backports.
(Closes: #475251)
* Replace old libcupsys2-dev names by libcups2-dev in Build-Depends and
Depends. Thanks to Martin-?\195?\137ric Racine. (Closes: #529965).
* Add missing build-dependency on cpio. (Closes: #536848)
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/changelog 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,16 +1,25 @@
-qt-x11-free (3:3.3.8b-7) UNRELEASED; urgency=low
+qt-x11-free (3:3.3.8b-6) unstable; urgency=low
- * Build depend on libmysqlclient-dev only. It is virtual package in lenny.
+ +++ Changes by Fathi Boudra:
- -- Modestas Vainius <modestas at vainius.eu> Tue, 11 Aug 2009 12:50:18 +0300
+ * Add firebird2-dev as alternative build-dependency for backports.
+ (Closes: #475251)
+ * Replace old libcupsys2-dev names by libcups2-dev in Build-Depends and
+ Depends. Thanks to Martin-Éric Racine. (Closes: #529965).
+ * Add missing build-dependency on cpio. (Closes: #536848)
-qt-x11-free (3:3.3.8b-6) unstable; urgency=low
+ +++ Changes by Modestas Vainius:
- * Build with -O1 on sparc as something is broken here. (Closes: #490999)
- * Fix parallel build, Thanks Robert. (Closes: 475333)
+ * Build depend on libmysqlclient-dev only. It is a virtual package in Lenny.
- -- Sune Vuorela <debian at pusling.com> Sun, 23 Nov 2008 21:42:03 +0100
+ +++ Changes by Sune Vuorela:
+ * Add debian/patches/71_sparc_only_-O1.diff and use linux-g++-sparc:
+ - Build with -O1 on sparc as something is broken here. (Closes: #490999)
+ * Fix parallel build. Thanks Robert Millan. (Closes: 475333)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 26 Aug 2009 12:50:18 +0300
+
qt-x11-free (3:3.3.8b-5) unstable; urgency=medium
+++ Changes by Modestas Vainius:
@@ -160,7 +169,7 @@
his work on this!
- Build-Depend on firebird2.0-dev instead of firebird1.5-dev.
- Add powerpc to firebird-supported architectures.
- - Add patch 70_bad_typecast_amd64 to fix bad typecast in
+ - Add patch 70_bad_typecast_amd64 to fix bad typecast in
src/sql/drivers/ibase/qsql_ibase.cpp causing FTBFS on amd64.
* Update uploaders.
@@ -169,7 +178,7 @@
qt-x11-free (3:3.3.7-6) unstable; urgency=low
* Patch for potential vulnerability in QTextEdit, which might cause remote
- execution when parsing maliciously crafted text from an unknown source.
+ execution when parsing maliciously crafted text from an unknown source.
CVE-2007-3388
-- Ana Beatriz Guerrero Lopez <ana at debian.org> Tue, 31 Jul 2007 13:34:00 +0200
@@ -204,7 +213,7 @@
* Improved debian/copyright.
* Update Uploaders.
- * Applied patch to avoid qmake segfaulting on GNU/Hurd when no output
+ * Applied patch to avoid qmake segfaulting on GNU/Hurd when no output
file is specified. Thanks to Michael Banck. (Closes: #399984)
+++ Changes by Sune Vuorela
@@ -620,17 +629,17 @@
qt-x11-free (3:3.3.4-1) experimental; urgency=low
* ML: New upstream release Qt 3.3.4 packages for Debian (Closes: #292422)
- * ML: patches/0048-qclipboard_hack_80072.patch: Fix the clipboard stuff
+ * ML: patches/0048-qclipboard_hack_80072.patch: Fix the clipboard stuff
(Closes: #295828)
* ML: patches/0061-qscrollview-propagate-horizontal-wheelevent.patch: Fix
problems with horizontal scrollview
* ML: Took patch from BTS by Andreas Jochens to fix the FTBFS on the amd64
architecture (Closes: #288405)
- * ML: patches/19_security_fixes.dpatch: Removed this patch, incorporated
+ * ML: patches/19_security_fixes.dpatch: Removed this patch, incorporated
into upstream now.
* ML: patches/20_qlocale_compile_arm.dpatch: Removed, incorporated into
upstream as well.
- * ML: patches/17_fix_qfontdatabase_cpp.dpatch: Disabled for now, seems to
+ * ML: patches/17_fix_qfontdatabase_cpp.dpatch: Disabled for now, seems to
be fixed by upstream according to changelog
-- Martin Loschwitz <madkiss at debian.org> Fri, 18 Mar 2005 15:57:00 +0100
@@ -652,7 +661,7 @@
qt-x11-free (3:3.3.3-6) unstable; urgency=high
* ML: Addedd debian/patches/21_fix_mips_mipsel.dpatch to make the beast
- compile on MIPS/MIPSel again
+ compile on MIPS/MIPSel again
-- Martin Loschwitz <madkiss at debian.org> Sun, 14 Nov 2004 16:44:00 +0100
@@ -663,9 +672,9 @@
breakage caused by invalid redefinitions of variables (Closes: #278781)
* debian/rules: Delete .obj-directories in the clean-Target as requested
by Fabio Massimo Di Nitto (thanks for noticing this)
-
+
-- Martin Loschwitz <madkiss at debian.org> Sun, 31 Oct 2004 10:51:00 +0100
-
+
qt-x11-free (3:3.3.3-4.1) unstable; urgency=high
* NMU, maintainer doesn't show any reaction.
@@ -680,7 +689,7 @@
qt-x11-free (3:3.3.3-4) unstable; urgency=high
- * ML: Applied patch from Marcus Meissner to fix broken XPM DoS not yet
+ * ML: Applied patch from Marcus Meissner to fix broken XPM DoS not yet
fixed upstream [src/kernel/qimage.cpp, CAN-2004-0692]
* ML: Applied patch forwarded by Marcus Meissner to fix broken GIF DoS
unfixed upstream [src/kernel/qasyncimageio.cpp, CAN-2004-0693]
@@ -697,7 +706,7 @@
qt-x11-free (3:3.3.3-2) unstable; urgency=high
- * ML: Bring back the goddamn qmake binary that silently disappeared (thank
+ * ML: Bring back the goddamn qmake binary that silently disappeared (thank
you Trolltech for replacing it with a symlink) (Closes: #265958)
-- Martin Loschwitz <madkiss at debian.org> Mon, 16 Aug 2004 00:31:00 +0200
@@ -706,13 +715,13 @@
* ML: debian/control: Turned libqt3-headers and libqt3-compat-headers into
Architecture: any. This should avoid blocking packages from testing
- * ML: debian/control: Added a patch by Robert Millan to add control.in to
+ * ML: debian/control: Added a patch by Robert Millan to add control.in to
fix breakage with iBase and OSes != Linux (Closes: #265413)
* ML: debian/patches/16_fix_opengl_check.dpatch: Make QLibrary search for
libGL.so.1, no dependency on libgl-dev packages (Closes: #264928)
* ML: debian/patches/17_fix_qfontdatabase_cpp.dpatch: A patch taken from
Lars Knoll via kde mailing list; fixes a problem with fond handling
- * ML: Re-Build against the latest iodbc to get back shlibs of it; previous
+ * ML: Re-Build against the latest iodbc to get back shlibs of it; previous
version didn't have shlins accidentally (kudos to Adrian Bunk)
* ML: New Upstream Version (Qt 3.3.3), urgency is high to push this into
sarge as soon as possible (Qt 3.2 is not acceptable)
@@ -720,7 +729,7 @@
-- Martin Loschwitz <madkiss at debian.org> Sat, 14 Aug 2004 21:05:00 +0200
qt-x11-free (3:3.3.2-5) unstable; urgency=medium
-
+
* ML: debian/rules: Fixed the debhelper calls, dh tried to install the
iBase stuff (Architecture: i386) even on non-i386 architectures.
* ML: Enable iBase for all Operating Systems instead of only for Linux
@@ -738,7 +747,7 @@
-- Martin Loschwitz <madkiss at debian.org> Sat, 07 Aug 2004 22:13:00 +0200
qt-x11-free (3:3.3.2-3) unstable; urgency=low
-
+
* ML: debian/control: Switch from Firebird1 to Firebird2
-- Martin Loschwitz <madkiss at debian.org> Sat, 07 Aug 2004 16:33:00 +0200
@@ -786,7 +795,7 @@
* ML: Use the OpenGL-libraries via dlopen (Closes: #257705)
-- Martin Loschwitz <madkiss at debian.org> Sat, 07 Aug 2004 09:50:00 +0200
-
+
qt-x11-free (3:3.3.2-0pre2) experimental; urgency=low
* ML: Added qaccessible.h to the list of headers
@@ -841,12 +850,12 @@
* ML: Bumped Standards-Version to 3.6.1 (No changes)
* ML: Added debian/compat
* ML: Added patch by Simon Hausmann to fix generation of pkgcof files
-
+
-- Martin Loschwitz <madkiss at debian.org> Sun, 05 Oct 2003 11:24:00 +0200
-
+
qt-x11-free (3:3.2.1-5) unstable; urgency=low
- * ML: Let's build styles into the library, instead of as plugins
+ * ML: Let's build styles into the library, instead of as plugins
(Closes: #197157)
* ML: Added build dependency for libaudio-dev to libqt3{-mt}-dev
(Closes: #210628, #210994, #212530)
@@ -858,7 +867,7 @@
qt-x11-free (3:3.2.1-4) unstable; urgency=low
- * ML: re-add the fontlist fix from previous versions
+ * ML: re-add the fontlist fix from previous versions
* ML: Added dependencies for libxft2-dev, libxrender-dev and libxcursor-dev
to the -dev packages (Closes: #208421)
* ML: Changed description of libqt3-plugins-headers package
@@ -866,7 +875,7 @@
* RN: move unixmake2.cpp patch (approved by TT)
* RN: add qlineedit.cpp patch (approved by TT)
* RN: re-add pkg-config files
-
+
-- Martin Loschwitz <madkiss at debian.org> Wed, 3 Sep 2003 18:30:00 +0200
qt-x11-free (3:3.2.1-3) unstable; urgency=low
@@ -898,7 +907,7 @@
* ML: debian/control: Point out that libqt3-compat-headers might be of
importance (with Recommends and addition to package description,
- Ben, I hope this satisfies you for now)
+ Ben, I hope this satisfies you for now)
* ML: debian/rules Fix for-fork with patch from BTS (Closes: #188536)
-- Martin Loschwitz <madkiss at debian.org> Tue, 15 Jul 2003 19:45:00 +0200
@@ -913,9 +922,9 @@
* ML: debian/libqt3-plugins-headers: Added qinterlacestyle.h (Closes: #182259)
* ML: Have libqt3-dev and libqt3-mt-dev in the libdevel section
* RN: debian/control: Add libxft2-dev as dependency for -dev-packages
-
+
-- Martin Loschwitz <madkiss at debian.org> Sat, 10 May 2003 14:55:00 +0200
-
+
qt-x11-free (3:3.1.1-7) unstable; urgency=low
* ML: The "Arg, can somebody purge typod please?"-release
@@ -942,7 +951,7 @@
* ML: Removed patch for hppa (was needed to fix FTBFS)
-- Martin Loschwitz <madkiss at madkiss.org> Sat, 22 Feb 2003 08:47:00 +0100
-
+
qt-x11-free (3:3.1.1-4) unstable; urgency=low
* RN: debian/rules: remove byacc commands
@@ -958,7 +967,7 @@
* ML: Create seperate qconfig.h files for non-mt/mt (Conflicts for -dev!)
-- Martin Loschwitz <madkiss at madkiss.org> Tue, 18 Feb 2003 19:26:00 +0100
-
+
qt-x11-free (3:3.1.1-3) unstable; urgency=low
* RN: debian/libqt3-plugins-headers.install: Removed headers for codecs
@@ -970,7 +979,7 @@
* ML: Added debian/maintain/fixqc.sh to fix qmake.cache files during install
-- Martin Loschwitz <madkiss at madkiss.org> Wed, 12 Feb 2003 16:31:00 +0100
-
+
qt-x11-free (3:3.1.1-2pre3v1) unstable; urgency=low
* New package: libqt3-compat-headers (Thanks to Ralf Nolden again)
@@ -1012,9 +1021,9 @@
* This was fixed in 3:3.1.1-1 (Closes: #179155)
* debian/maintain/qmake*.conf: Fix errors causing FTBFS on hppa/alpha (Closes: #179582)
* debian/control: Make libqt3-dev/-mt-dev depend on xlibmesa-gl-dev (Closes: #179573)
-
+
-- Martin Loschwitz <madkiss at madkiss.org> Mon, 3 Feb 2003 12:49:00 +0100
-
+
qt-x11-free (3:3.1.1-1) unstable; urgency=low
* The packages have been redesigned radically.
@@ -1064,7 +1073,7 @@
* debian/control: Added build-dependency for Xft2 - thus Xft2 enabled
-- Martin Loschwitz <madkiss at madkiss.org> Fri, 20 Dec 2002 17:53:00 +0100
-
+
qt-x11-free (2:3.1.0+cvs.20021205-1) unstable; urgency=low
* New Upstream version (Qt 3.1.0, using qt-copy from KDE project) (Closes: #167001)
@@ -1077,7 +1086,7 @@
* debian/rules: Converted to dh_install
-- Martin Loschwitz <madkiss at madkiss.org> Thu, 05 Dec 2002 14:10:00 +0100
-
+
qt-x11-free (2:3.0.5-4) unstable; urgency=low
* debian/09_assistant.dpatch: Fix doc-dir-path for Qt-assistant (Closes: #148924)
@@ -1093,7 +1102,7 @@
* debian/rules: Re-enabled NAS (Network Audio System)
* Must be a local problem (there ARE files in libqt3-dev) (Closes: #159674)
* Not a Qt bug; has been fixed probably long time ago (Closes: #154976)
-
+
-- Martin Loschwitz <madkiss at madkiss.org> Thu, 15 Oct 2002 09:29:00 +0200
qt-x11-free (2:3.0.5-3) unstable; urgency=low
@@ -1104,7 +1113,7 @@
unthreaded plugins now (Closes: #152022)
-- Martin Loschwitz <madkiss at madkiss.org> Thu, 9 Aug 2002 22:18:00 +0200
-
+
qt-x11-free (2:3.0.5-2) unstable; urgency=low
* debian/control: qt3-dev and qt3-doc are "Priority: extra" now.
@@ -1127,7 +1136,7 @@
* debian/control: Depend on libpng3-dev (Closes: #154234).
-- Martin Loschwitz <madkiss at madkiss.org> Sat, 27 Jul 2002 13:51:00 +0200
-
+
qt-x11-free (2:3.0.4-2) unstable; urgency=low
* Fix hppa build hopefully (Closes: #150917)
@@ -1139,9 +1148,9 @@
* New upstream version
* Fix qt-designer html access (Closes: #149505)
- * Build postgresql modules
+ * Build postgresql modules
* This was fixed a while ago. (Closes: #134637)
- * Build static libs again. yuk! Who the heck uses these anymore?
+ * Build static libs again. yuk! Who the heck uses these anymore?
(Closes: #147084)
-- Ivan E. Moore II <rkrusty at debian.org> Sun, 16 Jun 2002 12:25:00 -0700
@@ -1155,7 +1164,7 @@
qt-copy (2:3.0.3-20020329-6) unstable; urgency=low
* Remove unused doc dirs. (Closes: #148595)
- * move html files to html subdir
+ * move html files to html subdir
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 30 May 2002 22:58:00 -0700
@@ -1180,7 +1189,7 @@
qt-copy (2:3.0.3-20020329-2) unstable; urgency=low
* Fix overwrite issue (Closes: #141803, #141639)
- * Re-add all the additional man pages
+ * Re-add all the additional man pages
-- Ivan E. Moore II <rkrusty at debian.org> Tue, 23 Apr 2002 00:27:00 -0700
@@ -1208,13 +1217,13 @@
qt-copy (2:3.0.3-20020314-3) unstable; urgency=low
- * Since this is still in incoming..change from a build-conflict to a
+ * Since this is still in incoming..change from a build-conflict to a
versioned depend
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 16 Mar 2002 11:00:00 -0700
qt-copy (2:3.0.3-20020314-2) unstable; urgency=low
-
+
* Build-Conflict with libpng2-dev since it provides libpng-dev and we don't
want any of those problems.
@@ -1222,7 +1231,7 @@
qt-copy (2:3.0.3-20020314-1) unstable; urgency=low
- * New upstream version.
+ * New upstream version.
* Includes updated zlib code
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 14 Mar 2002 12:31:00 -0700
@@ -1322,56 +1331,56 @@
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 29 Aug 2001 20:52:00 -0700
qt-x11-free (2:3.0.0-0beta3-2) unstable; urgency=low
-
+
* Fix path issues for documentation (Closes: #109255)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 19 Aug 2001 00:01:00 -0700
qt-x11-free (2:3.0.0-0beta3-1) unstable; urgency=low
-
+
* new upstream beta
* Include mkspecs bits for qmake
* include qmake wrapper
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 27 Jul 2001 03:36:00 -0700
qt-x11-free (2:3.0.0-0beta2-3) unstable; urgency=low
-
+
* drop Optimization down for other archs
* *should* fix m68k build (Closes: #104043)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Tue, 17 Jul 2001 15:47:00 -0700
qt-x11-free (2:3.0.0-0beta2-2) unstable; urgency=low
-
+
* actually include libqxt.so so people can build packages against it
* Remove the suggests for anti-aliasing-howto from the plugin packages
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sun, 08 Jul 2001 03:50:00 -0700
qt-x11-free (2:3.0.0-0beta2-1) unstable; urgency=low
-
+
* New upstream beta
* Ok, now we break out libqxt0
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 05 Jul 2001 12:46:00 -0700
qt-x11-free (3.0.0-0beta1-6) unstable; urgency=low
-
+
* Add missing build-depend for flex (Closes: #102978, #102984)
* Add conflict with libqxt0 (Closes: #102959)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sun, 01 Jul 2001 08:32:00 -0700
qt-x11-free (3.0.0-0beta1-5) unstable; urgency=low
-
+
* ok..I'll get this stuff worked out soon. Fix gl build bits
(Closes: #102849)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 30 Jun 2001 00:27:00 -0700
qt-x11-free (3.0.0-0beta1-4) unstable; urgency=low
-
+
* Include qmake in libqt3-dev package
* Build database modules and provide seperate packages for them
* Build styles and provide them in libqt3 package
@@ -1380,44 +1389,44 @@
* Update build-depends
* Actually include linguist desktop file
* Include interface files as well
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 28 Jun 2001 22:03:00 -0700
qt-x11-free (3.0.0-0beta1-3) unstable; urgency=low
-
+
* Fix libqui1 deps (Closes: #100804)
* Fix qmake symlink (Closes: #100964)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 18 Jun 2001 19:40:00 -0700
qt-x11-free (3.0.0-0beta1-2) unstable; urgency=low
-
+
* Fix dependencies for libqt3-dev...grrr
* Fix description for qt3-tools
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 07 Jun 2001 21:00:00 -0700
qt-x11-free (3.0.0-0beta1-1) unstable; urgency=low
-
+
* New upstream beta version
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 26 May 2001 11:06:00 -0700
qt-x11 (2:2.3.0-final-5) unstable; urgency=low
-
+
* Fix LD PATH problems due to new fakeroot routines (Closes: #98068)
* Get rid of gl specific package and just build main package with gl support
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 25 May 2001 00:25:00 -0700
qt-x11 (2:2.3.0-final-4) unstable; urgency=low
-
+
* Fix konsole accents (Closes: #96678)
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 11 May 2001 10:27:00 -0700
qt-x11 (2:2.3.0-final-3) unstable; urgency=low
-
+
* More alpha tweaks (only remove optimization for CXXFLAGS)
* Update bulid flags (Closes: #90334)
* Updating shlibs to stop problem with people using old libqt2 packages
@@ -1445,42 +1454,42 @@
-- Ivan E. Moore II <rkrusty at debian.org> Tue, 01 May 2001 22:42:00 -0700
qt-x11 (2:2.3.0-final-2) unstable; urgency=low
-
+
* test build
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sun, 07 Mar 2001 13:26:00 -0700
qt-x11 (2:2.3.0-final-1) unstable; urgency=low
-
+
* New upstream version
* Applied xft workaround patch
* versioning the depends
* Adding in alpha specific build code so that it will build out of the
box.
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 07 Mar 2001 13:26:00 -0700
qt-x11 (2:2.3.0-beta1-3) unstable; urgency=low
-
+
* Various patches applied from qt-copy branch of kde cvs. These include
several upstream fixes that were done post beta-1 and will be a part of
the next release.
LANG=he_IL.iso8859-8 will work correctly now.
- .fontguess file now accepts quoted font names (so you can use font anmes
+ .fontguess file now accepts quoted font names (so you can use font anmes
with white space inside)
* Konq's combobox works again
* Include xt extension (Closes: #88147)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 01 Mar 2001 09:17:00 -0700
qt-x11 (2:2.3.0-beta1-2) unstable; urgency=low
-
+
* Fix grave bug with xft (Closes: #87758)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 26 Feb 2001 23:22:00 -0700
qt-x11 (2:2.3.0-beta1-1) unstable; urgency=low
-
+
* New upstream version
* Don't clean everything out of bin/ after each stage as some pieces are
scripts that don't get built
@@ -1492,70 +1501,70 @@
packages as to not totally hose people up right away. These will go
away prior to freeze.
* Build with XFT support - Anti Aliasing
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 23 Feb 2001 06:23:00 -0700
qt-x11 (2:2.2.4-5) unstable; urgency=low
-
+
* Fix qt-mt package (Closes: #85132)
building of the tools cause the mt library to get hosed somehow
* Fix -dev depends for mt-dev
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 17 Feb 2001 00:42:00 -0700
qt-x11 (2:2.2.4-4) unstable; urgency=low
-
+
* Break out uic and libqutil. This allows for developers not to need
qt-designer to build packages and also takes care of the fact that
libqutil is common.
- * Changing dev packages to libqt-dev and libqt-mt-dev
-
+ * Changing dev packages to libqt-dev and libqt-mt-dev
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 15 Feb 2001 02:30:00 -0700
qt-x11 (2:2.2.4-3) unstable; urgency=low
-
+
* Fix pathing for qt-designer for #85493
* Change qt-designer's Depends on qt2.2-doc to Recommends (Closes: #85486)
* Adding in Perl depends properly for libqt2.2-dev
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 10 Feb 2001 17:30:00 -0700
qt-x11 (2:2.2.4-2) unstable; urgency=low
-
+
* Include findtr (Closes: 85439)
* Build against new libmng
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 09 Feb 2001 16:30:00 -0700
qt-x11 (2:2.2.4-1) unstable; urgency=low
-
+
* New upstream version
- On X11, popup menus do not grab the keyboard anymore, but rely on and
+ On X11, popup menus do not grab the keyboard anymore, but rely on and
enforce the application to have focus. This works around an X11 bug
where deadkeys do not work while the keyboard is grabbed.
See QT changelog for full list of updates
* Installing ui templates so that Designer doesn't complain.
* Adding in suggests for tmake
* Moving libqutil and uic over to designer package where they belong
- * Moving away from /usr/lib/qt2 -
+ * Moving away from /usr/lib/qt2 -
/usr/share/qt would have links for include/docs/man
it will also store all other pieces such as the ui templates for
- designer.
+ designer.
* Cleaning up post/pre scripts, docs, etc. libqt2.2 package doesn't need
development docs and information...move it into -dev package
* Creating createcw and associated libs for use with designer
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 02 Feb 2001 16:30:00 -0700
qt2.2 (2:2.2.3-12) unstable; urgency=low
-
+
* Only build designer once, using the shared libraries. This will cut
down on build time.
* Moving man pages into /usr/share/man tree
- * Do not duplicate header files for examples and tools.
+ * Do not duplicate header files for examples and tools.
* Don't copy the tools/ directory tree since we build them already, if
someone wants the source to them they can dl the orig.tar.gz
- * Don't remove the Makefile's during a clean so that we can include them
+ * Don't remove the Makefile's during a clean so that we can include them
with the examples and tutorial
* Adding in a Debian menu entry for QT Designer
* Cleaning up descriptions to show where man pages were (since they were
@@ -1568,46 +1577,46 @@
* Upstream patch applied for "dead keys" in qpopups - this is part of a
fix for Bug 82967.
* fix for setNamedColor parsing problem
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 27 Jan 2001 07:25:00 -0700
qt2.2 (2:2.2.3-11) unstable; urgency=low
-
+
* Removing libpth-dev from depends
* One more upstream crash/bug fix in qasyncimageio
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 24 Jan 2001 18:41:00 -0700
qt2.2 (2:2.2.3-10) unstable; urgency=low
-
+
* Fixing libqt2.2-dev dependencies. Adding libz-dev, xlibs-dev, libpng2-dev,
libjpeg62-dev, libmng-dev. (Closes: #83298)
* Adding uic information to libqt2.2-dev's description
* More crash fixes for graphics manipulation
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Tue, 23 Jan 2001 14:13:00 -0700
qt2.2 (2:2.2.3-9) unstable; urgency=low
-
+
* Fix a crash problem with qimage
* More i18n
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 22 Jan 2001 00:10:00 -0700
qt2.2 (2:2.2.3-8) unstable; urgency=low
-
+
* More upstream fixes...moving towards 2.2.4
i18n work
bug fixes
- * Removing old i18n patches
+ * Removing old i18n patches
* fixing qt-designer section
* Build against new version of MNG
* Update build-depends
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 20 Jan 2001 01:28:00 -0700
qt2.2 (2:2.2.3-7) unstable; urgency=low
-
+
* Moving tools/ includes to /usr/share/doc/qt2.2-doc/tools/includes
Apparantly they were causing problems with some apps
* Updating build-depends
@@ -1617,13 +1626,13 @@
fixes printing in almost all 8bit locales, *if* you are using these
fonts.
OK button fix
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 17 Jan 2001 16:05:00 -0700
qt2.2 (2:2.2.3-6) unstable; urgency=low
-
+
* New i18n patches - submitted upstream finally it seems
- * Cleanup of build-depends and depends.
+ * Cleanup of build-depends and depends.
* Creating a non-kde designer package
* Upstream i18n updates out of future 2.2.4 release.
* Fix print dialog problem - thanks to Michael Lachmann <dirk at santafe.edu>
@@ -1631,183 +1640,183 @@
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 15 Jan 2001 15:30:00 -0700
qt2.2 (2:2.2.3-5) unstable; urgency=low
-
+
* Cleaning up depends/provides/conflicts
We are the only qt package for unstable so lets act like it.
* new i18n patch for qpsprinter
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 10 Jan 2001 16:00:00 -0700
qt2.2 (2:2.2.3-4) unstable; urgency=low
-
+
* New i18n patches
* More build fixes
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 01 Jan 2001 03:31:00 -0700
qt2.2 (2:2.2.3-3) unstable; urgency=low
-
+
* Applying Anti-Aliasing patch
* Adjusting Build-Depends as we now must have the latest X4
* Adding libfreetyp6-dev to Build-Depends
* Fixing document links (Closes: #79876)
* New i18n patch update for qpsprinter
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 18 Dec 2000 01:13:00 -0700
qt2.2 (2:2.2.3-2) unstable; urgency=low
-
+
* More build fixes...arggg...
* Applying new i18n patches for 2.2.3 and removing old 2.2.2 hacks
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 14 Dec 2000 16:27:00 -0700
qt2.2 (2:2.2.3-1) unstable; urgency=low
-
+
* New upstream version
* Cleaning up build process
* Removing Mesa specific GL code as before
* Including new tools - qconfig, qvfb, makeqpf, and qembed
* Applying qscrollview patch from QT via <j.w.greven at student.utwente.nl>
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 13 Dec 2000 14:45:00 -0700
qt2.2 (2:2.2.2-12) unstable; urgency=low
-
- * New ad hoc xim patch - amazing what happens when you have no other choice
+
+ * New ad hoc xim patch - amazing what happens when you have no other choice
* Updating shlibs
* More build-depends and depends work
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 11 Dec 2000 09:09:00 -0700
qt2.2 (2:2.2.2-11) unstable; urgency=low
-
+
* Removing xim patch since it's been weeks without a fix for the problems
it causes
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 09 Dec 2000 06:30:00 -0700
qt2.2 (2:2.2.2-10) unstable; urgency=low
-
+
* Friggen dependency loops.
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 07 Dec 2000 01:00:00 -0700
qt2.2 (2:2.2.2-9) unstable; urgency=low
-
+
* Fixing broken shlibs...arggg
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 02 Dec 2000 23:12:00 -0700
qt2.2 (2:2.2.2-8) unstable; urgency=low
-
+
* Creating libqt2.2-gl package. Recommendations from upstream folks to
only compile in GL support as necessary due to stability issues and the
fact that we do have users that require GL support in QT has led me to
move GL support out of the main QT package. libqt2.2 conflicts/replaces
- libqt2.2-gl while libqt2.2-gl replaces libqt2.2.
+ libqt2.2-gl while libqt2.2-gl replaces libqt2.2.
* Adding in missing build-depends
* More build cleanup
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 30 Nov 2000 15:15:00 -0700
qt2.2 (2:2.2.2-7) unstable; urgency=low
-
+
* New i18n patches
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 29 Nov 2000 07:52:00 -0700
qt2.2 (2:2.2.2-6) unstable; urgency=low
-
- * New i18n patches
+
+ * New i18n patches
* Adding in a replaces for libqt1g-dev and qt1g-dev
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 25 Nov 2000 03:40:00 -0700
qt2.2 (2:2.2.2-5) unstable; urgency=low
-
+
* Removing nas support per popular demand
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 20 Nov 2000 15:45:00 -0700
qt2.2 (2:2.2.2-4) unstable; urgency=low
-
+
* Moving threaded version of libqt to libqt2.2-mt to cut down on size of
main package and still allow for those who need the threaded version to
obtain it.
- * Fixing up dependencies for xlibs vs xlib6g for ports that do not have
+ * Fixing up dependencies for xlibs vs xlib6g for ports that do not have
xlibs
* Fixing shlibs
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 18 Nov 2000 20:14:00 -0700
qt2.2 (2:2.2.2-4) unstable; urgency=low
-
+
* Fixing up thread support again
* Fixing the last lintian error
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 18 Nov 2000 08:30:00 -0700
qt2.2 (2:2.2.2-3.1) unstable; urgency=low
-
+
* Fixing QGLWidget problem (Closes: #77248)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 16 Nov 2000 21:30:00 -0700
qt2.2 (2:2.2.2-3) unstable; urgency=low
-
+
* Applying uic patch from upstream
* Adding in versioned replace (Closes: #77147)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 16 Nov 2000 07:15:00 -0700
qt2.2 (2:2.2.2-2.1) unstable; urgency=low
-
+
* Removing thread support as it still seems unstable
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 16 Nov 2000 07:15:00 -0700
qt2.2 (2:2.2.2-2) unstable; urgency=low
-
+
* contains new i18n patches
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 16 Nov 2000 02:00:00 -0700
qt2.2 (2:2.2.2-1) unstable; urgency=low
-
+
* New upstream version
* Does not contain any i18n patches
* compiled with nas sound support
* mesa specific GL code removed manually
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Tue, 14 Nov 2000 20:00:00 -0700
qt2.2 (2:2.2.1-11) unstable; urgency=low
-
+
* Manually removing Mesa specific GL code from qt
* New i18n patch
* Cleaned up diff file
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sun, 12 Nov 2000 03:00:00 -0700
qt2.2 (2:2.2.1-10) unstable; urgency=low
-
+
* New i18n patches (Closes: #75830)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 08 Nov 2000 16:00:00 -0700
-
+
qt2.2 (2:2.2.1-9.2) unstable; urgency=low
-
+
* Fix to /usr/lib/qt2/man link problem (Closes: #75622)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sun, 05 Nov 2000 22:00:00 -0700
-
+
qt2.2 (2:2.2.1-9.1) unstable; urgency=low
-
+
* Build against X4 libs
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 04 Nov 2000 12:00:00 -0700
-
+
qt2.2 (2:2.2.1-9) unstable; urgency=low
* More opengl cleanup
@@ -1816,67 +1825,67 @@
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 01 Nov 2000 23:00:00 -0700
qt2.2 (2:2.2.1-8) unstable; urgency=low
-
+
* Re-adding opengl support until another solution is created
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 23 Oct 2000 16:28:00 -0700
qt2.2 (2:2.2.1-7) unstable; urgency=low
-
+
* Round 42..heh...let's try the png fix again
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 18 Oct 2000 23:54:00 -0700
-
+
qt2.2 (2:2.2.1-6) unstable; urgency=low
-
+
* Hopefully fix png image viewing crashing
* adding in links for /usr/lib/qt2/man and /usr/lib/qt2/doc
* Fixing compression of html files
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 18 Oct 2000 00:15:00 -0700
-
+
qt2.2 (2:2.2.1-5) unstable; urgency=low
-
+
* Minor dependency fix for libqt2.2-dev's perl necessesity
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 14 Oct 2000 01:00:00 -0700
qt2.2 (2:2.2.1-4) unstable; urgency=low
-
+
* Ok, I'm not sure what i did but somehow the i18n patches missed getting
applied when I updated the source. Re-Applying them. (Closes: #74713)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 13 Oct 2000 23:30:00 -0700
qt2.2 (2:2.2.1-3) unstable; urgency=low
-
+
* Putting includes for examples into qt2.2-doc package (Closes: #74479)
* adding in some build options recommended by upstream that will reduce
the amount of memory used by apps linked against qt as well as reduce
the size of the resulting library significantly
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 11 Oct 2000 02:30:00 -0700
-
+
qt2.2 (2:2.2.1-2) unstable; urgency=low
-
+
* More build cleanup
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sun, 08 Oct 2000 03:45:00 -0700
qt2.2 (2:2.2.1-1) unstable; urgency=low
-
+
* Including new version of upstream source code (they buggered something)
* Applying i18n patches for 2.2.1
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 07 Oct 2000 22:00:00 -0700
-
+
qt2.2 (2:2.2.1-0) unstable; urgency=low
-
+
* New upstream version
* Building with thread support turned on (Closes: #72994)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 05 Oct 2000 20:00:00 -0700
-
+
qt2.2 (2:2.2.0-20000906-9) unstable; urgency=low
* Fixing up some dependencies and build-depends
@@ -1892,26 +1901,26 @@
-- Ivan E. Moore II <rkrusty at debian.org> Sun, 24 Sep 2000 22:00:00 -0700
qt2.2 (2:2.2.0-20000906-7) unstable; urgency=low
-
+
* Finally adding in a fix for dangling manpage (Closes: #67375)
* Getting rid of alternatives since this will be the only qt package
* Adding libmng support
* Fixing up build-depends
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 23 Sep 2000 00:30:00 -0700
qt2.2 (2:2.2.0-20000906-6) unstable; urgency=low
-
+
* More cleanup of build process to better handle mergetr and msg2qm
* Should fix problem with mesa linking (Closes: #71829)
* Applying m17n patches (Closes: #71820)
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 18 Sep 2000 17:30:00 -0700
qt2.2 (2:2.2.0-20000906-5) unstable; urgency=low
-
+
* Fixing problem with missing mergetr and msg2qm
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Tue, 12 Sep 2000 09:00:00 -0700
qt2.2 (2:2.2.0-20000906-4) unstable; urgency=low
@@ -1928,20 +1937,20 @@
-- Ivan E. Moore II <rkrusty at debian.org> Sat, 09 Sep 2000 15:15:00 -0700
qt2.2 (2:2.2.0-20000906-2) unstable; urgency=low
-
+
* Removing designer build pieces
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 08 Sep 2000 00:15:00 -0700
qt2.2 (2:2.2.0-20000906-1) unstable; urgency=low
-
+
* Working out build issues
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 07 Sep 2000 15:00:00 -0700
qt2.2 (2:2.2.0-20000906-0) unstable; urgency=low
- * New upstream stable release
+ * New upstream stable release
* Includes designer and is under a dual license. QPL and GPL
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 06 Sep 2000 07:45:00 -0700
@@ -1949,7 +1958,7 @@
qt2.2-copy (2:2.2.0-20000821-0.3) unstable; urgency=low
* Building other tools (mergetr, msg2qm, qconfig)
- * removing replace/conflict with libqt2.1
+ * removing replace/conflict with libqt2.1
-- Ivan E. Moore II <rkrusty at debian.org> Tue, 05 Sep 2000 18:00:00 -0700
@@ -1960,24 +1969,24 @@
-- Ivan E. Moore II <rkrusty at debian.org> Fri, 01 Sep 2000 17:00:00 -0700
qt2.2-copy (2:2.2.0-20000821-0.1) unstable; urgency=low
-
+
* Updating version number to be higher than Debian one
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 28 Aug 2000 06:00:00 -0700
-
+
qt2.2-copy (2:2.2.0-20000821-0) unstable; urgency=low
* New upstream CVS version
- * Providing designer
+ * Providing designer
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 21 Aug 2000 18:00:00 -0700
qt2.2-copy (2:2.2.0-1.copy.1) unstable; urgency=low
-
+
* New upstream beta version
-
- -- Ivan E. Moore II <rkrusty at debian.org> Sun, 20 Aug 2000 00:30:00 -0700
+ -- Ivan E. Moore II <rkrusty at debian.org> Sun, 20 Aug 2000 00:30:00 -0700
+
qt2.2-beta1 (2:2.2.0-0.beta1.0) unstable; urgency=low
* New upstream beta version
@@ -1985,17 +1994,17 @@
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 10 Aug 2000 02:30:00 -0700
qt2.1 (2:2.1.0-1.1) unstable; urgency=low
-
+
* Upping the epoch number since the upstream version changes made 2.1.0
full release lower than the 2.1.0beta
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Thu, 18 May 2000 08:30:00 -0700
qt2.1 (2.1.0-1.1) unstable; urgency=low
-
+
* Fixing qt_windows/mac.h include errors
* Adding in build depends
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 15 May 2000 02:30:00 -0700
qt2.1 (2.1.0-1) unstable; urgency=low
@@ -2018,21 +2027,21 @@
-- Ivan E. Moore II <rkrusty at debian.org> Wed, 22 Mar 2000 18:00:00 -0700
qt2.1beta2 (2.1.0beta2-1.1) unstable; urgency=low
-
- * Applying qsortedlist.h patch
-
+
+ * Applying qsortedlist.h patch
+
-- Ivan E. Moore II <rkrusty at debian.org> Tue, 07 Mar 2000 10:30:00 -0700
qt2.1beta2 (2.1.0beta2-1) unstable; urgency=low
-
+
* New upstream beta version
* Fixing prerm script
-
+
-- Ivan E. Moore II <rkrusty at debian.org> Mon, 06 Mar 2000 00:30:00 -0700
-
+
qt2.1 (2.1.0-0.beta1.0) unstable; urgency=medium
- * New upstream beta version
+ * New upstream beta version
* Taking over maintainership temporarily with permission from Heiko
* Fixing alternatives issue (Closes: #56997)
Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/control 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,7 +1,16 @@
Source: qt-x11-free
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: debhelper (>= 5.0.31), quilt, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
+Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
+ libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
+ libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
+ libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
+ libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev,
+ libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
+ libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4),
+ libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
+ firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
Section: libs
Priority: optional
Standards-Version: 3.7.3
@@ -79,7 +88,15 @@
Architecture: any
Section: libdevel
Replaces: libqt-mt-dev, libqt3-dev, libqt3-helper, libqt3-headers (<= 3:3.1.1-3), libqt3-emb (<= 3:3.0.3-1)
-Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${binary:Version}), libqt3-headers (= ${binary:Version}), qt3-dev-tools (= ${binary:Version})
+Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
+ libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
+ libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
+ libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev,
+ libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3),
+ libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev,
+ libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${binary:Version}),
+ libqt3-headers (= ${binary:Version}), qt3-dev-tools (= ${binary:Version})
Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1), libqt3-dev
Recommends: libqt3-compat-headers
Suggests: libqt3-i18n, qt3-doc
Modified: trunk/packages/qt-x11-free/debian/patches/0001-dnd_optimization.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0001-dnd_optimization.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0001-dnd_optimization.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -26,7 +26,7 @@
#undef KeyPress
#undef KeyRelease
-@@ -256,20 +258,47 @@
+@@ -256,20 +258,47 @@ class QShapedPixmapWidget : public QWidg
public:
QShapedPixmapWidget(int screen = -1) :
QWidget(QApplication::desktop()->screen( screen ),
@@ -77,7 +77,7 @@
};
static QShapedPixmapWidget * qt_xdnd_deco = 0;
-@@ -875,6 +904,45 @@
+@@ -875,6 +904,45 @@ void QDragManager::timerEvent( QTimerEve
move( QCursor::pos() );
}
@@ -123,7 +123,7 @@
bool QDragManager::eventFilter( QObject * o, QEvent * e)
{
if ( beingCancelled ) {
-@@ -897,8 +965,10 @@
+@@ -897,8 +965,10 @@ bool QDragManager::eventFilter( QObject
if ( e->type() == QEvent::MouseMove ) {
QMouseEvent* me = (QMouseEvent *)e;
@@ -136,7 +136,7 @@
return TRUE;
} else if ( e->type() == QEvent::MouseButtonRelease ) {
qApp->removeEventFilter( this );
-@@ -1139,7 +1209,7 @@
+@@ -1139,7 +1209,7 @@ void QDragManager::move( const QPoint &
qt_xdnd_deco->grabMouse();
}
}
@@ -145,7 +145,7 @@
if ( qt_xdnd_source_sameanswer.contains( globalPos ) &&
qt_xdnd_source_sameanswer.isValid() ) {
-@@ -1732,7 +1802,7 @@
+@@ -1732,7 +1802,7 @@ bool QDragManager::drag( QDragObject * o
// qt_xdnd_source_object persists until we get an xdnd_finish message
}
@@ -154,7 +154,7 @@
{
if ( qt_xdnd_deco ) {
QPixmap pm;
-@@ -1747,9 +1817,8 @@
+@@ -1747,9 +1817,8 @@ void QDragManager::updatePixmap()
defaultPm = new QPixmap(default_pm);
pm = *defaultPm;
}
@@ -166,7 +166,7 @@
//if ( willDrop ) {
qt_xdnd_deco->show();
//} else {
-@@ -1758,4 +1827,9 @@
+@@ -1758,4 +1827,9 @@ void QDragManager::updatePixmap()
}
}
@@ -178,7 +178,7 @@
#endif // QT_NO_DRAGANDDROP
--- a/src/kernel/qdragobject.h
+++ b/src/kernel/qdragobject.h
-@@ -248,6 +248,7 @@
+@@ -248,6 +248,7 @@ private:
void move( const QPoint & );
void drop();
void updatePixmap();
Modified: trunk/packages/qt-x11-free/debian/patches/0002-dnd_active_window_fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0002-dnd_active_window_fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0002-dnd_active_window_fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -27,7 +27,7 @@
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -3975,7 +3975,7 @@
+@@ -3975,7 +3975,7 @@ void QApplication::closePopup( QWidget *
// Keyboard event translation
//
@@ -36,7 +36,7 @@
{
int bst = 0;
if ( s & Button1Mask )
-@@ -4041,7 +4041,7 @@
+@@ -4041,7 +4041,7 @@ bool QETWidget::translateMouseEvent( con
pos.ry() = lastMotion.y;
globalPos.rx() = lastMotion.x_root;
globalPos.ry() = lastMotion.y_root;
@@ -45,7 +45,7 @@
if ( qt_button_down && (state & (LeftButton |
MidButton |
RightButton ) ) == 0 )
-@@ -4065,7 +4065,7 @@
+@@ -4065,7 +4065,7 @@ bool QETWidget::translateMouseEvent( con
pos.ry() = xevent->xcrossing.y;
globalPos.rx() = xevent->xcrossing.x_root;
globalPos.ry() = xevent->xcrossing.y_root;
@@ -54,7 +54,7 @@
if ( qt_button_down && (state & (LeftButton |
MidButton |
RightButton ) ) == 0 )
-@@ -4077,7 +4077,7 @@
+@@ -4077,7 +4077,7 @@ bool QETWidget::translateMouseEvent( con
pos.ry() = event->xbutton.y;
globalPos.rx() = event->xbutton.x_root;
globalPos.ry() = event->xbutton.y_root;
@@ -63,7 +63,7 @@
switch ( event->xbutton.button ) {
case Button1: button = LeftButton; break;
case Button2: button = MidButton; break;
-@@ -5023,7 +5023,7 @@
+@@ -5023,7 +5023,7 @@ bool QETWidget::translateKeyEventInterna
XKeyEvent xkeyevent = event->xkey;
// save the modifier state, we will use the keystate uint later by passing
@@ -72,7 +72,7 @@
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
-@@ -5137,7 +5137,7 @@
+@@ -5137,7 +5137,7 @@ bool QETWidget::translateKeyEventInterna
}
#endif // !QT_NO_XIM
@@ -83,7 +83,7 @@
if ( qt_use_rtl_extensions && type == QEvent::KeyRelease ) {
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
-@@ -118,6 +118,8 @@
+@@ -118,6 +118,8 @@ Atom qt_xdnd_finished;
Atom qt_xdnd_type_list;
const int qt_xdnd_version = 4;
@@ -92,7 +92,7 @@
// Actions
//
// The Xdnd spec allows for user-defined actions. This could be implemented
-@@ -203,6 +205,8 @@
+@@ -203,6 +205,8 @@ static Time qt_xdnd_target_current_time;
static int qt_xdnd_current_screen = -1;
// state of dragging... true if dragging, false if not
bool qt_xdnd_dragging = FALSE;
@@ -101,7 +101,7 @@
// dict of payload data, sorted by type atom
static QIntDict<QByteArray> * qt_xdnd_target_data = 0;
-@@ -900,8 +904,20 @@
+@@ -900,8 +904,20 @@ void qt_handle_xdnd_finished( QWidget *,
void QDragManager::timerEvent( QTimerEvent* e )
{
@@ -124,7 +124,7 @@
}
static bool qt_xdnd_was_move = false;
-@@ -969,6 +985,7 @@
+@@ -969,6 +985,7 @@ bool QDragManager::eventFilter( QObject
updateMode(me->stateAfter());
move( me->globalPos() );
}
@@ -132,7 +132,7 @@
return TRUE;
} else if ( e->type() == QEvent::MouseButtonRelease ) {
qApp->removeEventFilter( this );
-@@ -1007,9 +1024,11 @@
+@@ -1007,9 +1024,11 @@ bool QDragManager::eventFilter( QObject
beingCancelled = FALSE;
qApp->exit_loop();
} else {
@@ -147,7 +147,7 @@
}
return TRUE; // Eat all key events
}
-@@ -1036,10 +1055,10 @@
+@@ -1036,10 +1055,10 @@ bool QDragManager::eventFilter( QObject
static Qt::ButtonState oldstate;
@@ -160,7 +160,7 @@
const int both = ShiftButton|ControlButton;
if ( (newstate & both) == both ) {
global_requested_action = QDropEvent::Link;
-@@ -1063,6 +1082,7 @@
+@@ -1063,6 +1082,7 @@ void QDragManager::updateMode( ButtonSta
}
}
oldstate = newstate;
@@ -168,7 +168,7 @@
}
-@@ -1769,6 +1789,7 @@
+@@ -1769,6 +1789,7 @@ bool QDragManager::drag( QDragObject * o
qt_xdnd_source_sameanswer = QRect();
move(QCursor::pos());
heartbeat = startTimer(200);
@@ -178,7 +178,7 @@
qApp->setOverrideCursor( arrowCursor );
--- a/src/kernel/qdragobject.h
+++ b/src/kernel/qdragobject.h
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ private:
private:
QDragObject * object;
Modified: trunk/packages/qt-x11-free/debian/patches/0005-qpixmap_mitshm.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0005-qpixmap_mitshm.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0005-qpixmap_mitshm.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -109,7 +109,7 @@
#include "qbitmap.h"
#include "qpaintdevicemetrics.h"
#include "qimage.h"
-@@ -94,7 +105,7 @@
+@@ -94,7 +105,7 @@ inline static void qSafeXDestroyImage( X
MIT Shared Memory Extension support: makes xForm noticeably (~20%) faster.
*****************************************************************************/
@@ -118,7 +118,7 @@
static bool xshminit = FALSE;
static XShmSegmentInfo xshminfo;
-@@ -176,8 +187,100 @@
+@@ -176,8 +187,100 @@ static bool qt_create_mitshm_buffer( con
// return FALSE;
// }
@@ -220,7 +220,7 @@
/*****************************************************************************
Internal functions
-@@ -630,9 +733,20 @@
+@@ -630,9 +733,20 @@ QImage QPixmap::convertToImage() const
d = 32; // > 8 ==> 32
XImage *xi = (XImage *)data->ximage; // any cached ximage?
@@ -242,7 +242,7 @@
Q_CHECK_PTR( xi );
if (!xi)
return image; // null image
-@@ -643,15 +757,31 @@
+@@ -643,15 +757,31 @@ QImage QPixmap::convertToImage() const
QImage::LittleEndian : QImage::BigEndian;
}
image.create( w, h, d, 0, bitOrder );
@@ -276,7 +276,7 @@
if (axi) {
image.setAlphaBuffer( TRUE );
-@@ -665,6 +795,11 @@
+@@ -665,6 +795,11 @@ QImage QPixmap::convertToImage() const
src += axi->bytes_per_line;
}
@@ -288,7 +288,7 @@
qSafeXDestroyImage( axi );
}
} else if (msk) {
-@@ -807,6 +942,12 @@
+@@ -807,6 +942,12 @@ QImage QPixmap::convertToImage() const
xi->bits_per_pixel );
#endif
image.reset();
@@ -301,7 +301,7 @@
return image;
}
-@@ -912,10 +1053,22 @@
+@@ -912,10 +1053,22 @@ QImage QPixmap::convertToImage() const
delete [] carr;
}
if ( data->optim != BestOptim ) { // throw away image data
@@ -325,7 +325,7 @@
return image;
}
-@@ -1088,6 +1241,11 @@
+@@ -1088,6 +1241,11 @@ bool QPixmap::convertFromImage( const QI
bool trucol = (visual->c_class == TrueColor || visual->c_class == DirectColor);
int nbytes = image.numBytes();
uchar *newbits= 0;
@@ -337,7 +337,7 @@
if ( trucol ) { // truecolor display
QRgb pix[256]; // pixel translation table
-@@ -1116,10 +1274,18 @@
+@@ -1116,10 +1274,18 @@ bool QPixmap::convertFromImage( const QI
}
}
@@ -357,7 +357,7 @@
newbits = (uchar *)malloc( xi->bytes_per_line*h );
Q_CHECK_PTR( newbits );
if ( !newbits ) // no memory
-@@ -1326,6 +1492,7 @@
+@@ -1326,6 +1492,7 @@ bool QPixmap::convertFromImage( const QI
}
newbits = (uchar *)malloc( nbytes ); // copy image into newbits
@@ -365,7 +365,7 @@
Q_CHECK_PTR( newbits );
if ( !newbits ) // no memory
return FALSE;
-@@ -1443,11 +1610,18 @@
+@@ -1443,11 +1610,18 @@ bool QPixmap::convertFromImage( const QI
}
if ( !xi ) { // X image not created
@@ -384,7 +384,7 @@
Q_CHECK_PTR( newerbits );
if ( !newerbits ) // no memory
return FALSE;
-@@ -1465,6 +1639,14 @@
+@@ -1465,6 +1639,14 @@ bool QPixmap::convertFromImage( const QI
"(bpp=%d)", xi->bits_per_pixel );
#endif
}
@@ -399,7 +399,7 @@
xi->data = (char *)newbits;
}
-@@ -1498,19 +1680,24 @@
+@@ -1498,19 +1680,24 @@ bool QPixmap::convertFromImage( const QI
}
@@ -430,7 +430,7 @@
if ( image.hasAlphaBuffer() ) {
QBitmap m;
m = image.createAlphaMask( conversion_flags );
-@@ -1546,13 +1733,22 @@
+@@ -1546,13 +1733,22 @@ bool QPixmap::convertFromImage( const QI
data->alphapm->rendhd =
(HANDLE) XftDrawCreateAlpha( x11Display(), data->alphapm->hd, 8 );
@@ -454,7 +454,7 @@
char *aptr = axi->data;
if (image.depth() == 32) {
-@@ -1570,14 +1766,48 @@
+@@ -1570,14 +1766,48 @@ bool QPixmap::convertFromImage( const QI
}
GC gc = XCreateGC(x11Display(), data->alphapm->hd, 0, 0);
@@ -504,7 +504,7 @@
return TRUE;
}
-@@ -1740,7 +1970,7 @@
+@@ -1740,7 +1970,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
return pm;
}
@@ -513,7 +513,7 @@
static bool try_once = TRUE;
if (try_once) {
try_once = FALSE;
-@@ -1773,7 +2003,7 @@
+@@ -1773,7 +2003,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
dbpl = ((w*bpp+31)/32)*4;
dbytes = dbpl*h;
@@ -522,7 +522,7 @@
if ( use_mitshm ) {
dptr = (uchar *)xshmimg->data;
uchar fillbyte = bpp == 8 ? white.pixel() : 0xff;
-@@ -1789,7 +2019,7 @@
+@@ -1789,7 +2019,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
memset( dptr, Qt::white.pixel( x11Screen() ), dbytes );
else
memset( dptr, 0xff, dbytes );
@@ -531,7 +531,7 @@
}
#endif
-@@ -1820,7 +2050,7 @@
+@@ -1820,7 +2050,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
} else {
xbpl = (w*bpp)/8;
p_inc = dbpl - xbpl;
@@ -540,7 +540,7 @@
if ( use_mitshm )
p_inc = xshmimg->bytes_per_line - xbpl;
#endif
-@@ -1857,7 +2087,7 @@
+@@ -1857,7 +2087,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
QPixmap pm( w, h );
pm.data->uninit = FALSE;
pm.x11SetScreen( x11Screen() );
@@ -549,7 +549,7 @@
if ( use_mitshm ) {
XCopyArea( dpy, xshmpm, pm.handle(), gc, 0, 0, w, h, 0, 0 );
} else {
-@@ -1866,7 +2096,7 @@
+@@ -1866,7 +2096,7 @@ QPixmap QPixmap::xForm( const QWMatrix &
ZPixmap, 0, (char *)dptr, w, h, 32, 0 );
XPutImage( dpy, pm.handle(), gc, xi, 0, 0, 0, 0, w, h);
qSafeXDestroyImage( xi );
Modified: trunk/packages/qt-x11-free/debian/patches/0007-qpixmap_constants.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0007-qpixmap_constants.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0007-qpixmap_constants.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -7,7 +7,7 @@
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
-@@ -1292,9 +1292,6 @@
+@@ -1292,9 +1292,6 @@ bool QPixmap::convertFromImage( const QI
return FALSE;
int bppc = xi->bits_per_pixel;
@@ -17,7 +17,7 @@
bool contig_bits = n_bits(red_mask) == rbits &&
n_bits(green_mask) == gbits &&
n_bits(blue_mask) == bbits;
-@@ -1343,32 +1340,70 @@
+@@ -1343,32 +1340,70 @@ bool QPixmap::convertFromImage( const QI
}
init=TRUE;
}
@@ -104,7 +104,7 @@
#define GET_PIXEL_DITHER_TC \
int r = qRed ( *p ); \
int g = qGreen( *p ); \
-@@ -1389,91 +1424,177 @@
+@@ -1389,91 +1424,177 @@ bool QPixmap::convertFromImage( const QI
? g << green_shift : g >> -green_shift; \
b = blue_shift > 0 \
? b << blue_shift : b >> -blue_shift; \
@@ -354,7 +354,7 @@
}
if ( d == 8 && !trucol ) { // 8 bit pixmap
-@@ -1753,15 +1874,24 @@
+@@ -1753,15 +1874,24 @@ bool QPixmap::convertFromImage( const QI
if (image.depth() == 32) {
const int *iptr = (const int *) image.bits();
Modified: trunk/packages/qt-x11-free/debian/patches/0032-fix_rotated_randr.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0032-fix_rotated_randr.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0032-fix_rotated_randr.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -9,7 +9,7 @@
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -3407,7 +3407,8 @@
+@@ -3407,7 +3407,8 @@ int QApplication::x11ProcessEvent( XEven
#endif
#ifndef QT_NO_XRANDR
Modified: trunk/packages/qt-x11-free/debian/patches/0038-dragobject-dont-prefer-unknown.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0038-dragobject-dont-prefer-unknown.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0038-dragobject-dont-prefer-unknown.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -38,7 +38,7 @@
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
-@@ -893,6 +893,16 @@
+@@ -893,6 +893,16 @@ bool QTextDrag::decode( const QMimeSourc
{
if(!e)
return FALSE;
Modified: trunk/packages/qt-x11-free/debian/patches/0044-qscrollview-windowactivate-fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0044-qscrollview-windowactivate-fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0044-qscrollview-windowactivate-fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -26,7 +26,7 @@
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
-@@ -1553,6 +1553,9 @@
+@@ -1553,6 +1553,9 @@ bool QScrollView::eventFilter( QObject *
case QEvent::LayoutHint:
d->autoResizeHint(this);
break;
Modified: trunk/packages/qt-x11-free/debian/patches/0047-fix-kmenu-width.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0047-fix-kmenu-width.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0047-fix-kmenu-width.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -10,7 +10,7 @@
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
-@@ -2533,7 +2533,7 @@
+@@ -2533,7 +2533,7 @@ QSize QPopupMenu::sizeHint() const
constPolish();
QPopupMenu* that = (QPopupMenu*) this;
//We do not need a resize here, just the sizeHint..
Modified: trunk/packages/qt-x11-free/debian/patches/0048-qclipboard_hack_80072.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0048-qclipboard_hack_80072.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0048-qclipboard_hack_80072.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -7,7 +7,7 @@
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
-@@ -112,6 +112,7 @@
+@@ -112,6 +112,7 @@ static int pending_timer_id = 0;
static bool pending_clipboard_changed = FALSE;
static bool pending_selection_changed = FALSE;
@@ -15,7 +15,7 @@
// event capture mechanism for qt_xclb_wait_for_event
static bool waiting_for_data = FALSE;
-@@ -464,6 +465,15 @@
+@@ -464,6 +465,15 @@ static Bool checkForClipboardEvents(Disp
|| e->xselectionclear.selection == qt_xa_clipboard)));
}
@@ -31,7 +31,7 @@
bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
int timeout )
{
-@@ -515,6 +525,14 @@
+@@ -515,6 +525,14 @@ bool qt_xclb_wait_for_event( Display *dp
do {
if ( XCheckTypedWindowEvent(dpy,win,type,event) )
return TRUE;
Modified: trunk/packages/qt-x11-free/debian/patches/0056-khotkeys_input_84434.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0056-khotkeys_input_84434.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0056-khotkeys_input_84434.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -7,7 +7,7 @@
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -5300,8 +5300,10 @@
+@@ -5300,8 +5300,10 @@ static Bool qt_keypress_scanner(Display
qt_auto_repeat_data *d = (qt_auto_repeat_data *) arg;
if (d->error ||
event->xkey.window != d->window ||
Modified: trunk/packages/qt-x11-free/debian/patches/0059-qpopup_has_mouse.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0059-qpopup_has_mouse.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0059-qpopup_has_mouse.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -22,7 +22,7 @@
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
-@@ -256,6 +256,7 @@
+@@ -256,6 +256,7 @@ public:
} scroll;
QSize calcSize;
QRegion mouseMoveBuffer;
@@ -30,7 +30,7 @@
};
static QPopupMenu* active_popup_menu = 0;
-@@ -275,6 +276,7 @@
+@@ -275,6 +276,7 @@ QPopupMenu::QPopupMenu( QWidget *parent,
d->scroll.scrollableSize = d->scroll.topScrollableIndex = 0;
d->scroll.scrollable = QPopupMenuPrivate::Scroll::ScrollNone;
d->scroll.scrolltimer = 0;
@@ -38,7 +38,7 @@
isPopupMenu = TRUE;
#ifndef QT_NO_ACCEL
autoaccel = 0;
-@@ -1744,6 +1746,11 @@
+@@ -1744,6 +1746,11 @@ void QPopupMenu::mouseMoveEvent( QMouseE
int item = itemAtPos( e->pos() );
if ( item == -1 ) { // no valid item
@@ -50,7 +50,7 @@
int lastActItem = actItem;
actItem = -1;
if ( lastActItem >= 0 )
-@@ -1755,6 +1762,7 @@
+@@ -1755,6 +1762,7 @@ void QPopupMenu::mouseMoveEvent( QMouseE
}
} else { // mouse on valid item
// but did not register mouse press
@@ -58,7 +58,7 @@
if ( (e->state() & Qt::MouseButtonMask) && !mouseBtDn )
mouseBtDn = TRUE; // so mouseReleaseEvent will pop down
-@@ -2163,6 +2171,7 @@
+@@ -2163,6 +2171,7 @@ void QPopupMenu::timerEvent( QTimerEvent
*/
void QPopupMenu::leaveEvent( QEvent * )
{
Modified: trunk/packages/qt-x11-free/debian/patches/0060-qpopup_ignore_mousepos.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0060-qpopup_ignore_mousepos.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0060-qpopup_ignore_mousepos.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -29,7 +29,7 @@
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
-@@ -257,6 +257,7 @@
+@@ -257,6 +257,7 @@ public:
QSize calcSize;
QRegion mouseMoveBuffer;
uint hasmouse : 1;
@@ -37,7 +37,7 @@
};
static QPopupMenu* active_popup_menu = 0;
-@@ -1359,6 +1360,7 @@
+@@ -1359,6 +1360,7 @@ void QPopupMenu::show()
popupActive = -1;
if(style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this))
d->mouseMoveBuffer = QRegion();
@@ -45,7 +45,7 @@
}
/*!
-@@ -1706,6 +1708,11 @@
+@@ -1706,6 +1708,11 @@ void QPopupMenu::mouseReleaseEvent( QMou
void QPopupMenu::mouseMoveEvent( QMouseEvent *e )
{
Modified: trunk/packages/qt-x11-free/debian/patches/0061-qscrollview-propagate-horizontal-wheelevent.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0061-qscrollview-propagate-horizontal-wheelevent.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0061-qscrollview-propagate-horizontal-wheelevent.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -7,7 +7,7 @@
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
-@@ -1868,7 +1868,7 @@
+@@ -1868,7 +1868,7 @@ void QScrollView::viewportWheelEvent( QW
the event itself.
*/
QWheelEvent ce( viewportToContents(e->pos()),
Modified: trunk/packages/qt-x11-free/debian/patches/0073-xinerama-aware-qpopup.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0073-xinerama-aware-qpopup.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0073-xinerama-aware-qpopup.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -7,7 +7,7 @@
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
-@@ -460,6 +460,15 @@
+@@ -460,6 +460,15 @@ void QPopupMenu::frameChanged()
menuContentsChanged();
}
@@ -23,7 +23,7 @@
/*!
Displays the popup menu so that the item number \a indexAtPoint
will be at the specified \e global position \a pos. To translate a
-@@ -504,6 +513,15 @@
+@@ -504,6 +513,15 @@ void QPopupMenu::popup( const QPoint &po
// point.
#endif
@@ -39,7 +39,7 @@
if(d->scroll.scrollable) {
d->scroll.scrollable = QPopupMenuPrivate::Scroll::ScrollNone;
d->scroll.topScrollableIndex = d->scroll.scrollableSize = 0;
-@@ -523,18 +541,6 @@
+@@ -523,18 +541,6 @@ void QPopupMenu::popup( const QPoint &po
updateSize(TRUE);
}
@@ -58,7 +58,7 @@
int sw = screen.width(); // screen width
int sh = screen.height(); // screen height
int sx = screen.x(); // screen pos
-@@ -1062,7 +1068,7 @@
+@@ -1062,7 +1068,7 @@ QSize QPopupMenu::updateSize(bool force_
mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4 );
}
@@ -67,7 +67,7 @@
ncols = 1;
for ( QMenuItemListIt it2( *mitems ); it2.current(); ++it2 ) {
-@@ -2316,9 +2322,9 @@
+@@ -2316,9 +2322,9 @@ void QPopupMenu::subMenuTimer() {
bool right = FALSE;
if ( ( parentMenu && parentMenu->isPopupMenu &&
((QPopupMenu*)parentMenu)->geometry().x() < geometry().x() ) ||
@@ -79,7 +79,7 @@
right = FALSE;
if ( right )
p.setX( mapToGlobal( r.topRight() ).x() );
-@@ -2329,7 +2335,7 @@
+@@ -2329,7 +2335,7 @@ void QPopupMenu::subMenuTimer() {
bool left = FALSE;
if ( ( parentMenu && parentMenu->isPopupMenu &&
((QPopupMenu*)parentMenu)->geometry().x() > geometry().x() ) ||
@@ -88,7 +88,7 @@
left = TRUE;
if ( left && (ps.width() > mapToGlobal( r.topLeft() ).x() ) )
left = FALSE;
-@@ -2337,8 +2343,8 @@
+@@ -2337,8 +2343,8 @@ void QPopupMenu::subMenuTimer() {
p.setX( mapToGlobal( r.topLeft() ).x() - ps.width() );
}
QRect pr = popup->itemGeometry(popup->count() - 1);
@@ -101,7 +101,7 @@
if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this )) {
--- a/src/widgets/qpopupmenu.h
+++ b/src/widgets/qpopupmenu.h
-@@ -155,6 +155,7 @@
+@@ -155,6 +155,7 @@ private:
QSize updateSize(bool force_recalc=FALSE, bool do_resize=TRUE);
void updateRow( int row );
Modified: trunk/packages/qt-x11-free/debian/patches/0079-compositing-types.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0079-compositing-types.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0079-compositing-types.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -8,7 +8,7 @@
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
-@@ -264,6 +264,7 @@
+@@ -264,6 +264,7 @@ public:
QWidget(QApplication::desktop()->screen( screen ),
0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 )
{
@@ -16,7 +16,7 @@
}
void setPixmap(QPixmap pm, QPoint hot)
-@@ -1224,6 +1225,7 @@
+@@ -1224,6 +1225,7 @@ void QDragManager::move( const QPoint &
// recreate the pixmap on the new screen...
delete qt_xdnd_deco;
qt_xdnd_deco = new QShapedPixmapWidget( screen );
@@ -24,7 +24,7 @@
if (!QWidget::mouseGrabber()) {
updatePixmap();
qt_xdnd_deco->grabMouse();
-@@ -1777,6 +1779,7 @@
+@@ -1777,6 +1779,7 @@ bool QDragManager::drag( QDragObject * o
dragSource = (QWidget *)(object->parent());
@@ -34,7 +34,7 @@
XSetSelectionOwner( QPaintDevice::x11AppDisplay(), qt_xdnd_selection,
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -270,6 +270,11 @@
+@@ -270,6 +270,11 @@ Atom qt_net_wm_window_type_menu = 0;
Atom qt_net_wm_window_type_utility = 0;
Atom qt_net_wm_window_type_splash = 0;
Atom qt_net_wm_window_type_override = 0; // KDE extension
@@ -46,7 +46,7 @@
Atom qt_net_wm_frame_strut = 0; // KDE extension
Atom qt_net_wm_state_stays_on_top = 0; // KDE extension
Atom qt_net_wm_pid = 0;
-@@ -1920,6 +1925,11 @@
+@@ -1920,6 +1925,11 @@ void qt_init_internal( int *argcptr, cha
qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_UTILITY", &qt_net_wm_window_type_utility );
qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_SPLASH", &qt_net_wm_window_type_splash );
qt_x11_intern_atom( "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE", &qt_net_wm_window_type_override );
@@ -60,7 +60,7 @@
&qt_net_wm_state_stays_on_top );
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
-@@ -128,6 +128,11 @@
+@@ -128,6 +128,11 @@ extern Atom qt_net_wm_window_type_menu;
extern Atom qt_net_wm_window_type_utility;
extern Atom qt_net_wm_window_type_splash;
extern Atom qt_net_wm_window_type_override;
@@ -72,7 +72,7 @@
extern Atom qt_net_wm_pid;
extern Atom qt_net_wm_user_time;
extern Atom qt_enlightenment_desktop;
-@@ -451,10 +456,6 @@
+@@ -451,10 +456,6 @@ void QWidget::create( WId window, bool i
x11Colormap() );
#endif // QT_NO_XFTFREETYPE
@@ -83,7 +83,7 @@
// NET window states
long net_winstates[6] = { 0, 0, 0, 0, 0, 0 };
int curr_winstate = 0;
-@@ -476,7 +477,6 @@
+@@ -476,7 +477,6 @@ void QWidget::create( WId window, bool i
if ( testWFlags(WStyle_Splash) ) {
if (qt_net_supports(qt_net_wm_window_type_splash)) {
clearWFlags( WX11BypassWM );
@@ -91,7 +91,7 @@
} else {
setWFlags( WX11BypassWM | WStyle_Tool | WStyle_NoBorder );
}
-@@ -485,27 +485,22 @@
+@@ -485,27 +485,22 @@ void QWidget::create( WId window, bool i
mwmhints.decorations = 0L;
mwmhints.flags |= (1L << 1); // MWM_HINTS_DECORATIONS
@@ -131,7 +131,7 @@
if (testWFlags(WStyle_Tool)) {
wsa.save_under = True;
-@@ -525,23 +520,6 @@
+@@ -525,23 +520,6 @@ void QWidget::create( WId window, bool i
}
}
@@ -155,7 +155,7 @@
// stays on top
if (testWFlags(WStyle_StaysOnTop)) {
net_winstates[curr_winstate++] = qt_net_wm_state_above;
-@@ -576,6 +554,7 @@
+@@ -576,6 +554,7 @@ void QWidget::create( WId window, bool i
wsa.save_under = True;
XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa );
@@ -163,7 +163,7 @@
} else if ( topLevel && !desktop ) { // top-level widget
QWidget *p = parentWidget(); // real parent
if (p)
-@@ -635,12 +614,7 @@
+@@ -635,12 +614,7 @@ void QWidget::create( WId window, bool i
else
XDeleteProperty(dpy, id, qt_xa_motif_wm_hints);
@@ -177,7 +177,7 @@
// set _NET_WM_WINDOW_STATE
if (curr_winstate > 0)
-@@ -899,6 +873,64 @@
+@@ -899,6 +873,64 @@ void QWidget::reparentSys( QWidget *pare
setMouseTracking(mouse_tracking);
}
@@ -244,7 +244,7 @@
Translates the widget coordinate \a pos to global screen
--- a/src/kernel/qwidget.h
+++ b/src/kernel/qwidget.h
-@@ -467,7 +467,19 @@
+@@ -467,7 +467,19 @@ public:
CGContextRef macCGContext(bool clipped=TRUE) const;
#endif
#endif
@@ -267,7 +267,7 @@
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
-@@ -708,7 +708,7 @@
+@@ -708,7 +708,7 @@ void QDialog::show()
&& qApp->mainWidget() && qApp->mainWidget()->isVisible()
&& !qApp->mainWidget()->isMinimized()) {
// make sure the transient for hint is set properly for modal dialogs
@@ -278,7 +278,7 @@
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
-@@ -75,6 +75,7 @@
+@@ -75,6 +75,7 @@ public:
polish();
setText(text);
adjustSize();
@@ -286,7 +286,7 @@
}
void setWidth( int w ) { resize( sizeForWidth( w ) ); }
};
-@@ -531,6 +532,10 @@
+@@ -531,6 +532,10 @@ void QTipManager::showTip()
if (!widget)
return;
@@ -299,7 +299,7 @@
#else
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
-@@ -392,12 +392,8 @@
+@@ -392,12 +392,8 @@ public:
inline QListBox * listBox() { return lBox; }
inline QComboBoxPopup * popup() { return pop; }
void updateLinedGeometry();
@@ -314,7 +314,7 @@
int current;
int maxCount;
-@@ -443,6 +439,30 @@
+@@ -443,6 +439,30 @@ void QComboBoxData::updateLinedGeometry(
ed->setGeometry( r );
}
@@ -347,7 +347,7 @@
{
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
-@@ -301,6 +301,9 @@
+@@ -301,6 +301,9 @@ QPopupMenu::QPopupMenu( QWidget *parent,
connectModalRecursionSafety = 0;
setFocusPolicy( StrongFocus );
@@ -357,7 +357,7 @@
}
/*!
-@@ -564,6 +567,29 @@
+@@ -564,6 +567,29 @@ void QPopupMenu::popup( const QPoint &po
if ( y < sy )
y = sy;
}
@@ -387,7 +387,7 @@
if ( x+w > sx+sw ) // the complete widget must
x = sx+sw - w; // be visible
-@@ -1393,6 +1419,13 @@
+@@ -1393,6 +1419,13 @@ void QPopupMenu::hide()
#if defined(QT_ACCESSIBILITY_SUPPORT)
QAccessible::updateAccessibility( this, 0, QAccessible::PopupMenuEnd );
#endif
@@ -401,7 +401,7 @@
parentMenu = 0;
hidePopups();
QWidget::hide();
-@@ -2716,6 +2749,9 @@
+@@ -2716,6 +2749,9 @@ void QPopupMenu::toggleTearOff()
geometry().topLeft(), FALSE );
p->mitems->setAutoDelete( FALSE );
p->tornOff = TRUE;
Modified: trunk/packages/qt-x11-free/debian/patches/0080-net-wm-sync-request.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0080-net-wm-sync-request.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0080-net-wm-sync-request.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -9,7 +9,7 @@
--- a/src/kernel/qwidget.h
+++ b/src/kernel/qwidget.h
-@@ -589,6 +589,14 @@
+@@ -589,6 +589,14 @@ private:
void destroyInputContext();
void focusInputContext();
void checkChildrenDnd();
@@ -24,7 +24,7 @@
#elif defined(Q_WS_MAC)
uint own_id : 1, macDropEnabled : 1;
EventHandlerRef window_event;
-@@ -965,6 +973,10 @@
+@@ -965,6 +973,10 @@ struct Q_EXPORT QTLWExtra {
uint uspos : 1; // User defined position
uint ussize : 1; // User defined size
void *xic; // XIM Input Context
@@ -37,7 +37,7 @@
WindowGroupRef group;
--- a/src/kernel/qt_x11_p.h
+++ b/src/kernel/qt_x11_p.h
-@@ -177,6 +177,11 @@
+@@ -177,6 +177,11 @@ extern "C" {
#endif // QT_NO_XRENDER
@@ -51,7 +51,7 @@
#endif // QT_NO_XKB
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
-@@ -90,6 +90,12 @@
+@@ -90,6 +90,12 @@ static QWidget *keyboardGrb = 0;
extern Time qt_x_time;
extern Time qt_x_user_time;
@@ -64,7 +64,7 @@
// defined in qfont_x11.cpp
extern bool qt_has_xft;
-@@ -598,11 +604,14 @@
+@@ -598,11 +604,14 @@ void QWidget::create( WId window, bool i
XResizeWindow( dpy, id, crect.width(), crect.height() );
XStoreName( dpy, id, qAppName() );
@@ -80,7 +80,7 @@
if ( testWFlags( WStyle_ContextHelp ) )
protocols[n++] = qt_net_wm_context_help;
XSetWMProtocols( dpy, id, protocols, n );
-@@ -628,6 +637,14 @@
+@@ -628,6 +637,14 @@ void QWidget::create( WId window, bool i
XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace,
(unsigned char *) &curr_pid, 1);
@@ -95,7 +95,7 @@
// when we create a toplevel widget, the frame strut should be dirty
fstrut_dirty = 1;
-@@ -723,6 +740,9 @@
+@@ -723,6 +740,9 @@ void QWidget::destroy( bool destroyWindo
if ( destroyWindow )
qt_XDestroyWindow( this, x11Display(), winid );
}
@@ -105,7 +105,7 @@
setWinId( 0 );
extern void qPRCleanup( QWidget *widget ); // from qapplication_x11.cpp
-@@ -772,6 +792,10 @@
+@@ -772,6 +792,10 @@ void QWidget::reparentSys( QWidget *pare
destroyInputContext();
}
@@ -116,7 +116,7 @@
if ( isTopLevel() || !parent ) // we are toplevel, or reparenting to toplevel
topData()->parentWinId = 0;
-@@ -2459,6 +2483,11 @@
+@@ -2459,6 +2483,11 @@ void QWidget::createTLSysExtra()
{
// created lazily
extra->topextra->xic = 0;
@@ -128,7 +128,7 @@
}
void QWidget::deleteTLSysExtra()
-@@ -2504,6 +2533,51 @@
+@@ -2504,6 +2533,51 @@ void QWidget::checkChildrenDnd()
}
}
@@ -182,7 +182,7 @@
\brief whether drop events are enabled for this widget
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -288,6 +288,11 @@
+@@ -288,6 +288,11 @@ Atom *qt_net_supported_list = 0;
Window *qt_net_virtual_root_list = 0;
@@ -194,7 +194,7 @@
// client leader window
Window qt_x11_wm_client_leader = 0;
-@@ -312,6 +317,13 @@
+@@ -312,6 +317,13 @@ static int xrandr_eventbase;
// Display
Q_EXPORT bool qt_use_xrender = FALSE;
@@ -208,7 +208,7 @@
// modifier masks for alt/meta - detected when the application starts
static long qt_alt_mask = 0;
static long qt_meta_mask = 0;
-@@ -1941,6 +1953,11 @@
+@@ -1941,6 +1953,11 @@ void qt_init_internal( int *argcptr, cha
qt_x11_intern_atom( "UTF8_STRING", &qt_utf8_string );
qt_x11_intern_atom( "_SGI_DESKS_MANAGER", &qt_sgi_desks_manager );
@@ -220,7 +220,7 @@
qt_xdnd_setup();
qt_x11_motifdnd_init();
-@@ -1977,6 +1994,15 @@
+@@ -1977,6 +1994,15 @@ void qt_init_internal( int *argcptr, cha
}
#endif // QT_NO_XRENDER
@@ -236,7 +236,7 @@
#ifndef QT_NO_XKB
// If XKB is detected, set the GrabsUseXKBState option so input method
// compositions continue to work (ie. deadkeys)
-@@ -3144,6 +3170,10 @@
+@@ -3144,6 +3170,10 @@ int QApplication::x11ClientMessage(QWidg
XSendEvent( event->xclient.display, event->xclient.window,
False, SubstructureNotifyMask|SubstructureRedirectMask, event );
}
@@ -247,7 +247,7 @@
}
} else if ( event->xclient.message_type == qt_qt_scrolldone ) {
widget->translateScrollDoneEvent(event);
-@@ -5684,6 +5714,21 @@
+@@ -5684,6 +5714,21 @@ bool QETWidget::translateScrollDoneEvent
return FALSE;
}
@@ -269,7 +269,7 @@
//
// ConfigureNotify (window move and resize) event translation
-@@ -5715,6 +5760,7 @@
+@@ -5715,6 +5760,7 @@ bool QETWidget::translateConfigEvent( co
if (! extra || extra->compress_events) {
// ConfigureNotify compression for faster opaque resizing
XEvent otherEvent;
@@ -277,7 +277,7 @@
while ( XCheckTypedWindowEvent( x11Display(), winId(), ConfigureNotify,
&otherEvent ) ) {
if ( qt_x11EventFilter( &otherEvent ) )
-@@ -5735,7 +5781,18 @@
+@@ -5735,7 +5781,18 @@ bool QETWidget::translateConfigEvent( co
newCPos.ry() = otherEvent.xconfigure.y +
otherEvent.xconfigure.border_width;
}
@@ -296,7 +296,7 @@
}
QRect cr ( geometry() );
-@@ -5789,6 +5846,8 @@
+@@ -5789,6 +5846,8 @@ bool QETWidget::translateConfigEvent( co
repaint( !testWFlags(WResizeNoErase) || transbg );
}
Modified: trunk/packages/qt-x11-free/debian/patches/0083-CVE-2007-4137.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0083-CVE-2007-4137.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0083-CVE-2007-4137.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -8,7 +8,7 @@
--- a/src/codecs/qutfcodec.cpp
+++ b/src/codecs/qutfcodec.cpp
-@@ -303,7 +303,7 @@
+@@ -303,7 +303,7 @@ public:
QString toUnicode(const char* chars, int len)
{
QString result;
Modified: trunk/packages/qt-x11-free/debian/patches/0085-fix-buildkey.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0085-fix-buildkey.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0085-fix-buildkey.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -8,7 +8,7 @@
--- a/configure
+++ b/configure
-@@ -3081,16 +3081,16 @@
+@@ -3081,16 +3081,16 @@ case "$COMPILER" in
g++*)
# GNU C++
QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"`
Modified: trunk/packages/qt-x11-free/debian/patches/0086-revert-qt-khmer-fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0086-revert-qt-khmer-fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0086-revert-qt-khmer-fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -9,7 +9,7 @@
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
-@@ -2675,23 +2675,16 @@
+@@ -2675,23 +2675,16 @@ bool QOpenType::positionAndAdd(QShaperIt
// ###### fix the case where we have y advances. How do we handle this in Uniscribe?????
if (positions[i].new_advance) {
item->advances[i] = item->flags & QTextEngine::RightToLeft
Modified: trunk/packages/qt-x11-free/debian/patches/0087-use-xrandr-1.2.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/0087-use-xrandr-1.2.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/0087-use-xrandr-1.2.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -9,7 +9,7 @@
--- a/src/kernel/qdesktopwidget_x11.cpp
+++ b/src/kernel/qdesktopwidget_x11.cpp
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ QDesktopWidgetPrivate::~QDesktopWidgetPr
screens[i] = 0;
}
@@ -18,7 +18,7 @@
}
if ( rects ) delete [] rects;
-@@ -117,6 +117,8 @@
+@@ -117,6 +117,8 @@ QDesktopWidgetPrivate::~QDesktopWidgetPr
void QDesktopWidgetPrivate::init()
{
// get the screen count
@@ -27,7 +27,7 @@
#ifndef QT_NO_XINERAMA
XineramaScreenInfo *xinerama_screeninfo = 0;
int unused;
-@@ -126,23 +128,26 @@
+@@ -126,23 +128,26 @@ void QDesktopWidgetPrivate::init()
if (use_xinerama) {
xinerama_screeninfo =
@@ -60,7 +60,7 @@
#ifndef QT_NO_XINERAMA
if (use_xinerama) {
-@@ -159,11 +164,33 @@
+@@ -159,11 +164,33 @@ void QDesktopWidgetPrivate::init()
h = HeightOfScreen(ScreenOfDisplay(QPaintDevice::x11AppDisplay(), i));
}
@@ -95,7 +95,7 @@
if (xinerama_screeninfo)
XFree(xinerama_screeninfo);
#endif // QT_NO_XINERAMA
-@@ -216,8 +243,7 @@
+@@ -216,8 +243,7 @@ QWidget *QDesktopWidget::screen( int scr
screen = d->defaultScreen;
if ( ! d->screens ) {
Modified: trunk/packages/qt-x11-free/debian/patches/00_qmake_debian_compliant_release_target.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00_qmake_debian_compliant_release_target.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/00_qmake_debian_compliant_release_target.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
---- qt-x11-free-3.3.8b/configure 2008-02-17 04:26:04.000000000 +0200
-+++ qt-x11-free-3.3.8b/configure 2008-02-17 14:16:25.000000000 +0200
-@@ -2607,8 +2607,14 @@
+--- a/configure
++++ b/configure
+@@ -2607,8 +2607,14 @@ if true; then ###[ '!' -f "$outpath/bin/
grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
if [ "$CFG_DEBUG" = "yes" ]; then
grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
@@ -15,9 +15,9 @@
fi
if [ "$PLATFORM_MAC" = "yes" ]; then
echo "CARBON_LFLAGS +=-framework CoreServices" >>$mkfile
---- qt-x11-free-3.3.8b/mkspecs/linux-g++/qmake.conf 2008-02-17 04:32:14.000000000 +0200
-+++ qt-x11-free-3.3.8b/mkspecs/linux-g++/qmake.conf 2008-02-17 14:10:44.000000000 +0200
-@@ -16,12 +16,12 @@
+--- a/mkspecs/linux-g++/qmake.conf
++++ b/mkspecs/linux-g++/qmake.conf
+@@ -16,12 +16,12 @@ QMAKE_YACCFLAGS = -d
QMAKE_YACCFLAGS_MANGLE = -p $base -b $base
QMAKE_YACC_HEADER = $base.tab.h
QMAKE_YACC_SOURCE = $base.tab.c
@@ -32,7 +32,7 @@
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_THREAD = -D_REENTRANT
-@@ -83,7 +83,7 @@
+@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
Modified: trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,5 +1,5 @@
---- qt-x11-free-3.3.8b/src/__debian_export_symbols.cpp 2008-02-21 16:23:18.772005855 +0200
-+++ qt-x11-free-3.3.8b/src/__debian_export_symbols.cpp 2008-02-22 00:19:32.000000000 +0200
+--- /dev/null
++++ b/src/__debian_export_symbols.cpp
@@ -0,0 +1,63 @@
+// Use the __NO_INLINE__ hack below to prevent sys/stat.h from
+// exporting __extern_inline definitions of the symbols [fl]?stat64
@@ -64,9 +64,9 @@
+# endif /* INLINES_ENABLED */
+
+#endif
---- qt-x11-free-3.3.8b/src/qt.pro 2008-02-21 20:50:46.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/qt.pro 2008-02-22 00:20:48.000000000 +0200
-@@ -174,6 +174,16 @@
+--- a/src/qt.pro
++++ b/src/qt.pro
+@@ -174,6 +174,16 @@ unix {
QMAKE_PKGCONFIG_INCDIR = $$headers.path
}
Modified: trunk/packages/qt-x11-free/debian/patches/02_various_fixes.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/02_various_fixes.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/02_various_fixes.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -18,7 +18,7 @@
(defun designer-create-ui-file (&optional arg)
--- a/tools/tools.pro
+++ b/tools/tools.pro
-@@ -6,7 +6,12 @@
+@@ -6,7 +6,12 @@ no-png {
designer \
assistant \
linguist
@@ -34,7 +34,7 @@
CONFIG+=ordered
--- a/tools/designer/designer.pro
+++ b/tools/designer/designer.pro
-@@ -5,7 +5,9 @@
+@@ -5,7 +5,9 @@ CONFIG += ordered
SUBDIRS = uic \
uilib \
designer \
@@ -47,7 +47,7 @@
shared:SUBDIRS *= editor plugins
--- a/tools/designer/tools/createcw/createcw.pro
+++ b/tools/designer/tools/createcw/createcw.pro
-@@ -3,3 +3,6 @@
+@@ -3,3 +3,6 @@ CONFIG += qt warn_on release
HEADERS =
SOURCES = main.cpp
TARGET = createcw
@@ -56,7 +56,7 @@
+INSTALLS += target
--- a/tools/makeqpf/makeqpf.pro
+++ b/tools/makeqpf/makeqpf.pro
-@@ -5,3 +5,6 @@
+@@ -5,3 +5,6 @@ SOURCES = main.cpp
INTERFACES =
TARGET = makeqpf
REQUIRES=full-config nocrosscompiler
@@ -65,7 +65,7 @@
+INSTALLS += target
--- a/tools/mergetr/mergetr.pro
+++ b/tools/mergetr/mergetr.pro
-@@ -4,3 +4,6 @@
+@@ -4,3 +4,6 @@ HEADERS =
SOURCES = mergetr.cpp
TARGET = mergetr
REQUIRES=full-config nocrosscompiler
@@ -74,7 +74,7 @@
+INSTALLS += target
--- a/tools/msg2qm/msg2qm.pro
+++ b/tools/msg2qm/msg2qm.pro
-@@ -5,3 +5,6 @@
+@@ -5,3 +5,6 @@ HEADERS =
SOURCES = msg2qm.cpp
TARGET = msg2qm
REQUIRES=full-config nocrosscompiler
@@ -83,7 +83,7 @@
+INSTALLS += target
--- a/tools/qembed/qembed.pro
+++ b/tools/qembed/qembed.pro
-@@ -2,3 +2,6 @@
+@@ -2,3 +2,6 @@ CONFIG += console qt warn_on release
SOURCES = qembed.cpp
TARGET = qembed
REQUIRES=full-config nocrosscompiler
Modified: trunk/packages/qt-x11-free/debian/patches/03_qt_fontlist_fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/03_qt_fontlist_fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/03_qt_fontlist_fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
-@@ -721,6 +721,9 @@
+@@ -721,6 +721,9 @@ static void loadXlfds( const char *reqFa
if ( fontFamily && fontFamily->xlfdLoaded )
return;
@@ -14,7 +14,7 @@
int fontCount;
// force the X server to give us XLFDs
QCString xlfd_pattern = "-*-";
-@@ -822,8 +825,11 @@
+@@ -822,8 +825,11 @@ static void loadXlfds( const char *reqFa
}
XFreeFontNames( fontList );
Modified: trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/04_qsql_odbc.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/plugins/src/sqldrivers/odbc/odbc.pro
+++ b/plugins/src/sqldrivers/odbc/odbc.pro
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ mac {
unix {
OBJECTS_DIR = .obj
!contains( LIBS, .*odbc.* ) {
@@ -43,7 +43,7 @@
class QODBCDriver;
--- a/src/sql/qt_sql.pri
+++ b/src/sql/qt_sql.pri
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ sql {
unix {
!contains( LIBS, .*odbc.* ) {
Modified: trunk/packages/qt-x11-free/debian/patches/05_qvfb_cpp.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/05_qvfb_cpp.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/05_qvfb_cpp.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -8,7 +8,7 @@
0.5
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ void QVFb::init( int display_id, int w,
bool vis = isVisible();
if ( vis ) hide();
menuBar()->hide();
Modified: trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/06_disable_rpath.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
@@ -15,7 +15,7 @@
QMAKE_LIBS_DYNLOAD = -ldl
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
Modified: trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/09_amd64_lib64.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -43,11 +43,11 @@
+@@ -43,11 +43,11 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
QMAKE_INCDIR =
QMAKE_LIBDIR =
QMAKE_INCDIR_X11 = /usr/X11R6/include
Modified: trunk/packages/qt-x11-free/debian/patches/10_arm_gcc4.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/10_arm_gcc4.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/10_arm_gcc4.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -11,7 +11,7 @@
# endif
--- a/src/tools/qstring.h
+++ b/src/tools/qstring.h
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@ public:
char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
ushort unicode() const { return ucs; }
#ifdef Q_NO_PACKED_REFERENCE
Modified: trunk/packages/qt-x11-free/debian/patches/11_qt_rubberband.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/11_qt_rubberband.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/11_qt_rubberband.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/iconview/qiconview.cpp
+++ b/src/iconview/qiconview.cpp
-@@ -264,6 +264,7 @@
+@@ -264,6 +264,7 @@ public:
QIconViewToolTip *toolTip;
QPixmapCache maskCache;
@@ -8,7 +8,7 @@
QPtrDict<QIconViewItem> selectedItems;
struct ItemContainer {
-@@ -1998,14 +1999,27 @@
+@@ -1998,14 +1999,27 @@ void QIconViewItem::paintItem( QPainter
if ( picture() ) {
QPicture *pic = picture();
if ( isSelected() ) {
@@ -40,7 +40,7 @@
int align = view->itemTextPos() == QIconView::Bottom ? AlignHCenter : AlignAuto;
if ( view->d->wordWrapIconText )
-@@ -2063,10 +2077,19 @@
+@@ -2063,10 +2077,19 @@ void QIconViewItem::paintItem( QPainter
p->save();
if ( isSelected() ) {
@@ -63,7 +63,7 @@
int align = AlignHCenter;
if ( view->d->wordWrapIconText )
-@@ -2082,31 +2105,13 @@
+@@ -2082,31 +2105,13 @@ void QIconViewItem::paintItem( QPainter
/*!
Paints the focus rectangle of the item using the painter \a p and
the color group \a cg.
@@ -99,7 +99,7 @@
}
/*!
-@@ -2804,6 +2809,7 @@
+@@ -2804,6 +2809,7 @@ QIconView::QIconView( QWidget *parent, c
d->renamingItem = 0;
d->drawActiveSelection = TRUE;
d->drawDragShapes = FALSE;
@@ -107,7 +107,7 @@
connect( d->adjustTimer, SIGNAL( timeout() ),
this, SLOT( adjustItems() ) );
-@@ -3288,7 +3294,7 @@
+@@ -3288,7 +3294,7 @@ uint QIconView::count() const
void QIconView::doAutoScroll()
{
@@ -116,7 +116,7 @@
QPoint vp = viewport()->mapFromGlobal( QCursor::pos() );
QPoint pos = viewportToContents( vp );
-@@ -3305,7 +3311,6 @@
+@@ -3305,7 +3311,6 @@ void QIconView::doAutoScroll()
bool block = signalsBlocked();
QRect rr;
@@ -124,7 +124,7 @@
blockSignals( TRUE );
viewport()->setUpdatesEnabled( FALSE );
-@@ -3331,9 +3336,6 @@
+@@ -3331,9 +3336,6 @@ void QIconView::doAutoScroll()
item->setSelected( TRUE, TRUE );
changed = TRUE;
rr = rr.unite( item->rect() );
@@ -134,7 +134,7 @@
}
minx = QMIN( minx, item->x() - 1 );
-@@ -3350,42 +3352,77 @@
+@@ -3350,42 +3352,77 @@ void QIconView::doAutoScroll()
viewport()->setUpdatesEnabled( TRUE );
blockSignals( block );
@@ -239,7 +239,7 @@
}
if ( !QRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) &&
-@@ -3412,9 +3449,7 @@
+@@ -3412,9 +3449,7 @@ void QIconView::doAutoScroll()
void QIconView::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
{
@@ -250,7 +250,7 @@
QRect r = QRect( cx, cy, cw, ch );
QIconViewPrivate::ItemContainer *c = d->firstContainer;
-@@ -3488,8 +3523,16 @@
+@@ -3488,8 +3523,16 @@ void QIconView::drawContents( QPainter *
d->currentItem->paintFocus( p, colorGroup() );
}
@@ -269,7 +269,7 @@
}
/*!
-@@ -4388,17 +4431,15 @@
+@@ -4388,17 +4431,15 @@ void QIconView::contentsMousePressEvent(
void QIconView::contentsMousePressEventEx( QMouseEvent *e )
{
if ( d->rubber ) {
@@ -295,7 +295,7 @@
if ( d->scrollTimer ) {
disconnect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( doAutoScroll() ) );
-@@ -4583,21 +4624,17 @@
+@@ -4583,21 +4624,17 @@ void QIconView::contentsMouseReleaseEven
d->startDragItem = 0;
if ( d->rubber ) {
@@ -324,7 +324,7 @@
d->currentItem = d->tmpCurrentItem;
d->tmpCurrentItem = 0;
if ( d->currentItem )
-@@ -5357,9 +5394,9 @@
+@@ -5357,9 +5394,9 @@ void QIconView::drawRubber( QPainter *p
QPoint pnt( d->rubber->x(), d->rubber->y() );
pnt = contentsToViewport( pnt );
Modified: trunk/packages/qt-x11-free/debian/patches/12_disable_includehints.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/12_disable_includehints.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/12_disable_includehints.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
-@@ -733,16 +733,7 @@
+@@ -733,16 +733,7 @@ void Uic::createFormImpl( const QDomElem
}
n2 = n2.nextSibling().toElement();
}
Modified: trunk/packages/qt-x11-free/debian/patches/13_qt335_qlistview_crash_fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/13_qt335_qlistview_crash_fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/13_qt335_qlistview_crash_fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
-@@ -4563,6 +4563,7 @@
+@@ -4563,6 +4563,7 @@ void QListView::contentsMouseReleaseEven
}
emitClicked = emitClicked && d->pressedItem == i;
d->pressedItem = 0;
Modified: trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/configure
+++ b/configure
-@@ -1324,7 +1324,7 @@
+@@ -1324,7 +1324,7 @@ if [ "$CFG_EMBEDDED" != "no" ]; then
XPLATFORM="qws/solaris-$CFG_EMBEDDED-g++"
fi
;;
@@ -13,7 +13,7 @@
if [ -z "$PLATFORM" ]; then
case "$UNAME_MACHINE" in
*86)
-@@ -1379,9 +1379,6 @@
+@@ -1379,9 +1379,6 @@ if [ -z "$PLATFORM" ]; then
QNX:*)
PLATFORM=qnx-g++
;;
@@ -23,7 +23,7 @@
dgux:*)
PLATFORM=dgux-g++
;;
-@@ -1428,7 +1425,7 @@
+@@ -1428,7 +1425,7 @@ if [ -z "$PLATFORM" ]; then
- Also available for Tru64: tru64-g++
"
;;
@@ -34,7 +34,7 @@
- Also available for Linux: linux-kcc linux-icc linux-cxx
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ body { background: #ffffff; color: black
# define Q_OS_ULTRIX
#elif defined(sinix)
# define Q_OS_RELIANT
@@ -43,7 +43,7 @@
# define Q_OS_LINUX
#elif defined(__FreeBSD__) || defined(__DragonFly__)
# define Q_OS_FREEBSD
-@@ -173,8 +173,6 @@
+@@ -173,8 +173,6 @@ body { background: #ffffff; color: black
# define Q_OS_AIX
#elif defined(__Lynx__)
# define Q_OS_LYNX
Modified: trunk/packages/qt-x11-free/debian/patches/16_fix_opengl_check.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/16_fix_opengl_check.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/16_fix_opengl_check.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ bool qt_resolve_gl_symbols(bool fatal)
if (gl_syms_resolved)
return TRUE;
@@ -9,7 +9,7 @@
gl.setAutoUnload(FALSE);
qt_glCallLists = (_glCallLists) gl.resolve("glCallLists");
-@@ -286,7 +286,7 @@
+@@ -286,7 +286,7 @@ static Colormap choose_cmap( Display *dp
typedef Status (*_XmuLookupStandardColormap)( Display *dpy, int screen, VisualID visualid, unsigned int depth,
Atom property, Bool replace, Bool retain );
_XmuLookupStandardColormap qt_XmuLookupStandardColormap;
@@ -20,7 +20,7 @@
#define XmuLookupStandardColormap qt_XmuLookupStandardColormap
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/qlibrary.cpp
-@@ -429,6 +429,7 @@
+@@ -429,6 +429,7 @@ QString QLibrary::library() const
} else {
tmpfilename = QString( "lib%1" ).arg( filename );
}
Modified: trunk/packages/qt-x11-free/debian/patches/17_qlistview_crash_iterator.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/17_qlistview_crash_iterator.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/17_qlistview_crash_iterator.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
-@@ -7577,21 +7577,21 @@
+@@ -7577,21 +7577,21 @@ QListViewItemIterator::~QListViewItemIte
QListViewItemIterator &QListViewItemIterator::operator++()
{
Modified: trunk/packages/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/18_fix_makeqpf_qembed.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/tools/makeqpf/main.cpp
+++ b/tools/makeqpf/main.cpp
-@@ -137,8 +137,6 @@
+@@ -137,8 +137,6 @@ public:
}
};
@@ -13,7 +13,7 @@
class MakeQPF : public QMainWindow
{
Q_OBJECT
-@@ -152,7 +150,7 @@
+@@ -152,7 +150,7 @@ public:
view->addColumn("Weight");
view->addColumn("Style");
setCentralWidget(view);
Modified: trunk/packages/qt-x11-free/debian/patches/19_qfontdatabase_hack.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/19_qfontdatabase_hack.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/19_qfontdatabase_hack.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
-@@ -689,6 +689,10 @@
+@@ -689,6 +689,10 @@ static QtFontStyle *bestStyle(QtFontFoun
}
FM_DEBUG( " best style has distance 0x%x", dist );
Modified: trunk/packages/qt-x11-free/debian/patches/20_hppa_FTBFS.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/20_hppa_FTBFS.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/20_hppa_FTBFS.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
-@@ -125,13 +125,24 @@
+@@ -125,13 +125,24 @@ static inline double nan()
#endif
// We can't rely on -NAN, since all operations on a NAN should return a NAN.
Modified: trunk/packages/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/22_fix_ftbfs_amd64.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ QVFbView::QVFbView( int display_id, int
data = (unsigned char *)shmat( shmId, 0, 0 );
}
@@ -11,7 +11,7 @@
hdr = (QVFbHeader *)data;
--- a/examples/demo/opengl/fbm.c
+++ b/examples/demo/opengl/fbm.c
-@@ -50,6 +50,8 @@
+@@ -50,6 +50,8 @@ static void init(void);
r1 = r0 - 1.;
#define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
@@ -22,7 +22,7 @@
double fBm( Vector point, double H, double lacunarity, double octaves,
--- a/examples/demo/opengl/fbm.h
+++ b/examples/demo/opengl/fbm.h
-@@ -26,7 +26,6 @@
+@@ -26,7 +26,6 @@ typedef struct {
double z;
} Vector;
Modified: trunk/packages/qt-x11-free/debian/patches/32_gtkstyle.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/32_gtkstyle.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/32_gtkstyle.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
-@@ -231,6 +231,10 @@
+@@ -231,6 +231,10 @@ static const int motifItemFrame = 2; //
static const int motifItemHMargin = 5; // menu item hor text margin
static const int motifItemVMargin = 4; // menu item ver text margin
@@ -11,7 +11,7 @@
/*
+-----------------------------
-@@ -295,7 +299,14 @@
+@@ -295,7 +299,14 @@ QMenuBar::QMenuBar( QWidget *parent, con
setFrameStyle( QFrame::MenuBarPanel | QFrame::Raised );
QFontMetrics fm = fontMetrics();
@@ -27,7 +27,7 @@
setGeometry( 0, 0, width(), h );
-@@ -949,12 +960,19 @@
+@@ -949,12 +960,19 @@ int QMenuBar::calculateRects( int max_wi
h = QMAX( mi->pixmap()->height() + 4, QApplication::globalStrut().height() );
} else if ( !mi->text().isNull() ) { // text item
QString s = mi->text();
@@ -61,7 +61,7 @@
/*
-@@ -2348,8 +2350,18 @@
+@@ -2348,8 +2350,18 @@ void QPopupMenu::subMenuTimer() {
QRect r( itemGeometry( actItem ) );
QPoint p;
QSize ps = popup->sizeHint();
@@ -81,7 +81,7 @@
p = mapToGlobal( p );
bool right = FALSE;
-@@ -2362,7 +2374,7 @@
+@@ -2362,7 +2374,7 @@ void QPopupMenu::subMenuTimer() {
if ( right )
p.setX( mapToGlobal( r.topRight() ).x() );
} else {
@@ -92,7 +92,7 @@
bool left = FALSE;
--- a/src/kernel/qnamespace.h
+++ b/src/kernel/qnamespace.h
-@@ -297,7 +297,8 @@
+@@ -297,7 +297,8 @@ public:
#ifdef QT_NO_COMPAT
enum GUIStyle {
WindowsStyle = 1, // ### Qt 4.0: either remove the obsolete enums or clean up compat vs.
@@ -102,7 +102,7 @@
};
#else
enum GUIStyle {
-@@ -305,7 +306,8 @@
+@@ -305,7 +306,8 @@ public:
WindowsStyle,
Win3Style, // OBSOLETE
PMStyle, // OBSOLETE
Modified: trunk/packages/qt-x11-free/debian/patches/45_immodule_unified.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/45_immodule_unified.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/45_immodule_unified.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -2281,7 +2281,7 @@
+ QInputContext instance
--- a/configure
+++ b/configure
-@@ -222,7 +222,7 @@
+@@ -222,7 +222,7 @@ else
fi
# licensed modules depend on type of commercial license
@@ -2290,7 +2290,7 @@
[ "$PLATFORM_QWS" = "yes" ] && [ "$Products" = "qt-professional" ] && MODULES="$MODULES network"
[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml opengl sql"
CFG_MODULES_AVAILABLE=$MODULES
-@@ -269,6 +269,9 @@
+@@ -269,6 +269,9 @@ CFG_SQL_AVAILABLE=
CFG_SQL_AUTODETECTED=
CFG_GFX_AVAILABLE=
CFG_STYLE_AVAILABLE=
@@ -2300,7 +2300,7 @@
CFG_TABLET=auto
CFG_XKB=auto
CFG_NIS=auto
-@@ -400,6 +403,12 @@
+@@ -400,6 +403,12 @@ while [ "$#" -gt 0 ]; do
VAR=fatal_error
VAL=no
;;
@@ -2313,7 +2313,7 @@
-embedded)
VAR=embedded
# this option may or may not be followed by an argument
-@@ -1019,6 +1028,20 @@
+@@ -1019,6 +1028,20 @@ while [ "$#" -gt 0 ]; do
dlopen-opengl)
CFG_DLOPEN_OPENGL="$VAL"
;;
@@ -2334,7 +2334,7 @@
*)
UNKNOWN_OPT=yes
;;
-@@ -1895,6 +1918,13 @@
+@@ -1895,6 +1918,13 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
CFG_GFX_AVAILABLE=`echo $CFG_GFX_AVAILABLE`
fi
@@ -2348,7 +2348,7 @@
#-------------------------------------------------------------------------------
# help - interactive parts of the script _after_ this section please
-@@ -2202,6 +2232,20 @@
+@@ -2202,6 +2232,20 @@ if [ "$PLATFORM_X11" = "yes" ]; then
XKY="*"
XKN=" "
fi
@@ -2369,7 +2369,7 @@
cat << EOF
Qt/X11 only:
-@@ -2250,6 +2294,14 @@
+@@ -2250,6 +2294,14 @@ Qt/X11 only:
-dlopen-opengl ..... Qt uses dlopen(3) to resolve OpenGL functions
(instead of linking with OpenGL libraries directly).
@@ -2384,7 +2384,7 @@
EOF
fi
-@@ -2983,6 +3035,16 @@
+@@ -2989,6 +3041,16 @@ if [ "$PLATFORM_X11" = "yes" ]; then
if [ "$CFG_XKB" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG xkb"
fi
@@ -2401,7 +2401,7 @@
elif [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_TABLET" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG tablet"
-@@ -3107,7 +3169,7 @@
+@@ -3113,7 +3175,7 @@ esac
# minimal-config small-config medium-config large-config full-config
#
# Modules:
@@ -2410,7 +2410,7 @@
#
# Enterprise/Open Source edition modules:
# network canvas table xml opengl sql
-@@ -3115,6 +3177,8 @@
+@@ -3121,6 +3183,8 @@ esac
# Options:
# stl
#
@@ -2419,7 +2419,7 @@
# Things that do not affect the Qt API/ABI:
# system-jpeg no-jpeg jpeg
# system-mng no-mng mng
-@@ -3136,10 +3200,10 @@
+@@ -3142,10 +3206,10 @@ esac
# tablet
# ipv6
#
@@ -2432,7 +2432,7 @@
BUILD_CONFIG=
BUILD_OPTIONS=
-@@ -3153,7 +3217,7 @@
+@@ -3159,7 +3223,7 @@ for config_option in $QMAKE_CONFIG; do
BUILD_CONFIG="$config_option"
;;
@@ -2441,7 +2441,7 @@
# these config options affect the Qt API/ABI. they should influence
# the generation of the buildkey, so we don't skip them
SKIP="no"
-@@ -3500,6 +3564,8 @@
+@@ -3506,6 +3570,8 @@ if [ "$PLATFORM_X11" = "yes" ]; then
echo "XRender support ..... $CFG_XRENDER"
echo "Xft support ......... $CFG_FREETYPE"
echo "XKB Support ......... $CFG_XKB"
@@ -11987,7 +11987,7 @@
+}
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
-@@ -3164,6 +3164,35 @@
+@@ -3164,6 +3164,35 @@ void QApplication::postEvent( QObject *r
};
}
@@ -12023,7 +12023,7 @@
// if no compression could be done, just append something
event->posted = TRUE;
QPostEvent * pe = new QPostEvent( receiver, event );
-@@ -3310,6 +3339,23 @@
+@@ -3310,6 +3339,23 @@ void QApplication::sendPostedEvents( QOb
void QApplication::removePostedEvents( QObject *receiver )
{
@@ -12047,7 +12047,7 @@
if ( !receiver )
return;
-@@ -3328,18 +3374,24 @@
+@@ -3328,18 +3374,24 @@ void QApplication::removePostedEvents( Q
// leave the QPostEvent objects; they'll be deleted by
// sendPostedEvents().
QPostEventList * l = receiver->postedEvents;
@@ -12079,7 +12079,7 @@
}
-@@ -3524,6 +3576,8 @@
+@@ -3524,6 +3576,8 @@ void QApplication::setActiveWindow( QWid
focus_widget = 0;
#ifdef Q_WS_WIN
QInputContext::accept( tmp );
@@ -12090,7 +12090,7 @@
} else if ( active_window ) {
--- a/src/kernel/qapplication.h
+++ b/src/kernel/qapplication.h
-@@ -54,6 +54,9 @@
+@@ -54,6 +54,9 @@ class QSessionManager;
class QStyle;
class QTranslator;
class QEventLoop;
@@ -12100,7 +12100,7 @@
#if defined(Q_WS_QWS)
class QWSDecoration;
#endif
-@@ -275,8 +278,19 @@
+@@ -275,8 +278,19 @@ public:
virtual void saveState( QSessionManager& sm );
#endif
#if defined(Q_WS_X11)
@@ -12120,7 +12120,7 @@
static bool x11_apply_settings();
#endif
void wakeUpGuiThread();
-@@ -331,6 +345,12 @@
+@@ -331,6 +345,12 @@ private:
friend void qt_init(int *, char **, QApplication::Type);
#endif
@@ -12133,7 +12133,7 @@
#ifdef QT_THREAD_SUPPORT
static QMutex *qt_mutex;
#endif // QT_THREAD_SUPPORT
-@@ -380,9 +400,12 @@
+@@ -380,9 +400,12 @@ private:
static QString* session_key;
bool is_session_restored;
#endif
@@ -12147,7 +12147,7 @@
static QSize app_strut;
#ifndef QT_NO_COMPONENT
-@@ -399,6 +422,7 @@
+@@ -399,6 +422,7 @@ private:
static bool sendSpontaneousEvent( QObject *receiver, QEvent *event );
static void removePostedEvent( QEvent * );
@@ -12168,7 +12168,7 @@
#include "qinternal_p.h" // shared double buffer cleanup
#if defined(QT_THREAD_SUPPORT)
-@@ -192,10 +194,9 @@
+@@ -192,10 +194,9 @@ static const char *appBTNCol = 0; // ap
static const char *mwGeometry = 0; // main widget geometry
static const char *mwTitle = 0; // main widget title
//Ming-Che 10/10
@@ -12180,7 +12180,7 @@
static Display *appDpy = 0; // X11 application display
static char *appDpyName = 0; // X11 display name
static bool appForeignDpy = FALSE; // we didn't create display
-@@ -411,14 +412,14 @@
+@@ -411,14 +412,14 @@ static bool qt_x11EventFilter( XEvent* e
#if !defined(QT_NO_XIM)
@@ -12199,7 +12199,7 @@
Q_EXPORT Time qt_x_time = CurrentTime;
Q_EXPORT Time qt_x_user_time = CurrentTime;
-@@ -531,8 +532,7 @@
+@@ -531,8 +532,7 @@ public:
void setWFlags( WFlags f ) { QWidget::setWFlags(f); }
void clearWFlags( WFlags f ) { QWidget::clearWFlags(f); }
bool translateMouseEvent( const XEvent * );
@@ -12209,7 +12209,7 @@
bool translateKeyEvent( const XEvent *, bool grab );
bool translatePaintEvent( const XEvent * );
bool translateConfigEvent( const XEvent * );
-@@ -549,114 +549,120 @@
+@@ -549,114 +549,120 @@ public:
// ************************************************************************
@@ -12421,7 +12421,7 @@
#endif // QT_NO_XIM
}
-@@ -664,6 +670,43 @@
+@@ -664,6 +670,43 @@ void QApplication::create_xim()
/*! \internal
Closes the application input method.
*/
@@ -12465,7 +12465,7 @@
void QApplication::close_xim()
{
#ifndef QT_NO_XIM
-@@ -671,7 +714,10 @@
+@@ -671,7 +714,10 @@ void QApplication::close_xim()
// XCloseIM( qt_xim );
// We prefer a less serious memory leak
@@ -12477,7 +12477,7 @@
QWidgetList *list = qApp->topLevelWidgets();
QWidgetListIt it(*list);
while(it.current()) {
-@@ -679,9 +725,8 @@
+@@ -679,9 +725,8 @@ void QApplication::close_xim()
++it;
}
delete list;
@@ -12488,7 +12488,7 @@
/*****************************************************************************
Default X error handlers
-@@ -1052,18 +1097,40 @@
+@@ -1052,18 +1097,40 @@ bool QApplication::x11_apply_settings()
settings.readBoolEntry("/qt/useRtlExtensions", FALSE);
#ifndef QT_NO_XIM
@@ -12534,7 +12534,7 @@
}
#endif
-@@ -1099,19 +1166,19 @@
+@@ -1099,19 +1166,19 @@ static void qt_set_input_encoding()
// Always use the locale codec, since we have no examples of non-local
// XIMs, and since we cannot get a sensible answer about the encoding
// from the XIM.
@@ -12561,7 +12561,7 @@
if( data )
XFree( (char *)data );
}
-@@ -1549,6 +1616,8 @@
+@@ -1549,6 +1616,8 @@ static Visual *find_truecolor_visual( Di
#define XK_MISCELLANY
#define XK_LATIN1
@@ -12570,7 +12570,7 @@
#include <X11/keysymdef.h>
// ### This should be static but it isn't because of the friend declaration
-@@ -1639,10 +1708,7 @@
+@@ -1639,10 +1708,7 @@ void qt_init_internal( int *argcptr, cha
//Ming-Che 10/10
} else if ( arg == "-im" ) {
if ( ++i < argc )
@@ -12582,7 +12582,7 @@
} else if ( arg == "-iconic" ) {
mwIconic = !mwIconic;
} else if ( arg == "-ncols" ) { // xv and netscape use this name
-@@ -1662,17 +1728,17 @@
+@@ -1662,17 +1728,17 @@ void qt_init_internal( int *argcptr, cha
if ( ++i < argc ) {
QCString s = QCString(argv[i]).lower();
if ( s == "onthespot" )
@@ -12608,7 +12608,7 @@
}
#endif
} else if ( arg == "-cmap" ) { // xv uses this name
-@@ -2139,34 +2205,13 @@
+@@ -2139,34 +2205,13 @@ void qt_init_internal( int *argcptr, cha
QApplication::setFont( f );
}
@@ -12650,7 +12650,7 @@
#if defined (QT_TABLET_SUPPORT)
int ndev,
-@@ -2415,9 +2460,12 @@
+@@ -2415,9 +2460,12 @@ void qt_cleanup()
XCloseDevice( appDpy, devEraser );
#endif
@@ -12666,7 +12666,7 @@
#endif
if ( qt_is_gui_used ) {
-@@ -3280,77 +3328,59 @@
+@@ -3280,77 +3328,59 @@ int QApplication::x11ProcessEvent( XEven
}
}
@@ -12792,7 +12792,7 @@
}
if ( qt_x11EventFilter(event) ) // send through app filter
-@@ -3502,34 +3532,8 @@
+@@ -3502,34 +3532,8 @@ int QApplication::x11ProcessEvent( XEven
case XKeyRelease:
{
if ( keywidget && keywidget->isEnabled() ) { // should always exist
@@ -12829,7 +12829,7 @@
}
break;
}
-@@ -4824,6 +4828,92 @@
+@@ -4824,6 +4828,92 @@ static const KeySym KeyTbl[] = { // key
0x1005FF10, Qt::Key_F11, // hardcoded Sun F36 (labeled F11)
0x1005FF11, Qt::Key_F12, // hardcoded Sun F37 (labeled F12)
@@ -12922,7 +12922,7 @@
// Special multimedia keys
// currently only tested with MS internet keyboard
-@@ -5041,9 +5131,9 @@
+@@ -5041,9 +5131,9 @@ static QChar keysymToUnicode(unsigned ch
bool QETWidget::translateKeyEventInternal( const XEvent *event, int& count,
QString& text,
int& state,
@@ -12934,7 +12934,7 @@
// some XmbLookupString implementations don't return buffer overflow correctly,
// so we increase the input buffer to allow for long strings...
// 256 chars * 2 bytes + 1 null-term == 513 bytes
-@@ -5090,6 +5180,11 @@
+@@ -5090,6 +5180,11 @@ bool QETWidget::translateKeyEventInterna
if ( type == QEvent::KeyPress ) {
bool mb=FALSE;
@@ -12946,7 +12946,7 @@
if ( qt_xim ) {
QTLWExtra* xd = tlw->topData();
QInputContext *qic = (QInputContext *) xd->xic;
-@@ -5098,13 +5193,14 @@
+@@ -5098,13 +5193,14 @@ bool QETWidget::translateKeyEventInterna
count = qic->lookupString(&xkeyevent, chars, &key, &status);
}
}
@@ -12963,7 +12963,7 @@
}
if ( key )
keyDict->replace( keycode, (void*)key );
-@@ -5181,15 +5277,18 @@
+@@ -5181,15 +5277,18 @@ bool QETWidget::translateKeyEventInterna
state = qt_x11_translateButtonState( keystate );
static int directionKeyEvent = 0;
@@ -12983,7 +12983,7 @@
}
}
-@@ -5199,10 +5298,14 @@
+@@ -5199,10 +5298,14 @@ bool QETWidget::translateKeyEventInterna
// (to figure out whether the Ctrl modifier is held while Shift is pressed,
// or Shift is held while Ctrl is pressed) since the 'state' doesn't tell
// us whether the modifier held is Left or Right.
@@ -13000,7 +13000,7 @@
} else {
// this can no longer be a direction-changing accel.
// if any other key was pressed.
-@@ -5216,7 +5319,7 @@
+@@ -5216,7 +5319,7 @@ bool QETWidget::translateKeyEventInterna
// Qt keycodes between 128 and 255, but should rather use the
// QKeyEvent::text().
//
@@ -13009,7 +13009,7 @@
code = isprint((int)key) ? toupper((int)key) : 0; // upper-case key, if known
} else if ( key >= XK_F1 && key <= XK_F35 ) {
code = Key_F1 + ((int)key - XK_F1); // function keys
-@@ -5267,8 +5370,8 @@
+@@ -5267,8 +5370,8 @@ bool QETWidget::translateKeyEventInterna
chars[0] = 0;
}
@@ -13020,7 +13020,7 @@
if ( key == XK_Shift_L && directionKeyEvent == XK_Control_L ||
key == XK_Control_L && directionKeyEvent == XK_Shift_L ) {
directionKeyEvent = Key_Direction_L;
-@@ -5446,8 +5549,34 @@
+@@ -5446,8 +5549,34 @@ bool QETWidget::translateKeyEvent( const
translateKeyEventInternal( event, count, text, state, ascii, code, type );
}
@@ -13055,7 +13055,7 @@
// do not compress keys if the key event we just got above matches
// one of the key ranges used to compute stopCompression
! ( ( code >= Key_Escape && code <= Key_SysReq ) ||
-@@ -5506,7 +5635,12 @@
+@@ -5506,7 +5635,12 @@ bool QETWidget::translateKeyEvent( const
// autorepeat compression makes sense for all widgets (Windows
// does it automatically .... )
@@ -13071,7 +13071,7 @@
for (;;) {
--- a/src/kernel/qevent.cpp
+++ b/src/kernel/qevent.cpp
-@@ -735,6 +735,10 @@
+@@ -735,6 +735,10 @@ QWheelEvent::QWheelEvent( const QPoint &
the result of a known key (e.g. it may be the result of a compose
sequence or a keyboard macro, or due to key event compression).
@@ -14613,7 +14613,7 @@
+#endif //Q_NO_IM
--- a/src/kernel/qnamespace.h
+++ b/src/kernel/qnamespace.h
-@@ -402,6 +402,87 @@
+@@ -402,6 +402,87 @@ public:
Key_Help = 0x1058,
Key_Direction_L = 0x1059,
Key_Direction_R = 0x1060,
@@ -14701,7 +14701,7 @@
Key_Space = 0x20, // 7 bit printable ASCII
Key_Any = Key_Space,
Key_Exclam = 0x21,
-@@ -474,6 +555,11 @@
+@@ -474,6 +555,11 @@ public:
Key_AsciiTilde = 0x7e,
// Latin 1 codes adapted from X: keysymdef.h,v 1.21 94/08/28 16:17:06
@@ -14715,7 +14715,7 @@
Key_exclamdown = 0x0a1,
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
-@@ -665,7 +665,7 @@
+@@ -665,7 +665,7 @@ void QTextCursor::restoreState()
pop();
}
@@ -14724,7 +14724,7 @@
{
QPoint pos( p );
QRect r;
-@@ -683,7 +683,7 @@
+@@ -683,7 +683,7 @@ bool QTextCursor::place( const QPoint &p
str = s;
if ( pos.y() >= r.y() && pos.y() <= r.y() + r.height() )
break;
@@ -14733,7 +14733,7 @@
#ifdef Q_WS_MACX
pos.setX( s->rect().x() + s->rect().width() );
#endif
-@@ -724,7 +724,7 @@
+@@ -724,7 +724,7 @@ bool QTextCursor::place( const QPoint &p
if ( pos.x() < x )
pos.setX( x + 1 );
int cw;
@@ -14742,7 +14742,7 @@
int dist = 10000000;
bool inCustom = FALSE;
while ( i < nextLine ) {
-@@ -746,14 +746,21 @@
+@@ -746,14 +746,21 @@ bool QTextCursor::place( const QPoint &p
cpos += cw;
int d = cpos - pos.x();
bool dm = d < 0 ? !chr->rightToLeft : chr->rightToLeft;
@@ -14766,7 +14766,7 @@
setIndex( curpos );
#ifndef QT_NO_TEXTCUSTOMITEM
-@@ -4879,6 +4886,9 @@
+@@ -4879,6 +4886,9 @@ void QTextParagraph::drawString( QPainte
tmpw = fullSelectionWidth - xleft;
painter.fillRect( xleft, y, tmpw, h, color );
painter.drawText( xstart, y + baseLine, str, start, len, dir );
@@ -14778,7 +14778,7 @@
}
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
-@@ -365,7 +365,8 @@
+@@ -365,7 +365,8 @@ public:
int totalOffsetY() const; // total document offset
bool place( const QPoint &pos, QTextParagraph *s ) { return place( pos, s, FALSE ); }
@@ -14790,7 +14790,7 @@
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
-@@ -34,7 +34,6 @@
+@@ -34,7 +34,6 @@ kernel {
$$KERNEL_H/qimage.h \
$$KERNEL_P/qimageformatinterface_p.h \
$$KERNEL_H/qimageformatplugin.h \
@@ -14798,7 +14798,7 @@
$$KERNEL_H/qkeycode.h \
$$KERNEL_H/qkeysequence.h \
$$KERNEL_H/qlayout.h \
-@@ -99,6 +98,12 @@
+@@ -99,6 +98,12 @@ kernel {
$$KERNEL_CPP/qfontengine_p.h \
$$KERNEL_CPP/qtextlayout_p.h
@@ -14811,7 +14811,7 @@
win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \
$$KERNEL_CPP/qclipboard_win.cpp \
$$KERNEL_CPP/qcolor_win.cpp \
-@@ -130,6 +135,7 @@
+@@ -130,6 +135,7 @@ kernel {
$$KERNEL_CPP/qdesktopwidget_x11.cpp \
$$KERNEL_CPP/qeventloop_x11.cpp \
$$KERNEL_CPP/qfont_x11.cpp \
@@ -14821,7 +14821,7 @@
$$KERNEL_CPP/qpixmap_x11.cpp \
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
-@@ -3285,8 +3285,24 @@
+@@ -3285,8 +3285,24 @@ void QWidget::setFocus()
if ( isActiveWindow() ) {
QWidget * prev = qApp->focus_widget;
if ( prev ) {
@@ -14847,7 +14847,7 @@
}
#if defined(Q_WS_WIN)
else {
-@@ -3294,9 +3310,8 @@
+@@ -3294,9 +3310,8 @@ void QWidget::setFocus()
}
#endif
qApp->focus_widget = this;
@@ -14859,7 +14859,7 @@
#if defined(Q_WS_WIN)
if ( !topLevelWidget()->isPopup() )
-@@ -3344,7 +3359,11 @@
+@@ -3344,7 +3359,11 @@ void QWidget::clearFocus()
focusProxy()->clearFocus();
return;
} else if ( hasFocus() ) {
@@ -14871,7 +14871,7 @@
QWidget* w = qApp->focusWidget();
// clear active focus
qApp->focus_widget = 0;
-@@ -4670,7 +4689,13 @@
+@@ -4670,7 +4689,13 @@ bool QWidget::event( QEvent *e )
break;
case QEvent::MouseButtonPress:
@@ -14898,7 +14898,7 @@
class QLayout;
struct QWExtra;
struct QTLWExtra;
-@@ -550,6 +554,18 @@
+@@ -550,6 +554,18 @@ protected:
int metric( int ) const;
@@ -14917,7 +14917,7 @@
void resetInputContext();
virtual void create( WId = 0, bool initializeWindow = TRUE,
-@@ -581,13 +597,16 @@
+@@ -581,13 +597,16 @@ protected:
private slots:
void focusProxyDestroyed();
@@ -14935,7 +14935,7 @@
void checkChildrenDnd();
#ifndef QT_NO_XSYNC
-@@ -667,6 +686,9 @@
+@@ -667,6 +686,9 @@ private:
#ifndef QT_NO_LAYOUT
QLayout *lay_out;
#endif
@@ -14945,7 +14945,7 @@
QWExtra *extra;
#if defined(Q_WS_QWS)
QRegion req_region; // Requested region
-@@ -972,7 +994,9 @@
+@@ -972,7 +994,9 @@ struct Q_EXPORT QTLWExtra {
uint dnd : 1; // DND properties installed
uint uspos : 1; // User defined position
uint ussize : 1; // User defined size
@@ -14958,7 +14958,7 @@
uint syncRequestValue[2];
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
-@@ -64,11 +64,9 @@
+@@ -64,11 +64,9 @@ int qt_sip_count( QWidget* );
bool qt_wstate_iconified( WId );
void qt_updated_rootinfo();
@@ -14973,7 +14973,7 @@
#endif
// Paint event clipping magic
-@@ -682,6 +680,10 @@
+@@ -682,6 +680,10 @@ void QWidget::create( WId window, bool i
if ( destroyw )
qt_XDestroyWindow( this, dpy, destroyw );
@@ -14984,7 +14984,7 @@
}
-@@ -748,6 +750,16 @@
+@@ -748,6 +750,16 @@ void QWidget::destroy( bool destroyWindo
extern void qPRCleanup( QWidget *widget ); // from qapplication_x11.cpp
if ( testWState(WState_Reparented) )
qPRCleanup(this);
@@ -15001,7 +15001,7 @@
}
}
-@@ -784,11 +796,11 @@
+@@ -784,11 +796,11 @@ void QWidget::reparentSys( QWidget *pare
XReparentWindow( x11Display(), old_winid,
RootWindow( x11Display(), x11Screen() ), 0, 0 );
@@ -15018,7 +15018,7 @@
destroyInputContext();
}
-@@ -1006,7 +1018,8 @@
+@@ -1006,7 +1018,8 @@ QPoint QWidget::mapFromGlobal( const QPo
language input systems.
In the X11 version of Qt, if \a text is TRUE, this method sets the
@@ -15028,7 +15028,7 @@
The font \a f is a rendering hint to the currently active input method.
If \a f is 0 the widget's font is used.
-@@ -1016,22 +1029,15 @@
+@@ -1016,22 +1029,15 @@ QPoint QWidget::mapFromGlobal( const QPo
void QWidget::setMicroFocusHint(int x, int y, int width, int height,
bool text, QFont *f )
{
@@ -15056,7 +15056,7 @@
}
}
#endif
-@@ -1501,7 +1507,7 @@
+@@ -1501,7 +1507,7 @@ void QWidget::setActiveWindow()
QWidget *tlw = topLevelWidget();
if ( tlw->isVisible() && !tlw->topData()->embedded && !qt_deferred_map_contains(tlw) ) {
XSetInputFocus( x11Display(), tlw->winId(), RevertToNone, qt_x_time);
@@ -15065,7 +15065,7 @@
}
}
-@@ -2481,8 +2487,10 @@
+@@ -2481,8 +2487,10 @@ void QWidget::deleteSysExtra()
void QWidget::createTLSysExtra()
{
@@ -15076,7 +15076,7 @@
#ifndef QT_NO_XSYNC
extra->topextra->syncCounter = 0;
extra->topextra->syncRequestValue[0] = 0;
-@@ -2492,7 +2500,8 @@
+@@ -2492,7 +2500,8 @@ void QWidget::createTLSysExtra()
void QWidget::deleteTLSysExtra()
{
@@ -15086,7 +15086,7 @@
}
/*
-@@ -2769,76 +2778,255 @@
+@@ -2769,76 +2778,255 @@ void QWidget::updateFrameStrut() const
}
@@ -15385,7 +15385,7 @@
{
--- a/src/qt.pro
+++ b/src/qt.pro
-@@ -37,6 +37,7 @@
+@@ -37,6 +37,7 @@ OPENGL_CPP = opengl
TOOLS_CPP = tools
CODECS_CPP = codecs
WORKSPACE_CPP = workspace
@@ -15393,7 +15393,7 @@
XML_CPP = xml
STYLES_CPP = styles
EMBEDDED_CPP = embedded
-@@ -54,6 +55,7 @@
+@@ -54,6 +55,7 @@ win32 {
TOOLS_H = $$TOOLS_CPP
CODECS_H = $$CODECS_CPP
WORKSPACE_H = $$WORKSPACE_CPP
@@ -15401,7 +15401,7 @@
XML_H = $$XML_CPP
CANVAS_H = $$CANVAS_CPP
STYLES_H = $$STYLES_CPP
-@@ -70,6 +72,7 @@
+@@ -70,6 +72,7 @@ win32 {
TOOLS_H = $$WIN_ALL_H
CODECS_H = $$WIN_ALL_H
WORKSPACE_H = $$WIN_ALL_H
@@ -15409,7 +15409,7 @@
XML_H = $$WIN_ALL_H
CANVAS_H = $$WIN_ALL_H
STYLES_H = $$WIN_ALL_H
-@@ -98,6 +101,7 @@
+@@ -98,6 +101,7 @@ unix {
TOOLS_H = $$TOOLS_CPP
CODECS_H = $$CODECS_CPP
WORKSPACE_H = $$WORKSPACE_CPP
@@ -15417,7 +15417,7 @@
XML_H = $$XML_CPP
STYLES_H = $$STYLES_CPP
!embedded:!mac:CONFIG += x11 x11inc
-@@ -112,7 +116,7 @@
+@@ -112,7 +116,7 @@ embedded {
EMBEDDED_H = $$EMBEDDED_CPP
}
@@ -15426,7 +15426,7 @@
DEPENDPATH += $$ICONVIEW_H;$$OPENGL_H;$$TOOLS_H;$$CODECS_H;$$WORKSPACE_H;$$XML_H;
DEPENDPATH += $$CANVAS_H;$$STYLES_H
embedded:DEPENDPATH += ;$$EMBEDDED_H
-@@ -147,6 +151,7 @@
+@@ -147,6 +151,7 @@ include($$WIDGETS_CPP/qt_widgets.pri)
include($$DIALOGS_CPP/qt_dialogs.pri)
include($$ICONVIEW_CPP/qt_iconview.pri)
include($$WORKSPACE_CPP/qt_workspace.pri)
@@ -15465,7 +15465,7 @@
#include "qpainter.h"
#include "qdrawutil.h"
#include "qfontmetrics.h"
-@@ -248,12 +254,17 @@
+@@ -248,12 +254,17 @@ struct QLineEditPrivate : public Qt
// input methods
int imstart, imend, imselstart, imselend;
@@ -15483,7 +15483,7 @@
int xToPos( int x, QTextItem::CursorPosition = QTextItem::BetweenCharacters ) const;
inline int visualAlignment() const { return alignment ? alignment : int( isRightToLeft() ? AlignRight : AlignLeft ); }
QRect cursorRect() const;
-@@ -591,6 +602,7 @@
+@@ -591,6 +602,7 @@ void QLineEdit::setEchoMode( EchoMode mo
return;
d->echoMode = mode;
d->updateTextLayout();
@@ -15491,7 +15491,7 @@
update();
}
-@@ -1422,6 +1434,8 @@
+@@ -1422,6 +1434,8 @@ bool QLineEdit::event( QEvent * e )
*/
void QLineEdit::mousePressEvent( QMouseEvent* e )
{
@@ -15500,7 +15500,7 @@
if ( e->button() == RightButton )
return;
if ( d->tripleClickTimer && ( e->pos() - d->tripleClick ).manhattanLength() <
-@@ -1451,7 +1465,8 @@
+@@ -1451,7 +1465,8 @@ void QLineEdit::mousePressEvent( QMouseE
*/
void QLineEdit::mouseMoveEvent( QMouseEvent * e )
{
@@ -15510,7 +15510,7 @@
#ifndef QT_NO_CURSOR
if ( ( e->state() & MouseButtonMask ) == 0 ) {
if ( !d->readOnly && d->dragEnabled
-@@ -1480,6 +1495,8 @@
+@@ -1480,6 +1495,8 @@ void QLineEdit::mouseMoveEvent( QMouseEv
*/
void QLineEdit::mouseReleaseEvent( QMouseEvent* e )
{
@@ -15519,7 +15519,7 @@
#ifndef QT_NO_DRAGANDDROP
if ( e->button() == LeftButton ) {
if ( d->dndTimer ) {
-@@ -1506,6 +1523,8 @@
+@@ -1506,6 +1523,8 @@ void QLineEdit::mouseReleaseEvent( QMous
*/
void QLineEdit::mouseDoubleClickEvent( QMouseEvent* e )
{
@@ -15528,7 +15528,7 @@
if ( e->button() == Qt::LeftButton ) {
deselect();
d->cursor = d->xToPos( e->pos().x() );
-@@ -1775,6 +1794,33 @@
+@@ -1775,6 +1794,33 @@ void QLineEdit::keyPressEvent( QKeyEvent
e->ignore();
}
@@ -15562,7 +15562,7 @@
/*! \reimp
*/
void QLineEdit::imStartEvent( QIMEvent *e )
-@@ -1835,6 +1881,8 @@
+@@ -1835,6 +1881,8 @@ void QLineEdit::focusInEvent( QFocusEven
}
if( !hasSelectedText() || style().styleHint( QStyle::SH_BlinkCursorWhenTextSelected ) )
d->setCursorVisible( TRUE );
@@ -15571,7 +15571,7 @@
d->updateMicroFocusHint();
}
-@@ -1919,6 +1967,14 @@
+@@ -1919,6 +1967,14 @@ void QLineEdit::drawContents( QPainter *
} else if (d->hscroll < 0) {
d->hscroll = 0;
}
@@ -15586,7 +15586,7 @@
// the y offset is there to keep the baseline constant in case we have script changes in the text.
QPoint topLeft = lineRect.topLeft() - QPoint(d->hscroll, d->ascent-fm.ascent());
-@@ -1959,7 +2015,7 @@
+@@ -1959,7 +2015,7 @@ void QLineEdit::drawContents( QPainter *
}
// input method edit area
@@ -15595,7 +15595,7 @@
QRect highlight = QRect( QPoint( tix + ti.cursorToX( QMAX( d->imstart - first, 0 ) ), lineRect.top() ),
QPoint( tix + ti.cursorToX( QMIN( d->imend - first, last - first + 1 ) )-1, lineRect.bottom() ) ).normalize();
p->save();
-@@ -1972,11 +2028,16 @@
+@@ -1972,11 +2028,16 @@ void QLineEdit::drawContents( QPainter *
imCol.setHsv( h1, s1, ( v1 + v2 ) / 2 );
p->fillRect( highlight, imCol );
p->drawTextItem( topLeft, ti, textflags );
@@ -15613,7 +15613,7 @@
QRect highlight = QRect( QPoint( tix + ti.cursorToX( QMAX( d->imselstart - first, 0 ) ), lineRect.top() ),
QPoint( tix + ti.cursorToX( QMIN( d->imselend - first, last - first + 1 ) )-1, lineRect.bottom() ) ).normalize();
p->save();
-@@ -2004,7 +2065,11 @@
+@@ -2004,7 +2065,11 @@ void QLineEdit::drawContents( QPainter *
}
// draw cursor
@@ -15626,7 +15626,7 @@
QPoint from( topLeft.x() + cix, lineRect.top() );
QPoint to = from + QPoint( 0, lineRect.height() );
p->drawLine( from, to );
-@@ -2119,6 +2184,10 @@
+@@ -2119,6 +2184,10 @@ enum { IdUndo, IdRedo, IdSep1, IdCut, Id
void QLineEdit::contextMenuEvent( QContextMenuEvent * e )
{
#ifndef QT_NO_POPUPMENU
@@ -15637,7 +15637,7 @@
d->separate();
QPopupMenu *menu = createPopupMenu();
if (!menu)
-@@ -2172,6 +2241,13 @@
+@@ -2172,6 +2241,13 @@ QPopupMenu *QLineEdit::createPopupMenu()
+ ACCEL_KEY( A )
#endif
);
@@ -15651,7 +15651,7 @@
popup->setItemEnabled( id - IdUndo, d->isUndoAvailable() );
popup->setItemEnabled( id - IdRedo, d->isRedoAvailable() );
#ifndef QT_NO_CLIPBOARD
-@@ -2305,7 +2381,7 @@
+@@ -2305,7 +2381,7 @@ void QLineEditPrivate::updateTextLayout(
textLayout.endLine(0, 0, Qt::AlignLeft|Qt::SingleLine, &ascent);
}
@@ -15660,7 +15660,7 @@
{
x-= q->contentsRect().x() - hscroll + innerMargin;
for ( int i = 0; i < textLayout.numItems(); ++i ) {
-@@ -2314,7 +2390,13 @@
+@@ -2314,7 +2390,13 @@ int QLineEditPrivate::xToPos( int x, QTe
if ( x >= tir.left() && x <= tir.right() )
return ti.xToCursor( x - tir.x(), betweenOrOn ) + ti.from();
}
@@ -15675,7 +15675,7 @@
}
-@@ -2335,9 +2417,19 @@
+@@ -2335,9 +2417,19 @@ QRect QLineEditPrivate::cursorRect() con
void QLineEditPrivate::updateMicroFocusHint()
{
@@ -15699,7 +15699,7 @@
--- a/src/widgets/qlineedit.h
+++ b/src/widgets/qlineedit.h
-@@ -199,6 +199,7 @@
+@@ -199,6 +199,7 @@ protected:
void dropEvent( QDropEvent * );
#endif
void contextMenuEvent( QContextMenuEvent * );
@@ -15721,7 +15721,7 @@
#include "../kernel/qrichtext_p.h"
#include "qpainter.h"
#include "qpen.h"
-@@ -111,6 +116,8 @@
+@@ -111,6 +116,8 @@ public:
int id[ 7 ];
int preeditStart;
int preeditLength;
@@ -15730,7 +15730,7 @@
uint ensureCursorVisibleInShowEvent : 1;
uint tabChangesFocus : 1;
QString scrollToAnchor; // used to deferr scrollToAnchor() until the show event when we are resized
-@@ -1081,6 +1088,10 @@
+@@ -1081,6 +1088,10 @@ void QTextEdit::drawContents( QPainter *
l += v;
}
}
@@ -15741,7 +15741,7 @@
}
/*!
-@@ -1556,6 +1567,35 @@
+@@ -1556,6 +1567,35 @@ void QTextEdit::keyPressEvent( QKeyEvent
}
/*!
@@ -15777,7 +15777,7 @@
\reimp
*/
void QTextEdit::imStartEvent( QIMEvent *e )
-@@ -1585,11 +1625,17 @@
+@@ -1585,11 +1625,17 @@ void QTextEdit::imComposeEvent( QIMEvent
doc->removeSelection( QTextDocument::IMCompositionText );
doc->removeSelection( QTextDocument::IMSelectionText );
@@ -15797,7 +15797,7 @@
// insert can trigger an imEnd event as it emits a textChanged signal, so better
// be careful
if(d->preeditStart != -1) {
-@@ -1601,14 +1647,20 @@
+@@ -1601,14 +1647,20 @@ void QTextEdit::imComposeEvent( QIMEvent
cursor->setIndex( d->preeditStart + e->cursorPos() );
@@ -15819,7 +15819,7 @@
}
}
-@@ -1632,11 +1684,12 @@
+@@ -1632,11 +1684,12 @@ void QTextEdit::imEndEvent( QIMEvent *e
if (undoRedoInfo.type == UndoRedoInfo::IME)
undoRedoInfo.type = UndoRedoInfo::Invalid;
@@ -15834,7 +15834,7 @@
}
d->preeditStart = d->preeditLength = -1;
-@@ -2127,6 +2180,13 @@
+@@ -2127,6 +2180,13 @@ void QTextEdit::drawCursor( bool visible
isReadOnly() )
return;
@@ -15848,7 +15848,7 @@
QPainter p( viewport() );
QRect r( cursor->topParagraph()->rect() );
cursor->paragraph()->setChanged( TRUE );
-@@ -2201,6 +2261,9 @@
+@@ -2201,6 +2261,9 @@ void QTextEdit::contentsMousePressEvent(
}
#endif
@@ -15858,7 +15858,7 @@
if ( d->trippleClickTimer->isActive() &&
( e->globalPos() - d->trippleClickPoint ).manhattanLength() <
QApplication::startDragDistance() ) {
-@@ -2306,7 +2369,9 @@
+@@ -2306,7 +2369,9 @@ void QTextEdit::contentsMouseMoveEvent(
return;
}
#endif
@@ -15869,7 +15869,7 @@
#ifndef QT_NO_DRAGANDDROP
if ( mightStartDrag ) {
dragStartTimer->stop();
-@@ -2363,7 +2428,7 @@
+@@ -2363,7 +2428,7 @@ void QTextEdit::copyToClipboard()
void QTextEdit::contentsMouseReleaseEvent( QMouseEvent * e )
{
@@ -15878,7 +15878,7 @@
int para = 0;
int index = charAt( e->pos(), ¶ );
emit clicked( para, index );
-@@ -2374,6 +2439,8 @@
+@@ -2374,6 +2439,8 @@ void QTextEdit::contentsMouseReleaseEven
return;
}
#endif
@@ -15887,7 +15887,7 @@
QTextCursor oldCursor = *cursor;
if ( scrollTimer->isActive() )
scrollTimer->stop();
-@@ -2467,7 +2534,7 @@
+@@ -2467,7 +2534,7 @@ void QTextEdit::contentsMouseReleaseEven
void QTextEdit::contentsMouseDoubleClickEvent( QMouseEvent * e )
{
@@ -15896,7 +15896,7 @@
e->ignore();
return;
}
-@@ -2498,6 +2565,9 @@
+@@ -2498,6 +2565,9 @@ void QTextEdit::contentsMouseDoubleClick
} else
#endif
{
@@ -15906,7 +15906,7 @@
QTextCursor c1 = *cursor;
QTextCursor c2 = *cursor;
#if defined(Q_OS_MAC)
-@@ -2673,10 +2743,15 @@
+@@ -2673,10 +2743,15 @@ void QTextEdit::contentsDropEvent( QDrop
*/
void QTextEdit::contentsContextMenuEvent( QContextMenuEvent *e )
{
@@ -15923,7 +15923,7 @@
#ifndef QT_NO_POPUPMENU
QGuardedPtr<QTextEdit> that = this;
QGuardedPtr<QPopupMenu> popup = createPopupMenu( e->pos() );
-@@ -2826,6 +2901,12 @@
+@@ -2826,6 +2901,12 @@ void QTextEdit::placeCursor( const QPoin
void QTextEdit::updateMicroFocusHint()
{
QTextCursor c( *cursor );
@@ -15936,7 +15936,7 @@
if ( d->preeditStart != -1 ) {
c.setIndex( d->preeditStart );
if(doc->hasSelection(QTextDocument::IMSelectionText)) {
-@@ -2834,7 +2915,8 @@
+@@ -2834,7 +2915,8 @@ void QTextEdit::updateMicroFocusHint()
c.setIndex(index);
}
}
@@ -15946,7 +15946,7 @@
if ( hasFocus() || viewport()->hasFocus() ) {
int h = c.paragraph()->lineHeightOfChar( cursor->index() );
if ( !readonly ) {
-@@ -2998,6 +3080,8 @@
+@@ -2998,6 +3080,8 @@ void QTextEdit::insert( const QString &t
bool indent = insertionFlags & RedoIndentation;
bool checkNewLine = insertionFlags & CheckNewLines;
bool removeSelected = insertionFlags & RemoveSelected;
@@ -15955,7 +15955,7 @@
QString txt( text );
drawCursor( FALSE );
if ( !isReadOnly() && doc->hasSelection( QTextDocument::Standard ) && removeSelected )
-@@ -3037,7 +3121,10 @@
+@@ -3037,7 +3121,10 @@ void QTextEdit::insert( const QString &t
formatMore();
repaintChanged();
ensureCursorVisible();
@@ -15967,7 +15967,7 @@
if ( undoEnabled && !isReadOnly() && undoRedoInfo.type != UndoRedoInfo::IME ) {
undoRedoInfo.d->text += txt;
-@@ -3059,7 +3146,13 @@
+@@ -3059,7 +3146,13 @@ void QTextEdit::insert( const QString &t
doc->setSelectionEnd( QTextDocument::Standard, *cursor );
repaintChanged();
}
@@ -15982,7 +15982,7 @@
setModified();
emit textChanged();
}
-@@ -5571,6 +5664,13 @@
+@@ -5571,6 +5664,13 @@ QPopupMenu *QTextEdit::createPopupMenu(
#else
d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) + ACCEL_KEY( A ) );
#endif
@@ -15998,7 +15998,7 @@
#ifndef QT_NO_CLIPBOARD
--- a/src/widgets/qtextedit.h
+++ b/src/widgets/qtextedit.h
-@@ -214,7 +214,9 @@
+@@ -214,7 +214,9 @@ public:
enum TextInsertionFlags {
RedoIndentation = 0x0001,
CheckNewLines = 0x0002,
@@ -16009,7 +16009,7 @@
};
QTextEdit( const QString& text, const QString& context = QString::null,
-@@ -442,6 +444,7 @@
+@@ -442,6 +444,7 @@ protected:
void contentsDropEvent( QDropEvent *e );
#endif
void contentsContextMenuEvent( QContextMenuEvent *e );
@@ -16071,7 +16071,7 @@
#include <qobjectlist.h>
#include <qfontdatabase.h>
#include <qlineedit.h>
-@@ -374,13 +375,73 @@
+@@ -374,13 +375,73 @@ MainWindow::MainWindow()
rtlExtensions->setChecked( settings.readBoolEntry( "/qt/useRtlExtensions", FALSE ) );
@@ -16146,7 +16146,7 @@
fontembeddingcheckbox->setChecked( settings.readBoolEntry("/qt/embedFonts", TRUE) );
fontpaths = settings.readListEntry("/qt/fontPath", ':');
fontpathlistbox->insertStringList(fontpaths);
-@@ -457,6 +518,13 @@
+@@ -457,6 +518,13 @@ void MainWindow::fileSave()
else if ( style == trUtf8( "Root" ) )
str = "Root";
settings.writeEntry( "/qt/XIMInputStyle", inputStyle->currentText() );
@@ -16162,7 +16162,7 @@
QStringList effects;
--- a/tools/qtconfig/mainwindow.h
+++ b/tools/qtconfig/mainwindow.h
-@@ -96,6 +96,7 @@
+@@ -96,6 +96,7 @@ private:
QPalette editPalette, previewPalette;
QStyle *previewstyle;
QStringList fontpaths;
Modified: trunk/packages/qt-x11-free/debian/patches/46_immodule_keyrelease_fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/46_immodule_keyrelease_fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/46_immodule_keyrelease_fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -5264,11 +5264,12 @@
+@@ -5264,11 +5264,12 @@ bool QETWidget::translateKeyEventInterna
} else {
key = (int)(long)keyDict->find( keycode );
if ( key )
Modified: trunk/packages/qt-x11-free/debian/patches/47_immodule_nodebug_fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/47_immodule_nodebug_fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/47_immodule_nodebug_fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
-@@ -141,7 +141,7 @@
+@@ -141,7 +141,7 @@ bool QSimpleInputContext::filterEvent( c
// only one character. See description of
// QInputContext::filterEvent() about key compression.
val = text[0].unicode();
@@ -9,7 +9,7 @@
}
// Store value
-@@ -165,14 +165,14 @@
+@@ -165,14 +165,14 @@ bool QSimpleInputContext::filterEvent( c
void QSimpleInputContext::setFocus()
{
@@ -28,7 +28,7 @@
reset();
}
-@@ -189,8 +189,8 @@
+@@ -189,8 +189,8 @@ void QSimpleInputContext::mouseHandler(
case QEvent::MouseButtonRelease:
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
@@ -39,7 +39,7 @@
break;
default:
break;
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ bool QSimpleInputContext::checkComposeTa
// no entries were found
if ( p == composeTable->data + composeTable->size ) {
@@ -48,7 +48,7 @@
clearComposeBuffer();
return FALSE;
}
-@@ -251,18 +251,18 @@
+@@ -251,18 +251,18 @@ bool QSimpleInputContext::checkComposeTa
// check if partial match
if ( composeBuffer[i] == 0 && p->keys[i] ) {
@@ -72,7 +72,7 @@
commitChar( p->value );
--- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
+++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
-@@ -361,7 +361,7 @@
+@@ -361,7 +361,7 @@ void QXIMInputContext::setHolderWidget(
}
if (! widget->isTopLevel()) {
Modified: trunk/packages/qt-x11-free/debian/patches/48_immodule_xim_fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/48_immodule_xim_fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/48_immodule_xim_fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -3337,11 +3337,11 @@
+@@ -3337,11 +3337,11 @@ int QApplication::x11ProcessEvent( XEven
// filtering opportunity first to ensure all input methods work
// properly regardless of application design.
@@ -18,7 +18,7 @@
return TRUE;
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
-@@ -2807,11 +2807,12 @@
+@@ -2807,11 +2807,12 @@ QInputContext *QWidget::getInputContext(
{
QInputContext *qic = 0;
@@ -33,7 +33,7 @@
// icHolderWidget is always topLevelWidget
QTLWExtra *topdata = icHolderWidget()->topData();
qic = (QInputContext *)topdata->xic;
-@@ -2862,10 +2863,10 @@
+@@ -2862,10 +2863,10 @@ void QWidget::changeInputContext( const
*/
void QWidget::createInputContext()
{
Modified: trunk/packages/qt-x11-free/debian/patches/53_xinerama_dialog_placement_fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/53_xinerama_dialog_placement_fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/53_xinerama_dialog_placement_fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
-@@ -799,7 +799,9 @@
+@@ -799,7 +799,9 @@ void QDialog::adjustPositionInternal( QW
w = w->topLevelWidget();
QRect desk;
if ( w ) {
Modified: trunk/packages/qt-x11-free/debian/patches/54_seli_xinerama.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/54_seli_xinerama.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/54_seli_xinerama.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -2,7 +2,7 @@
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -280,6 +280,7 @@
+@@ -280,6 +280,7 @@ Atom qt_net_wm_frame_strut = 0; // KDE
Atom qt_net_wm_state_stays_on_top = 0; // KDE extension
Atom qt_net_wm_pid = 0;
Atom qt_net_wm_user_time = 0;
@@ -10,7 +10,7 @@
// Enlightenment support
Atom qt_enlightenment_desktop = 0;
-@@ -2013,6 +2014,7 @@
+@@ -2013,6 +2014,7 @@ void qt_init_internal( int *argcptr, cha
&qt_net_wm_state_stays_on_top );
qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid );
qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time );
@@ -20,7 +20,7 @@
qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name );
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
-@@ -673,6 +673,11 @@
+@@ -673,6 +673,11 @@ bool QDialog::event( QEvent *e )
#if defined(Q_WS_X11)
extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
@@ -32,7 +32,7 @@
#endif // Q_WS_X11
/*!
-@@ -694,10 +699,12 @@
+@@ -694,10 +699,12 @@ void QDialog::show()
if ( !did_resize )
adjustSize();
Modified: trunk/packages/qt-x11-free/debian/patches/60_gnu_hurd_support.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/60_gnu_hurd_support.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/60_gnu_hurd_support.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -5,7 +5,7 @@
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,7 @@ QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
QMAKE_YACCFLAGS = -d
@@ -14,7 +14,7 @@
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ QMAKE_CFLAGS_RELEASE = -O2
QMAKE_CFLAGS_DEBUG = -g
QMAKE_CFLAGS_SHLIB = -fPIC
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
@@ -22,7 +22,7 @@
QMAKE_CXX = g++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-@@ -33,6 +34,7 @@
+@@ -33,6 +34,7 @@ QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
@@ -30,7 +30,7 @@
QMAKE_INCDIR =
QMAKE_LIBDIR =
-@@ -51,14 +53,19 @@
+@@ -51,14 +53,19 @@ QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_SHLIB = -shared
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
@@ -54,7 +54,7 @@
QMAKE_UIC = $(QTDIR)/bin/uic
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
-@@ -74,6 +74,20 @@
+@@ -74,6 +74,20 @@ QString QDir::homeDirPath()
QString QDir::canonicalPath() const
{
QString r;
@@ -75,7 +75,7 @@
char cur[PATH_MAX+1];
if ( ::getcwd( cur, PATH_MAX ) ) {
char tmp[PATH_MAX+1];
-@@ -86,6 +100,7 @@
+@@ -86,6 +100,7 @@ QString QDir::canonicalPath() const
// always make sure we go back to the current dir
::chdir( cur );
}
@@ -83,7 +83,7 @@
return r;
}
-@@ -147,9 +162,17 @@
+@@ -147,9 +162,17 @@ QString QDir::currentDirPath()
struct stat st;
if ( ::stat( ".", &st ) == 0 ) {
@@ -113,7 +113,7 @@
void QFileInfo::slashify( QString& )
{
-@@ -127,16 +130,43 @@
+@@ -127,16 +130,43 @@ bool QFileInfo::isSymLink() const
QString QFileInfo::readLink() const
{
Modified: trunk/packages/qt-x11-free/debian/patches/61_eastern_asian_languagues.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/61_eastern_asian_languagues.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/61_eastern_asian_languagues.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200
-@@ -966,20 +966,22 @@
+--- a/src/kernel/qfontdatabase.cpp
++++ b/src/kernel/qfontdatabase.cpp
+@@ -966,20 +966,22 @@ QFontDatabase::findFont( QFont::Script s
#ifdef Q_WS_X11
if (script == QFont::Han) {
Modified: trunk/packages/qt-x11-free/debian/patches/63_qmake_hurd.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/63_qmake_hurd.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/63_qmake_hurd.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ Option::QMAKE_MODE Option::qmake_mode =
//all modes
int Option::warn_level = WarnLogic;
int Option::debug_level = 0;
Modified: trunk/packages/qt-x11-free/debian/patches/65_gcc-4.2_qbuttons.h-fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/65_gcc-4.2_qbuttons.h-fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/65_gcc-4.2_qbuttons.h-fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/src/widgets/qbutton.h
+++ b/src/widgets/qbutton.h
-@@ -183,7 +183,7 @@
+@@ -183,7 +183,7 @@ inline const QPixmap *QButton::pixmap()
inline bool QButton::isToggleButton() const
{
@@ -13,7 +13,7 @@
}
inline bool QButton::isDown() const
-@@ -193,7 +193,7 @@
+@@ -193,7 +193,7 @@ inline bool QButton::isDown() const
inline bool QButton::isOn() const
{
Modified: trunk/packages/qt-x11-free/debian/patches/66_gcc-4.3_compile-fix.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/66_gcc-4.3_compile-fix.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/66_gcc-4.3_compile-fix.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
-@@ -116,6 +116,7 @@
+@@ -116,6 +116,7 @@ extern "C" Bool XftInitFtLibrary(void);
#include <string.h>
#include <ctype.h>
#include <locale.h>
Modified: trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -4,7 +4,7 @@
--- a/configure
+++ b/configure
-@@ -1645,7 +1645,7 @@
+@@ -1645,7 +1645,7 @@ if echo $MODULES | grep sql >/dev/null;
ODBC_REQ="-lodbc sql.h sqlext.h"
TDS_REQ="-lsybdb sybfront.h sybdb.h"
DB2_REQ="-ldb2 sqlcli.h sqlcli1.h"
@@ -15,7 +15,7 @@
mysql)
--- a/plugins/src/sqldrivers/ibase/ibase.pro
+++ b/plugins/src/sqldrivers/ibase/ibase.pro
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ unix {
OBJECTS_DIR = .obj
!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ) {
@@ -26,7 +26,7 @@
win32 {
--- a/src/sql/qt_sql.pri
+++ b/src/sql/qt_sql.pri
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ sql {
SOURCES += $$SQL_CPP/drivers/ibase/qsql_ibase.cpp
DEFINES += QT_SQL_IBASE
unix {
Modified: trunk/packages/qt-x11-free/debian/patches/70_bad_typecast_amd64.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/70_bad_typecast_amd64.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/70_bad_typecast_amd64.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -3,7 +3,7 @@
@DPATCH@
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
-@@ -767,7 +767,7 @@
+@@ -767,7 +767,7 @@ QIBaseDriver::QIBaseDriver(void *connect
: QSqlDriver(parent, name ? name : QIBASE_DRIVER_NAME)
{
d = new QIBaseDriverPrivate(this);
Modified: trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -2,7 +2,7 @@
--- a/configure
+++ b/configure
-@@ -34,7 +34,44 @@
+@@ -34,7 +34,44 @@ SUPPORTED=
#-------------------------------------------------------------------------------
# need that throughout the script
Modified: trunk/packages/qt-x11-free/debian/patches/73_configure_quilt_compat.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/73_configure_quilt_compat.diff 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/patches/73_configure_quilt_compat.diff 2009-08-26 22:10:27 UTC (rev 15801)
@@ -1,6 +1,6 @@
---- qt-x11-free-3.3.8b/configure 2008-02-20 23:34:39.000000000 +0200
-+++ qt-x11-free-3.3.8b/configure 2008-02-20 23:35:12.000000000 +0200
-@@ -3634,7 +3634,7 @@
+--- a/configure
++++ b/configure
+@@ -3634,7 +3634,7 @@ EXEC=""
echo "Finding project files. Please wait..."
if [ -z "$QMAKE_PROJECTS" ]; then
Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules 2009-08-26 19:30:25 UTC (rev 15800)
+++ trunk/packages/qt-x11-free/debian/rules 2009-08-26 22:10:27 UTC (rev 15801)
@@ -16,7 +16,7 @@
ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++
-else #hurd
+else #hurd
ifeq ($(DEB_HOST_ARCH),sparc)
PLATFORM_ARG = linux-g++-sparc
else #sparc
@@ -210,7 +210,7 @@
dh_testdir
dh_testroot
-
+
dh_clean -i
dh_installdirs
@@ -246,7 +246,7 @@
rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done
rm -rf outputfile `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/logo32.png
rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/linguist*
-
+
## qt3-assistant
# remove docs from qt3-doc for qt-assistant
rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/assistant*
@@ -264,20 +264,20 @@
# Build architecture-independent files here.
dh_testdir
dh_testroot
-
+
dh_installdocs -i -XREADME.Debian
dh_installchangelogs -i changes-3.3.8
dh_installchangelogs -i changes-3.3.8b
-
+
find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/qt3/doc/
-
+
-rm -f `find $(P_DOC)/usr/share/qt3/doc/ -name "*.o"`
find $(P_DOC) -type f -perm +0100 | xargs --no-run-if-empty rm -f
install -d $(P_DOC)/usr/share/man/man3/
for i in $(P_DOC)/usr/share/qt3/doc/doc/man/man3/* ; do mv $$i $(P_DOC)/usr/share/man/man3/ ; done
-
+
-rm -rf $(P_DOC)/usr/share/qt3/doc/doc
# other i18n files
@@ -311,21 +311,21 @@
# proceed
dh_compress -i -Xhtml/
dh_link -i
-
+
dh_fixperms -i
dh_installdeb -i
-
+
dh_perl -i
dh_shlibdeps -i
-
+
# fix shlibdeps madness
for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done
dh_gencontrol -i
dh_md5sums -i
-
+
dh_builddeb -i
-
+
binary-arch: build install
dh_testdir
@@ -337,28 +337,28 @@
cp `pwd`/tools/designer/interfaces/*.h $(P_APPSDEV)/usr/include/qt3/
cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/qt3/
rm -rf `pwd`/debian/qt3-apps-dev/usr/include/qt3/preferences.ui.h
-
+
## qvfb package
install -m644 -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/qt3-dev-tools-embedded/etc/qt3/qvfb/pda.skin
install -m644 -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_down.png
install -m644 -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_up.png
-
+
# remove utterly ugle symlink
rm -rf `pwd`/debian/qt3-dev-tools//usr/share/qt3/mkspecs/linux-g++/linux-g++
-
+
# language file for linguist
install -d `pwd`/debian/qt3-linguist/usr/share/doc/qt3-linguist/
cp translations/qt_untranslated.ts `pwd`/debian/qt3-linguist/usr/share/doc/qt3-linguist/
-
+
# fix that stupid friggin professional file
perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
-
+
## i18n files for designer, linguist and assistant
(cd `pwd`/tools/designer/designer/ && lrelease designer.pro)
for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/qt3-designer/usr/share/qt3/translations/designer_"$$a".qm; done
rm -rf `pwd`/tools/designer/designer/*.qm
-
+
(cd `pwd`/tools/assistant/ && lrelease assistant.pro)
for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/qt3-assistant/usr/share/qt3/translations/assistant_"$$a".qm; done
@@ -372,10 +372,10 @@
# desktop lnk files
install -m644 -D debian/maintain/designer-qt3.desktop `pwd`/debian/qt3-designer/usr/share/applications/designer-qt3.desktop
install -m644 -D debian/maintain/linguist-qt3.desktop `pwd`/debian/qt3-linguist/usr/share/applications/linguist-qt3.desktop
-
+
install -m644 -D debian/maintain/assistant-qt3.desktop `pwd`/debian/qt3-assistant/usr/share/applications/assistant-qt3.desktop
install -m644 -D debian/maintain/qt3config.desktop `pwd`/debian/qt3-qtconfig/usr/share/applications/qt3config.desktop
-
+
# include logo32 for every program
cd `pwd`/debian/qt3-designer/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done
@@ -388,10 +388,10 @@
cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done
-
+
for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-"$$a"/usr/share/qt3/doc/html/logo32-"$$a".png; done
install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html/logo32-qmake.png
-
+
# fix qmake.conf files
cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/qt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/qt3/g' | \
sed 's/\-I\/usr\/include/&\/qt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
@@ -424,7 +424,7 @@
dh_link -pqt3-assistant usr/share/qt3/doc/html usr/share/doc/qt3-assistant/html
dh_link -pqt3-linguist usr/share/qt3/doc/html usr/share/doc/qt3-linguist/html
dh_link -pqt3-dev-tools usr/share/qt3/doc/html usr/share/doc/qt3-dev-tools/html
-
+
# install the manpages we have
dh_installman -pqt3-designer debian/maintain/man/createcw.1
dh_installman -pqt3-dev-tools-compat debian/maintain/man/qt20fix.1 debian/maintain/man/mergetr.1 debian/maintain/man/findtr.1 debian/maintain/man/msg2qm.1
@@ -448,11 +448,11 @@
rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.moc
rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.obj
rm -f debian/qt3-designer/usr/share/qt3/tools/conv2ui/Makefile
-
+
# run remaining debhelper scripts
dh_installdocs -a $(IBASE) -XREADME.Debian
dh_installmenu -a $(IBASE)
-
+
dh_installchangelogs -a $(IBASE) changes-3.3.8
dh_installchangelogs -a $(IBASE) changes-3.3.8b
@@ -460,7 +460,7 @@
dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg
dh_compress -a $(IBASE)
dh_fixperms -a $(IBASE)
-
+
# run remaining debhelper scripts
dh_makeshlibs -a $(IBASE) -V
dh_installdeb -a $(IBASE)
@@ -472,7 +472,7 @@
# fix conffiles file for qt3-dev-tools-embedded
echo "/etc/qt3/qvfb/pda.skin" > `pwd`/debian/qt3-dev-tools-embedded/DEBIAN/conffiles
-
+
dh_gencontrol -a $(IBASE)
dh_md5sums -a $(IBASE)
dh_builddeb -a $(IBASE)
More information about the pkg-kde-commits
mailing list