From e2d67520a82324fc0a08874f34f3a5b91a4c5e24 Mon Sep 17 00:00:00 2001 From: Brian Nelson Date: Sun, 4 Mar 2007 15:26:08 +0000 Subject: * Re-arranged patches to group them by arch so that they're easier to deal with --- debian/changelog | 5 +- debian/patches/00list | 26 ++++----- debian/patches/01_qmake_for_debian.dpatch | 34 +++++++++++ debian/patches/02_launch_assistant-qt4.dpatch | 24 ++++++++ debian/patches/03_launch_moc-qt4.dpatch | 19 +++++++ debian/patches/10_qmake_for_debian.dpatch | 34 ----------- debian/patches/11_launch_assistant-qt4.dpatch | 24 -------- debian/patches/12_mips_atomic_ops.dpatch | 66 ---------------------- debian/patches/13_arm_ftbfs_fixes.dpatch | 23 -------- debian/patches/14_kfreebsd_build_fix.dpatch | 20 ------- debian/patches/16_hppa_ldcw_fix.dpatch | 30 ---------- debian/patches/17_alpha_ice.dpatch | 53 ----------------- debian/patches/18_disable_opengl_visibility.dpatch | 17 ------ debian/patches/19_m68k_inotify_fix.dpatch | 23 -------- debian/patches/20_hppa_inotify_fix.dpatch | 21 ------- debian/patches/20_mips_atomic_ops.dpatch | 66 ++++++++++++++++++++++ debian/patches/21_hurd_detection.dpatch | 27 --------- debian/patches/22_launch_moc-qt4.dpatch | 19 ------- debian/patches/30_arm_ftbfs_fixes.dpatch | 23 ++++++++ debian/patches/31_arm_eabi_fix.dpatch | 36 ++++++++++++ debian/patches/40_alpha_ice.dpatch | 53 +++++++++++++++++ .../41_alpha_disable_opengl_visibility.dpatch | 17 ++++++ debian/patches/50_kfreebsd_build_fix.dpatch | 20 +++++++ debian/patches/60_m68k_inotify_fix.dpatch | 23 ++++++++ debian/patches/70_hppa_ldcw_fix.dpatch | 30 ++++++++++ debian/patches/71_hppa_inotify_fix.dpatch | 21 +++++++ debian/patches/80_hurd_detection.dpatch | 27 +++++++++ debian/patches/90_arm_eabi_fix.dpatch | 36 ------------ 28 files changed, 410 insertions(+), 407 deletions(-) create mode 100755 debian/patches/01_qmake_for_debian.dpatch create mode 100755 debian/patches/02_launch_assistant-qt4.dpatch create mode 100755 debian/patches/03_launch_moc-qt4.dpatch delete mode 100755 debian/patches/10_qmake_for_debian.dpatch delete mode 100755 debian/patches/11_launch_assistant-qt4.dpatch delete mode 100644 debian/patches/12_mips_atomic_ops.dpatch delete mode 100755 debian/patches/13_arm_ftbfs_fixes.dpatch delete mode 100755 debian/patches/14_kfreebsd_build_fix.dpatch delete mode 100644 debian/patches/16_hppa_ldcw_fix.dpatch delete mode 100644 debian/patches/17_alpha_ice.dpatch delete mode 100644 debian/patches/18_disable_opengl_visibility.dpatch delete mode 100755 debian/patches/19_m68k_inotify_fix.dpatch delete mode 100755 debian/patches/20_hppa_inotify_fix.dpatch create mode 100644 debian/patches/20_mips_atomic_ops.dpatch delete mode 100644 debian/patches/21_hurd_detection.dpatch delete mode 100755 debian/patches/22_launch_moc-qt4.dpatch create mode 100755 debian/patches/30_arm_ftbfs_fixes.dpatch create mode 100644 debian/patches/31_arm_eabi_fix.dpatch create mode 100644 debian/patches/40_alpha_ice.dpatch create mode 100644 debian/patches/41_alpha_disable_opengl_visibility.dpatch create mode 100755 debian/patches/50_kfreebsd_build_fix.dpatch create mode 100755 debian/patches/60_m68k_inotify_fix.dpatch create mode 100644 debian/patches/70_hppa_ldcw_fix.dpatch create mode 100755 debian/patches/71_hppa_inotify_fix.dpatch create mode 100644 debian/patches/80_hurd_detection.dpatch delete mode 100644 debian/patches/90_arm_eabi_fix.dpatch diff --git a/debian/changelog b/debian/changelog index c6e2d71..5ba0868 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,10 @@ qt4-x11 (4.2.2-1) UNRELEASED; urgency=low * debian/qt4-designer.links: added a link /usr/share/qt4/bin/designer -> /usr/bin/designer-qt4 (Closes: #410885) - -- Brian Nelson Sat, 3 Mar 2007 13:08:30 -0500 + * Re-arranged patches to group them by arch so that they're easier to + deal with + + -- Brian Nelson Sun, 4 Mar 2007 10:26:01 -0500 qt4-x11 (4.2.1-2) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 4f59234..f2bc30a 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,13 +1,13 @@ -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 -19_m68k_inotify_fix -20_hppa_inotify_fix -21_hurd_detection -22_launch_moc-qt4 -90_arm_eabi_fix +01_qmake_for_debian +02_launch_assistant-qt4 +03_launch_moc-qt4 +20_mips_atomic_ops +30_arm_ftbfs_fixes +31_arm_eabi_fix +40_alpha_ice +41_alpha_disable_opengl_visibility +50_kfreebsd_build_fix +60_m68k_inotify_fix +70_hppa_ldcw_fix +71_hppa_inotify_fix +80_hurd_detection diff --git a/debian/patches/01_qmake_for_debian.dpatch b/debian/patches/01_qmake_for_debian.dpatch new file mode 100755 index 0000000..980f19c --- /dev/null +++ b/debian/patches/01_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 + diff --git a/debian/patches/02_launch_assistant-qt4.dpatch b/debian/patches/02_launch_assistant-qt4.dpatch new file mode 100755 index 0000000..4f623cf --- /dev/null +++ b/debian/patches/02_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; + } diff --git a/debian/patches/03_launch_moc-qt4.dpatch b/debian/patches/03_launch_moc-qt4.dpatch new file mode 100755 index 0000000..e5d7cdd --- /dev/null +++ b/debian/patches/03_launch_moc-qt4.dpatch @@ -0,0 +1,19 @@ +#! /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"); diff --git a/debian/patches/10_qmake_for_debian.dpatch b/debian/patches/10_qmake_for_debian.dpatch deleted file mode 100755 index 980f19c..0000000 --- a/debian/patches/10_qmake_for_debian.dpatch +++ /dev/null @@ -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 - diff --git a/debian/patches/11_launch_assistant-qt4.dpatch b/debian/patches/11_launch_assistant-qt4.dpatch deleted file mode 100755 index 4f623cf..0000000 --- a/debian/patches/11_launch_assistant-qt4.dpatch +++ /dev/null @@ -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; - } diff --git a/debian/patches/12_mips_atomic_ops.dpatch b/debian/patches/12_mips_atomic_ops.dpatch deleted file mode 100644 index c3f9a21..0000000 --- a/debian/patches/12_mips_atomic_ops.dpatch +++ /dev/null @@ -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 diff --git a/debian/patches/13_arm_ftbfs_fixes.dpatch b/debian/patches/13_arm_ftbfs_fixes.dpatch deleted file mode 100755 index ae2f46c..0000000 --- a/debian/patches/13_arm_ftbfs_fixes.dpatch +++ /dev/null @@ -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 diff --git a/debian/patches/14_kfreebsd_build_fix.dpatch b/debian/patches/14_kfreebsd_build_fix.dpatch deleted file mode 100755 index cbf6459..0000000 --- a/debian/patches/14_kfreebsd_build_fix.dpatch +++ /dev/null @@ -1,20 +0,0 @@ -#! /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 diff --git a/debian/patches/16_hppa_ldcw_fix.dpatch b/debian/patches/16_hppa_ldcw_fix.dpatch deleted file mode 100644 index 0405799..0000000 --- a/debian/patches/16_hppa_ldcw_fix.dpatch +++ /dev/null @@ -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 diff --git a/debian/patches/17_alpha_ice.dpatch b/debian/patches/17_alpha_ice.dpatch deleted file mode 100644 index 8529bff..0000000 --- a/debian/patches/17_alpha_ice.dpatch +++ /dev/null @@ -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) { diff --git a/debian/patches/18_disable_opengl_visibility.dpatch b/debian/patches/18_disable_opengl_visibility.dpatch deleted file mode 100644 index 040e695..0000000 --- a/debian/patches/18_disable_opengl_visibility.dpatch +++ /dev/null @@ -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) - diff --git a/debian/patches/19_m68k_inotify_fix.dpatch b/debian/patches/19_m68k_inotify_fix.dpatch deleted file mode 100755 index 9dd507d..0000000 --- a/debian/patches/19_m68k_inotify_fix.dpatch +++ /dev/null @@ -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 diff --git a/debian/patches/20_hppa_inotify_fix.dpatch b/debian/patches/20_hppa_inotify_fix.dpatch deleted file mode 100755 index fb679e6..0000000 --- a/debian/patches/20_hppa_inotify_fix.dpatch +++ /dev/null @@ -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 diff --git a/debian/patches/20_mips_atomic_ops.dpatch b/debian/patches/20_mips_atomic_ops.dpatch new file mode 100644 index 0000000..c3f9a21 --- /dev/null +++ b/debian/patches/20_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 diff --git a/debian/patches/21_hurd_detection.dpatch b/debian/patches/21_hurd_detection.dpatch deleted file mode 100644 index a6860f5..0000000 --- a/debian/patches/21_hurd_detection.dpatch +++ /dev/null @@ -1,27 +0,0 @@ -#! /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" diff --git a/debian/patches/22_launch_moc-qt4.dpatch b/debian/patches/22_launch_moc-qt4.dpatch deleted file mode 100755 index e5d7cdd..0000000 --- a/debian/patches/22_launch_moc-qt4.dpatch +++ /dev/null @@ -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"); diff --git a/debian/patches/30_arm_ftbfs_fixes.dpatch b/debian/patches/30_arm_ftbfs_fixes.dpatch new file mode 100755 index 0000000..ae2f46c --- /dev/null +++ b/debian/patches/30_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 diff --git a/debian/patches/31_arm_eabi_fix.dpatch b/debian/patches/31_arm_eabi_fix.dpatch new file mode 100644 index 0000000..a826663 --- /dev/null +++ b/debian/patches/31_arm_eabi_fix.dpatch @@ -0,0 +1,36 @@ +#! /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 --git a/debian/patches/40_alpha_ice.dpatch b/debian/patches/40_alpha_ice.dpatch new file mode 100644 index 0000000..8529bff --- /dev/null +++ b/debian/patches/40_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) { diff --git a/debian/patches/41_alpha_disable_opengl_visibility.dpatch b/debian/patches/41_alpha_disable_opengl_visibility.dpatch new file mode 100644 index 0000000..040e695 --- /dev/null +++ b/debian/patches/41_alpha_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) + diff --git a/debian/patches/50_kfreebsd_build_fix.dpatch b/debian/patches/50_kfreebsd_build_fix.dpatch new file mode 100755 index 0000000..cbf6459 --- /dev/null +++ b/debian/patches/50_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 diff --git a/debian/patches/60_m68k_inotify_fix.dpatch b/debian/patches/60_m68k_inotify_fix.dpatch new file mode 100755 index 0000000..9dd507d --- /dev/null +++ b/debian/patches/60_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.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 diff --git a/debian/patches/70_hppa_ldcw_fix.dpatch b/debian/patches/70_hppa_ldcw_fix.dpatch new file mode 100644 index 0000000..0405799 --- /dev/null +++ b/debian/patches/70_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 diff --git a/debian/patches/71_hppa_inotify_fix.dpatch b/debian/patches/71_hppa_inotify_fix.dpatch new file mode 100755 index 0000000..fb679e6 --- /dev/null +++ b/debian/patches/71_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 diff --git a/debian/patches/80_hurd_detection.dpatch b/debian/patches/80_hurd_detection.dpatch new file mode 100644 index 0000000..a6860f5 --- /dev/null +++ b/debian/patches/80_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" diff --git a/debian/patches/90_arm_eabi_fix.dpatch b/debian/patches/90_arm_eabi_fix.dpatch deleted file mode 100644 index a826663..0000000 --- a/debian/patches/90_arm_eabi_fix.dpatch +++ /dev/null @@ -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 -- cgit v1.2.3