rev 6518 - in trunk/packages/qt-x11-free/debian: . patches

Sat Jun 16 18:52:35 UTC 2007

Author: pusling-guest
Date: 2007-06-16 18:52:35 +0000 (Sat, 16 Jun 2007)
New Revision: 6518

Added:
   trunk/packages/qt-x11-free/debian/patches/90_armeabi.dpatch
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
   trunk/packages/qt-x11-free/debian/patches/00list
   trunk/packages/qt-x11-free/debian/rules
Log:
qt3 armel support


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================

--- trunk/packages/qt-x11-free/debian/changelog	2007-06-16 18:15:18 UTC (rev 6517)
+++ trunk/packages/qt-x11-free/debian/changelog	2007-06-16 18:52:35 UTC (rev 6518)
@@ -6,6 +6,11 @@
   * Add fix to compile with gcc-4.3 (Closes: 417499). Thanks to Martin
     Michlmayr.
   * Fix designer and assistant desktop files. Thanks Pino.
+  * Fix ftbfs with newer firebird. Thanks to Firebird maintainers for breaking
+    it. (Closes: #427191)
+  * Add sparc to firebird archs. Thanks to Damyan Ivanov
+  * Add armel support to qt3. Thanks to Riku Voipu and Lennert Beytenhek.
+    (Closes: 408814)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 May 2007 13:07:33 +0200
 

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2007-06-16 18:15:18 UTC (rev 6517)
+++ trunk/packages/qt-x11-free/debian/control	2007-06-16 18:52:35 UTC (rev 6518)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
-Build-Depends: debhelper (>= 5.0.31), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), 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), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev, firebird2-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64]
+Build-Depends: debhelper (>= 5.0.31), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), 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), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev, firebird1.5-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc]
 Section: libs
 Priority: optional
 Standards-Version: 3.7.2
@@ -51,7 +51,7 @@
  to access a PostgreSQL DB.
 
 Package: libqt3-mt-ibase
-Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64
+Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc
 Section: libs
 Depends: ${shlibs:Depends}
 Conflicts: libqt3c102-mt-ibase

Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2007-06-16 18:15:18 UTC (rev 6517)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2007-06-16 18:52:35 UTC (rev 6518)
@@ -44,3 +44,4 @@
 64_utf8-parsing-vulnerability
 65_gcc-4.2_qbuttons.h-fix.dpatch
 66_gcc-4.3_compile-fix.dpatch
+90_armeabi

Added: trunk/packages/qt-x11-free/debian/patches/90_armeabi.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/90_armeabi.dpatch	                        (rev 0)
+++ trunk/packages/qt-x11-free/debian/patches/90_armeabi.dpatch	2007-06-16 18:52:35 UTC (rev 6518)
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+## 90_armeabi.dpatch.dpatch by Lennert Buytenhek <buytenh at wantstofly.org>
+##
+## 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
+
+ at DPATCH@
+--- qt-x11-free-3.3.7/src/tools/qglobal.h.orig	2006-12-22 03:23:58.000000000 +0000
++++ qt-x11-free-3.3.7/src/tools/qglobal.h	2006-12-22 03:24:23.000000000 +0000
+@@ -315,7 +315,7 @@
+    QString bloat. However, gcc 3.4 doesn't allow us to create references to
+    members of a packed struct. (Pointers are OK, because then you
+    supposedly know what you are doing.) */
+-#  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))
+ #    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 || __GNUC__ > 3
+ #      define Q_NO_PACKED_REFERENCE

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2007-06-16 18:15:18 UTC (rev 6517)
+++ trunk/packages/qt-x11-free/debian/rules	2007-06-16 18:52:35 UTC (rev 6518)
@@ -93,7 +93,7 @@
 		-inputmethod			\
 		# End of CONFIGURE_OPTS
 
-interbase_archs := i386 amd64
+interbase_archs := i386 amd64 sparc
 ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs)))
 	CONFIGURE_OPTS += -no-sql-ibase
 	IBASE = -Nlibqt3-mt-ibase


