rev 6911 - branches/kde4/packages tags/packages/qt4-x11 tags/packages/qt4-x11/4.3.0-5/debian tags/packages/qt4-x11/4.3.0-5/debian/patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Mon Jul 30 21:45:06 UTC 2007
Author: fboudra-guest
Date: 2007-07-30 21:45:06 +0000 (Mon, 30 Jul 2007)
New Revision: 6911
Added:
tags/packages/qt4-x11/4.3.0-1/
tags/packages/qt4-x11/4.3.0-4/
tags/packages/qt4-x11/4.3.0-5/
tags/packages/qt4-x11/4.3.0-5/debian/changelog
tags/packages/qt4-x11/4.3.0-5/debian/patches/00_0185-fix-format-strings.dpatch
tags/packages/qt4-x11/4.3.0-5/debian/patches/00_0186-fix-component-alpha-text.dpatch
tags/packages/qt4-x11/4.3.0-5/debian/patches/00list
tags/packages/qt4-x11/4.3.0-5/debian/patches/01_qmake_for_debian.dpatch
Removed:
branches/kde4/packages/qt4-x11/
tags/packages/qt4-x11/4.3.0-5/debian/changelog
tags/packages/qt4-x11/4.3.0-5/debian/patches/00list
tags/packages/qt4-x11/4.3.0-5/debian/patches/01_qmake_for_debian.dpatch
tags/packages/qt4-x11/qt4-x11-4.3.0-1/
tags/packages/qt4-x11/qt4-x11-4.3.0-4/
Log:
* Tags Qt4 4.3.0-5.
* Remove Qt4 from kde4 branches.
* Rename Qt4 tags properly.
Copied: tags/packages/qt4-x11/4.3.0-1 (from rev 6894, tags/packages/qt4-x11/qt4-x11-4.3.0-1)
Copied: tags/packages/qt4-x11/4.3.0-4 (from rev 6894, tags/packages/qt4-x11/qt4-x11-4.3.0-4)
Copied: tags/packages/qt4-x11/4.3.0-5 (from rev 6894, trunk/packages/qt4-x11)
Deleted: tags/packages/qt4-x11/4.3.0-5/debian/changelog
Copied: tags/packages/qt4-x11/4.3.0-5/debian/changelog (from rev 6910, trunk/packages/qt4-x11/debian/changelog)
===================================================================
--- tags/packages/qt4-x11/4.3.0-5/debian/changelog (rev 0)
+++ tags/packages/qt4-x11/4.3.0-5/debian/changelog 2007-07-30 21:45:06 UTC (rev 6911)
@@ -0,0 +1,634 @@
+qt4-x11 (4.3.0-5) unstable; urgency=low
+
+ [Fathi Boudra]
+ * Update 01_qmake_for_debian patch. Add DEFINES += QT_SHARED in qmake.conf
+ along with the removal of link_prl. (Closes: #434019)
+ * Apply qt-copy patches:
+ * 00_0185-fix-format-strings: This patch fixes various code issues with
+ handling format strings. None of them seem to be exceptionally bad,
+ but its better safe than sorry. It is related to CVE-2007-3388.
+ TT claims the problem is not present in any version of Qt 4. Dirk Muller
+ disagrees and believes that some of them are possible to exploit.
+ * 00_0186-fix-component-alpha-text: This patch fixes component alpha
+ (LCD hinted) text when it's drawn on a non-opaque background. Qt doesn't
+ initialize the alpha channel in the glyph masks, which causes problems
+ in Konsole when transparency is enabled, and in other situations where
+ the background isn't fully opaque.
+
+ -- Fathi Boudra <fboudra at free.fr> Mon, 30 Jul 2007 21:36:25 +0200
+
+qt4-x11 (4.3.0-4) unstable; urgency=low
+
+ [Fathi Boudra]
+ * Add 42_alpha_fetch_and_add patch to fix broken threading on alpha, hangs
+ uselessly on startup. fetch-and-add is supposed to return the original
+ value before the addition. Thanks to Steve Langasek and Bradley Hughes.
+ (Closes: #433031)
+ * Update control: Replace ${source:Version} by ${binary:Version}.
+ Make the package binNMU safe. Thanks to Lior Kaplan. (Closes: #433548)
+
+ -- Fathi Boudra <fboudra at free.fr> Mon, 16 Jul 2007 21:32:01 +0200
+
+qt4-x11 (4.3.0-3) unstable; urgency=low
+
+ [Fathi Boudra]
+ * Update control: Replace deprecated ${Source-Version} by ${source:Version}.
+ * Update rules:
+ * Add bindir and libdir configure options.
+ * Replace common-install-arch target. Replaced by build system patches and
+ a fix for pkgconfig files. (Closes: #401807)
+ * Add patches:
+ * 04_launch_uic-qt4: call uic-qt4 binary.
+ * 05_append_qt4_target: append -qt4 when needed. It fixes moc-location and
+ uic_location are properly in pkgconfig files. (See bug #401807)
+ * 06_qtdemo_destdir: remove QT_BUILD_TREE in qtdemo DESTDIR target.
+ (Closes: #408639)
+ * Revert Qt handling argb visuals on X11 patch. There are dependencies
+ not fixed in Qt. They cause a few regressions when this patch is applied.
+ (Closes: #430907, #431436, #431943)
+ * Update Qt support for new window types used for compositing patch.
+ Fix crashes when 'w' is null. (Closes: #431322)
+ * Apply qt-copy patches:
+ * 00_0172-prefer-xrandr-over-xinerama: only trust libxinerama if it is not
+ the emulated information coming from xrandr 1.2.
+ * 00_0177-qurl-clear-fix: fix QUrl::clear(). Applied upstream.
+ * 00_0183-qprocess-corruption: fix plain data loss bug. Applied Upstream.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 29 Jun 2007 08:15:23 +0200
+
+qt4-x11 (4.3.0-2) unstable; urgency=low
+
+ [Brian Nelson]
+ * Changed dist back to unstable.
+ * Tightened qt4-dev-tools's dependency on libqt4-core to
+ (= ${Source-Version}), since it uses internal (non-public) classes in
+ Qt whose ABI can change. (Closes: #429817)
+ * Added a build-dependency on libxi-dev to enable tablet support.
+ * Constrict the hack to clean all binary files to the bin, config.tests,
+ and qmake directories to drastically improve its speed
+
+ [Fathi Boudra]
+ * Qt4 demos builds properly in Qt4.3. (Closes: #408639)
+ * Apply qt-copy patches:
+ * 00_0178-transparency-window-types: adds Qt support for new window types
+ used for compositing.
+ * 00_0179-transient-hack: workaround that makes setting of WM_TRANSIENT_FOR
+ work with some window types.
+ * 00_0180-window-role: several problems with Qt's support for the
+ WM_WINDOW_ROLE property.
+ * 00_0181-qdnd-x11-fix: makes the find_child algorithm in qdnd look at
+ _all_ widgets that contain the QPoint.
+ * 00_0182-argb-visuals-default: Qt handling argb visuals on X11.
+
+ -- Brian Nelson <pyro at debian.org> Wed, 27 Jun 2007 00:02:07 -0400
+
+qt4-x11 (4.3.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes a QListView issue. (Closes: #419654)
+
+ * Update uploaders. Add Ana, Sune and Fathi.
+
+ [Sune Vuorela]
+ * Remove 04_utf8_bug_fix: Merged upstream.
+ * Update libqt4-dev.install. Upstream installs pkgconfig files the right place.
+ * Update libqt4-core.install. Add libQtScript.
+ * Update rules:
+ * Add utils.mk to use list-missing.
+ * Cleaning seems to fail a bit. Trying to hack around that in clean::
+ target.
+
+ [Fathi Boudra]
+ * Redo 30_arm_ftbfs_fixes to fix another FTBFS. Add arm target to configure
+ script. Thanks to Sune Vuorela and Aurelien Jarno. (Closes: #426129)
+ * Remove 71_hppa_inotify_fix: Merged upstream.
+ * Update patches:
+ * 02_launch_assistant-qt4
+ * 03_launch_moc-qt4
+ * 50_kfreebsd_build_fix
+ * 80_hurd_max_path
+ * Apply qt-copy patches:
+ * 00_0163-fix-gcc43-support: Various fixes to get Qt 4.3 without hundreds
+ of warnings compiling.
+ * 00_0167-fix-group-reading: In big user environments, getgrgid_r() needs
+ more memory than sysconf() returns.
+ * 00_0175-fix-s390-qatomic: Fix s390(x) build.
+ * 00_0176-coverity-fixes: Fix various obvious memory leaks.
+ * Rename disable opengl visibility patch. It is not alpha architecture only.
+ * Add desktop files to support Desktop Environments. (Closes: #378915)
+ * Update qt4-dev-tools.install. Add qdbusviewer and pixeltool.
+ Thanks to Benjamin Meyer for the reminder.
+ * Update libqt4-dev.install. Remove qtdemo binary as we provide a tarball of the
+ demos directory. qtdemo is useless, it can't launch anything without demos
+ builded. It can only show screenshots and short description of demos,
+ users have it in Qt assistant.
+ * Update rules:
+ * Remove -debug-and-release option. Deprecated.
+ * Add configure options:
+ * -no-exceptions
+ * -debug
+ * -qdbus
+ * -pch
+ * -nomake examples
+ * -nomake demos
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 09 Jun 2007 00:25:41 +0200
+
+qt4-x11 (4.2.3-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixes build failures when QT_NO_DEBUG_OUTPUT defined
+ (Closes: #418832)
+ - Fixes broken signal/slot connection in QSvgRenderer
+ (Closes: #411292)
+
+ -- Brian Nelson <pyro at debian.org> Thu, 12 Apr 2007 12:38:06 -0400
+
+qt4-x11 (4.2.2-2) unstable; urgency=high
+
+ * debian/patches/04_utf8_bug_fix.dpatch: new patch to fix the "UTF-8
+ overlong sequence decoding vulnerability" [CVE-2007-0242]
+
+ -- Brian Nelson <pyro at debian.org> Fri, 30 Mar 2007 11:04:20 -0400
+
+qt4-x11 (4.2.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #410862)
+
+ * debian/rules: set the sysconfdir to /etc/xdg instead of /etc/qt4 to
+ match the QSettings documentation (Closes: #407297)
+
+ * Added Riku Voipio's patch for ARM EABI (Closes: #408813)
+
+ * debian/patches/22_launch_moc-qt4.dpatch: new patch to ensure the Qt4
+ version of moc is launched by qdbuscpp2xml (Closes: #399049)
+
+ * Added a doc-base file for qt4-doc (Closes: #403290)
+
+ * debian/qt4-designer.links: added a link /usr/share/qt4/bin/designer ->
+ /usr/bin/designer-qt4 (Closes: #410885)
+
+ * Re-arranged patches to group them by arch so that they're easier to
+ deal with
+
+ * Applied new patches for kFreeBSD and Hurd support
+ (Closes: #380097, #402007)
+
+ * debian/libqt4-gui.install: added the codecs plugins, somehow these got
+ accidentally dropped (Closes: #409228)
+
+ -- Brian Nelson <pyro at debian.org> Sun, 4 Mar 2007 13:50:39 -0500
+
+qt4-x11 (4.2.1-2) unstable; urgency=low
+
+ * debian/patches/20_hppa_inotify_fix.dpatch: new patch that should fix
+ the FTBFS on hppa due to missing defines (Closes: #394953)
+
+ * Added patches for hurd support (Closes: #380097)
+
+ * debian/patches/10_qmake_for_debian.dpatch: restored the modification
+ to remove link_prl from the CONFIG line, which fixes problems with
+ unnecessary linkage (Closes: #394836)
+
+ -- Brian Nelson <pyro at debian.org> Tue, 31 Oct 2006 02:42:02 -0500
+
+qt4-x11 (4.2.1-1) unstable; urgency=high
+
+ * New upstream release
+ - Fixes integer overflow in pixmap handling [CVE-2006-4811]
+ (Closes: #394192)
+
+ * Install the libqtaccessiblecompatwidgets.so plugin into
+ libqt4-qt3support, so that libqt4-gui does not circularly depend on
+ libqt4-qt3support (Closes: #394351, #394629)
+
+ -- Brian Nelson <pyro at debian.org> Mon, 23 Oct 2006 11:59:52 -0400
+
+qt4-x11 (4.2.0-2) unstable; urgency=low
+
+ * debian/control: added a dependency on libglib2.0-dev for libqt4-dev
+ (Closes: #392797, #392173)
+
+ * Added a bunch of plugins and their debugging symbols to be installed
+
+ * debian/patches/19_m68k_inotify_fix.dpatch: new patch to fix FTBFS on
+ m68k (Closes: #391902)
+
+ * Imported Ubuntu fixes, thanks to Jonathan Riddell for the tip
+ - Fix typo in debian/rules -qt-sql-slite to -qt-sql-sqlite
+ (Closes: #392808)
+ - Install usr/bin/qdbus usr/bin/qdbusxml2cpp and usr/bin/qdbuscpp2xml
+ (Closes: #391726)
+
+ * debian/control: added a libqt4-dev dependency on libsqlite0-dev
+ (Closes: #392558)
+
+ -- Brian Nelson <pyro at debian.org> Tue, 17 Oct 2006 23:44:31 -0400
+
+qt4-x11 (4.2.0-1) unstable; urgency=low
+
+ * New upstream release
+ - No longer includes "CONFIG = ... debug" in the mkspecs/qconfig.pri
+ (Closes: #357136)
+ - Fixes QFontDialog assert() failures (Closes: #380418)
+
+ * debian/control: made libqt4-gui conflict/replace libqt4-designer, to
+ ensure that old package is removed (Closes: #380253)
+
+ * Enable Qt's new support for using the system's SQLite 3 library
+ (Closes: #382238)
+
+ * debian/rules: removed the PostgreSQL and MySQL include hacks from the
+ configure arguments, since the configure script now autodetects them
+ itself
+
+ * debian/patches/10_qmake_for_debian.dpatch: updated for new upstream
+
+ * debian/patches/13_arm_ftbfs_fixes.dpatch: updated for new upstream
+
+ * debian/patches/19_s390_atomic.dpatch: removed, since it appears to be
+ obsolete
+
+ * debian/libqt4-debug.install: changed the wildcards to match the new
+ debug lib names. What was once *_debug.so.* is now *.debug. Ick.
+
+ * debian/control: removed libqt4-debug-dev since now that the _debug
+ libs have been removed and debugging symbols are shipped in their
+ place, this package is no longer needed
+
+ * Tar up the demos directory and include it in qt4-doc. Also added the
+ qtdemo binary to libqt4-dev. (Closes: #390925)
+
+ * debian/rules: add -DQT_QLOCALE_USES_FCVT to the configure arguments
+ when building on arm, like Qt3, to fix a uic problem (Closes: #386460)
+
+ * debian/libqt4-gui.install: added usr/lib/libQtAssistantClient.so.*,
+ since it's now shipped as a shared library; previously it was a static
+ library
+
+ * Added build-deps on libdbus-1-dev and libglib2.0-dev, and added
+ libQtDBus to the libqt4-core package
+
+ -- Brian Nelson <pyro at debian.org> Fri, 6 Oct 2006 23:16:46 -0400
+
+qt4-x11 (4.1.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Reintroduce the libpq-dev dependency, which seems to have been removed by
+ mistake in 4.1.0-2. (Closes: #327618)
+
+ -- Steinar H. Gunderson <sesse at debian.org> Tue, 29 Aug 2006 01:10:59 +0200
+
+qt4-x11 (4.1.4-1) unstable; urgency=low
+
+ * New upstream release (Closes: #378443)
+
+ * Moved usr/lib/libQtDesigner.so.* and
+ usr/lib/libQtDesignerComponents.so.* from qt4-designer to libqt4-gui
+ so there the libqt4-dev package won't contain dangling symlinks
+ (Closes: #374612)
+
+ -- Brian Nelson <pyro at debian.org> Sun, 16 Jul 2006 15:39:29 -0700
+
+qt4-x11 (4.1.3-3) unstable; urgency=low
+
+ * debian/patches/19_s390_atomic: patch from Bastian Blank to fix
+ including of s390 specific atomic header. (Closes: #370241)
+
+ * debian/patches/18_disable_opengl_visibility.dpatch: regenerated so
+ that it applies correctly for me
+
+ -- Brian Nelson <pyro at debian.org> Sun, 25 Jun 2006 11:42:57 -0700
+
+qt4-x11 (4.1.3-2) unstable; urgency=high
+
+ * patches/18_disable_opengl_visibility: disable -fvisibility-inlines-hidden
+ for src/opengl/opengl.pro as it makes gcc ICE on alpha.
+ (Closes: #368883)
+
+ * urgency set to high so that qt4-x11 stops blocking half of unstable out of
+ testing.
+
+ -- Pierre Habouzit <madcoder at debian.org> Mon, 5 Jun 2006 10:28:29 +0200
+
+qt4-x11 (4.1.3-1) unstable; urgency=high
+
+ * New upstream release
+
+ * debian/patches/16_hppa_ldcw_fix.dpatch: new patch from Ubuntu to
+ properly support hppa
+
+ * debian/patches/17_alpha_ice.dpatch: new patch from Steve Langasek to
+ fix FTBFS on alpha (Closes: #368883)
+ (urgency set to high for that fix).
+
+ * Dropped the .la files since they pull in too many unneeded
+ dependencies (Closes: #360802)
+
+ * debian/libqt4-debug.install: removed
+ usr/lib/qt4/plugins/codecs/*_debug.so since those aren't included
+ upstream anymore
+
+ * Increased standards version to 3.7.2
+
+ -- Brian Nelson <pyro at debian.org> Sat, 3 Jun 2006 17:56:32 -0700
+
+qt4-x11 (4.1.2-2) unstable; urgency=low
+
+ * debian/libqt4-debug-dev.install, debian/libqt4-dev.install: added
+ wildcards to install .a static libraries so that the libQtUiTools and
+ libQtAssistantClient libraries are included (Closes: #358224, #355902)
+
+ -- Brian Nelson <pyro at debian.org> Sun, 14 May 2006 10:03:40 -0700
+
+qt4-x11 (4.1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ * debian/control: removed dependencies on xlibs-static-dev and
+ xlibs-static-pic to transition to building against modular X
+ (Closes: #362262)
+
+ * debian/control: changed x-dev dependencies to x11proto-core-dev, for
+ modular X transition (Closes: #362053)
+
+ -- Brian Nelson <pyro at debian.org> Thu, 13 Apr 2006 10:35:28 -0700
+
+qt4-x11 (4.1.1-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixes the broken debug-and-release build and a load of resulting
+ bugs (Closes: #337764, #337847, #341807, #338380, #354993, #347251)
+ - debian/patches/15_alpha_ftbfs_fix.dpatch: removed, integrated upstream
+
+ * debian/control: updated libqt4-debug-dev priority to match that of the
+ override file
+
+ * debian/libqt4-dev.links: added a symlink /usr/share/qt4/bin/rcc to
+ /usr/bin/rcc (Closes: #349438)
+
+ * debian/libqt4-gui.install: added libqmng.so and libqgif.so plugins
+ (Closes: #354266)
+
+ -- Brian Nelson <pyro at debian.org> Mon, 6 Mar 2006 10:20:47 -0800
+
+qt4-x11 (4.1.0-3) unstable; urgency=low
+
+ * Moved *_debug.prl and *_debug.la support files to the libqt4-debug-dev
+ package
+
+ * Updated to debhelper v5 compatibility
+
+ * debian/qt4-dev-tools.install: removed the /usr/share/qt4/templates
+ entry, which no longer contains anything
+
+ * Added gif support (Closes: #348092)
+
+ * debian/patches/12_mips_atomic_ops.dpatch: applied fixes from Isaac
+ Clerencia <isaac at debian.org>, as the last patch was not good enough to
+ fix the FTBFS bug (Closes: #335831)
+
+ -- Brian Nelson <pyro at debian.org> Tue, 17 Jan 2006 09:49:11 -0800
+
+qt4-x11 (4.1.0-2) unstable; urgency=low
+
+ * debian/patches/12_mips_atomic_ops.dpatch: Updated patch to account for
+ 2 new functions, q_atomic_test_and_set_acquire_int and
+ q_atomic_test_and_set_release_int, that were added in this release.
+ This should again fix the build failures on mips. (Closes: #335831)
+
+ * debian/patches/13_arm_ftbfs_fixes.dpatch: renamed, added a fix for the
+ new build failure due to a poorly defined qreal (Closes: #347360)
+
+ * debian/control: build against libmysqlclient15, and updated all
+ dependencies to libmysqlclient15-dev (Closes: #346586)
+
+ * debian/control: added explicit dependencies for libqt4-dev on the
+ Source-Version packages libqt4-core, libqt4-gui, libqt4-sql, and
+ libqt4-qt3support. These dependencies were accidentally dropped in
+ the last version. Also removed some unneeded dependencies.
+
+ * Split the *_debug.so symlinks out of libqt4-dev and into a separate
+ libqt4-debug-dev package. Made the libqt4-debug-dev package depend on
+ the Source-Version of libqt4-debug. This way, the symlinks won't be
+ dangling if libqt4-debug isn't installed and prevents failed linking
+ due to version mismatches. (Closes: #346603, #346605)
+
+ * Re-enabled sqlite3 support. It's still statically linked, however,
+ but that'll have to do because I really don't want to futz with the
+ build system. (Closes: #330976)
+
+ * Enabled sqlite2 support
+
+ * debian/patches/15_alpha_ftbfs_fix.dpatch: new patch to rename
+ q_atomic_test_and_set_release_ptr to q_atomic_test_and_set_ptr, as
+ suggested by Isaac Clerencia <isaac at debian.org>, to fix a FTBFS on
+ alpha. (Closes: #347353)
+
+ * debian/patches/10_qmake_for_debian: renamed from
+ 10_qmake_use_qt4_tools, and updated to remove the "link_prl" from the
+ default qmake CONFIG line. This disables the recursive linkage
+ against all indirectly-used libraries. (Closes: #343190)
+
+ -- Brian Nelson <pyro at debian.org> Tue, 10 Jan 2006 19:29:52 -0800
+
+qt4-x11 (4.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixes missing QBitArray operators (Closes: #341658)
+ - Fixes qmake problem with including bad build path (Closes: #327359)
+
+ * Added the new QTestLib unit testing framework to the libqt4-core
+ package
+
+ * Added the new QtSvg module to the libqt4-gui package
+
+ * debian/patches/13_arm_gcc4.dpatch: new patch from Jeremy Laine to fix
+ FTBFS on arm (Closes: #343176)
+
+ * debian/patches/14_kfreebsd_build_fix.dpatch: new patch from Petr
+ Salinger to fix FTBFS on GNU/kFreeBSD (Closes: #343191)
+
+ * Split the qtconfig tool out of libqt4-gui and into a separate
+ qt4-qtconfig package, due to its linkage against libqt4-qt3support and
+ hence ridiculous dependency chain.
+
+ * debian/rules: improved/cleaned up the clean target
+
+ -- Brian Nelson <pyro at debian.org> Wed, 4 Jan 2006 12:56:23 -0800
+
+qt4-x11 (4.0.1-6) unstable; urgency=low
+
+ * Added a target to automatically install lintian overrides, stolen from
+ debian-qt-kde.mk
+
+ * Added a bunch of lintian overrides for stuff that should be ignored
+
+ -- Brian Nelson <pyro at debian.org> Sat, 19 Nov 2005 01:17:03 -0800
+
+qt4-x11 (4.0.1-5) unstable; urgency=low
+
+ * debian/control: made libqt4-gui replace libqt4-core (<< 4.0.1-3), for
+ the plugins move (Closes: #336492)
+
+ * debian/control: removed the mention of a qt4-examples package that
+ doesn't actually exist from the qt4-doc package description
+
+ * debian/rules: remove all *.so files under
+ examples/tools/plugandpaint/plugins/ in the clean target
+ (Closes: #339674)
+
+ * Removed the menu entry for designer-qt4 from qt4-dev-tools.menu, and
+ added it to a new qt4-designer.menu
+
+ * Added a tarball of the examples to qt4-doc (Closes: #336832)
+
+ -- Brian Nelson <pyro at debian.org> Fri, 18 Nov 2005 10:27:03 -0800
+
+qt4-x11 (4.0.1-4) unstable; urgency=low
+
+ * debian/control: changed qt4-designer's section to "devel"
+
+ * Added a patch from Thiemo Seufer to fix the FTBFS on mips/mipsel
+ (Closes: #335831)
+
+ -- Brian Nelson <pyro at debian.org> Wed, 26 Oct 2005 00:13:40 -0700
+
+qt4-x11 (4.0.1-3) unstable; urgency=low
+
+ * debian/libqt4-core.install: only install the non-debug codecs, since
+ the debug ones pull in a gratuitous dependency on libqt4-debug
+ (Closes: #328913)
+
+ * debian/libqt4-debug.install: install the debug codecs here instead
+
+ * debian/control: replaced obsolete xlibs-dev dependency with the
+ required split packages (Closes: #329302)
+
+ * Completely disabled SQLite support since it's too fubar in this
+ version to be usable. The build fails with SQLite2 support, and
+ SQLite3 is only supported by linking staticly with a version
+ distributed in the Qt source. Meh.
+
+ * Renamed libqt4-designer to qt4-designer, merged in the designer binary
+ from qt4-dev-tools, and added a dependency on libqt4-dev
+ (Closes: #330094)
+
+ * Moved the plugins installed in libqt4-core to libqt4-gui, since they
+ link against the GUI library. Otherwise a circular libqt4-core <->
+ libqt4-gui dependency results.
+
+ -- Brian Nelson <pyro at debian.org> Fri, 21 Oct 2005 00:28:53 -0700
+
+qt4-x11 (4.0.1-2) unstable; urgency=low
+
+ * debian/patches/10_qmake_use_qt4_tools.dpatch: new patch that modifies
+ qmake.conf so that qmake generates Makefiles that use the -qt4 tools.
+ This way, it can cope with systems that have alternatives set to use
+ the -qt3 versions.
+
+ * Increased the conflicting Qt3 package versions to <= 3.3.4-7, since
+ the Qt3 packages still don't use the alternatives system as needed to
+ coexist with Qt4.
+
+ * debian/libqt4-core.install: added /usr/lib/qt4/plugins/codecs
+
+ * debian/patches/11_launch_assistant-qt4: new patch that modifies the
+ QAssistantClient class to launch Qt Assistant as "assistant-qt4" to
+ cope with the alternatives system (Closes: #327294)
+
+ * debian/control: Upgraded libqt4-dev's dependencies on the modules
+ libqt4-sql and libqt4-qt3support from suggests to depends, and added
+ libpq-dev and libmysqlclient14-dev | libmysqlclient-dev as
+ dependencies. These dependencies are apparently required to make
+ building pkg-config-using packages happy. (Closes: #327618)
+
+ * debian/control: corrected libqt4-sql to suggest libmysqlclient14-dev,
+ not libmysqlclient12-dev which is deprecated
+
+ * debian/copyright: updated FSF snailmail address
+
+ * debian/libqt4-debug.install: removed the libqt3supportwidgets_debug.so
+ designer plugin, since for some reason having this installed breaks
+ designer (Closes: #325782)
+
+ -- Brian Nelson <pyro at debian.org> Mon, 12 Sep 2005 12:32:53 -0700
+
+qt4-x11 (4.0.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ * Install changes-4.0.1 as upstream changelog
+
+ * debian/manpages/assistant-qt4.1: new manpage written from scratch
+ based on the output of "assistant -help"
+
+ * debian/manpages/designer-qt4.1, debian/manpages/linguist-qt4.1:
+ manpages stolen from the Qt3 packages and trivially adapted for Qt4
+ (Closes: #322403)
+
+ * debian/manpages/moc-qt4.1: escape some '-' characters
+
+ * debian/qt4-dev-tools.manpages: install the new assistant-qt4.1,
+ designer-qt4.1, and linguist-qt4.1 manpages
+
+ * debian/control: made qt4-dev-tools recommend qt4-doc, since assisant
+ needs it to be useful (Closes: #323251)
+
+ * Removed the FAQ from qt4-doc.docs, since it's no longer included in
+ 4.0.1, and was useless anyway
+
+ * Build-depend on libmysqlclient14-dev since libmysqlclient12-dev is
+ scheduled to be removed
+
+ * debian/libqt4-dev.install: work around TT's broken "install" target in
+ this release so that the pkgconfig files are installed in
+ /usr/lib/pkgconfig instead of directly in /usr/lib. Grrrr.
+
+ -- Brian Nelson <pyro at debian.org> Thu, 25 Aug 2005 19:28:35 -0700
+
+qt4-x11 (4.0.0-3) unstable; urgency=low
+
+ * debian/control: changed the xlibs-pic dependency to xlibs-static-pic
+ for the X.org transition (Closes: #319586)
+
+ * Added manpages for lrelease, lupdate, moc, qtconfig, and uic, stolen
+ from the Qt3 upstream tarball, and wrote a manpage for qmake from
+ scratch. Since now manpages are included for all executables using
+ the alternatives, the symlinks to them no longer dangle.
+ (Closes: #319456)
+
+ * debian/libqt4-core.install: added
+ usr/lib/qt4/plugins/imageformats/libqjpeg.so to include the jpeg
+ plugin (Closes: #321582)
+
+ * debian/libqt4-debug.install: added the libqjpeg_debug.so plugin
+
+ * debian/rules: don't hardcode the /usr/include/postgresql/8.0 path,
+ instead of the output of `pg_config --includedir`, stolen from Qt3
+ packages
+
+ * debian/libqt4-gui.install: added the OpenGL module library so that it
+ actually gets included in a package (Closes: #321874)
+
+ * debian/control: updated the package descriptions to note that the
+ Network and XML modules are included in the libqt4-core package, and
+ the OpenGL module is included in the libqt4-gui package
+
+ -- Brian Nelson <pyro at debian.org> Mon, 8 Aug 2005 08:58:10 -0700
+
+qt4-x11 (4.0.0-2) unstable; urgency=low
+
+ * libqt4-dev: added /usr/bin/uic3 (Closes: #318451)
+
+ * Transition to the new X.org packages:
+ + (Build-)depend on libglu1-xorg-dev instead of xlibmesa-gl-dev
+ + (Build-)depend on libxinerama-dev (Closes: #318682)
+
+ -- Brian Nelson <pyro at debian.org> Tue, 19 Jul 2005 21:28:19 -0700
+
+qt4-x11 (4.0.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #306694)
+
+ -- Brian Nelson <pyro at debian.org> Tue, 5 Jul 2005 19:42:18 -0700
Copied: tags/packages/qt4-x11/4.3.0-5/debian/patches/00_0185-fix-format-strings.dpatch (from rev 6908, trunk/packages/qt4-x11/debian/patches/00_0185-fix-format-strings.dpatch)
===================================================================
--- tags/packages/qt4-x11/4.3.0-5/debian/patches/00_0185-fix-format-strings.dpatch (rev 0)
+++ tags/packages/qt4-x11/4.3.0-5/debian/patches/00_0185-fix-format-strings.dpatch 2007-07-30 21:45:06 UTC (rev 6911)
@@ -0,0 +1,271 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0185-fix-format-strings.dpatch by Fathi Boudra <fboudra at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/src/corelib/global/qglobal.h qt4-x11-4.3.0/src/corelib/global/qglobal.h
+--- qt4-x11-4.3.0~/src/corelib/global/qglobal.h 2007-05-25 15:24:09.000000000 +0200
++++ qt4-x11-4.3.0/src/corelib/global/qglobal.h 2007-07-30 22:05:17.000000000 +0200
+@@ -1261,8 +1261,16 @@
+ #ifdef QT3_SUPPORT
+ Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
+ #endif /* QT3_SUPPORT */
+-Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
+-Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
++Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++ __attribute__ ((format (printf, 2, 3)))
++#endif
++ ;
++Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++ __attribute__ ((format (printf, 1, 2)))
++#endif
++ ;
+
+ #if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
+ #define QT_NO_DEBUG_STREAM
+diff -urNad qt4-x11-4.3.0~/src/corelib/tools/qbytearray.h qt4-x11-4.3.0/src/corelib/tools/qbytearray.h
+--- qt4-x11-4.3.0~/src/corelib/tools/qbytearray.h 2007-05-25 15:24:11.000000000 +0200
++++ qt4-x11-4.3.0/src/corelib/tools/qbytearray.h 2007-07-30 22:05:17.000000000 +0200
+@@ -71,8 +71,16 @@
+ Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
+
+ // implemented in qvsnprintf.cpp
+-Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
+-Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
++Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++ __attribute__ ((format (printf, 3, 0)))
++#endif
++ ;
++Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++ __attribute__ ((format (printf, 3, 4)))
++#endif
++ ;
+
+ #ifdef QT3_SUPPORT
+ inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
+diff -urNad qt4-x11-4.3.0~/src/gui/painting/qprintengine_pdf.cpp qt4-x11-4.3.0/src/gui/painting/qprintengine_pdf.cpp
+--- qt4-x11-4.3.0~/src/gui/painting/qprintengine_pdf.cpp 2007-05-25 15:24:13.000000000 +0200
++++ qt4-x11-4.3.0/src/gui/painting/qprintengine_pdf.cpp 2007-07-30 22:05:17.000000000 +0200
+@@ -386,9 +386,8 @@
+ object = addXrefEntry(-1);
+ QByteArray alphaDef;
+ QPdf::ByteStream s(&alphaDef);
+- s << "<< /ca " << (alpha/qreal(255.)) << ">>\n";
+- xprintf(alphaDef.constData());
+- xprintf("endobj\n");
++ s << "<< /ca " << (alpha/qreal(255.)) << ">>";
++ xprintf("%s\nendobj\n", alphaDef.constData());
+ }
+ currentPage->graphicStates.append(object);
+ return object;
+diff -urNad qt4-x11-4.3.0~/src/gui/painting/qprintengine_pdf_p.h qt4-x11-4.3.0/src/gui/painting/qprintengine_pdf_p.h
+--- qt4-x11-4.3.0~/src/gui/painting/qprintengine_pdf_p.h 2007-05-25 15:24:13.000000000 +0200
++++ qt4-x11-4.3.0/src/gui/painting/qprintengine_pdf_p.h 2007-07-30 22:05:17.000000000 +0200
+@@ -148,7 +148,11 @@
+ void writePage();
+
+ int addXrefEntry(int object, bool printostr = true);
+- void xprintf(const char* fmt, ...);
++ void xprintf(const char* fmt, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++ __attribute__ ((format (printf, 2, 3)))
++#endif
++ ;
+ inline void write(const QByteArray &data) {
+ stream->writeRawData(data.constData(), data.size());
+ streampos += data.size();
+diff -urNad qt4-x11-4.3.0~/src/qt3support/tools/q3cstring.h qt4-x11-4.3.0/src/qt3support/tools/q3cstring.h
+--- qt4-x11-4.3.0~/src/qt3support/tools/q3cstring.h 2007-05-25 15:24:21.000000000 +0200
++++ qt4-x11-4.3.0/src/qt3support/tools/q3cstring.h 2007-07-30 22:05:17.000000000 +0200
+@@ -57,7 +57,11 @@
+ }
+
+ Q3CString copy() const { return *this; }
+- Q3CString &sprintf(const char *format, ...);
++ Q3CString &sprintf(const char *format, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++ __attribute__ ((format (printf, 2, 3)))
++#endif
++ ;
+
+ Q3CString left(uint len) const { return QByteArray::left(len); }
+ Q3CString right(uint len) const { return QByteArray::right(len); }
+diff -urNad qt4-x11-4.3.0~/src/qt3support/tools/q3gcache.cpp qt4-x11-4.3.0/src/qt3support/tools/q3gcache.cpp
+--- qt4-x11-4.3.0~/src/qt3support/tools/q3gcache.cpp 2007-05-25 15:24:20.000000000 +0200
++++ qt4-x11-4.3.0/src/qt3support/tools/q3gcache.cpp 2007-07-30 22:05:17.000000000 +0200
+@@ -622,7 +622,7 @@
+ #if defined(QT_DEBUG)
+ QString line;
+ line.fill(QLatin1Char('*'), 80);
+- qDebug(line.ascii());
++ qDebug("%s", line.ascii());
+ qDebug("CACHE STATISTICS:");
+ qDebug("cache contains %d item%s, with a total cost of %d",
+ count(), count() != 1 ? "s" : "", tCost);
+@@ -643,7 +643,7 @@
+ lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts);
+ qDebug("Statistics from internal dictionary class:");
+ dict->statistics();
+- qDebug(line.ascii());
++ qDebug("%s", line.ascii());
+ #endif
+ }
+
+diff -urNad qt4-x11-4.3.0~/src/qt3support/tools/q3gdict.cpp qt4-x11-4.3.0/src/qt3support/tools/q3gdict.cpp
+--- qt4-x11-4.3.0~/src/qt3support/tools/q3gdict.cpp 2007-05-25 15:24:20.000000000 +0200
++++ qt4-x11-4.3.0/src/qt3support/tools/q3gdict.cpp 2007-07-30 22:05:17.000000000 +0200
+@@ -828,11 +828,11 @@
+ QString line;
+ line.fill(QLatin1Char('-'), 60);
+ double real, ideal;
+- qDebug(line.ascii());
++ qDebug("%s", line.ascii());
+ qDebug("DICTIONARY STATISTICS:");
+ if (count() == 0) {
+ qDebug("Empty!");
+- qDebug(line.ascii());
++ qDebug("%s", line.ascii());
+ return;
+ }
+ real = 0.0;
+@@ -853,7 +853,7 @@
+ while (b--)
+ *pbuf++ = '*';
+ *pbuf = '\0';
+- qDebug(buf);
++ qDebug("%s", buf);
+ i++;
+ }
+ qDebug("Array size = %d", size());
+@@ -861,7 +861,7 @@
+ qDebug("Real dist = %g", real);
+ qDebug("Rand dist = %g", ideal);
+ qDebug("Real/Rand = %g", real/ideal);
+- qDebug(line.ascii());
++ qDebug("%s", line.ascii());
+ #endif // QT_DEBUG
+ }
+
+diff -urNad qt4-x11-4.3.0~/tools/assistant/config.cpp qt4-x11-4.3.0/tools/assistant/config.cpp
+--- qt4-x11-4.3.0~/tools/assistant/config.cpp 2007-05-25 15:24:32.000000000 +0200
++++ qt4-x11-4.3.0/tools/assistant/config.cpp 2007-07-30 22:05:17.000000000 +0200
+@@ -73,12 +73,12 @@
+
+ QFile file(profileFileName);
+ if (!file.exists()) {
+- qWarning( (QLatin1String("File does not exist: ") + profileFileName).toAscii().constData() );
++ qWarning( "File does not exist: %s", qPrintable(profileFileName) );
+ return 0;
+ }
+ DocuParser *parser = DocuParser::createParser( profileFileName );
+ if (!parser) {
+- qWarning( (QLatin1String("Failed to create parser for file: ") + profileFileName).toAscii().constData() );
++ qWarning( "Failed to create parser for file: %s", qPrintable(profileFileName) );
+ return 0;
+ }
+ if (parser->parserVersion() < DocuParser::Qt320) {
+@@ -89,7 +89,7 @@
+ parser->parse(&file);
+ config->profil = profileParser->profile();
+ if (!config->profil) {
+- qWarning( (QLatin1String("Config::loadConfig(), no profile in: ") + profileFileName).toAscii().constData() );
++ qWarning( "Config::loadConfig(), no profile in: %s", qPrintable(profileFileName) );
+ return 0;
+ }
+ config->profil->setProfileType(Profile::UserProfile);
+diff -urNad qt4-x11-4.3.0~/tools/assistant/index.cpp qt4-x11-4.3.0/tools/assistant/index.cpp
+--- qt4-x11-4.3.0~/tools/assistant/index.cpp 2007-05-25 15:24:31.000000000 +0200
++++ qt4-x11-4.3.0/tools/assistant/index.cpp 2007-07-30 22:05:17.000000000 +0200
+@@ -180,7 +180,7 @@
+ {
+ QFile file( filename );
+ if ( !file.open(QFile::ReadOnly) ) {
+- qWarning( (QLatin1String("can not open file ") + filename).toAscii().constData() );
++ qWarning( "can not open file %s", qPrintable(filename) );
+ return;
+ }
+
+@@ -352,7 +352,7 @@
+
+ QFile file( fileName );
+ if ( !file.open( QFile::ReadOnly ) ) {
+- qWarning( (QLatin1String("cannot open file ") + fileName).toAscii().constData() );
++ qWarning( "cannot open file %s", qPrintable(fileName) );
+ return fileName;
+ }
+ QTextStream s( &file );
+@@ -474,7 +474,7 @@
+ QString fName = url.toLocalFile();
+ QFile file( fName );
+ if ( !file.open( QFile::ReadOnly ) ) {
+- qWarning( (QLatin1String("cannot open file ") + fName).toAscii().constData() );
++ qWarning( "cannot open file %s", qPrintable(fName) );
+ return false;
+ }
+
+diff -urNad qt4-x11-4.3.0~/tools/designer/src/lib/shared/qdesigner_utils.cpp qt4-x11-4.3.0/tools/designer/src/lib/shared/qdesigner_utils.cpp
+--- qt4-x11-4.3.0~/tools/designer/src/lib/shared/qdesigner_utils.cpp 2007-05-25 15:25:01.000000000 +0200
++++ qt4-x11-4.3.0/tools/designer/src/lib/shared/qdesigner_utils.cpp 2007-07-30 22:05:17.000000000 +0200
+@@ -40,9 +40,7 @@
+ {
+ QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message)
+ {
+- QString prefixedMessage = QLatin1String("Designer: ");
+- prefixedMessage += message;
+- qWarning(prefixedMessage.toUtf8().constData());
++ qWarning("Designer: %s", qPrintable(message));
+ }
+
+ QString EnumType::id() const
+diff -urNad qt4-x11-4.3.0~/tools/designer/src/lib/uilib/formbuilderextra.cpp qt4-x11-4.3.0/tools/designer/src/lib/uilib/formbuilderextra.cpp
+--- qt4-x11-4.3.0~/tools/designer/src/lib/uilib/formbuilderextra.cpp 2007-05-25 15:25:01.000000000 +0200
++++ qt4-x11-4.3.0/tools/designer/src/lib/uilib/formbuilderextra.cpp 2007-07-30 22:05:17.000000000 +0200
+@@ -33,9 +33,7 @@
+ #endif
+
+ void uiLibWarning(const QString &message) {
+- QString prefixedMessage = QLatin1String("Designer: ");
+- prefixedMessage += message;
+- qWarning(prefixedMessage.toUtf8().constData());
++ qWarning("Designer: %s", qPrintable(message));
+ }
+
+ QFormBuilderExtra::QFormBuilderExtra() :
+diff -urNad qt4-x11-4.3.0~/tools/linguist/shared/profileevaluator.h qt4-x11-4.3.0/tools/linguist/shared/profileevaluator.h
+--- qt4-x11-4.3.0~/tools/linguist/shared/profileevaluator.h 2007-05-25 15:24:24.000000000 +0200
++++ qt4-x11-4.3.0/tools/linguist/shared/profileevaluator.h 2007-07-30 22:05:17.000000000 +0200
+@@ -88,7 +88,11 @@
+
+ private:
+ void logMessage(const QString &msg, MessageType mt = MT_DebugLevel2);
+- void logMessage(MessageType mt, const char *msg, ...);
++ void logMessage(MessageType mt, const char *msg, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++ __attribute__ ((format (printf, 3, 4)))
++#endif
++ ;
+ QString expandVariableReferences(const QString &value);
+ QString evaluateExpandFunction(const QByteArray &func, const QString &arguments);
+
+diff -urNad qt4-x11-4.3.0~/tools/qtestlib/src/qtest_global.h qt4-x11-4.3.0/tools/qtestlib/src/qtest_global.h
+--- qt4-x11-4.3.0~/tools/qtestlib/src/qtest_global.h 2007-05-25 15:24:23.000000000 +0200
++++ qt4-x11-4.3.0/tools/qtestlib/src/qtest_global.h 2007-07-30 22:05:17.000000000 +0200
+@@ -59,7 +59,11 @@
+ enum SkipMode { SkipSingle = 1, SkipAll = 2 };
+ enum TestFailMode { Abort = 1, Continue = 2 };
+
+- int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...);
++ int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...)
++#if defined(Q_CC_GNU) && !defined(__INSURE__)
++ __attribute__ ((format (printf, 3, 4)))
++#endif
++ ;
+ }
+
+ QT_END_HEADER
Copied: tags/packages/qt4-x11/4.3.0-5/debian/patches/00_0186-fix-component-alpha-text.dpatch (from rev 6908, trunk/packages/qt4-x11/debian/patches/00_0186-fix-component-alpha-text.dpatch)
===================================================================
--- tags/packages/qt4-x11/4.3.0-5/debian/patches/00_0186-fix-component-alpha-text.dpatch (rev 0)
+++ tags/packages/qt4-x11/4.3.0-5/debian/patches/00_0186-fix-component-alpha-text.dpatch 2007-07-30 21:45:06 UTC (rev 6911)
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0186-fix-component-alpha-text.diff.dpatch by Fathi Boudra <fboudra at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/src/gui/text/qfontengine_ft.cpp qt4-x11-4.3.0/src/gui/text/qfontengine_ft.cpp
+--- qt4-x11-4.3.0~/src/gui/text/qfontengine_ft.cpp 2007-05-25 15:24:14.000000000 +0200
++++ qt4-x11-4.3.0/src/gui/text/qfontengine_ft.cpp 2007-07-30 21:58:21.000000000 +0200
+@@ -699,7 +699,8 @@
+ uint red = src[x];
+ uint green = src[x+1];
+ uint blue = src[x+2];
+- uint res = (red << 16) + (green << 8) + blue;
++ uint alpha = green;
++ uint res = (alpha << 24) + (red << 16) + (green << 8) + blue;
+ *dd = res;
+ ++dd;
+ }
+@@ -713,7 +714,8 @@
+ uint blue = src[x];
+ uint green = src[x+1];
+ uint red = src[x+2];
+- uint res = (red << 16) + (green << 8) + blue;
++ uint alpha = green;
++ uint res = (alpha << 24) + (red << 16) + (green << 8) + blue;
+ *dd = res;
+ ++dd;
+ }
+@@ -737,7 +739,7 @@
+ uint high = (red*subpixel_filter[0][0] + green*subpixel_filter[0][1] + blue*subpixel_filter[0][2]) >> 8;
+ uint mid = (red*subpixel_filter[1][0] + green*subpixel_filter[1][1] + blue*subpixel_filter[1][2]) >> 8;
+ uint low = (red*subpixel_filter[2][0] + green*subpixel_filter[2][1] + blue*subpixel_filter[2][2]) >> 8;
+- uint res = (high << 16) + (mid << 8) + low;
++ uint res = (mid << 24) + (high << 16) + (mid << 8) + low;
+ dst[x] = res;
+ }
+ dst += info.width;
+@@ -752,7 +754,7 @@
+ uint high = (red*subpixel_filter[0][0] + green*subpixel_filter[0][1] + blue*subpixel_filter[0][2]) >> 8;
+ uint mid = (red*subpixel_filter[1][0] + green*subpixel_filter[1][1] + blue*subpixel_filter[1][2]) >> 8;
+ uint low = (red*subpixel_filter[2][0] + green*subpixel_filter[2][1] + blue*subpixel_filter[2][2]) >> 8;
+- uint res = (high << 16) + (mid << 8) + low;
++ uint res = (mid << 24) + (high << 16) + (mid << 8) + low;
+ dst[x] = res;
+ }
+ dst += info.width;
Deleted: tags/packages/qt4-x11/4.3.0-5/debian/patches/00list
Copied: tags/packages/qt4-x11/4.3.0-5/debian/patches/00list (from rev 6908, trunk/packages/qt4-x11/debian/patches/00list)
===================================================================
--- tags/packages/qt4-x11/4.3.0-5/debian/patches/00list (rev 0)
+++ tags/packages/qt4-x11/4.3.0-5/debian/patches/00list 2007-07-30 21:45:06 UTC (rev 6911)
@@ -0,0 +1,30 @@
+00_0163-fix-gcc43-support
+00_0167-fix-group-reading
+00_0172-prefer-xrandr-over-xinerama
+00_0175-fix-s390-qatomic
+00_0176-coverity-fixes
+00_0177-qurl-clear-fix
+00_0178-transparency-window-types
+00_0179-transient-hack
+00_0180-window-role
+00_0181-qdnd-x11-fix
+00_0183-qprocess-corruption
+00_0185-fix-format-strings
+00_0186-fix-component-alpha-text
+01_qmake_for_debian
+02_launch_assistant-qt4
+03_launch_moc-qt4
+04_launch_uic-qt4
+05_append_qt4_target
+06_qtdemo_destdir
+20_mips_atomic_ops
+30_arm_ftbfs_fixes
+31_arm_eabi_fix
+40_alpha_ice
+41_disable_opengl_visibility
+42_alpha_fetch_and_add
+50_kfreebsd_build_fix
+51_kfreebsd_mkspecs
+60_m68k_inotify_fix
+70_hppa_ldcw_fix
+80_hurd_max_path
Deleted: tags/packages/qt4-x11/4.3.0-5/debian/patches/01_qmake_for_debian.dpatch
Copied: tags/packages/qt4-x11/4.3.0-5/debian/patches/01_qmake_for_debian.dpatch (from rev 6910, trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.dpatch)
===================================================================
--- tags/packages/qt4-x11/4.3.0-5/debian/patches/01_qmake_for_debian.dpatch (rev 0)
+++ tags/packages/qt4-x11/4.3.0-5/debian/patches/01_qmake_for_debian.dpatch 2007-07-30 21:45:06 UTC (rev 6911)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_qmake_use_qt4_tools.dpatch by Brian Nelson <pyro at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ensures qmake generates Makefiles that use the -qt4 tools and
+## DP: that use recursively link against all indirectly-used libraries.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~/mkspecs/common/linux.conf qt4-x11-4.3.0/mkspecs/common/linux.conf
+--- qt4-x11-4.3.0~/mkspecs/common/linux.conf 2007-05-25 15:24:01.000000000 +0200
++++ qt4-x11-4.3.0/mkspecs/common/linux.conf 2007-07-30 22:18:23.000000000 +0200
+@@ -23,8 +23,8 @@
+ QMAKE_LIBS_OPENGL_QT = -lGL
+ QMAKE_LIBS_THREAD = -lpthread
+
+-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4
++QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4
+
+ QMAKE_AR = ar cqs
+ QMAKE_RANLIB =
+diff -urNad qt4-x11-4.3.0~/mkspecs/linux-g++/qmake.conf qt4-x11-4.3.0/mkspecs/linux-g++/qmake.conf
+--- qt4-x11-4.3.0~/mkspecs/linux-g++/qmake.conf 2007-05-25 15:24:01.000000000 +0200
++++ qt4-x11-4.3.0/mkspecs/linux-g++/qmake.conf 2007-07-30 22:19:35.000000000 +0200
+@@ -4,8 +4,9 @@
+
+ MAKEFILE_GENERATOR = UNIX
+ TEMPLATE = app
+-CONFIG += qt warn_on release incremental link_prl
++CONFIG += qt warn_on release incremental
+ QT += core gui
++DEFINES += QT_SHARED
+ QMAKE_INCREMENTAL_STYLE = sublib
+
+ include(../common/g++.conf)
More information about the pkg-kde-commits
mailing list