rev 5699 - in trunk/packages/qt4-x11/debian: . patches
Brian Nelson
pyro at alioth.debian.org
Sun Mar 4 16:46:09 CET 2007
Author: pyro
Date: 2007-03-04 15:46:08 +0000 (Sun, 04 Mar 2007)
New Revision: 5699
Added:
trunk/packages/qt4-x11/debian/patches/51_kfreebsd_mkspecs.dpatch
trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch
Removed:
trunk/packages/qt4-x11/debian/patches/80_hurd_detection.dpatch
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/patches/00list
trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch
trunk/packages/qt4-x11/debian/rules
Log:
* Applied new patches for kFreeBSD and Hurd support
(Closes: #380097, #402007)
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2007-03-04 15:26:08 UTC (rev 5698)
+++ trunk/packages/qt4-x11/debian/changelog 2007-03-04 15:46:08 UTC (rev 5699)
@@ -18,8 +18,11 @@
* Re-arranged patches to group them by arch so that they're easier to
deal with
- -- Brian Nelson <pyro at debian.org> Sun, 4 Mar 2007 10:26:01 -0500
+ * Applied new patches for kFreeBSD and Hurd support
+ (Closes: #380097, #402007)
+ -- Brian Nelson <pyro at debian.org> Sun, 4 Mar 2007 10:45:49 -0500
+
qt4-x11 (4.2.1-2) unstable; urgency=low
* debian/patches/20_hppa_inotify_fix.dpatch: new patch that should fix
Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list 2007-03-04 15:26:08 UTC (rev 5698)
+++ trunk/packages/qt4-x11/debian/patches/00list 2007-03-04 15:46:08 UTC (rev 5699)
@@ -7,7 +7,8 @@
40_alpha_ice
41_alpha_disable_opengl_visibility
50_kfreebsd_build_fix
+51_kfreebsd_mkspecs
60_m68k_inotify_fix
70_hppa_ldcw_fix
71_hppa_inotify_fix
-80_hurd_detection
+80_hurd_max_path
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch 2007-03-04 15:26:08 UTC (rev 5698)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch 2007-03-04 15:46:08 UTC (rev 5699)
@@ -1,20 +1,79 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_kfreebsd_build_fix.dpatch by Brian Nelson <pyro at debian.org> by way
-## of Petr Salinger <Petr.Salinger at t-systems.cz>
+## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger at seznam.cz>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes FTBFS on GNU/kFreeBSD
+## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC
@DPATCH@
-diff -urNad qt4-x11-4.0.1~/src/corelib/global/qglobal.h qt4-x11-4.0.1/src/corelib/global/qglobal.h
---- qt4-x11-4.0.1~/src/corelib/global/qglobal.h 2005-08-16 11:41:07.000000000 +0300
-+++ qt4-x11-4.0.1/src/corelib/global/qglobal.h 2005-12-13 18:19:47.000000000 +0200
-@@ -100,7 +100,7 @@
- # define Q_OS_ULTRIX
- #elif defined(sinix)
+diff -ur qt4-x11-4.2.1/src/corelib/global/qglobal.h qt4-x11-4.2.1/src/corelib/global/qglobal.h
+--- qt4-x11-4.2.1/src/corelib/global/qglobal.h 2006-10-20 17:35:14.000000000 +0200
++++ qt4-x11-4.2.1/src/corelib/global/qglobal.h 2006-12-06 23:06:11.000000000 +0100
+@@ -101,6 +102,12 @@
# define Q_OS_RELIANT
--#elif defined(__linux__) || defined(__linux)
-+#elif defined(__linux__) || defined(__linux) || defined(__GLIBC__)
+ #elif defined(__linux__) || defined(__linux)
# define Q_OS_LINUX
++# define Q_OS_GLIBC
++#elif defined(__GNU_HURD__) || defined(__GNU__)
++# define Q_OS_HURD
++# define Q_OS_GLIBC
++#elif defined(__GLIBC__)
++# define Q_OS_GLIBC
#elif defined(__FreeBSD__) || defined(__DragonFly__)
# define Q_OS_FREEBSD
+ # define Q_OS_BSD4
+@@ -121,8 +128,6 @@
+ # define Q_OS_AIX
+ #elif defined(__Lynx__)
+ # define Q_OS_LYNX
+-#elif defined(__GNU_HURD__)
+-# define Q_OS_HURD
+ #elif defined(__DGUX__)
+ # define Q_OS_DGUX
+ #elif defined(__QNXNTO__)
+diff -ur qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp
+--- qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp 2006-10-20 17:35:15.000000000 +0200
++++ qt4-x11-4.2.1/src/corelib/plugin/qlibrary.cpp 2006-12-07 09:01:45.000000000 +0100
+@@ -248,11 +248,11 @@
+
+ #if defined(Q_OS_UNIX)
+
+-#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
+ # define USE_MMAP
+ # include <sys/types.h>
+ # include <sys/mman.h>
+-#endif // Q_OS_FREEBSD || Q_OS_LINUX
++#endif // Q_OS_FREEBSD || Q_OS_GLIBC
+
+ static long qt_find_pattern(const char *s, ulong s_len,
+ const char *pattern, ulong p_len)
+diff -ur qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp 2006-10-20 17:35:15.000000000 +0200
++++ qt4-x11-4.2.1/src/corelib/tools/qlocale.cpp 2006-12-07 09:01:22.000000000 +0100
+@@ -47,7 +47,7 @@
+ #include <stdlib.h>
+ #include <qdebug.h>
+
+-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
+ # include <fenv.h>
+ #endif
+
+@@ -5639,7 +5639,7 @@
+ _control87(MCW_EM, MCW_EM);
+ #endif
+
+-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
+ fenv_t envp;
+ feholdexcept(&envp);
+ #endif
+@@ -5655,7 +5655,7 @@
+ #endif //_M_X64
+ #endif //Q_OS_WIN
+
+-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__)
+ fesetenv(&envp);
+ #endif
+
Added: trunk/packages/qt4-x11/debian/patches/51_kfreebsd_mkspecs.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/51_kfreebsd_mkspecs.dpatch 2007-03-04 15:26:08 UTC (rev 5698)
+++ trunk/packages/qt4-x11/debian/patches/51_kfreebsd_mkspecs.dpatch 2007-03-04 15:46:08 UTC (rev 5699)
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+## 90_kfreebsd_mkspecs.dpatch by Petr Salinger <Petr.Salinger at seznam.cz>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
+## DP: we cannot use directly linux-g++ due to src/corelib/io/io.pri
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ rm -rvf mkspecs/glibc-g++
+ cp -av mkspecs/linux-g++ mkspecs/glibc-g++
+ ;;
+ -unpatch)
+ rm -rvf mkspecs/glibc-g++
+ ;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
Deleted: trunk/packages/qt4-x11/debian/patches/80_hurd_detection.dpatch
Added: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch 2007-03-04 15:26:08 UTC (rev 5698)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.dpatch 2007-03-04 15:46:08 UTC (rev 5699)
@@ -0,0 +1,14 @@
+diff -ur qt4-x11-4.2.1/src/corelib/io/qfsfileengine_unix.cpp qt4-x11-4.2.1-youpi/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.2.1/src/corelib/io/qfsfileengine_unix.cpp 2006-10-20 15:35:14.000000000 +0000
++++ qt4-x11-4.2.1-youpi/src/corelib/io/qfsfileengine_unix.cpp 2007-01-21 19:52:35.000000000 +0000
+@@ -40,6 +40,10 @@
+ # include <private/qcore_mac_p.h>
+ #endif
+
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ void QFSFileEnginePrivate::init()
+ {
+ }
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2007-03-04 15:26:08 UTC (rev 5698)
+++ trunk/packages/qt4-x11/debian/rules 2007-03-04 15:46:08 UTC (rev 5699)
@@ -26,6 +26,13 @@
EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ PLATFORM_ARG = linux-g++
+else
+ PLATFORM_ARG = glibc-g++
+endif
+
+
common-configure-arch::
./configure -confirm-license \
-prefix "/usr" \
@@ -35,7 +42,7 @@
-plugindir "/usr/lib/qt4/plugins" \
-translationdir "/usr/share/qt4/translations" \
-sysconfdir "/etc/xdg" \
- -platform linux-g++ \
+ -platform $(PLATFORM_ARG) \
-debug-and-release \
-fast \
-no-rpath \
More information about the pkg-kde-commits
mailing list