Hi,
Michael Banck, le Mon 15 Jan 2007 16:00:15 +0100, a écrit :
> qt4-x11 still FTBFS on GNU/Hurd:
Here is the bunch of patches that are currently needed for producing
correct packages on hurd-i386 (and equivalent fixes for kfreebsd-i386
and kfreebsd-amd64):
- 22_path_max replaces the previously-proposed 21_hurd_path_max.dpatch
- 23_moc_uic_qt4 extends the existing 10_qmake_for_debian.dpatch to
kfreebsd and the Hurd.
- 24_non_linux fixes packaging rules and links for non-linux debian
ports.
Samuel
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()
{
}
diff -ur qt4-x11-4.2.1/mkspecs/freebsd-g++/qmake.conf
qt4-x11-4.2.1-youpi/mkspecs/freebsd-g++/qmake.conf
--- qt4-x11-4.2.1/mkspecs/freebsd-g++/qmake.conf 2006-10-20
15:35:09.000000000 +0000
+++ qt4-x11-4.2.1-youpi/mkspecs/freebsd-g++/qmake.conf 2007-01-21
20:49:28.000000000 +0000
@@ -64,8 +64,8 @@
QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD =
-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4
+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4
QMAKE_AR = ar cqs
QMAKE_RANLIB =
diff -ur qt4-x11-4.2.1/mkspecs/hurd-g++/qmake.conf
qt4-x11-4.2.1-youpi/mkspecs/hurd-g++/qmake.conf
--- qt4-x11-4.2.1/mkspecs/hurd-g++/qmake.conf 2006-10-20 15:35:54.000000000
+0000
+++ qt4-x11-4.2.1-youpi/mkspecs/hurd-g++/qmake.conf 2007-01-21
20:47:58.000000000 +0000
@@ -61,8 +61,8 @@
QMAKE_LIBS_OPENGL = -lGLU -lGL
QMAKE_LIBS_OPENGL_QT = -lGL
-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4
+QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4
QMAKE_AR = ar cqs
QMAKE_RANLIB =
diff -ur qt4-x11-4.2.1/debian/rules qt4-x11-4.2.1-youpi/debian/rules
--- qt4-x11-4.2.1/debian/rules 2007-01-22 09:19:03.000000000 +0000
+++ qt4-x11-4.2.1-youpi/debian/rules 2007-01-23 03:39:54.000000000 +0000
@@ -22,6 +22,18 @@
DEB_INSTALL_CHANGELOGS_ALL := changes-4.2.1
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+ PLATFORM := hurd-g++
+else
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ PLATFORM := freebsd-g++
+else
+ PLATFORM := linux-g++
+endif
+endif
+
ifeq ($(DEB_HOST_ARCH),arm)
EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
@@ -35,7 +47,7 @@
-plugindir "/usr/lib/qt4/plugins" \
-translationdir "/usr/share/qt4/translations" \
-sysconfdir "/etc/qt4" \
- -platform linux-g++ \
+ -platform $(PLATFORM) \
-debug-and-release \
-fast \
-no-rpath \
diff -urN qt4-x11-4.2.1/debian/libqt4-dev.links.hurd-i386
qt4-x11-4.2.1-youpi/debian/libqt4-dev.links.hurd-i386
--- qt4-x11-4.2.1/debian/libqt4-dev.links.hurd-i386 1970-01-01
00:00:00.000000000 +0000
+++ qt4-x11-4.2.1-youpi/debian/libqt4-dev.links.hurd-i386 2007-01-23
03:36:40.000000000 +0000
@@ -0,0 +1,9 @@
+usr/include/qt4 usr/share/qt4/include
+usr/bin/lrelease-qt4 usr/share/qt4/bin/lrelease
+usr/bin/lupdate-qt4 usr/share/qt4/bin/lupdate
+usr/bin/moc-qt4 usr/share/qt4/bin/moc
+usr/bin/qmake-qt4 usr/share/qt4/bin/qmake
+usr/bin/uic-qt4 usr/share/qt4/bin/uic
+usr/bin/rcc usr/share/qt4/bin/rcc
+usr/lib/qt4/plugins usr/share/qt4/plugins
+usr/share/qt4/mkspecs/hurd-g++ usr/share/qt4/mkspecs/default
diff -urN qt4-x11-4.2.1/debian/libqt4-dev.links.kfreebsd-amd64
qt4-x11-4.2.1-youpi/debian/libqt4-dev.links.kfreebsd-amd64
--- qt4-x11-4.2.1/debian/libqt4-dev.links.kfreebsd-amd64 1970-01-01
00:00:00.000000000 +0000
+++ qt4-x11-4.2.1-youpi/debian/libqt4-dev.links.kfreebsd-amd64 2007-01-23
03:37:15.000000000 +0000
@@ -0,0 +1,9 @@
+usr/include/qt4 usr/share/qt4/include
+usr/bin/lrelease-qt4 usr/share/qt4/bin/lrelease
+usr/bin/lupdate-qt4 usr/share/qt4/bin/lupdate
+usr/bin/moc-qt4 usr/share/qt4/bin/moc
+usr/bin/qmake-qt4 usr/share/qt4/bin/qmake
+usr/bin/uic-qt4 usr/share/qt4/bin/uic
+usr/bin/rcc usr/share/qt4/bin/rcc
+usr/lib/qt4/plugins usr/share/qt4/plugins
+usr/share/qt4/mkspecs/freebsd-g++ usr/share/qt4/mkspecs/default
diff -urN qt4-x11-4.2.1/debian/libqt4-dev.links.kfreebsd-i386
qt4-x11-4.2.1-youpi/debian/libqt4-dev.links.kfreebsd-i386
--- qt4-x11-4.2.1/debian/libqt4-dev.links.kfreebsd-i386 1970-01-01
00:00:00.000000000 +0000
+++ qt4-x11-4.2.1-youpi/debian/libqt4-dev.links.kfreebsd-i386 2007-01-23
03:37:17.000000000 +0000
@@ -0,0 +1,9 @@
+usr/include/qt4 usr/share/qt4/include
+usr/bin/lrelease-qt4 usr/share/qt4/bin/lrelease
+usr/bin/lupdate-qt4 usr/share/qt4/bin/lupdate
+usr/bin/moc-qt4 usr/share/qt4/bin/moc
+usr/bin/qmake-qt4 usr/share/qt4/bin/qmake
+usr/bin/uic-qt4 usr/share/qt4/bin/uic
+usr/bin/rcc usr/share/qt4/bin/rcc
+usr/lib/qt4/plugins usr/share/qt4/plugins
+usr/share/qt4/mkspecs/freebsd-g++ usr/share/qt4/mkspecs/default
