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

[Modestas Vainius]

Author: modax-guest
Date: 2008-02-21 11:52:17 +0000 (Thu, 21 Feb 2008)
New Revision: 9450

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
   trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff
Log:
* Drop versioned build-dependency on libc6. This will fix incorrect AutoDepWaits on arches with other libc6-dev incarnations.
* Instead make hack itself depend on glibc6 >=2.7.

Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2008-02-21 07:01:30 UTC (rev 9449)
+++ trunk/packages/qt-x11-free/debian/changelog	2008-02-21 11:52:17 UTC (rev 9450)
@@ -1,3 +1,14 @@
+qt-x11-free (3:3.3.8b-4) unstable; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Make 01_export_stat64_symbols.diff hack glibc >=2.7 dependant instead of
+    build depending on libc6-dev (>=2.7-1) and its other incarnations. This
+    will restore Qt3 backports friendliness. Thanks to Pierre Habouzit for
+    this idea.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 21 Feb 2008 12:59:07 +0200
+
 qt-x11-free (3:3.3.8b-3) unstable; urgency=low
 
   * The "Optimized Qt3" release.

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2008-02-21 07:01:30 UTC (rev 9449)
+++ trunk/packages/qt-x11-free/debian/control	2008-02-21 11:52:17 UTC (rev 9450)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: libc6-dev (>= 2.7-1), debhelper (>= 5.0.31), quilt, 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, libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
+Build-Depends: debhelper (>= 5.0.31), quilt, 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, libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
 Section: libs
 Priority: optional
 Standards-Version: 3.7.3

Modified: trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff	2008-02-21 07:01:30 UTC (rev 9449)
+++ trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff	2008-02-21 11:52:17 UTC (rev 9450)
@@ -1,7 +1,7 @@
 diff -uNr -x debian -x .pc qt-x11-free-3.3.8b/src/__debian_export_symbols.cpp qt-x11-free-3.3.8b.n/src/__debian_export_symbols.cpp
 --- qt-x11-free-3.3.8b/src/__debian_export_symbols.cpp	1970-01-01 03:00:00.000000000 +0300
 +++ qt-x11-free-3.3.8b.n/src/__debian_export_symbols.cpp	2008-02-17 11:58:54.000000000 +0200
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,30 @@
 +// Use the __NO_INLINE__ hack below to prevent sys/stat.h from ever
 +// (with g++-4.3 or later) exporting __extern_inline definitions
 +// of the symbols [fl]?stat64. We must ensure that [fl]?stat64 is
@@ -10,6 +10,10 @@
 +# define __NO_INLINE__
 +#endif
 +
++#include <features.h>
++
++#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 7)
++
 +#include <sys/stat.h>
 +
 +int stat64 (__const char *__path, struct stat64 *__statbuf)
@@ -26,6 +30,8 @@
 +{
 +    return __fxstat64 (_STAT_VER, __fd, __statbuf);
 +}
++
++#endif
 diff -uNr -x debian -x .pc qt-x11-free-3.3.8b/src/qt.pro qt-x11-free-3.3.8b.n/src/qt.pro
 --- qt-x11-free-3.3.8b/src/qt.pro	2008-02-16 23:37:36.000000000 +0200
 +++ qt-x11-free-3.3.8b.n/src/qt.pro	2008-02-17 12:01:12.000000000 +0200