[SCM] qttools packaging branch, master, updated. debian/5.0.2-1-6-g21d4b29

Pino Toscano pino at alioth.debian.org
Sun Apr 21 17:25:39 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=1edd397

The following commit has been merged in the master branch:
commit 1edd3973870ea25ddfdc9270c33a9f854aa6fd95
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 21 19:15:01 2013 +0200

    fix build on Hurd
---
 debian/changelog                  |    3 +++
 debian/patches/hurd-path_max.diff |   19 +++++++++++++++++++
 debian/patches/series             |    1 +
 3 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d50323b..e9481c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qttools-opensource-src (5.0.2-2) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Confirm symbols files for i386, ia64 and powerpc.
 
+  [ Pino Toscano ]
+  * Fix build on Hurd; patch hurd-path_max.diff.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 21 Apr 2013 12:24:52 -0300
 
 qttools-opensource-src (5.0.2-1) experimental; urgency=low
diff --git a/debian/patches/hurd-path_max.diff b/debian/patches/hurd-path_max.diff
new file mode 100644
index 0000000..d9b03e7
--- /dev/null
+++ b/debian/patches/hurd-path_max.diff
@@ -0,0 +1,19 @@
+Author: Marc Dequènes <duck at duckcorp.org>
+Bug: https://bugreports.qt-project.org/browse/QTBUG-6960
+Description: PATH_MAX fix
+ Fix a POSIX incompatibility (as programs should not rely on having PATH_MAX
+ defined on all systems) and causes FTBFS on Hurd.
+
+--- a/src/assistant/3rdparty/clucene/src/CLucene/config/compiler.h
++++ b/src/assistant/3rdparty/clucene/src/CLucene/config/compiler.h
+@@ -136,6 +136,10 @@
+ #define LUCENE_INT32_MAX_SHOULDBE 0x7FFFFFFFL
+ #define LUCENE_UINT8_MAX_SHOULDBE 0xff
+ 
++#if defined(__GNU__)
++ #define PATH_MAX 4096
++#endif
++
+ //maximum path length. only used for buffers that use fullpath.
+ //anything else should use a dynamic length.
+ #if defined(CL_MAX_PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 3d5c114..c853ff8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 lrelease-zlib.patch
+hurd-path_max.diff

-- 
qttools packaging



More information about the pkg-kde-commits mailing list