rev 15035 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-06-29 14:43:52 +0000 (Mon, 29 Jun 2009)
New Revision: 15035

Removed:
   trunk/packages/qt4-x11/debian/patches/81_hurd_more_max_path.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
   trunk/packages/qt4-x11/debian/patches/series
Log:
Rename 81_hurd_more_max_path to 80_hurd_max_path patch
Drop older 80_hurd_max_path


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-06-29 14:26:50 UTC (rev 15034)
+++ trunk/packages/qt4-x11/debian/changelog	2009-06-29 14:43:52 UTC (rev 15035)
@@ -17,6 +17,7 @@
   * Remove patches:
     - 20_mips_atomic_ops - Merged upstream.
     - 21_fix_quiloader_wrong_header_translated - Merged upstream.
+    - 81_hurd_more_max_path - Merged in 80_hurd_max_path.
     - 90_ia64_boilerplate - Fixed upstream.
     - 0234-fix-mysql-threaded - Fixed upstream.
     - 0273-odbc-64bit-compile - Fixed upstream.

Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff	2009-06-29 14:26:50 UTC (rev 15034)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff	2009-06-29 14:43:52 UTC (rev 15035)
@@ -1,15 +1,16 @@
-author: Brian Nelson <pyro at debian.org>
+author: Michael Banck <mbanck at debian.org>
 
---- a/src/corelib/io/qfsfileengine_unix.cpp
-+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -64,6 +64,10 @@
+define MAX_PATH if not defined. This is needed on hurd.
+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
  
- QT_BEGIN_NAMESPACE
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- /*!
-     \internal
- 
+ //this is the max filename... for now its just the same,

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2009-06-29 14:26:50 UTC (rev 15034)
+++ trunk/packages/qt4-x11/debian/patches/series	2009-06-29 14:43:52 UTC (rev 15035)
@@ -31,6 +31,5 @@
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
-81_hurd_more_max_path.diff
 89_powerpc_opts.diff
 91_s390_-gstabs.diff