rev 6453 - in trunk/packages/qt4-x11/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Fri Jun 8 21:52:11 UTC 2007
Author: pusling-guest
Date: 2007-06-08 21:52:11 +0000 (Fri, 08 Jun 2007)
New Revision: 6453
Added:
trunk/packages/qt4-x11/debian/desktop/
trunk/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch
trunk/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch
trunk/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch
trunk/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch
trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch
trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch
Removed:
trunk/packages/qt4-x11/debian/patches/04_utf8_bug_fix.dpatch
trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch
trunk/packages/qt4-x11/debian/patches/41_alpha_disable_opengl_visibility.dpatch
trunk/packages/qt4-x11/debian/patches/71_hppa_inotify_fix.dpatch
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/libqt4-core.install
trunk/packages/qt4-x11/debian/libqt4-dev.install
trunk/packages/qt4-x11/debian/patches/00list
trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.dpatch
trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.dpatch
trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch
trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch
trunk/packages/qt4-x11/debian/qt4-dev-tools.install
trunk/packages/qt4-x11/debian/rules
Log:
4.3.0 merged in
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/changelog 2007-06-08 21:52:11 UTC (rev 6453)
@@ -1,3 +1,53 @@
+qt4-x11 (4.3.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes a QListView issue. (Closes: 419654)
+
+ [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
+
+ -- Fathi Boudra <fboudra at free.fr> Thu, 17 May 2007 18:28:57 +0200
+
qt4-x11 (4.2.3-1) unstable; urgency=low
* New upstream release
Copied: trunk/packages/qt4-x11/debian/desktop (from rev 6441, branches/kde4/packages/qt4-x11/debian/desktop)
Modified: trunk/packages/qt4-x11/debian/libqt4-core.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-core.install 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/libqt4-core.install 2007-06-08 21:52:11 UTC (rev 6453)
@@ -3,5 +3,6 @@
usr/lib/libQtXml.so.*
usr/lib/libQtTest.so.*
usr/lib/libQtDBus.so.*
+usr/lib/libQtScript.so.*
usr/bin/qdbus
usr/share/qt4/translations/*.qm
Modified: trunk/packages/qt4-x11/debian/libqt4-dev.install
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dev.install 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/libqt4-dev.install 2007-06-08 21:52:11 UTC (rev 6453)
@@ -2,7 +2,7 @@
usr/lib/*.a
usr/lib/*.so
usr/lib/*.prl
-usr/lib/*.pc usr/lib/pkgconfig/
+usr/lib/pkgconfig/
usr/share/qt4/q3porting.xml
usr/share/qt4/mkspecs/*
usr/bin/qmake-qt4
@@ -13,6 +13,5 @@
usr/bin/qt3to4
usr/bin/rcc
usr/bin/uic3
-usr/bin/qtdemo
usr/bin/qdbusxml2cpp
usr/bin/qdbuscpp2xml
Copied: trunk/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch (from rev 6441, branches/kde4/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/00_0163-fix-gcc43-support.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -0,0 +1,174 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0163-fix-gcc43-support.dpatch by Dirk Mueller <mueller at kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Various fixes to get Qt 4.3 without hundreds of warnings compiling.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/config.tests/unix/endian.test qt4-x11-4.3.0~rc1/config.tests/unix/endian.test
+--- qt4-x11-4.3.0~rc1~/config.tests/unix/endian.test 2007-05-06 17:54:44.000000000 +0200
++++ qt4-x11-4.3.0~rc1/config.tests/unix/endian.test 2007-05-17 19:09:20.000000000 +0200
+@@ -30,6 +30,7 @@
+ [ "$VERBOSE" = "yes" ] && echo " Found 'MostSignificantByteFirst' in binary"
+ ENDIAN="BIG"
+ fi
++[ "$VERBOSE" = "yes" ] && make clean || make clean >/dev/null 2>&1
+
+ # done
+ if [ "$ENDIAN" = "LITTLE" ]; then
+diff -urNad qt4-x11-4.3.0~rc1~/config.tests/x11/glib/glib.cpp qt4-x11-4.3.0~rc1/config.tests/x11/glib/glib.cpp
+--- qt4-x11-4.3.0~rc1~/config.tests/x11/glib/glib.cpp 2007-05-06 17:54:37.000000000 +0200
++++ qt4-x11-4.3.0~rc1/config.tests/x11/glib/glib.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -6,7 +6,7 @@
+ {
+ GMainContext *context;
+ GSource *source;
+- GPollFD *pollfd;
++ GPollFD *pollfd = NULL;
+ if (!g_thread_supported())
+ g_thread_init(NULL);
+ context = g_main_context_default();
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/codecs/qtextcodec.cpp qt4-x11-4.3.0~rc1/src/corelib/codecs/qtextcodec.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/codecs/qtextcodec.cpp 2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/codecs/qtextcodec.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -415,7 +415,7 @@
+ localeMapper = checkForCodec(lang);
+
+ // 5. "@euro"
+- if (!localeMapper && ctype && strstr(ctype, "@euro") || lang && strstr(lang, "@euro"))
++ if ((!localeMapper && ctype && strstr(ctype, "@euro")) || (lang && strstr(lang, "@euro")))
+ localeMapper = checkForCodec("ISO 8859-15");
+
+ // 6. guess locale from ctype unless ctype is "C"
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qtextstream.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qtextstream.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qtextstream.cpp 2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qtextstream.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -541,8 +541,8 @@
+ if (!codec || autoDetectUnicode) {
+ autoDetectUnicode = false;
+
+- if (bytesRead >= 2 && (uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe
+- || uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff)) {
++ if (bytesRead >= 2 && ((uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe)
++ || (uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff))) {
+ codec = QTextCodec::codecForName("UTF-16");
+ } else if (!codec) {
+ codec = QTextCodec::codecForLocale();
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qurl.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qurl.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qurl.cpp 2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qurl.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -4724,9 +4724,9 @@
+ if (include.isEmpty()) {
+ for (int i = 0; i < len; ++i) {
+ unsigned char c = *inputData++;
+- if (c >= 0x61 && c <= 0x7A // ALPHA
+- || c >= 0x41 && c <= 0x5A // ALPHA
+- || c >= 0x30 && c <= 0x39 // DIGIT
++ if ((c >= 0x61 && c <= 0x7A) // ALPHA
++ || (c >= 0x41 && c <= 0x5A) // ALPHA
++ || (c >= 0x30 && c <= 0x39) // DIGIT
+ || c == 0x2D // -
+ || c == 0x2E // .
+ || c == 0x5F // _
+@@ -4743,9 +4743,9 @@
+ const char * alsoEncode = include.constData();
+ for (int i = 0; i < len; ++i) {
+ unsigned char c = *inputData++;
+- if ((c >= 0x61 && c <= 0x7A // ALPHA
+- || c >= 0x41 && c <= 0x5A // ALPHA
+- || c >= 0x30 && c <= 0x39 // DIGIT
++ if (((c >= 0x61 && c <= 0x7A) // ALPHA
++ || (c >= 0x41 && c <= 0x5A) // ALPHA
++ || (c >= 0x30 && c <= 0x39) // DIGIT
+ || c == 0x2D // -
+ || c == 0x2E // .
+ || c == 0x5F // _
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp 2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -2589,8 +2589,8 @@
+
+ QChar c1 = format.at(i);
+ QChar c2 = format.at(i + 1);
+- if (c1.unicode() == 'a' && c2.unicode() == 'p'
+- || c1.unicode() == 'A' && c2.unicode() == 'P')
++ if ((c1.unicode() == 'a' && c2.unicode() == 'p')
++ || (c1.unicode() == 'A' && c2.unicode() == 'P'))
+ return true;
+
+ ++i;
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qapplication.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qapplication.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qapplication.cpp 2007-05-06 17:54:32.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qapplication.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -2009,11 +2009,11 @@
+ #ifndef QT_NO_TRANSLATION
+ static bool qt_detectRTLLanguage()
+ {
+- return force_reverse ^
++ return (force_reverse ^
+ QApplication::tr("QT_LAYOUT_DIRECTION",
+ "Translate this string to the string 'LTR' in left-to-right"
+ " languages or to 'RTL' in right-to-left languages (such as Hebrew"
+- " and Arabic) to get proper widget layout.") == QLatin1String("RTL");
++ " and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
+ }
+ #endif
+
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qkeymapper_x11.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qkeymapper_x11.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qkeymapper_x11.cpp 2007-05-06 17:54:32.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qkeymapper_x11.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -1315,8 +1315,8 @@
+ }
+
+ if (directionKeyEvent && lastWinId == keyWidget->internalWinId()) {
+- if (keysym == XK_Shift_L && directionKeyEvent == XK_Control_L ||
+- keysym == XK_Control_L && directionKeyEvent == XK_Shift_L) {
++ if ((keysym == XK_Shift_L && directionKeyEvent == XK_Control_L) ||
++ (keysym == XK_Control_L && directionKeyEvent == XK_Shift_L)) {
+ directionKeyEvent = Qt::Key_Direction_L;
+ } else if (keysym == XK_Shift_R && directionKeyEvent == XK_Control_R ||
+ keysym == XK_Control_R && directionKeyEvent == XK_Shift_R) {
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/kernel/qwidget.cpp qt4-x11-4.3.0~rc1/src/gui/kernel/qwidget.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/kernel/qwidget.cpp 2007-05-06 17:54:31.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/kernel/qwidget.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -1804,7 +1804,7 @@
+
+ for (int i = 0; i < pd->children.size(); ++i) {
+ QWidget *w = qobject_cast<QWidget *>(pd->children.at(i));
+- if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created))
++ if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created)) {
+ if (w!=q) {
+ w->create();
+ } else {
+@@ -1814,6 +1814,7 @@
+ if (winid)
+ w->raise();
+ }
++ }
+ }
+ } else {
+ q->create();
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/painting/qregion_unix.cpp qt4-x11-4.3.0~rc1/src/gui/painting/qregion_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/painting/qregion_unix.cpp 2007-05-06 17:54:26.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/painting/qregion_unix.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -1929,7 +1929,7 @@
+ else
+ --isInside;
+
+- if (!inside && !isInside || inside && isInside) {
++ if ((!inside && !isInside) || (inside && isInside)) {
+ pWETE->nextWETE = AET;
+ pWETE = AET;
+ inside = !inside;
+diff -urNad qt4-x11-4.3.0~rc1~/src/tools/uic/driver.cpp qt4-x11-4.3.0~rc1/src/tools/uic/driver.cpp
+--- qt4-x11-4.3.0~rc1~/src/tools/uic/driver.cpp 2007-05-06 17:54:17.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/tools/uic/driver.cpp 2007-05-17 19:09:20.000000000 +0200
+@@ -160,7 +160,7 @@
+
+ static bool isAnsiCCharacter(const QChar& c)
+ {
+- return c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z')
++ return (c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z'))
+ || c.isDigit() || c == QLatin1Char('_');
+ }
+
Copied: trunk/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch (from rev 6441, branches/kde4/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/00_0167-fix-group-reading.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0167-fix-group-reading.dpatch by Dirk Mueller <mueller at kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: In big user environments, getgrgid_r() needs more memory than sysconf() returns.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp 2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp 2007-05-17 19:10:48.000000000 +0200
+@@ -830,9 +830,16 @@
+ } else if (own == OwnerGroup) {
+ struct group *gr = 0;
+ #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
+- buf.resize(sysconf(_SC_GETGR_R_SIZE_MAX));
+- struct group entry;
+- getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr);
++ for (unsigned size = sysconf(_SC_GETGR_R_SIZE_MAX); size < 256000; size += size)
++ {
++ buf.resize(size);
++ struct group entry;
++ // ERANGE indicates that the buffer was too small
++ if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr)
++ || errno != ERANGE)
++ break;
++ }
++
+ #else
+ gr = getgrgid(ownerId(own));
+ #endif
Copied: trunk/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch (from rev 6441, branches/kde4/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/00_0175-fix-s390-qatomic.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0175-fix-s390-qatomic.dpatch by Dirk Mueller <mueller at kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix s390(x) build.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/arch/qatomic_s390.h qt4-x11-4.3.0~rc1/src/corelib/arch/qatomic_s390.h
+--- qt4-x11-4.3.0~rc1~/src/corelib/arch/qatomic_s390.h 2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/arch/qatomic_s390.h 2007-05-17 19:13:18.000000000 +0200
+@@ -182,10 +182,20 @@
+ #endif
+ }
+
+-#error "fetch-and-add not implemented"
+-// int q_atomic_fetch_and_add_int(volatile int *ptr, int value);
+-// int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value);
+-// int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value);
++inline int q_atomic_fetch_and_add_int(volatile int *ptr, int value)
++{
++ return __sync_fetch_and_add(ptr, value);
++}
++
++inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value)
++{
++ return __sync_fetch_and_add(ptr, value);
++}
++
++inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value)
++{
++ return __sync_fetch_and_add(ptr, value);
++}
+
+ QT_END_HEADER
+
Copied: trunk/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch (from rev 6441, branches/kde4/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0176-coverity-fixes.diff.dpatch by Dirk Mueller <mueller at kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix various obvious memory leaks.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/painting/qimagescale.cpp qt4-x11-4.3.0~rc1/src/gui/painting/qimagescale.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/painting/qimagescale.cpp 2007-05-06 17:54:25.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/painting/qimagescale.cpp 2007-05-19 08:46:30.000000000 +0200
+@@ -1005,6 +1005,7 @@
+ buffer = QImage(dw, dh, src.format());
+ if (buffer.isNull()) {
+ qWarning("QImage: out of memory, returning null");
++ qimageFreeScaleInfo(scaleinfo);
+ return QImage();
+ }
+
+diff -urNad qt4-x11-4.3.0~rc1~/src/tools/uic/cpp/cppwriteicondata.cpp qt4-x11-4.3.0~rc1/src/tools/uic/cpp/cppwriteicondata.cpp
+--- qt4-x11-4.3.0~rc1~/src/tools/uic/cpp/cppwriteicondata.cpp 2007-05-06 17:54:47.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/tools/uic/cpp/cppwriteicondata.cpp 2007-05-19 08:47:22.000000000 +0200
+@@ -50,7 +50,7 @@
+ ba[i] = r;
+ }
+ QByteArray ret(reinterpret_cast<const char *>(ba), baSize);
+- delete ba;
++ delete [] ba;
+ return ret;
+ }
+
Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/patches/00list 2007-06-08 21:52:11 UTC (rev 6453)
@@ -1,15 +1,18 @@
+00_0163-fix-gcc43-support
+00_0167-fix-group-reading
+00_0175-fix-s390-qatomic
+00_0176-coverity-fixes
01_qmake_for_debian
02_launch_assistant-qt4
03_launch_moc-qt4
-04_utf8_bug_fix
20_mips_atomic_ops
30_arm_ftbfs_fixes
31_arm_eabi_fix
40_alpha_ice
-41_alpha_disable_opengl_visibility
+41_disable_opengl_visibility
50_kfreebsd_build_fix
51_kfreebsd_mkspecs
60_m68k_inotify_fix
70_hppa_ldcw_fix
-71_hppa_inotify_fix
80_hurd_max_path
+
Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.dpatch 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -5,20 +5,20 @@
## DP: No description.
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./tools/assistant/lib/qassistantclient.cpp /home/nelson/tmp/dpep-work.Zny9K3/qt4-x11-4.0.1/tools/assistant/lib/qassistantclient.cpp
---- ./tools/assistant/lib/qassistantclient.cpp 2005-08-16 01:41:14.000000000 -0700
-+++ /home/nelson/tmp/dpep-work.Zny9K3/qt4-x11-4.0.1/tools/assistant/lib/qassistantclient.cpp 2005-09-11 09:01:31.000000000 -0700
-@@ -128,11 +128,11 @@
- : QObject( parent ), host ( "localhost" )
+diff -urNad qt4-x11-4.3.0~rc1~/tools/assistant/lib/qassistantclient.cpp qt4-x11-4.3.0~rc1/tools/assistant/lib/qassistantclient.cpp
+--- qt4-x11-4.3.0~rc1~/tools/assistant/lib/qassistantclient.cpp 2007-05-06 17:54:36.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/assistant/lib/qassistantclient.cpp 2007-05-18 09:43:26.000000000 +0200
+@@ -172,11 +172,11 @@
+ : QObject( parent ), host ( QLatin1String("localhost") )
{
if ( path.isEmpty() )
-- assistantCommand = "assistant";
-+ assistantCommand = "assistant-qt4";
+- assistantCommand = QLatin1String("assistant");
++ assistantCommand = QLatin1String("assistant-qt4");
else {
QFileInfo fi( path );
if ( fi.isDir() )
-- assistantCommand = path + "/assistant";
-+ assistantCommand = path + "/assistant-qt4";
+- assistantCommand = path + QLatin1String("/assistant");
++ assistantCommand = path + QLatin1String("/assistant-qt4");
else
assistantCommand = path;
}
Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.dpatch 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -5,15 +5,15 @@
## DP: Ensure the Qt4 version of moc is launched.
@DPATCH@
-diff -urNad qt4-x11-4.2.2~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp qt4-x11-4.2.2/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
---- qt4-x11-4.2.2~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp 2006-11-27 12:26:30.000000000 -0500
-+++ qt4-x11-4.2.2/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp 2007-03-03 12:53:16.000000000 -0500
-@@ -375,7 +375,7 @@
+diff -urNad qt4-x11-4.3.0~rc1~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp qt4-x11-4.3.0~rc1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+--- qt4-x11-4.3.0~rc1~/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp 2007-05-06 17:54:54.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp 2007-05-18 09:44:18.000000000 +0200
+@@ -376,7 +376,7 @@
else {
// run moc on this file
QProcess proc;
-- proc.start(QLatin1String("moc"), QStringList() << QFile::decodeName(argv[i]));
-+ proc.start(QLatin1String("moc-qt4"), QStringList() << QFile::decodeName(argv[i]));
+- proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
++ proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
if (!proc.waitForStarted()) {
fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");
Deleted: trunk/packages/qt4-x11/debian/patches/04_utf8_bug_fix.dpatch
Deleted: trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch
Copied: trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch (from rev 6441, branches/kde4/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_arm_ftbfs_fixes.dpatch by Fathi Boudra <fboudra at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix arm FTBFS. Add arm target to configure script.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/configure qt4-x11-4.3.0~rc1/configure
+--- qt4-x11-4.3.0~rc1~/configure 2007-05-06 17:54:53.000000000 +0200
++++ qt4-x11-4.3.0~rc1/configure 2007-05-20 16:10:15.000000000 +0200
+@@ -2204,6 +2204,12 @@
+ fi
+ ARCH=s390
+ ;;
++ *:*:arm*)
++ if [ "$OPT_VERBOSE" = "yes" ]; then
++ echo " ARM (arm)"
++ fi
++ ARCH=arm
++ ;;
+ *:*:*)
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " Trying '$UNAME_MACHINE'..."
+diff -urNad qt4-x11-4.3.0~rc1~/tools/qtestlib/src/qtestcase.h qt4-x11-4.3.0~rc1/tools/qtestlib/src/qtestcase.h
+--- qt4-x11-4.3.0~rc1~/tools/qtestlib/src/qtestcase.h 2007-05-06 17:54:35.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/qtestlib/src/qtestcase.h 2007-05-20 16:11:07.000000000 +0200
+@@ -195,7 +195,7 @@
+ template <typename T1, typename T2>
+ bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
+
+-#if defined(QT_COORD_TYPE) || defined(__arm__)
++#if defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM)
+ template <>
+ inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual,
+ const char *expected, const char *file, int line)
Deleted: trunk/packages/qt4-x11/debian/patches/41_alpha_disable_opengl_visibility.dpatch
Copied: trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch (from rev 6441, branches/kde4/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.1.3~/src/opengl/opengl.pro qt4-x11-4.1.3/src/opengl/opengl.pro
+--- qt4-x11-4.1.3~/src/opengl/opengl.pro 2006-05-14 03:46:44.000000000 -0700
++++ qt4-x11-4.1.3/src/opengl/opengl.pro 2006-06-21 10:17:37.000000000 -0700
+@@ -5,6 +5,7 @@
+ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
+ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+
++QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden
+
+ include(../qbase.pri)
+
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -1,14 +1,14 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger at seznam.cz>
+## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger at seznam.cz>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC
+## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
@DPATCH@
-diff -ur qt4-x11-4.2.1/src/corelib/global/qglobal.h qt4-x11-4.2.1/src/corelib/global/qglobal.h
---- qt4-x11-4.2.1/src/corelib/global/qglobal.h 2006-10-20 17:35:14.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/global/qglobal.h 2006-12-06 23:06:11.000000000 +0100
-@@ -101,6 +102,12 @@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h
+--- qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h 2007-05-06 17:54:22.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h 2007-05-18 10:48:20.000000000 +0200
+@@ -110,6 +110,12 @@
# define Q_OS_RELIANT
#elif defined(__linux__) || defined(__linux)
# define Q_OS_LINUX
@@ -21,21 +21,21 @@
#elif defined(__FreeBSD__) || defined(__DragonFly__)
# define Q_OS_FREEBSD
# define Q_OS_BSD4
-@@ -121,8 +128,6 @@
+@@ -130,8 +136,6 @@
# define Q_OS_AIX
#elif defined(__Lynx__)
# define Q_OS_LYNX
--#elif defined(__GNU_HURD__)
+-#elif defined(__GNU__)
-# define Q_OS_HURD
#elif defined(__DGUX__)
# define Q_OS_DGUX
#elif defined(__QNXNTO__)
-diff -ur qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp
---- qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp 2006-10-20 17:35:15.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp 2006-12-07 09:01:45.000000000 +0100
-@@ -248,11 +248,11 @@
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/plugin/qlibrary.cpp qt4-x11-4.3.0~rc1/src/corelib/plugin/qlibrary.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/plugin/qlibrary.cpp 2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/plugin/qlibrary.cpp 2007-05-18 10:50:38.000000000 +0200
+@@ -278,11 +278,11 @@
- #if defined(Q_OS_UNIX)
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
@@ -47,19 +47,19 @@
static long qt_find_pattern(const char *s, ulong s_len,
const char *pattern, ulong p_len)
-diff -ur qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp
---- qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp 2006-10-20 17:35:15.000000000 +0200
-+++ qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp 2006-12-07 09:01:22.000000000 +0100
-@@ -47,7 +47,7 @@
- #include <stdlib.h>
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/tools/qlocale.cpp 2007-05-06 17:54:24.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/tools/qlocale.cpp 2007-05-18 10:51:21.000000000 +0200
+@@ -48,7 +48,7 @@
#include <qdebug.h>
+ #include <time.h>
-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
# include <fenv.h>
#endif
-@@ -5639,7 +5639,7 @@
+@@ -5906,7 +5906,7 @@
_control87(MCW_EM, MCW_EM);
#endif
@@ -68,7 +68,7 @@
fenv_t envp;
feholdexcept(&envp);
#endif
-@@ -5655,7 +5655,7 @@
+@@ -5922,7 +5922,7 @@
#endif //_M_X64
#endif //Q_OS_WIN
Deleted: trunk/packages/qt4-x11/debian/patches/71_hppa_inotify_fix.dpatch
Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch 2007-06-08 21:52:11 UTC (rev 6453)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad qt4-x11-4.2.2~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.2.2/src/corelib/io/qfsfileengine_unix.cpp
---- qt4-x11-4.2.2~/src/corelib/io/qfsfileengine_unix.cpp 2006-11-27 12:26:06.000000000 -0500
-+++ qt4-x11-4.2.2/src/corelib/io/qfsfileengine_unix.cpp 2007-03-04 10:50:03.000000000 -0500
+diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.3.0~rc1~/src/corelib/io/qfsfileengine_unix.cpp 2007-05-06 17:54:23.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/corelib/io/qfsfileengine_unix.cpp 2007-05-18 11:11:35.000000000 +0200
@@ -40,6 +40,10 @@
# include <private/qcore_mac_p.h>
#endif
@@ -16,6 +16,6 @@
+#define PATH_MAX 4096
+#endif
+
- void QFSFileEnginePrivate::init()
- {
- }
+ /*!
+ \internal
+
Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.install
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.install 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.install 2007-06-08 21:52:11 UTC (rev 6453)
@@ -1,3 +1,5 @@
usr/bin/assistant-qt4
usr/bin/linguist-qt4
+usr/bin/qdbusviewer
+usr/bin/pixeltool
usr/share/qt4/phrasebooks/*
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2007-06-08 21:35:54 UTC (rev 6452)
+++ trunk/packages/qt4-x11/debian/rules 2007-06-08 21:52:11 UTC (rev 6453)
@@ -7,9 +7,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/utils.mk
DEB_MAKE_INVOKE := $(MAKE)
-DEB_MAKE_BUILD_TARGET := sub-src sub-tools
+DEB_MAKE_BUILD_TARGET := sub-src sub-tools
DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
@@ -20,8 +21,10 @@
DEB_MAKE_CLEAN_TARGET := confclean distclean
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_INSTALL_CHANGELOGS_ALL := changes-4.2.3
+DEB_DH_STRIP_ARGS_libqt4-debug := -X.debug
+DEB_INSTALL_CHANGELOGS_ALL := changes-4.3.0
+
ifeq ($(DEB_HOST_ARCH),arm)
EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
@@ -32,7 +35,6 @@
PLATFORM_ARG = glibc-g++
endif
-
common-configure-arch::
./configure -confirm-license \
-prefix "/usr" \
@@ -43,7 +45,6 @@
-translationdir "/usr/share/qt4/translations" \
-sysconfdir "/etc/xdg" \
-platform $(PLATFORM_ARG) \
- -debug-and-release \
-fast \
-no-rpath \
-system-zlib \
@@ -53,12 +54,18 @@
-qt-gif \
-qt-sql-psql \
-qt-sql-mysql \
- -qt-sql-sqlite \
+ -qt-sql-sqlite \
-system-sqlite \
-qt-sql-sqlite2 \
-I/usr/include/freetype2 \
-lfontconfig \
-cups \
+ -no-exceptions \
+ -debug \
+ -qdbus \
+ -pch \
+ -nomake examples \
+ -nomake demos \
$(EXTRA_CONFIGURE_OPTS)
clean::
@@ -76,6 +83,11 @@
rm -rf lib/ plugins/
+ find . -exec file {} \; | grep ELF | sed 's/:.*//' | xargs rm -f
+ rm -f examples/tools/plugandpaint/plugins/libpnp_basictools.a
+ rm -f examples/qdbus/complexpingpong/Makefile*
+ rm -f examples/qdbus/pingpong/Makefile*
+
find include/ -type l -print0 | xargs -0r rm -f
find . -mindepth 2 -name Makefile -print0 \
-o -name Makefile.Debug -print0 \
@@ -85,7 +97,6 @@
# Hack to fix dpatch-edit-patch
unpatch: deapply-dpatches
-
BINDIR := $(DEB_DESTDIR)/usr/bin
common-install-arch::
# Tack on -qt4 to the binaries that use the alternatives system
@@ -93,6 +104,20 @@
mv "$(BINDIR)/$$f" "$(BINDIR)/$$f-qt4"; \
done
+install/qt4-designer::
+ install -D -p -m0644 debian/desktop/designer-qt4.desktop \
+ debian/qt4-designer/usr/share/applications/designer-qt4.desktop
+
+install/qt4-dev-tools::
+ install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
+ debian/qt4-dev-tools/usr/share/applications/assistant-qt4.desktop
+ install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
+ debian/qt4-dev-tools/usr/share/applications/linguist-qt4.desktop
+
+install/qt4-qtconfig::
+ install -D -p -m0644 debian/desktop/qt4config.desktop \
+ debian/qt4-qtconfig/usr/share/applications/qt4config.desktop
+
binary-install/qt4-doc::
# Tar up the examples to include them in qt4-doc
-$(MAKE) -k -C examples distclean
More information about the pkg-kde-commits
mailing list