reverted: --- qt4-x11-4.2.3/debian/patches/70_hppa_ldcw_fix.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/70_hppa_ldcw_fix.dpatch @@ -1,30 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 15_hppa_ldcw.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: patch from Ubuntu to properly support hppa - -@DPATCH@ -diff -urNad qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s ---- qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s 2006-02-03 01:50:30.000000000 +0000 -+++ qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s 2006-02-03 02:00:36.000000000 +0000 -@@ -1,17 +1,7 @@ -- .SPACE $PRIVATE$ -- .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 -- .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 -- .SPACE $TEXT$ -- .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44 -- .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY -- .IMPORT $global$,DATA -- .IMPORT $$dyncall,MILLICODE -- .SPACE $TEXT$ -- .SUBSPA $CODE$ -- -+ .text - .align 4 - .EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR --q_ldcw -+ .label q_ldcw - .PROC - .CALLINFO FRAME=0,CALLS,SAVE_RP - .ENTRY reverted: --- qt4-x11-4.2.3/debian/patches/50_kfreebsd_build_fix.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/50_kfreebsd_build_fix.dpatch @@ -1,79 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 14_kfreebsd_build_fix.dpatch by Petr Salinger -## -## All lines beginning with `## DP:' are a description of the patch. -## 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 @@ - # define Q_OS_RELIANT - #elif defined(__linux__) || defined(__linux) - # define Q_OS_LINUX -+# define Q_OS_GLIBC -+#elif defined(__GNU_HURD__) || defined(__GNU__) -+# define Q_OS_HURD -+# define Q_OS_GLIBC -+#elif defined(__GLIBC__) -+# define Q_OS_GLIBC - #elif defined(__FreeBSD__) || defined(__DragonFly__) - # define Q_OS_FREEBSD - # define Q_OS_BSD4 -@@ -121,8 +128,6 @@ - # define Q_OS_AIX - #elif defined(__Lynx__) - # define Q_OS_LYNX --#elif defined(__GNU_HURD__) --# 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 @@ - - #if defined(Q_OS_UNIX) - --#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX) -+#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC) - # define USE_MMAP - # include - # include --#endif // Q_OS_FREEBSD || Q_OS_LINUX -+#endif // Q_OS_FREEBSD || Q_OS_GLIBC - - 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 - #include - --#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) -+#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) - # include - #endif - -@@ -5639,7 +5639,7 @@ - _control87(MCW_EM, MCW_EM); - #endif - --#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) -+#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) - fenv_t envp; - feholdexcept(&envp); - #endif -@@ -5655,7 +5655,7 @@ - #endif //_M_X64 - #endif //Q_OS_WIN - --#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) -+#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) - fesetenv(&envp); - #endif - reverted: --- qt4-x11-4.2.3/debian/patches/51_kfreebsd_mkspecs.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/51_kfreebsd_mkspecs.dpatch @@ -1,25 +0,0 @@ -#! /bin/sh -e -## 90_kfreebsd_mkspecs.dpatch by Petr Salinger -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD -## DP: we cannot use directly linux-g++ due to src/corelib/io/io.pri - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - rm -rvf mkspecs/glibc-g++ - cp -av mkspecs/linux-g++ mkspecs/glibc-g++ - ;; - -unpatch) - rm -rvf mkspecs/glibc-g++ - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 reverted: --- qt4-x11-4.2.3/debian/patches/03_launch_moc-qt4.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/03_launch_moc-qt4.dpatch @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 22_launch_moc-qt4.dpatch by Brian Nelson -## -## All lines beginning with `## DP:' are a description of the patch. -## 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 @@ - 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])); - - if (!proc.waitForStarted()) { - fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n"); reverted: --- qt4-x11-4.2.3/debian/patches/20_mips_atomic_ops.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/20_mips_atomic_ops.dpatch @@ -1,66 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_mips_atomic_ops.dpatch by Thiemo Seufer -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix compilation for Linux MIPS-I code. - -@DPATCH@ -diff -urNad qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s ---- qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s 2005-12-16 03:52:19.000000000 -0800 -+++ qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s 2006-01-16 10:39:45.000000000 -0800 -@@ -6,10 +6,12 @@ - .globl q_atomic_test_and_set_int - .ent q_atomic_test_and_set_int - q_atomic_test_and_set_int: -+ .set mips2 - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) -+ .set mips0 - beqz $2,1b - nop - jr $31 -@@ -21,6 +23,7 @@ - .globl q_atomic_test_and_set_acquire_int - .ent q_atomic_test_and_set_acquire_int - q_atomic_test_and_set_acquire_int: -+ .set mips2 - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 -@@ -30,6 +33,7 @@ - jr $31 - nop - 2: sync -+ .set mips0 - jr $31 - move $2,$0 - .end q_atomic_test_and_set_acquire_int -@@ -37,11 +41,13 @@ - .globl q_atomic_test_and_set_release_int - .ent q_atomic_test_and_set_release_int - q_atomic_test_and_set_release_int: -+ .set mips2 - sync - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) -+ .set mips0 - beqz $2,1b - nop - jr $31 -@@ -53,10 +59,12 @@ - .globl q_atomic_test_and_set_ptr - .ent q_atomic_test_and_set_ptr - q_atomic_test_and_set_ptr: -+ .set mips2 - 1: ll $8,0($4) - bne $8,$5,2f - move $2,$6 - sc $2,0($4) -+ .set mips0 - beqz $2,1b - nop - jr $31 reverted: --- qt4-x11-4.2.3/debian/patches/41_alpha_disable_opengl_visibility.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/41_alpha_disable_opengl_visibility.dpatch @@ -1,17 +0,0 @@ -#! /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. - -@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) - reverted: --- qt4-x11-4.2.3/debian/patches/80_hurd_max_path.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/80_hurd_max_path.dpatch @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 80_hurd_max_path.dpatch by Brian Nelson -## -## All lines beginning with `## DP:' are a description of the patch. -## 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 -@@ -40,6 +40,10 @@ - # include - #endif - -+#ifndef PATH_MAX -+#define PATH_MAX 4096 -+#endif -+ - void QFSFileEnginePrivate::init() - { - } reverted: --- qt4-x11-4.2.3/debian/patches/04_utf8_bug_fix.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/04_utf8_bug_fix.dpatch @@ -1,141 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_utf8_bug_fix.dpatch by Brian Nelson -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt4-x11-4.2.2~/src/corelib/codecs/qutfcodec.cpp qt4-x11-4.2.2/src/corelib/codecs/qutfcodec.cpp ---- qt4-x11-4.2.2~/src/corelib/codecs/qutfcodec.cpp 2006-11-27 12:26:05.000000000 -0500 -+++ qt4-x11-4.2.2/src/corelib/codecs/qutfcodec.cpp 2007-03-30 10:38:53.000000000 -0400 -@@ -127,15 +127,19 @@ - bool headerdone = false; - QChar replacement = QChar::ReplacementCharacter; - int need = 0; -+ int error = -1; - uint uc = 0; -+ uint min_uc = 0; - if (state) { - if (state->flags & IgnoreHeader) - headerdone = true; - if (state->flags & ConvertInvalidToNull) - replacement = QChar::Null; - need = state->remainingChars; -- if (need) -+ if (need) { - uc = state->state_data[0]; -+ min_uc = state->state_data[1]; -+ } - } - if (!headerdone && len > 3 - && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) { -@@ -152,7 +156,7 @@ - int invalid = 0; - - for (int i=0; i= result.size()) { -+ result.resize(where + 2); -+ qch = result.data() + where; -+ } -+ - *qch++ = QChar(high); - *qch++ = QChar(low); -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // error -+ *qch++ = QChar::ReplacementCharacter; -+ ++invalid; - } else { - *qch++ = uc; - } - } - } else { - // error -+ i = error; - *qch++ = QChar::ReplacementCharacter; - ++invalid; - need = 0; -@@ -181,12 +198,22 @@ - } else if ((ch & 0xe0) == 0xc0) { - uc = ch & 0x1f; - need = 1; -+ error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; -+ error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; -+ error = i; -+ min_uc = 0x10000; -+ } else { -+ // error -+ *qch++ = QChar::ReplacementCharacter; -+ ++invalid; - } - } - } -@@ -197,6 +224,7 @@ - if (headerdone) - state->flags |= IgnoreHeader; - state->state_data[0] = need ? uc : 0; -+ state->state_data[1] = need ? min_uc : 0; - } - return result; - } -diff -urNad qt4-x11-4.2.2~/src/corelib/tools/qstring.cpp qt4-x11-4.2.2/src/corelib/tools/qstring.cpp ---- qt4-x11-4.2.2~/src/corelib/tools/qstring.cpp 2006-11-27 12:26:07.000000000 -0500 -+++ qt4-x11-4.2.2/src/corelib/tools/qstring.cpp 2007-03-30 10:38:53.000000000 -0400 -@@ -3352,6 +3352,7 @@ - result.resize(size); // worst case - ushort *qch = result.d->data; - uint uc = 0; -+ uint min_uc = 0; - int need = 0; - int error = -1; - uchar ch; -@@ -3369,6 +3370,12 @@ - ushort low = uc%0x400 + 0xdc00; - *qch++ = high; - *qch++ = low; -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // overlong seqence, UTF16 surrogate or BOM -+ i = error; -+ qch = addOne(qch, result); -+ *qch++ = 0xdbff; -+ *qch++ = 0xde00 + ((uchar)str[i]); - } else { - *qch++ = uc; - } -@@ -3391,14 +3398,17 @@ - uc = ch & 0x1f; - need = 1; - error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; - error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; - error = i; -+ min_uc = 0x10000; - } else { - // Error - qch = addOne(qch, result); reverted: --- qt4-x11-4.2.3/debian/patches/60_m68k_inotify_fix.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/60_m68k_inotify_fix.dpatch @@ -1,23 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 19_m68k_inotify_fix.dpatch by Brian Nelson -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: From Roman Zippel : These defines are -## DP: taken from the m68k tree, they should appear like this soon also -## DP: in the upstream source. - -@DPATCH@ -diff -urNad qt4-x11-4.2.2~/src/corelib/io/qfilesystemwatcher_inotify.cpp qt4-x11-4.2.2/src/corelib/io/qfilesystemwatcher_inotify.cpp ---- qt4-x11-4.2.2~/src/corelib/io/qfilesystemwatcher_inotify.cpp 2006-11-27 12:26:05.000000000 -0500 -+++ qt4-x11-4.2.2/src/corelib/io/qfilesystemwatcher_inotify.cpp 2007-03-03 12:30:28.000000000 -0500 -@@ -88,6 +88,10 @@ - # define __NR_inotify_init 269 - # define __NR_inotify_add_watch 270 - # define __NR_inotify_rm_watch 271 -+#elif defined (__mc68000__) -+# define __NR_inotify_init 284 -+# define __NR_inotify_add_watch 285 -+# define __NR_inotify_rm_watch 286 - #else - # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com" - #endif reverted: --- qt4-x11-4.2.3/debian/patches/30_arm_ftbfs_fixes.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/30_arm_ftbfs_fixes.dpatch @@ -1,23 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 13_arm_ftbfs_fixes.dpatch by Brian Nelson by way of -## Jeremy Laine . -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes FTBFS on arm - -@DPATCH@ -diff -urNad qt4-x11-4.2.0~/src/corelib/global/qglobal.h qt4-x11-4.2.0/src/corelib/global/qglobal.h ---- qt4-x11-4.2.0~/src/corelib/global/qglobal.h 2006-10-05 21:46:36.000000000 -0400 -+++ qt4-x11-4.2.0/src/corelib/global/qglobal.h 2006-10-05 21:46:44.000000000 -0400 -@@ -792,8 +792,9 @@ - - #if defined(QT_COORD_TYPE) - typedef QT_COORD_TYPE qreal; --#elif defined(__arm__) --typedef float qreal; -+// BN: Defining qreal as float on arm breaks compilation! -+//#elif defined(__arm__) -+//typedef float qreal; - #else - typedef double qreal; - #endif reverted: --- qt4-x11-4.2.3/debian/patches/71_hppa_inotify_fix.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/71_hppa_inotify_fix.dpatch @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_hppa_inotify_fix.dpatch by Brian Nelson -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt4-x11-4.2.1~/src/corelib/io/qfilesystemwatcher_inotify.cpp qt4-x11-4.2.1/src/corelib/io/qfilesystemwatcher_inotify.cpp ---- qt4-x11-4.2.1~/src/corelib/io/qfilesystemwatcher_inotify.cpp 2006-10-24 12:10:36.000000000 -0400 -+++ qt4-x11-4.2.1/src/corelib/io/qfilesystemwatcher_inotify.cpp 2006-10-24 12:16:35.000000000 -0400 -@@ -88,6 +88,10 @@ - # define __NR_inotify_init 284 - # define __NR_inotify_add_watch 285 - # define __NR_inotify_rm_watch 286 -+#elif defined (__hppa__) -+# define __NR_inotify_init 269 -+# define __NR_inotify_add_watch 270 -+# define __NR_inotify_rm_watch 271 - #else - # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com" - #endif reverted: --- qt4-x11-4.2.3/debian/patches/01_qmake_for_debian.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/01_qmake_for_debian.dpatch @@ -1,34 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_qmake_use_qt4_tools.dpatch by Brian Nelson -## -## 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. - -@DPATCH@ -diff -urNad qt4-x11-4.2.1~/mkspecs/common/linux.conf qt4-x11-4.2.1/mkspecs/common/linux.conf ---- qt4-x11-4.2.1~/mkspecs/common/linux.conf 2006-10-20 11:35:09.000000000 -0400 -+++ qt4-x11-4.2.1/mkspecs/common/linux.conf 2006-10-30 22:24:57.000000000 -0500 -@@ -19,8 +19,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.2.1~/mkspecs/linux-g++/qmake.conf qt4-x11-4.2.1/mkspecs/linux-g++/qmake.conf ---- qt4-x11-4.2.1~/mkspecs/linux-g++/qmake.conf 2006-10-20 11:35:55.000000000 -0400 -+++ qt4-x11-4.2.1/mkspecs/linux-g++/qmake.conf 2006-10-30 22:25:28.000000000 -0500 -@@ -4,7 +4,7 @@ - - MAKEFILE_GENERATOR = UNIX - TEMPLATE = app --CONFIG += qt warn_on release incremental link_prl -+CONFIG += qt warn_on release incremental - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - reverted: --- qt4-x11-4.2.3/debian/patches/40_alpha_ice.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/40_alpha_ice.dpatch @@ -1,53 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt4-x11-4.1.3~/src/corelib/global/qlibraryinfo.cpp qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp ---- qt4-x11-4.1.3~/src/corelib/global/qlibraryinfo.cpp 2006-05-14 03:46:59.000000000 -0700 -+++ qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp 2006-06-03 11:55:29.000000000 -0700 -@@ -47,14 +47,7 @@ - { - public: - static QSettings *findConfiguration(); -- static void cleanup() -- { -- QLibrarySettings *ls = qt_library_settings(); -- if (ls) { -- delete static_cast(ls->settings); -- ls->settings = 0; -- } -- } -+ static void cleanup(); - static QSettings *configuration() - { - #ifdef QT_NO_THREAD -@@ -75,6 +68,15 @@ - Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings) - }; - -+void QLibraryInfoPrivate::cleanup() -+{ -+ QLibrarySettings *ls = qt_library_settings(); -+ if (ls) { -+ delete static_cast(ls->settings); -+ ls->settings = 0; -+ } -+} -+ - QLibrarySettings::QLibrarySettings() - { - settings = QLibraryInfoPrivate::findConfiguration(); -diff -urNad qt4-x11-4.1.3~/src/corelib/tools/qhash.h qt4-x11-4.1.3/src/corelib/tools/qhash.h ---- qt4-x11-4.1.3~/src/corelib/tools/qhash.h 2006-05-14 03:46:59.000000000 -0700 -+++ qt4-x11-4.1.3/src/corelib/tools/qhash.h 2006-06-03 11:55:29.000000000 -0700 -@@ -405,7 +405,7 @@ - } - - template --Q_INLINE_TEMPLATE void QHash::duplicateNode(QHashData::Node *node, void *newNode) -+void QHash::duplicateNode(QHashData::Node *node, void *newNode) - { - Node *concreteNode = concrete(node); - if (QTypeInfo::isDummy) { reverted: --- qt4-x11-4.2.3/debian/patches/31_arm_eabi_fix.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/31_arm_eabi_fix.dpatch @@ -1,36 +0,0 @@ -#! /bin/sh -e -## 90_armeabi.dpatch.dpatch by Lennert Buytenhek -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Add support for EABI ARM platforms to Qt. - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- qt4-x11-4.2.1/src/corelib/global/qglobal.h.orig 2007-01-04 23:57:34.000000000 +0000 -+++ qt4-x11-4.2.1/src/corelib/global/qglobal.h 2007-01-04 23:58:06.000000000 +0000 -@@ -290,7 +290,7 @@ - # if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3) - # define Q_BROKEN_DEBUG_STREAM - # endif --# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) -+# if (defined(__arm__) || defined(__ARMEL__)) && !defined(__ARM_EABI__) && !defined(QT_MOC_CPP) - # define Q_PACKED __attribute__ ((__packed__)) - # define Q_NO_PACKED_REFERENCE - # endif diff -u qt4-x11-4.2.3/debian/patches/00list qt4-x11-4.2.3/debian/patches/00list --- qt4-x11-4.2.3/debian/patches/00list +++ qt4-x11-4.2.3/debian/patches/00list @@ -1,18 +1,10 @@ -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 -50_kfreebsd_build_fix -51_kfreebsd_mkspecs -60_m68k_inotify_fix -70_hppa_ldcw_fix -71_hppa_inotify_fix -80_hurd_max_path +10_qmake_for_debian +11_launch_assistant-qt4 +12_mips_atomic_ops +13_arm_ftbfs_fixes +14_kfreebsd_build_fix +16_hppa_ldcw_fix +17_alpha_ice +18_disable_opengl_visibility +21_hurd_detection kubuntu_01_file_dialogue -kubuntu_02_qlocale_workaround_patch - reverted: --- qt4-x11-4.2.3/debian/patches/02_launch_assistant-qt4.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/02_launch_assistant-qt4.dpatch @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_launch_assistant-qt4.dpatch by Brian Nelson -## -## All lines beginning with `## DP:' are a description of the patch. -## 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" ) - { - if ( path.isEmpty() ) -- assistantCommand = "assistant"; -+ assistantCommand = "assistant-qt4"; - else { - QFileInfo fi( path ); - if ( fi.isDir() ) -- assistantCommand = path + "/assistant"; -+ assistantCommand = path + "/assistant-qt4"; - else - assistantCommand = path; - } reverted: --- qt4-x11-4.2.3/debian/patches/kubuntu_02_qlocale_workaround_patch.dpatch +++ qt4-x11-4.2.3.orig/debian/patches/kubuntu_02_qlocale_workaround_patch.dpatch @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## kubuntu_02_qlocale_workaround_patch.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad qt4-x11-4.2.3~/src/corelib/tools/qlocale.cpp qt4-x11-4.2.3/src/corelib/tools/qlocale.cpp ---- qt4-x11-4.2.3~/src/corelib/tools/qlocale.cpp 2007-04-30 13:13:52.000000000 +0100 -+++ qt4-x11-4.2.3/src/corelib/tools/qlocale.cpp 2007-04-30 13:14:52.000000000 +0100 -@@ -53,7 +53,7 @@ - - #if !defined(QT_QLOCALE_NEEDS_VOLATILE) - # if defined(Q_CC_GNU) --# if __GNUC__ == 4 && __GNUC_MINOR__ == 0 -+# if __GNUC__ == 4 - # define QT_QLOCALE_NEEDS_VOLATILE - # elif defined(Q_OS_WIN) - # define QT_QLOCALE_NEEDS_VOLATILE diff -u qt4-x11-4.2.3/debian/control qt4-x11-4.2.3/debian/control --- qt4-x11-4.2.3/debian/control +++ qt4-x11-4.2.3/debian/control @@ -1,8 +1,7 @@ Source: qt4-x11 Section: libs Priority: optional -Maintainer: Jonathan Riddell -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Maintainer: Debian Qt/KDE Maintainers Uploaders: Brian Nelson Build-Depends: debhelper (>= 5.0.0), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, cdbs (>= 0.4.0), dpatch, libxinerama-dev, libsqlite0-dev, libsqlite3-dev, libdbus-1-dev, libglib2.0-dev Standards-Version: 3.7.2 diff -u qt4-x11-4.2.3/debian/libqt4-dev.install qt4-x11-4.2.3/debian/libqt4-dev.install --- qt4-x11-4.2.3/debian/libqt4-dev.install +++ qt4-x11-4.2.3/debian/libqt4-dev.install @@ -13,6 +13,7 @@ usr/bin/qt3to4 usr/bin/rcc usr/bin/uic3 +usr/bin/pixeltool usr/bin/qtdemo usr/bin/qdbusxml2cpp usr/bin/qdbuscpp2xml reverted: --- qt4-x11-4.2.3/debian/qt4-designer.links +++ qt4-x11-4.2.3.orig/debian/qt4-designer.links @@ -1 +0,0 @@ -usr/bin/designer-qt4 usr/share/qt4/bin/designer diff -u qt4-x11-4.2.3/debian/libqt4-gui.install qt4-x11-4.2.3/debian/libqt4-gui.install --- qt4-x11-4.2.3/debian/libqt4-gui.install +++ qt4-x11-4.2.3/debian/libqt4-gui.install @@ -10,2 +10,2 @@ -usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so usr/lib/qt4/plugins/codecs/*.so +usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so diff -u qt4-x11-4.2.3/debian/changelog qt4-x11-4.2.3/debian/changelog --- qt4-x11-4.2.3/debian/changelog +++ qt4-x11-4.2.3/debian/changelog @@ -1,61 +1,8 @@ -qt4-x11 (4.2.3-1ubuntu2) gutsy; urgency=low +qt4-x11 (4.2.3-0ubuntu4) gutsy; urgency=low - * Add kubuntu_02_qlocale_workaround_patch.dpatch from Trolltech - fixes miscompilation in qlocale.cpp in Qt 4 that can lead to - incorrect conversions from strings to numbers. + * Added a .desktop and an icon for qt4-designer (LP: #117045) - -- Jonathan Riddell Mon, 30 Apr 2007 13:18:11 +0100 - -qt4-x11 (4.2.3-1ubuntu1) gutsy; urgency=low - - * Merge with Debian - - -- Jonathan Riddell Fri, 27 Apr 2007 15:21:23 +0100 - -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 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 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 Sun, 4 Mar 2007 13:50:39 -0500 + -- Siegfried-Angel Gevatter Pujals (RainCT) Sat, 26 May 2007 22:26:39 +0200 qt4-x11 (4.2.3-0ubuntu3) feisty; urgency=low reverted: --- qt4-x11-4.2.3/debian/qt4-doc.doc-base +++ qt4-x11-4.2.3.orig/debian/qt4-doc.doc-base @@ -1,11 +0,0 @@ -Document: qt4-doc -Title: Qt4 Reference Documentation -Author: Trolltech AS -Abstract: Qt is a cross-platform C++ application framework. Qt's - primary feature is its rich set of widgets that provide standard GUI - functionality. -Section: Apps/Programming - -Format: HTML -Index: /usr/share/doc/qt4-doc/html/index.html -Files: /usr/share/doc/qt4-doc/html/*.html diff -u qt4-x11-4.2.3/debian/rules qt4-x11-4.2.3/debian/rules --- qt4-x11-4.2.3/debian/rules +++ qt4-x11-4.2.3/debian/rules @@ -26,13 +26,6 @@ EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif -ifeq ($(DEB_HOST_ARCH_OS),linux) - PLATFORM_ARG = linux-g++ -else - PLATFORM_ARG = glibc-g++ -endif - - common-configure-arch:: ./configure -confirm-license \ -prefix "/usr" \ @@ -41,8 +34,8 @@ -datadir "/usr/share/qt4" \ -plugindir "/usr/lib/qt4/plugins" \ -translationdir "/usr/share/qt4/translations" \ - -sysconfdir "/etc/xdg" \ - -platform $(PLATFORM_ARG) \ + -sysconfdir "/etc/qt4" \ + -platform linux-g++ \ -debug-and-release \ -fast \ -no-rpath \ diff -u qt4-x11-4.2.3/debian/qt4-designer.install qt4-x11-4.2.3/debian/qt4-designer.install --- qt4-x11-4.2.3/debian/qt4-designer.install +++ qt4-x11-4.2.3/debian/qt4-designer.install @@ -2,0 +3,2 @@ +debian/qt4-designer.desktop usr/share/applications/ +debian/qt4-designer.xpm usr/share/pixmaps/ reverted: --- qt4-x11-4.2.3/Qt-4.2.3-UTF-8-fix.diff +++ qt4-x11-4.2.3.orig/Qt-4.2.3-UTF-8-fix.diff @@ -1,133 +0,0 @@ ---- src/corelib/codecs/qutfcodec.cpp Fri Mar 30 06:06:30 2007 -+++ src/corelib/codecs/qutfcodec.cpp Fri Mar 30 06:06:30 2007 -@@ -117,15 +117,19 @@ - bool headerdone = false; - QChar replacement = QChar::ReplacementCharacter; - int need = 0; -+ int error = -1; - uint uc = 0; -+ uint min_uc = 0; - if (state) { - if (state->flags & IgnoreHeader) - headerdone = true; - if (state->flags & ConvertInvalidToNull) - replacement = QChar::Null; - need = state->remainingChars; -- if (need) -+ if (need) { - uc = state->state_data[0]; -+ min_uc = state->state_data[1]; -+ } - } - if (!headerdone && len > 3 - && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) { -@@ -142,7 +146,7 @@ - int invalid = 0; - - for (int i=0; i= result.size()) { -+ result.resize(where + 2); -+ qch = result.data() + where; -+ } -+ - *qch++ = QChar(high); - *qch++ = QChar(low); -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // error -+ *qch++ = QChar::ReplacementCharacter; -+ ++invalid; - } else { - *qch++ = uc; - } - } - } else { - // error -+ i = error; - *qch++ = QChar::ReplacementCharacter; - ++invalid; - need = 0; -@@ -171,12 +188,22 @@ - } else if ((ch & 0xe0) == 0xc0) { - uc = ch & 0x1f; - need = 1; -+ error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; -+ error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; -+ error = i; -+ min_uc = 0x10000; -+ } else { -+ // error -+ *qch++ = QChar::ReplacementCharacter; -+ ++invalid; - } - } - } -@@ -187,6 +214,7 @@ - if (headerdone) - state->flags |= IgnoreHeader; - state->state_data[0] = need ? uc : 0; -+ state->state_data[1] = need ? min_uc : 0; - } - return result; - } - ---- src/corelib/tools/qstring.cpp Fri Mar 30 06:06:30 2007 -+++ src/corelib/tools/qstring.cpp Fri Mar 30 06:06:30 2007 -@@ -3342,6 +3342,7 @@ - result.resize(size); // worst case - ushort *qch = result.d->data; - uint uc = 0; -+ uint min_uc = 0; - int need = 0; - int error = -1; - uchar ch; -@@ -3359,6 +3360,12 @@ - ushort low = uc%0x400 + 0xdc00; - *qch++ = high; - *qch++ = low; -+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { -+ // overlong seqence, UTF16 surrogate or BOM -+ i = error; -+ qch = addOne(qch, result); -+ *qch++ = 0xdbff; -+ *qch++ = 0xde00 + ((uchar)str[i]); - } else { - *qch++ = uc; - } -@@ -3381,14 +3388,17 @@ - uc = ch & 0x1f; - need = 1; - error = i; -+ min_uc = 0x80; - } else if ((ch & 0xf0) == 0xe0) { - uc = ch & 0x0f; - need = 2; - error = i; -+ min_uc = 0x800; - } else if ((ch&0xf8) == 0xf0) { - uc = ch & 0x07; - need = 3; - error = i; -+ min_uc = 0x10000; - } else { - // Error - qch = addOne(qch, result); only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/qt4-designer.desktop +++ qt4-x11-4.2.3/debian/qt4-designer.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=Qt Designer +GenericName=Qt Interface Designer +GenericName[ca]=Dissenyador d'interfícies Qt +Comment=Create or edit GUI designs for Qt applications +Comment[ca]=Creeu o obriu dissenys d'interfícies d'usuari per a aplicacions Qt +Icon=qt4-designer +TryExec=designer-qt4 +Exec=designer-qt4 +Terminal=false +MimeType= +Categories=Application;Development; only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/qt4-designer.xpm +++ qt4-x11-4.2.3/debian/qt4-designer.xpm @@ -0,0 +1,539 @@ +/* XPM */ +static char * qt4_designer_xpm[] = { +"32 32 504 2", +" c None", +". c #8CAC52", +"+ c #AFC980", +"@ c #CBD6B7", +"# c #838C72", +"$ c #71A517", +"% c #88C71C", +"& c #87C61B", +"* c #88C222", +"= c #8EBB40", +"- c #AAC876", +"; c #C7D5AD", +"> c #D8DAD6", +", c #344511", +"' c #A0D629", +") c #B2E230", +"! c #A6DB2A", +"~ c #9BD325", +"{ c #8FCA20", +"] c #87C71B", +"^ c #87C41F", +"/ c #8CBA3B", +"( c #A6C56E", +"_ c #C2D2A6", +": c #DFE2D9", +"< c #6B7557", +"[ c #2E4109", +"} c #B0E037", +"| c #C6EF44", +"1 c #C6EF40", +"2 c #C6F03F", +"3 c #C6F03C", +"4 c #C1EC39", +"5 c #B4E431", +"6 c #A8DC2B", +"7 c #8DC91F", +"8 c #87C61C", +"9 c #8ABB34", +"0 c #A2C367", +"a c #BED19C", +"b c #DBDED2", +"c c #46542A", +"d c #71A616", +"e c #B4E23F", +"f c #C4ED4C", +"g c #C4ED4B", +"h c #C4EE49", +"i c #C5EE46", +"j c #C5EE45", +"k c #C6EF41", +"l c #C6F03D", +"m c #C0EB3A", +"n c #B0E22F", +"o c #A4D92A", +"p c #95CF22", +"q c #89C61D", +"r c #89BC30", +"s c #9DC05F", +"t c #B9CF92", +"u c #E5EADC", +"v c #B4E148", +"w c #C1E955", +"x c #C2EA52", +"y c #C2EA51", +"z c #C2EB50", +"A c #C5ED4D", +"B c #C8EE50", +"C c #CAEE51", +"D c #CAEF50", +"E c #C9EF4D", +"F c #C8EF49", +"G c #C6EF42", +"H c #C5EF3C", +"I c #B8E635", +"J c #94CE22", +"K c #AEC97C", +"L c #B2DE4C", +"M c #BEE658", +"N c #BEE657", +"O c #C1E856", +"P c #C3E959", +"Q c #CDEE5E", +"R c #D0EF5F", +"S c #BCDB5A", +"T c #B0CE57", +"U c #AFCE51", +"V c #BDDE54", +"W c #CDEF57", +"X c #C5EE48", +"Y c #BEE93E", +"Z c #AECA7C", +"` c #B2DE4D", +" . c #BBE35A", +".. c #C2E560", +"+. c #CCEB66", +"@. c #B9D462", +"#. c #8BA456", +"$. c #819A54", +"%. c #819A53", +"&. c #819A52", +"*. c #819B4E", +"=. c #8FAB51", +"-. c #BFDF5B", +";. c #C7EC57", +">. c #BFE84B", +",. c #AEDB4C", +"'. c #B6DF58", +"). c #B8E159", +"!. c #BDE45C", +"~. c #C6E863", +"{. c #ADC663", +"]. c #7E8D62", +"^. c #839368", +"/. c #839366", +"(. c #829364", +"_. c #829462", +":. c #829560", +"<. c #84985F", +"[. c #839A59", +"}. c #B7D461", +"|. c #C2E75B", +"1. c #BFE757", +"2. c #BFE755", +"3. c #ABD94A", +"4. c #B4DE58", +"5. c #B5DF58", +"6. c #C0E45E", +"7. c #BAD665", +"8. c #808B69", +"9. c #899277", +"0. c #828E6A", +"a. c #98AD63", +"b. c #B9D564", +"c. c #C4E165", +"d. c #B6D063", +"e. c #92A563", +"f. c #84926C", +"g. c #869567", +"h. c #BFDE62", +"i. c #A6D646", +"j. c #ACD951", +"k. c #B3DE57", +"l. c #C2E660", +"m. c #8C9869", +"n. c #8B9080", +"o. c #868B7A", +"p. c #A0B464", +"q. c #BCE25C", +"r. c #BFE45E", +"s. c #C5E663", +"t. c #C8E666", +"u. c #98AB66", +"v. c #8A917C", +"w. c #99AC66", +"x. c #BAE15B", +"y. c #A1D33D", +"z. c #AAD84C", +"A. c #B0DC54", +"B. c #B5D55D", +"C. c #7D7E78", +"D. c #90928C", +"E. c #87916A", +"F. c #BBE15B", +"G. c #B0DC55", +"H. c #B1DC55", +"I. c #BAE25B", +"J. c #92A363", +"K. c #8E9B65", +"L. c #C6E565", +"M. c #8A8F79", +"N. c #888E7C", +"O. c #B5DC59", +"P. c #AEDA52", +"Q. c #99CF34", +"R. c #A3D441", +"S. c #ADDA4C", +"T. c #97B057", +"U. c #7C7D78", +"V. c #7F807C", +"W. c #99B35A", +"X. c #ADDA4D", +"Y. c #A8D748", +"Z. c #B2DD53", +"`. c #96AE5A", +" + c #7C7C78", +".+ c #70716B", +"++ c #A3C059", +"@+ c #96A865", +"#+ c #898986", +"$+ c #A0C058", +"%+ c #94CD29", +"&+ c #9CD13A", +"*+ c #AAD842", +"=+ c #81944C", +"-+ c #70726D", +";+ c #696A66", +">+ c #A3C84A", +",+ c #A4D540", +"'+ c #AAD844", +")+ c #96B54A", +"!+ c #686964", +"~+ c #7A7B75", +"{+ c #798755", +"]+ c #B0DC48", +"^+ c #97B34D", +"/+ c #747671", +"(+ c #8CA84F", +"_+ c #9BD035", +":+ c #8BC91E", +"<+ c #95CD27", +"[+ c #A4D534", +"}+ c #72853A", +"|+ c #5F5F5D", +"1+ c #545453", +"2+ c #9FC936", +"3+ c #A6D731", +"4+ c #95BB37", +"5+ c #50524B", +"6+ c #686865", +"7+ c #656563", +"8+ c #839B40", +"9+ c #AAD934", +"0+ c #8FAF39", +"a+ c #5B5B5A", +"b+ c #789538", +"c+ c #8EC821", +"d+ c #ADC77C", +"e+ c #E1CAC7", +"f+ c #E1D8D6", +"g+ c #9DD229", +"h+ c #718A2C", +"i+ c #4B4B4A", +"j+ c #484747", +"k+ c #91B232", +"l+ c #9BC52E", +"m+ c #393F2A", +"n+ c #4A4A49", +"o+ c #4A4A4A", +"p+ c #50504F", +"q+ c #43453F", +"r+ c #8FB031", +"s+ c #7E9832", +"t+ c #759A28", +"u+ c #84BE1E", +"v+ c #AAC27D", +"w+ c #E6DEDD", +"x+ c #F1BFBB", +"y+ c #FAC2BE", +"z+ c #F8B0AB", +"A+ c #D8B5B2", +"B+ c #8AC81E", +"C+ c #99CF27", +"D+ c #87AA2C", +"E+ c #393938", +"F+ c #424241", +"G+ c #687D2C", +"H+ c #A4CA33", +"I+ c #363B28", +"J+ c #333330", +"K+ c #8CAB30", +"L+ c #4B5430", +"M+ c #434342", +"N+ c #3D4032", +"O+ c #4C572F", +"P+ c #3B3B3A", +"Q+ c #82B125", +"R+ c #7BB01D", +"S+ c #A7BB7D", +"T+ c #F0B2AE", +"U+ c #F0938C", +"V+ c #F6A9A4", +"W+ c #F7A19A", +"X+ c #F5938B", +"Y+ c #E1CBC9", +"Z+ c #94CD24", +"`+ c #A8D630", +" @ c #343729", +".@ c #3B3A3A", +"+@ c #31332A", +"@@ c #A2C832", +"#@ c #9BC130", +"$@ c #719025", +"%@ c #ABDA30", +"&@ c #A4CC32", +"*@ c #3A4029", +"=@ c #3C3C3B", +"-@ c #3A3939", +";@ c #404A29", +">@ c #88BA24", +",@ c #71A119", +"'@ c #9EB178", +")@ c #F08F88", +"!@ c #DA635E", +"~@ c #CD5551", +"{@ c #EF8982", +"]@ c #F2847C", +"^@ c #DDA4A0", +"/@ c #8ECA20", +"(@ c #9ED22A", +"_@ c #688028", +":@ c #2C2B2B", +"<@ c #313130", +"[@ c #343B23", +"}@ c #9BC02F", +"|@ c #ACDA31", +"1@ c #A7D72E", +"2@ c #B2DE34", +"3@ c #77922C", +"4@ c #2B2B2A", +"5@ c #2A2A2A", +"6@ c #414E22", +"7@ c #78A81E", +"8@ c #638D16", +"9@ c #97A875", +"0@ c #E6E4DD", +"a@ c #EEE6D1", +"b@ c #CE8B88", +"c@ c #C2403D", +"d@ c #A22220", +"e@ c #881716", +"f@ c #A23F3C", +"g@ c #E5D2D0", +"h@ c #89C81C", +"i@ c #95CD25", +"j@ c #A5D42F", +"k@ c #39431F", +"l@ c #252524", +"m@ c #252525", +"n@ c #1C1D1A", +"o@ c #424F1E", +"p@ c #52651F", +"q@ c #38431B", +"r@ c #181818", +"s@ c #1E1E1E", +"t@ c #101110", +"u@ c #5A7D17", +"v@ c #507114", +"w@ c #808B60", +"x@ c #F2E1B5", +"y@ c #F3D66C", +"z@ c #C2C1BB", +"A@ c #929290", +"B@ c #7E3533", +"C@ c #851312", +"D@ c #711211", +"E@ c #C3B0AF", +"F@ c #8DCA1F", +"G@ c #9FCA2F", +"H@ c #333E18", +"I@ c #141414", +"J@ c #171717", +"K@ c #161616", +"L@ c #131313", +"M@ c #121212", +"N@ c #0F0F0F", +"O@ c #384419", +"P@ c #576E20", +"Q@ c #384815", +"R@ c #567815", +"S@ c #516326", +"T@ c #DECF9E", +"U@ c #F5D661", +"V@ c #EEC019", +"W@ c #CEA736", +"X@ c #5A5850", +"Y@ c #1D1D1D", +"Z@ c #181515", +"`@ c #B1B0AF", +" # c #98CF26", +".# c #A4D52E", +"+# c #6C8822", +"@# c #303C14", +"## c #161A0D", +"$# c #334114", +"%# c #678523", +"&# c #80B024", +"*# c #6B931C", +"=# c #567716", +"-# c #536625", +";# c #EEBE18", +"># c #EAB212", +",# c #E7A60C", +"'# c #BC760D", +")# c #602F12", +"!# c #B0B0B0", +"~# c #93CC24", +"{# c #9BD028", +"]# c #A1D42B", +"^# c #A5D62D", +"/# c #9CD129", +"(# c #8FC425", +"_# c #7CAE1F", +":# c #699517", +"<# c #557714", +"[# c #536824", +"}# c #D78B0A", +"|# c #B6510F", +"1# c #CFBAAE", +"2# c #8BC81E", +"3# c #86C11D", +"4# c #6C9918", +"5# c #5A7F15", +"6# c #556B24", +"7# c #F5D560", +"8# c #EEBF18", +"9# c #B54F0D", +"0# c #BFAB9D", +"a# c #4B5930", +"b# c #87C41C", +"c# c #7FB81B", +"d# c #74A619", +"e# c #618A16", +"f# c #435B16", +"g# c #DBCD9C", +"h# c #E9B011", +"i# c #E7A50B", +"j# c #B09B8E", +"k# c #A3A898", +"l# c #84BF1C", +"m# c #6B981A", +"n# c #506D1B", +"o# c #3B4820", +"p# c #2A2B26", +"q# c #575756", +"r# c #F5D96F", +"s# c #EDBE18", +"t# c #E9B111", +"u# c #B6500E", +"v# c #BCA89B", +"w# c #505E35", +"x# c #81BE1A", +"y# c #6A981B", +"z# c #557320", +"A# c #445329", +"B# c #3D3E39", +"C# c #5D5D5C", +"D# c #6F6F6D", +"E# c #848483", +"F# c #BABAB5", +"G# c #ECCE67", +"H# c #CCB7AA", +"I# c #BEC1B6", +"J# c #72A618", +"K# c #87C123", +"L# c #80AB34", +"M# c #6C8939", +"N# c #4D5A37", +"O# c #40413D", +"P# c #535351", +"Q# c #676765", +"R# c #7E7E7C", +"S# c #949492", +"T# c #A9A9A8", +"U# c #BDBDBD", +"V# c #CECECE", +"W# c #C8C8C8", +"X# c #E2DED0", +"Y# c #D9D3B8", +"Z# c #DAAF3B", +"`# c #D4900F", +" $ c #B75110", +".$ c #D0BBAE", +"+$ c #D1D8C4", +"@$ c #DFDFDD", +"#$ c #CFCFCF", +"$$ c #A5A5A4", +"%$ c #90918F", +"&$ c #999998", +"*$ c #ACACAB", +"=$ c #BFBFBF", +"-$ c #D0D0D0", +";$ c #BEBEBC", +">$ c #D6D0B9", +",$ c #C4BE9D", +"'$ c #AAA588", +")$ c #B1AC97", +"!$ c #C9C4B9", +"~$ c #DADADA", +"{$ c #D4D4D4", +"]$ c #DCDCDC", +"^$ c #DBDBDB", +"/$ c #7B7B79", +"($ c #696861", +"_$ c #777771", +":$ c #737372", +"<$ c #5E5E5D", +"[$ c #565655", +"}$ c #6F6F6C", +"|$ c #90908D", +"1$ c #B5B5B5", +"2$ c #D5D6D6", +"3$ c #C1C1C1", +"4$ c #8A8A89", +"5$ c #686866", +"6$ c #41413F", +"7$ c #4E4E4D", +"8$ c #8E8F8B", +"9$ c #B4B4B4", +"0$ c #D6D6D6", +"a$ c #CBCBCA", +"b$ c #C2C2C1", +"c$ c #BDBDBC", +"d$ c #C4C4C4", +"e$ c #D2D2D2", +" . + @ ", +" # $ % & * = - ; ", +" > , $ ' ) ! ~ { ] ^ / ( _ : ", +" < [ $ } | 1 2 3 4 5 6 ~ 7 8 9 0 a b ", +" c [ d e f g g h i j k l l m n o p q r s t u ", +" c [ d v w x y z z A B C D E F G l H I 6 J K ", +" c [ d L M N w O P Q R S T U V W B h X j Y Z ", +" c [ d ` . . ...+.@.#.$.%.&.*.=.-.;.x z >.Z ", +" c [ d ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.Z ", +" c [ d 3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h. . .Z ", +" c [ d i.j.k.l.m.n.o.p.l.q.r.s.t.u.v.w.x.4.Z ", +" c [ d y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Z ", +" c [ d Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+i.K ", +" c [ d %+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+K ", +" c [ d :+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+ e+f+ ", +" c [ d ] :+g+h+i+j+k+l+m+n+o+p+q+r+s+j+t+u+v+ w+x+y+z+A+ ", +" c [ d ] B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+ T+U+V+W+X+Y+", +" c [ d ] ] Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@ )@!@~@{@]@^@", +" c [ d ] ] /@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@ b@c@d@e@f@g@", +" c [ d ] ] h@i@j@k@l@m@n@o@p@q@r@s@r@t@u@v@w@x@y@z@A@B@C@D@E@ ", +" c [ d ] ] ] F@C+G@H@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ ", +" c [ d ] ] ] ] F@ #.#+#@#####$#%#&#*#=#-#T@U@;#>#,#'#)#!# ", +" c [ d ] ] ] ] ] :+~#{#]#^#/#(#_#:#<#[#T@U@V@>#,#}#|#1# ", +" c [ d ] ] ] ] ] ] ] B+F@2#3#R+4#5#6#T@7#8#>#,#}#9#0# ", +" a#[ d ] ] ] ] ] ] ] ] & b#c#d#e#f#g#U@8#h#i#}#9#j# ", +" k#[ d ] ] ] ] ] ] ] ] l#m#n#o#p#q#r#s#t#i#}#u#v# ", +" w#$ & ] & ] x#y#z#A#B#i+C#D#E#F#G#t#i#}#|#H# ", +" I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$ ", +" +$@$#$$$%$&$*$=$-$ ;$>$,$'$)$!$~${${$]$ ", +" ^$ /$($_$:$<$[$a+}$|$1$2$ ", +" 3$4$5$p+M+6$7$5$8$9$0$ ", +" ~$a$b$c$d$e$ "}; only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/11_launch_assistant-qt4.dpatch +++ qt4-x11-4.2.3/debian/patches/11_launch_assistant-qt4.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_launch_assistant-qt4.dpatch by Brian Nelson +## +## All lines beginning with `## DP:' are a description of the patch. +## 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" ) + { + if ( path.isEmpty() ) +- assistantCommand = "assistant"; ++ assistantCommand = "assistant-qt4"; + else { + QFileInfo fi( path ); + if ( fi.isDir() ) +- assistantCommand = path + "/assistant"; ++ assistantCommand = path + "/assistant-qt4"; + else + assistantCommand = path; + } only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/14_kfreebsd_build_fix.dpatch +++ qt4-x11-4.2.3/debian/patches/14_kfreebsd_build_fix.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 14_kfreebsd_build_fix.dpatch by Brian Nelson by way +## of Petr Salinger +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes FTBFS on GNU/kFreeBSD + +@DPATCH@ +diff -urNad qt4-x11-4.0.1~/src/corelib/global/qglobal.h qt4-x11-4.0.1/src/corelib/global/qglobal.h +--- qt4-x11-4.0.1~/src/corelib/global/qglobal.h 2005-08-16 11:41:07.000000000 +0300 ++++ qt4-x11-4.0.1/src/corelib/global/qglobal.h 2005-12-13 18:19:47.000000000 +0200 +@@ -100,7 +100,7 @@ + # define Q_OS_ULTRIX + #elif defined(sinix) + # define Q_OS_RELIANT +-#elif defined(__linux__) || defined(__linux) ++#elif defined(__linux__) || defined(__linux) || defined(__GLIBC__) + # define Q_OS_LINUX + #elif defined(__FreeBSD__) || defined(__DragonFly__) + # define Q_OS_FREEBSD only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/18_disable_opengl_visibility.dpatch +++ qt4-x11-4.2.3/debian/patches/18_disable_opengl_visibility.dpatch @@ -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. + +@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) + only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/10_qmake_for_debian.dpatch +++ qt4-x11-4.2.3/debian/patches/10_qmake_for_debian.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_qmake_use_qt4_tools.dpatch by Brian Nelson +## +## 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. + +@DPATCH@ +diff -urNad qt4-x11-4.2.1~/mkspecs/common/linux.conf qt4-x11-4.2.1/mkspecs/common/linux.conf +--- qt4-x11-4.2.1~/mkspecs/common/linux.conf 2006-10-20 11:35:09.000000000 -0400 ++++ qt4-x11-4.2.1/mkspecs/common/linux.conf 2006-10-30 22:24:57.000000000 -0500 +@@ -19,8 +19,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.2.1~/mkspecs/linux-g++/qmake.conf qt4-x11-4.2.1/mkspecs/linux-g++/qmake.conf +--- qt4-x11-4.2.1~/mkspecs/linux-g++/qmake.conf 2006-10-20 11:35:55.000000000 -0400 ++++ qt4-x11-4.2.1/mkspecs/linux-g++/qmake.conf 2006-10-30 22:25:28.000000000 -0500 +@@ -4,7 +4,7 @@ + + MAKEFILE_GENERATOR = UNIX + TEMPLATE = app +-CONFIG += qt warn_on release incremental link_prl ++CONFIG += qt warn_on release incremental + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/12_mips_atomic_ops.dpatch +++ qt4-x11-4.2.3/debian/patches/12_mips_atomic_ops.dpatch @@ -0,0 +1,66 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 12_mips_atomic_ops.dpatch by Thiemo Seufer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix compilation for Linux MIPS-I code. + +@DPATCH@ +diff -urNad qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s +--- qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s 2005-12-16 03:52:19.000000000 -0800 ++++ qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s 2006-01-16 10:39:45.000000000 -0800 +@@ -6,10 +6,12 @@ + .globl q_atomic_test_and_set_int + .ent q_atomic_test_and_set_int + q_atomic_test_and_set_int: ++ .set mips2 + 1: ll $8,0($4) + bne $8,$5,2f + move $2,$6 + sc $2,0($4) ++ .set mips0 + beqz $2,1b + nop + jr $31 +@@ -21,6 +23,7 @@ + .globl q_atomic_test_and_set_acquire_int + .ent q_atomic_test_and_set_acquire_int + q_atomic_test_and_set_acquire_int: ++ .set mips2 + 1: ll $8,0($4) + bne $8,$5,2f + move $2,$6 +@@ -30,6 +33,7 @@ + jr $31 + nop + 2: sync ++ .set mips0 + jr $31 + move $2,$0 + .end q_atomic_test_and_set_acquire_int +@@ -37,11 +41,13 @@ + .globl q_atomic_test_and_set_release_int + .ent q_atomic_test_and_set_release_int + q_atomic_test_and_set_release_int: ++ .set mips2 + sync + 1: ll $8,0($4) + bne $8,$5,2f + move $2,$6 + sc $2,0($4) ++ .set mips0 + beqz $2,1b + nop + jr $31 +@@ -53,10 +59,12 @@ + .globl q_atomic_test_and_set_ptr + .ent q_atomic_test_and_set_ptr + q_atomic_test_and_set_ptr: ++ .set mips2 + 1: ll $8,0($4) + bne $8,$5,2f + move $2,$6 + sc $2,0($4) ++ .set mips0 + beqz $2,1b + nop + jr $31 only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/20_hppa_inotify_fix.dpatch +++ qt4-x11-4.2.3/debian/patches/20_hppa_inotify_fix.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_hppa_inotify_fix.dpatch by Brian Nelson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad qt4-x11-4.2.1~/src/corelib/io/qfilesystemwatcher_inotify.cpp qt4-x11-4.2.1/src/corelib/io/qfilesystemwatcher_inotify.cpp +--- qt4-x11-4.2.1~/src/corelib/io/qfilesystemwatcher_inotify.cpp 2006-10-24 12:10:36.000000000 -0400 ++++ qt4-x11-4.2.1/src/corelib/io/qfilesystemwatcher_inotify.cpp 2006-10-24 12:16:35.000000000 -0400 +@@ -88,6 +88,10 @@ + # define __NR_inotify_init 284 + # define __NR_inotify_add_watch 285 + # define __NR_inotify_rm_watch 286 ++#elif defined (__hppa__) ++# define __NR_inotify_init 269 ++# define __NR_inotify_add_watch 270 ++# define __NR_inotify_rm_watch 271 + #else + # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com" + #endif only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/19_m68k_inotify_fix.dpatch +++ qt4-x11-4.2.3/debian/patches/19_m68k_inotify_fix.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 19_m68k_inotify_fix.dpatch by Brian Nelson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: From Roman Zippel : These defines are +## DP: taken from the m68k tree, they should appear like this soon also +## DP: in the upstream source. + +@DPATCH@ +diff -urNad qt4-x11-4.2.0~/src/corelib/io/qfilesystemwatcher_inotify.cpp qt4-x11-4.2.0/src/corelib/io/qfilesystemwatcher_inotify.cpp +--- qt4-x11-4.2.0~/src/corelib/io/qfilesystemwatcher_inotify.cpp 2006-09-29 10:44:58.000000000 -0400 ++++ qt4-x11-4.2.0/src/corelib/io/qfilesystemwatcher_inotify.cpp 2006-10-16 17:38:56.000000000 -0400 +@@ -84,6 +84,10 @@ + # define __NR_inotify_init 284 + # define __NR_inotify_add_watch 285 + # define __NR_inotify_rm_watch 286 ++#elif defined (__mc68000__) ++# define __NR_inotify_init 284 ++# define __NR_inotify_add_watch 285 ++# define __NR_inotify_rm_watch 286 + #else + # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com" + #endif only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/13_arm_ftbfs_fixes.dpatch +++ qt4-x11-4.2.3/debian/patches/13_arm_ftbfs_fixes.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 13_arm_ftbfs_fixes.dpatch by Brian Nelson by way of +## Jeremy Laine . +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes FTBFS on arm + +@DPATCH@ +diff -urNad qt4-x11-4.2.0~/src/corelib/global/qglobal.h qt4-x11-4.2.0/src/corelib/global/qglobal.h +--- qt4-x11-4.2.0~/src/corelib/global/qglobal.h 2006-10-05 21:46:36.000000000 -0400 ++++ qt4-x11-4.2.0/src/corelib/global/qglobal.h 2006-10-05 21:46:44.000000000 -0400 +@@ -792,8 +792,9 @@ + + #if defined(QT_COORD_TYPE) + typedef QT_COORD_TYPE qreal; +-#elif defined(__arm__) +-typedef float qreal; ++// BN: Defining qreal as float on arm breaks compilation! ++//#elif defined(__arm__) ++//typedef float qreal; + #else + typedef double qreal; + #endif only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/17_alpha_ice.dpatch +++ qt4-x11-4.2.3/debian/patches/17_alpha_ice.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad qt4-x11-4.1.3~/src/corelib/global/qlibraryinfo.cpp qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp +--- qt4-x11-4.1.3~/src/corelib/global/qlibraryinfo.cpp 2006-05-14 03:46:59.000000000 -0700 ++++ qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp 2006-06-03 11:55:29.000000000 -0700 +@@ -47,14 +47,7 @@ + { + public: + static QSettings *findConfiguration(); +- static void cleanup() +- { +- QLibrarySettings *ls = qt_library_settings(); +- if (ls) { +- delete static_cast(ls->settings); +- ls->settings = 0; +- } +- } ++ static void cleanup(); + static QSettings *configuration() + { + #ifdef QT_NO_THREAD +@@ -75,6 +68,15 @@ + Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings) + }; + ++void QLibraryInfoPrivate::cleanup() ++{ ++ QLibrarySettings *ls = qt_library_settings(); ++ if (ls) { ++ delete static_cast(ls->settings); ++ ls->settings = 0; ++ } ++} ++ + QLibrarySettings::QLibrarySettings() + { + settings = QLibraryInfoPrivate::findConfiguration(); +diff -urNad qt4-x11-4.1.3~/src/corelib/tools/qhash.h qt4-x11-4.1.3/src/corelib/tools/qhash.h +--- qt4-x11-4.1.3~/src/corelib/tools/qhash.h 2006-05-14 03:46:59.000000000 -0700 ++++ qt4-x11-4.1.3/src/corelib/tools/qhash.h 2006-06-03 11:55:29.000000000 -0700 +@@ -405,7 +405,7 @@ + } + + template +-Q_INLINE_TEMPLATE void QHash::duplicateNode(QHashData::Node *node, void *newNode) ++void QHash::duplicateNode(QHashData::Node *node, void *newNode) + { + Node *concreteNode = concrete(node); + if (QTypeInfo::isDummy) { only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/21_hurd_detection.dpatch +++ qt4-x11-4.2.3/debian/patches/21_hurd_detection.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_hurd_detection.dpatch by Cyril Brulebois +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable GNU/Hurd detection + +@DPATCH@ +diff -Nur qt4-x11-4.1.3~/src/corelib/global/qglobal.h qt4-x11-4.1.3~/src/corelib/global/qglobal.h +--- qt4-x11-4.1.3~/src/corelib/global/qglobal.h 2006-07-21 11:51:19.000000000 +0000 ++++ qt4-x11-4.1.3/src/corelib/global/qglobal.h 2006-07-21 11:58:25.000000000 +0000 +@@ -69,6 +69,7 @@ + LYNX - LynxOS + BSD4 - Any BSD 4.4 system + UNIX - Any UNIX BSD/SYSV system ++ HURD - Hurd + */ + + #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) +@@ -136,6 +137,8 @@ + # define Q_OS_UNIXWARE + #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ + # define Q_OS_UNIXWARE ++#elif defined(__GNU__) /* To avoid confusion, like for mkspecs files */ ++# define Q_OS_HURD + #elif defined(__MAKEDEPEND__) + #else + # error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com" only in patch2: unchanged: --- qt4-x11-4.2.3.orig/debian/patches/16_hppa_ldcw_fix.dpatch +++ qt4-x11-4.2.3/debian/patches/16_hppa_ldcw_fix.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_hppa_ldcw.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: patch from Ubuntu to properly support hppa + +@DPATCH@ +diff -urNad qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s +--- qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s 2006-02-03 01:50:30.000000000 +0000 ++++ qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s 2006-02-03 02:00:36.000000000 +0000 +@@ -1,17 +1,7 @@ +- .SPACE $PRIVATE$ +- .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 +- .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 +- .SPACE $TEXT$ +- .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44 +- .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY +- .IMPORT $global$,DATA +- .IMPORT $$dyncall,MILLICODE +- .SPACE $TEXT$ +- .SUBSPA $CODE$ +- ++ .text + .align 4 + .EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR +-q_ldcw ++ .label q_ldcw + .PROC + .CALLINFO FRAME=0,CALLS,SAVE_RP + .ENTRY