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

Brian Nelson pyro at alioth.debian.org
Tue Oct 31 04:23:00 CET 2006


Author: pyro
Date: 2006-10-31 04:23:00 +0100 (Tue, 31 Oct 2006)
New Revision: 4827

Added:
   trunk/packages/qt4-x11/debian/patches/21_hurd_detection.dpatch
   trunk/packages/qt4-x11/debian/patches/22_hurd_path_max.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * Added patches for hurd support (Closes: #380097)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-10-30 18:30:31 UTC (rev 4826)
+++ trunk/packages/qt4-x11/debian/changelog	2006-10-31 03:23:00 UTC (rev 4827)
@@ -3,8 +3,10 @@
   * debian/patches/20_hppa_inotify_fix.dpatch: new patch that should fix
     the FTBFS on hppa due to missing defines (Closes: #394953)
 
- -- Brian Nelson <pyro at debian.org>  Tue, 24 Oct 2006 12:18:59 -0400
+  * Added patches for hurd support (Closes: #380097)
 
+ -- Brian Nelson <pyro at debian.org>  Mon, 30 Oct 2006 22:20:30 -0500
+
 qt4-x11 (4.2.1-1) unstable; urgency=high
 
   * New upstream release    

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2006-10-30 18:30:31 UTC (rev 4826)
+++ trunk/packages/qt4-x11/debian/patches/00list	2006-10-31 03:23:00 UTC (rev 4827)
@@ -8,3 +8,5 @@
 18_disable_opengl_visibility
 19_m68k_inotify_fix
 20_hppa_inotify_fix
+21_hurd_detection
+22_hurd_path_max

Added: trunk/packages/qt4-x11/debian/patches/21_hurd_detection.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/21_hurd_detection.dpatch	2006-10-30 18:30:31 UTC (rev 4826)
+++ trunk/packages/qt4-x11/debian/patches/21_hurd_detection.dpatch	2006-10-31 03:23:00 UTC (rev 4827)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_hurd_detection.dpatch by Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable GNU/Hurd detection
+
+ at DPATCH@
+diff -Nur qt4-x11-4.1.3~/src/corelib/global/qglobal.h qt4-x11-4.1.3~/src/corelib/global/qglobal.h
+--- qt4-x11-4.1.3~/src/corelib/global/qglobal.h	2006-07-21 11:51:19.000000000 +0000
++++ qt4-x11-4.1.3/src/corelib/global/qglobal.h	2006-07-21 11:58:25.000000000 +0000
+@@ -69,6 +69,7 @@
+      LYNX     - LynxOS
+      BSD4     - Any BSD 4.4 system
+      UNIX     - Any UNIX BSD/SYSV system
++     HURD     - Hurd
+ */
+ 
+ #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
+@@ -136,6 +137,8 @@
+ #  define Q_OS_UNIXWARE
+ #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */
+ #  define Q_OS_UNIXWARE
++#elif defined(__GNU__) /* To avoid confusion, like for mkspecs files */
++#  define Q_OS_HURD
+ #elif defined(__MAKEDEPEND__)
+ #else
+ #  error "Qt has not been ported to this OS - talk to qt-bugs at trolltech.com"

Added: trunk/packages/qt4-x11/debian/patches/22_hurd_path_max.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/22_hurd_path_max.dpatch	2006-10-30 18:30:31 UTC (rev 4826)
+++ trunk/packages/qt4-x11/debian/patches/22_hurd_path_max.dpatch	2006-10-31 03:23:00 UTC (rev 4827)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_hurd_detection.dpatch by Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix (workaround) POSIX incompatibility: unconditional use of PATH_MAX
+
+ at DPATCH@
+diff -Nur qt4-x11-4.1.3~/src/3rdparty/dlcompat/dlfcn.h qt4-x11-4.1.3/src/3rdparty/dlcompat/dlfcn.h
+--- qt4-x11-4.1.3~/src/3rdparty/dlcompat/dlfcn.h	2006-07-21 11:50:39.000000000 +0000
++++ qt4-x11-4.1.3/src/3rdparty/dlcompat/dlfcn.h	2006-07-21 11:59:52.000000000 +0000
+@@ -99,4 +99,8 @@
+ }
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #endif /* _DLFCN_H_ */
+diff -Nur qt4-x11-4.1.3~/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.1.3/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.1.3~/src/corelib/io/qfsfileengine_unix.cpp	2006-07-21 11:50:38.000000000 +0000
++++ qt4-x11-4.1.3/src/corelib/io/qfsfileengine_unix.cpp	2006-07-21 11:59:52.000000000 +0000
+@@ -40,6 +40,10 @@
+ # include <private/qcore_mac_p.h>
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ void QFSFileEnginePrivate::init()
+ {
+ }




More information about the pkg-kde-commits mailing list