Package: qt-x11-free Version: 3.3.6-4 Severity: important Hi,
here are two patches to add support for Hurd. The first applies only to debian/* files: debian/control: - removes firebird2-dev B-D: for hurd-i386 - removes hurd-i386 from Arch: for libqt3-mt-ibase debian/rules: - adds a hurd/linux test for the -platform option - adds a hurd case for ibase The second is a dpatch which only impacts upstream files: - it fixes POSIX incompatibilities (unconditional use of PATH_MAX); - it adds support for Hurd in some files; - it fixes some options in mkspecs/hurd-g++/qmake.conf Those patches have been elaborated and checked by: - Barry deFreese <[EMAIL PROTECTED]> - Alfredo Beaumont <[EMAIL PROTECTED]> - Samuel Thibault <[EMAIL PROTECTED]> I only put some pieces together, merged patches, dpatchified the upstream part, and checked that everything builds fine and can be installed succesfully. Cheers, -- Cyril Brulebois
--- qt-x11-free-3.3.6~/debian/control 2006-09-28 07:44:58.000000000 +0000 +++ qt-x11-free-3.3.6/debian/control 2006-09-28 07:45:49.000000000 +0000 @@ -1,7 +1,7 @@ Source: qt-x11-free Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Christopher Martin <[EMAIL PROTECTED]>, Adeodato Simó <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.31), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev, firebird2-dev [i386 hurd-i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64] +Build-Depends: debhelper (>= 5.0.31), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, dpatch (>= 1.13), libsqlite3-dev, firebird2-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64] Section: libs Priority: optional Standards-Version: 3.7.2 @@ -51,7 +51,7 @@ to access a PostgreSQL DB. Package: libqt3-mt-ibase -Architecture: i386 hurd-i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 +Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 Section: libs Depends: ${shlibs:Depends} Conflicts: libqt3c102-mt-ibase --- qt-x11-free-3.3.6~/debian/rules 2006-09-28 09:48:14.000000000 +0000 +++ qt-x11-free-3.3.6/debian/rules 2006-09-28 09:49:46.000000000 +0000 @@ -14,6 +14,12 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +ifeq ($(DEB_HOST_ARCH_OS),hurd) + PLATFORM_ARG = hurd-g++ +else + PLATFORM_ARG = linux-g++ +endif + # dpatch stuff include /usr/share/dpatch/dpatch.make @@ -41,7 +47,7 @@ -shared \ -fast \ -no-exceptions \ - -platform linux-g++ \ + -platform $(PLATFORM_ARG) \ \ -nis \ -no-pch \ @@ -95,6 +95,11 @@ IBASE = endif +ifeq ($(DEB_HOST_ARCH_OS),hurd) + CONFIGURE_OPTS += -no-sql-ibase + IBASE = -Nlibqt3-mt-ibase +endif + ifeq ($(DEB_HOST_ARCH),arm) CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif
60_gnu_hurd_support.dpatch
Description: application/shellscript