[Pkg-kde-commits] rev 1440 - in people/chrsmrtn/qt-x11-free/debian: . patches

[chrsmrtn-guest at costa.debian.org]

Author: chrsmrtn-guest
Date: 2005-08-12 04:13:37 +0000 (Fri, 12 Aug 2005)
New Revision: 1440

Modified:
   people/chrsmrtn/qt-x11-free/debian/changelog
   people/chrsmrtn/qt-x11-free/debian/patches/10_arm_gcc4.dpatch
   people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
Log:
Sync with the changes in trunk.


Modified: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog	2005-08-12 03:15:40 UTC (rev 1439)
+++ people/chrsmrtn/qt-x11-free/debian/changelog	2005-08-12 04:13:37 UTC (rev 1440)
@@ -1,4 +1,4 @@
-qt-x11-free (3:3.3.4-6) unstable; urgency=low
+qt-x11-free (3:3.3.4-8) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -27,6 +27,37 @@
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed,  6 Jul 2005 22:36:54 -0400
 
+qt-x11-free (3:3.3.4-7) unstable; urgency=low
+
+  * The "Mistakes happen; sadly, sometimes they happen all the same day" release.
+
+  +++ Changes by Adeodato Simó:
+
+  * Fix new arm FTBFS: in 08_arm_gcc4.dpatch, patch the original file, not the
+    symlink, since patch makes a copy.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Aug 2005 22:28:17 +0200
+
+qt-x11-free (3:3.3.4-6) unstable; urgency=low
+
+  * The "If debussy had been up..." release.
+
+  +++ Changes by Adeodato Simó:
+
+  * Include in 08_arm_gcc4.dpatch an appropriate cast so that GCC 4.0 does not
+    barf. Patch stolen from SuSE, kudos to Isaac Clerencia for finding it.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Aug 2005 14:29:47 +0200
+
+qt-x11-free (3:3.3.4-5) unstable; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Fix FTBFS on arm due to incomplete compiler version check: teach qglobal.h
+    that GCC versions with major version != 3 exist. [08_arm_gcc4.dpatch]
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 10 Aug 2005 12:10:01 +0200
+
 qt-x11-free (3:3.3.4-4) unstable; urgency=low
 
   * The "Three transitions and one maintainer switch" release.

Modified: people/chrsmrtn/qt-x11-free/debian/patches/10_arm_gcc4.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/10_arm_gcc4.dpatch	2005-08-12 03:15:40 UTC (rev 1439)
+++ people/chrsmrtn/qt-x11-free/debian/patches/10_arm_gcc4.dpatch	2005-08-12 04:13:37 UTC (rev 1440)
@@ -19,8 +19,8 @@
 exit 0
 
 @DPATCH@
---- qt/include/qglobal.h
-+++ qt/include/qglobal.h
+--- qt.orig/src/tools/qglobal.h
++++ qt.patched/src/tools/qglobal.h
 @@ -300,7 +300,7 @@
     supposedly know what you are doing.) */
  #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
@@ -30,3 +30,14 @@
  #      define Q_NO_PACKED_REFERENCE
  #    endif
  #  endif
+--- qt/src/tools/qstring.h
++++ qt/src/tools/qstring.h
+@@ -194,7 +194,7 @@
+     char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
+     ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+-    ushort &unicode() { return *(&ucs); }
++    ushort &unicode() { return *((ushort*)&ucs); }
+ #else
+     ushort &unicode() { return ucs; }
+ #endif

Modified: people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch	2005-08-12 03:15:40 UTC (rev 1439)
+++ people/chrsmrtn/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch	2005-08-12 04:13:37 UTC (rev 1440)
@@ -4,25 +4,21 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: unify declarations for Glibc-based systems in upstream files
 
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
     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;;
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
     *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
         exit 1;;
 esac
 
 exit 0
 
- at DPATCH@
 --- qt-x11-free-3.2.3.old/configure	2003-10-21 12:04:20.000000000 +0200
 +++ qt-x11-free-3.2.3/configure	2004-08-05 00:33:56.000000000 +0200
 @@ -1248,7 +1248,7 @@