rev 7017 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Thu Aug 9 09:34:39 UTC 2007
Author: fboudra-guest
Date: 2007-08-09 09:34:39 +0000 (Thu, 09 Aug 2007)
New Revision: 7017
Removed:
trunk/packages/qt4-x11/debian/patches-4.3.0/
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff
trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
trunk/packages/qt4-x11/debian/patches/0181-qdnd-x11-fix.diff
trunk/packages/qt4-x11/debian/patches/0182-argb-visuals-default.diff
trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff
trunk/packages/qt4-x11/debian/patches/0186-fix-component-alpha-text.diff
trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff
trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff
trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
trunk/packages/qt4-x11/debian/patches/series
trunk/packages/qt4-x11/debian/rules
Log:
* Some cleanup.
* Update patches and series.
* Update rules.
No more stuff TODO in mind ...
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/changelog 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,18 +1,22 @@
-qt4-x11 (4.3.1-1) UNRELEASED; urgency=low
+qt4-x11 (4.3.1-1) unstable; urgency=low
* New upstream release.
* Switch to quilt patch system.
* Update copyright. Add Trolltech GPL Exception.
* Update patches for Qt4.3.1.
+ * Remove 51_kfreebsd_mkspecs patch. Moved in rules.
+ * Add 0187-fix-font-fixed-pitch patch:
+ This patch works around broken QFontInfo::fixedPitch by always using a
+ glyph metrics comparison test to guess the information. This has the
+ property of both ignoring (bad) and not relying on (good) any information
+ that might be provided by the OS's font facility. For Mac OS X only.
* Remove patches merged upstream:
* 0177-qurl-clear-fix
* 0183-qprocess-corruption
* 42_alpha_fetch_and_add
+ * Disable 0172-prefer-xrandr-over-xinerama patch. (Closes: #433931)
+ * Enable 0182-argb-visuals-default patch.
- * TODO:
- * workaround for 51_kfreebsd_mkspecs patch.
- * Add comments to patches.
-
-- Fathi Boudra <fboudra at free.fr> Wed, 08 Aug 2007 15:08:11 +0200
qt4-x11 (4.3.0-5) unstable; urgency=low
Modified: trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,11 @@
+qt-bugs@ issue : none
+Trolltech task ID : N154723
+bugs.kde.org number : None
+applied: no
+author: Dirk Mueller <mueller at kde.org>
+
+various fixes to get Qt 4.3 without hundreds of warnings compiling
+
--- qt4-x11-4.3.1.orig/config.tests/unix/endian.test
+++ qt4-x11-4.3.1/config.tests/unix/endian.test
@@ -30,6 +30,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,12 @@
+qt-bugs@ issue : none
+Trolltech task ID : none yet
+bugs.kde.org number : None
+applied: no
+author: Dirk Mueller <mueller at kde.org>
+
+in big user environments, getgrgid_r() needs more memory than sysconf() returns.
+Try a bit harder.
+
--- qt4-x11-4.3.1.orig/src/corelib/io/qfsfileengine_unix.cpp
+++ qt4-x11-4.3.1/src/corelib/io/qfsfileengine_unix.cpp
@@ -845,9 +845,16 @@
Modified: trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,18 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+bugs.kde.org number :
+applied: yes
+author: Dirk Mueller
+
+only trust libxinerama if its not the emulated information
+coming from xrandr 1.2. xrandr 1.2 is merged fb and libxinerama
+presents then virtual screens in clone mode, which qt (and KDE)
+can't deal with.
+
+proper fix would be to detect crtcs as virtual screens, but
+given that qt can't deal with dynamically changing number of screens,
+this is for "when I have time".
+
--- qt4-x11-4.3.1.orig/src/gui/kernel/qdesktopwidget_x11.cpp
+++ qt4-x11-4.3.1/src/gui/kernel/qdesktopwidget_x11.cpp
@@ -124,11 +124,38 @@
Modified: trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,11 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller
+
+fix s390(x) build
+
--- qt4-x11-4.3.1.orig/src/corelib/arch/qatomic_s390.h
+++ qt4-x11-4.3.1/src/corelib/arch/qatomic_s390.h
@@ -197,10 +197,20 @@
Modified: trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,11 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller
+
+fix various obvious memory leaks etc
+
--- qt4-x11-4.3.1.orig/src/gui/painting/qimagescale.cpp
+++ qt4-x11-4.3.1/src/gui/painting/qimagescale.cpp
@@ -1020,6 +1020,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,11 @@
+qt-bugs@ issue : none yet
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: Lubos Lunak <l.lunak at kde.org>
+
+This patch adds Qt support for new window types used for compositing.
+
--- qt4-x11-4.3.1.orig/src/gui/kernel/qapplication_x11.cpp
+++ qt4-x11-4.3.1/src/gui/kernel/qapplication_x11.cpp
@@ -214,6 +214,11 @@
Modified: trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,13 @@
+qt-bugs@ issue : 166027
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: Lubos Lunak <l.lunak at kde.org>
+
+This patch is just a hackish workaround that makes setting of WM_TRANSIENT_FOR
+work with some window types (needed basically by the #0178 qt-copy patch).
+It is not a proper solution, waiting for TT to come up with something.
+
--- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget_x11.cpp
+++ qt4-x11-4.3.1/src/gui/kernel/qwidget_x11.cpp
@@ -1650,7 +1650,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,39 @@
+qt-bugs@ issue : none yet
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: Lubos Lunak <l.lunak at kde.org>
+
+ Hello,
+
+ there are several problems with Qt's support for the WM_WINDOW_ROLE property:
+
+- plain "QWidget w; w.setWindowRole( "test" );" aborts with
+Qt::WA_WState_Created not being set
+
+- while QWidgetPrivate::create_sys() uses QObject object name for initial
+setting of WM_WINDOW_ROLE, later calls to QObject::setObjectName() have no
+effect on it
+
+- Qt3 used the QObject object name for setting the window role, however Qt4
+uses some strange mix of object name and what's set manually with
+setWindowRole().
+
+ The result is that that Qt3 and KDE3 apps that had WM_WINDOW_ROLE set don't
+in their Qt4 and KDE4 versions. I suggest using the attached patch which
+fixed all of the above problems:
+
+- set explicit window role is used when actually set, otherwise the object
+name is used. This e.g. takes care of apps ported using setObjectName() from
+their Qt3/KDE3 versions (including e.g. Qt Designer) and generally makes it
+somewhat less demanding to actually set a usable window role (I can't quite
+see how many developers would be bothered to explicitly call
+setWindowRole()).
+
+- calls to QObject::setObjectName() update the WM_WINDOW_ROLE property. Since
+QObjectPrivate already has a virtual dtor I think adding another virtual for
+handling the QWidget-related functionality from QtCore is fine.
+
--- qt4-x11-4.3.1.orig/src/corelib/kernel/qobject.cpp
+++ qt4-x11-4.3.1/src/corelib/kernel/qobject.cpp
@@ -1008,9 +1008,18 @@
Modified: trunk/packages/qt4-x11/debian/patches/0181-qdnd-x11-fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0181-qdnd-x11-fix.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0181-qdnd-x11-fix.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,29 @@
+qt-bugs@ issue : 166518
+Trolltech task ID : 167509
+bugs.kde.org number :
+applied: no
+author: Matthias Kretz <kretz at kde.org>
+os: unix
+
+Consider:
+QWidget toplevel;
+QWidget dropWidget(&toplevel);
+dropWidget.setAcceptDrops(true);
+QWidget visibleFooWidget(&toplevel);
+
+find_child in qdnd_x11.cpp will find visibleFooWidget because it's the last
+entry in toplevel.children() and the QPoint of the drop is contained in it.
+But since it does not acceptDrops() handle_xdnd_position will now look at the
+parent widget which is toplevel. That one isWindow() so the iteration stops
+and no QDragEnterEvent will be sent.
+But it never even looked at dropWidget even though it also contains the QPoint
+of the drop!
+
+This patch makes the algorithm look at _all_ widgets that contain the QPoint.
+
+This bug effectively breaks all drops on QAbstractScrollArea subclasses with
+the KDE4 Oxygen widget style.
+
--- qt4-x11-4.3.1.orig/src/gui/kernel/qdnd_x11.cpp
+++ qt4-x11-4.3.1/src/gui/kernel/qdnd_x11.cpp
@@ -58,6 +58,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/0182-argb-visuals-default.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0182-argb-visuals-default.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0182-argb-visuals-default.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,14 @@
+qt-bugs@ issue : none, in Qt 4.4 already
+Trolltech task ID : 120338
+applied: no
+author: Zack Rusin <zrusin at trolltech.com>
+os: unix
+
+Fixes: Qt handling argb visuals on X11
+Details: we make Qt pick ARGB visuals when available.
+this allows people writing properly semi-transparent
+apps on X11.
+
--- qt4-x11-4.3.1.orig/src/gui/kernel/qapplication_x11.cpp
+++ qt4-x11-4.3.1/src/gui/kernel/qapplication_x11.cpp
@@ -1567,6 +1567,30 @@
Modified: trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,13 @@
+qt-bugs@ issue : N171087
+Trolltech task ID :
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller <mueller at kde.org>
+
+This patch fixes various code issues with handling format strings
+None of them seem to be exceptionally bad, but its better safe
+than sorry.
+
--- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
+++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
@@ -1276,8 +1276,16 @@
Modified: trunk/packages/qt4-x11/debian/patches/0186-fix-component-alpha-text.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0186-fix-component-alpha-text.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0186-fix-component-alpha-text.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,14 @@
+qt-bugs@ issue :
+Trolltech task ID :
+applied: yes
+author: Fredrik Höglund <fredrik at kde.org>
+os: unix
+
+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.
+
--- qt4-x11-4.3.1.orig/src/gui/text/qfontengine_ft.cpp
+++ qt4-x11-4.3.1/src/gui/text/qfontengine_ft.cpp
@@ -716,7 +716,8 @@
Modified: trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,13 @@
+qt-bugs@ issue :
+Trolltech task ID :
+applied: no
+author: Matthew Woehlke <mw_triad at users.sourceforge.net>
+
+This patch works around broken QFontInfo::fixedPitch by always using a
+glyph metrics comparison test to guess the information. This has the
+property of both ignoring (bad) and not relying on (good) any information
+that might be provided by the OS's font facility.
+
--- qt4-x11-4.3.1.orig/src/gui/text/qfont.cpp
+++ qt4-x11-4.3.1/src/gui/text/qfont.cpp
@@ -2093,7 +2093,6 @@
Modified: trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,8 @@
+author: Brian Nelson <pyro at debian.org>
+
+Ensures qmake generates Makefiles that use the -qt4 tools and that use
+recursively link against all indirectly-used libraries.
+
--- qt4-x11-4.3.1.orig/mkspecs/common/linux.conf
+++ qt4-x11-4.3.1/mkspecs/common/linux.conf
@@ -23,8 +23,8 @@
Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,5 @@
+author: Brian Nelson <pyro at debian.org>
+
--- qt4-x11-4.3.1.orig/tools/assistant/lib/qassistantclient.cpp
+++ qt4-x11-4.3.1/tools/assistant/lib/qassistantclient.cpp
@@ -187,11 +187,11 @@
Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,7 @@
+author: Brian Nelson <pyro at debian.org>
+
+Ensure the Qt4 version of moc is launched.
+
--- qt4-x11-4.3.1.orig/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ qt4-x11-4.3.1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -391,7 +391,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,5 @@
+author: Fathi Boudra <fboudra at free.fr>
+
--- qt4-x11-4.3.1.orig/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ qt4-x11-4.3.1/tools/designer/src/lib/shared/qdesigner_utils.cpp
@@ -133,7 +133,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,5 @@
+author: Fathi Boudra <fboudra at free.fr>
+
--- qt4-x11-4.3.1.orig/config.tests/unix/compile.test
+++ qt4-x11-4.3.1/config.tests/unix/compile.test
@@ -51,7 +51,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,7 @@
+author: Fathi Boudra <fboudra at free.fr>
+
+Fix qtdemo destdir.
+
--- qt4-x11-4.3.1.orig/demos/arthurplugin/arthurplugin.pro
+++ qt4-x11-4.3.1/demos/arthurplugin/arthurplugin.pro
@@ -3,7 +3,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,7 @@
+author: Thiemo Seufer <ths at debian.org>
+
+Fix compilation for Linux MIPS-I code.
+
--- qt4-x11-4.3.1.orig/src/corelib/arch/mips/qatomic32.s
+++ qt4-x11-4.3.1/src/corelib/arch/mips/qatomic32.s
@@ -6,10 +6,12 @@
Modified: trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,7 @@
+author: Fathi Boudra <fboudra at free.fr>
+
+Fix arm FTBFS.
+
--- qt4-x11-4.3.1.orig/tools/qtestlib/src/qtestcase.h
+++ qt4-x11-4.3.1/tools/qtestlib/src/qtestcase.h
@@ -210,7 +210,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,7 @@
+author: Lennert Buytenhek <buytenh at wantstofly.org>
+
+Add support for EABI ARM platforms to Qt.
+
--- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
+++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
@@ -331,7 +331,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,5 @@
+temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
+
--- qt4-x11-4.3.1.orig/src/opengl/opengl.pro
+++ qt4-x11-4.3.1/src/opengl/opengl.pro
@@ -5,6 +5,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,7 @@
+author: Petr Salinger <Petr.Salinger at seznam.cz>
+
+Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
+
--- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
+++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
@@ -125,6 +125,12 @@
Modified: trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,8 @@
+author: Brian Nelson <pyro at debian.org>
+
+From Roman Zippel <zippel at linux-m68k.org>: These defines are taken from the
+m68k tree, they should appear like this soon also in the upstream source.
+
--- qt4-x11-4.3.1.orig/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ qt4-x11-4.3.1/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -103,6 +103,10 @@
Modified: trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,7 @@
+author: LaMont Jones <lamont at bld-4.mmjgroup.com>
+
+patch from Ubuntu to properly support hppa.
+
--- qt4-x11-4.3.1.orig/src/corelib/arch/parisc/q_ldcw.s
+++ qt4-x11-4.3.1/src/corelib/arch/parisc/q_ldcw.s
@@ -1,17 +1,7 @@
Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,3 +1,5 @@
+author: Brian Nelson <pyro at debian.org>
+
--- qt4-x11-4.3.1.orig/src/corelib/io/qfsfileengine_unix.cpp
+++ qt4-x11-4.3.1/src/corelib/io/qfsfileengine_unix.cpp
@@ -55,6 +55,10 @@
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/patches/series 2007-08-09 09:34:39 UTC (rev 7017)
@@ -1,14 +1,14 @@
# qt-copy patches
0163-fix-gcc43-support.diff
0167-fix-group-reading.diff
-0172-prefer-xrandr-over-xinerama.diff
+#0172-prefer-xrandr-over-xinerama.diff
0175-fix-s390-qatomic.diff
0176-coverity-fixes.diff
0178-transparency-window-types.diff
0179-transient-hack.diff
0180-window-role.diff
0181-qdnd-x11-fix.diff
-#0182-argb-visuals-default.diff
+0182-argb-visuals-default.diff
0185-fix-format-strings.diff
0186-fix-component-alpha-text.diff
0187-fix-font-fixed-pitch.diff
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2007-08-09 06:43:46 UTC (rev 7016)
+++ trunk/packages/qt4-x11/debian/rules 2007-08-09 09:34:39 UTC (rev 7017)
@@ -36,6 +36,11 @@
endif
common-configure-arch::
+ # Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
+ # we cannot use directly linux-g++ due to src/corelib/io/io.pri
+ rm -rf mkspecs/glibc-g++
+ cp -a mkspecs/linux-g++ mkspecs/glibc-g++
+
./configure -confirm-license \
-prefix "/usr" \
-bindir "/usr/bin" \
@@ -87,7 +92,7 @@
examples/qdbus/complexpingpong/Makefile* \
examples/qdbus/pingpong/Makefile*
- rm -rf lib/ plugins/
+ rm -rf lib/ plugins/ mkspecs/glibc-g++
find bin/ config.tests/ qmake/ -exec file {} \; | grep ELF | sed 's/:.*//' | xargs rm -f
More information about the pkg-kde-commits
mailing list