summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSune Vuorela <debian@pusling.com>2008-07-18 00:34:58 +0000
committerSune Vuorela <debian@pusling.com>2008-07-18 00:34:58 +0000
commit0783d67bdb5ca59f796830dd0f817539f3e277d5 (patch)
treeef32df3dd4cf3104232a8c96963e51a54fe26d50
parent7906f4c12b42dc2f3f6ff62a42ec2231bd33d3e7 (diff)
downloadqt4-x11-0783d67bdb5ca59f796830dd0f817539f3e277d5.tar.gz
Apply patch from friendly hurd porters. (Closes: 485931)
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/81_hurd_more_max_path.diff15
-rw-r--r--debian/patches/series1
3 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9d3c61a..7b491d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qt4-x11 (4.4.0-5) UNRELEASED; urgency=low
* Remove watchfile. it doesn't work.
* mention qmake-qt4 in description of libqt4-dev. (Closes: 415816)
+ * Apply patch from friendly hurd porters. (Closes: 485931)
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 18 Jul 2008 00:57:42 +0200
diff --git a/debian/patches/81_hurd_more_max_path.diff b/debian/patches/81_hurd_more_max_path.diff
new file mode 100644
index 0000000..b3e7838
--- /dev/null
+++ b/debian/patches/81_hurd_more_max_path.diff
@@ -0,0 +1,15 @@
+define MAX_PATH if not defined. This is needed on hurd.
+Patch by Michael Banck
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485931
+
+--- a/src/3rdparty/clucene/src/CLucene/config/compiler.h
++++ b/src/3rdparty/clucene/src/CLucene/config/compiler.h
+@@ -147,7 +147,7 @@
+ #elif defined(_MAX_PATH)
+ #define CL_MAX_PATH _MAX_PATH
+ #else
+- #error "CL_MAX_PATH could not be determined"
++ #define CL_MAX_PATH 4096
+ #endif
+
+ //this is the max filename... for now its just the same,
diff --git a/debian/patches/series b/debian/patches/series
index 2a8919c..81bf1f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,4 +49,5 @@
72_generic_arch_atomic_header_fix.diff
73_from4.4.1_no_AAAA_when_ipv6_disabled.diff
80_hurd_max_path.diff
+81_hurd_more_max_path.diff
90_gcc43.diff