--- Begin Message ---
Package: qt4-x11
Severity: important
Version: 4.2.1-2
Tags: patch
Hi,
the current version fails to build on GNU/kFreeBSD,
see http://experimental.ftbfs.de/build.php?&pkg=qt4-x11&arch=kfreebsd-i386
Please find attached patch to fix that.
It updates debian/patches/14_kfreebsd_build_fix.dpatch.
This dpatch also makes obsolete debian/patches/21_hurd_detection.dpatch.
As "-platform linux-g++" does not longer work on non-linux
due to src/corelib/io/io.pri, there is also change to debian/rules
and corresponding debian/patches/90_kfreebsd_mkspecs.dpatch.
It would also be nice if you can ask upstream
to include similar change.
Thanks in advance
Petr
diff -u qt4-x11-4.2.1/debian/patches/14_kfreebsd_build_fix.dpatch qt4-x11-4.2.1/debian/patches/14_kfreebsd_build_fix.dpatch
--- qt4-x11-4.2.1/debian/patches/14_kfreebsd_build_fix.dpatch
+++ qt4-x11-4.2.1/debian/patches/14_kfreebsd_build_fix.dpatch
@@ -2,19 +2,78 @@
-## 14_kfreebsd_build_fix.dpatch by Brian Nelson <pyro@debian.org> by way
-## of Petr Salinger <Petr.Salinger@t-systems.cz>
+## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger@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
+
diff -u qt4-x11-4.2.1/debian/patches/00list qt4-x11-4.2.1/debian/patches/00list
--- qt4-x11-4.2.1/debian/patches/00list
+++ qt4-x11-4.2.1/debian/patches/00list
@@ -11 +11 @@
-21_hurd_detection
+90_kfreebsd_mkspecs
reverted:
--- qt4-x11-4.2.1/debian/patches/21_hurd_detection.dpatch
+++ qt4-x11-4.2.1.orig/debian/patches/21_hurd_detection.dpatch
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_hurd_detection.dpatch by Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable GNU/Hurd detection
-
-@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@trolltech.com"
diff -u qt4-x11-4.2.1/debian/rules qt4-x11-4.2.1/debian/rules
--- qt4-x11-4.2.1/debian/rules
+++ qt4-x11-4.2.1/debian/rules
@@ -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/qt4" \
- -platform linux-g++ \
+ -platform $(PLATFORM_ARG) \
-debug-and-release \
-fast \
-no-rpath \
only in patch2:
unchanged:
--- qt4-x11-4.2.1.orig/debian/patches/90_kfreebsd_mkspecs.dpatch
+++ qt4-x11-4.2.1/debian/patches/90_kfreebsd_mkspecs.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh -e
+## 90_kfreebsd_mkspecs.dpatch by Petr Salinger <Petr.Salinger@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
--- End Message ---
--- Begin Message ---
Source: qt4-x11
Source-Version: 4.2.2-1
We believe that the bug you reported is fixed in the latest version of
qt4-x11, which is due to be installed in the Debian FTP archive:
libqt4-core_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/libqt4-core_4.2.2-1_i386.deb
libqt4-debug_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/libqt4-debug_4.2.2-1_i386.deb
libqt4-dev_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/libqt4-dev_4.2.2-1_i386.deb
libqt4-gui_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/libqt4-gui_4.2.2-1_i386.deb
libqt4-qt3support_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/libqt4-qt3support_4.2.2-1_i386.deb
libqt4-sql_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/libqt4-sql_4.2.2-1_i386.deb
qt4-designer_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/qt4-designer_4.2.2-1_i386.deb
qt4-dev-tools_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/qt4-dev-tools_4.2.2-1_i386.deb
qt4-doc_4.2.2-1_all.deb
to pool/main/q/qt4-x11/qt4-doc_4.2.2-1_all.deb
qt4-qtconfig_4.2.2-1_i386.deb
to pool/main/q/qt4-x11/qt4-qtconfig_4.2.2-1_i386.deb
qt4-x11_4.2.2-1.diff.gz
to pool/main/q/qt4-x11/qt4-x11_4.2.2-1.diff.gz
qt4-x11_4.2.2-1.dsc
to pool/main/q/qt4-x11/qt4-x11_4.2.2-1.dsc
qt4-x11_4.2.2.orig.tar.gz
to pool/main/q/qt4-x11/qt4-x11_4.2.2.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 402007@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Brian Nelson <pyro@debian.org> (supplier of updated qt4-x11 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sun, 4 Mar 2007 13:50:39 -0500
Source: qt4-x11
Binary: libqt4-sql libqt4-core qt4-doc libqt4-debug libqt4-qt3support qt4-designer libqt4-dev qt4-dev-tools libqt4-gui qt4-qtconfig
Architecture: source i386 all
Version: 4.2.2-1
Distribution: unstable
Urgency: low
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Changed-By: Brian Nelson <pyro@debian.org>
Description:
libqt4-core - Qt 4 core non-GUI functionality runtime library
libqt4-debug - Qt 4 library debugging symbols
libqt4-dev - Qt 4 development files
libqt4-gui - Qt 4 core GUI functionality runtime library
libqt4-qt3support - Qt 3 compatibility library for Qt 4
libqt4-sql - Qt 4 SQL database module
qt4-designer - Qt 4 Designer
qt4-dev-tools - Qt 4 development tools
qt4-doc - Qt 4 API documentation
qt4-qtconfig - Qt 4 configuration tool
Closes: 380097 399049 402007 403290 407297 408813 409228 410862 410885
Changes:
qt4-x11 (4.2.2-1) unstable; urgency=low
.
* New upstream release (Closes: #410862)
.
* debian/rules: set the sysconfdir to /etc/xdg instead of /etc/qt4 to
match the QSettings documentation (Closes: #407297)
.
* Added Riku Voipio's patch for ARM EABI (Closes: #408813)
.
* debian/patches/22_launch_moc-qt4.dpatch: new patch to ensure the Qt4
version of moc is launched by qdbuscpp2xml (Closes: #399049)
.
* Added a doc-base file for qt4-doc (Closes: #403290)
.
* debian/qt4-designer.links: added a link /usr/share/qt4/bin/designer ->
/usr/bin/designer-qt4 (Closes: #410885)
.
* Re-arranged patches to group them by arch so that they're easier to
deal with
.
* Applied new patches for kFreeBSD and Hurd support
(Closes: #380097, #402007)
.
* debian/libqt4-gui.install: added the codecs plugins, somehow these got
accidentally dropped (Closes: #409228)
Files:
312ef5cc9fcb5d4cf5d85e2b5086b784 1380 libs optional qt4-x11_4.2.2-1.dsc
19f6374fe7924e33775cb87ee02669cb 37636491 libs optional qt4-x11_4.2.2.orig.tar.gz
df7ec0162ab592e81902b768d7bd4736 23399 libs optional qt4-x11_4.2.2-1.diff.gz
ebff69a3e6cabab557d6cabbfb23778d 21769284 doc optional qt4-doc_4.2.2-1_all.deb
e288c8a5329564235916d80a6c2b55e8 4211374 libdevel optional libqt4-dev_4.2.2-1_i386.deb
c72e75949f3a9635b045ce6d2d91f649 1176806 libs optional libqt4-core_4.2.2-1_i386.deb
93c0c6eb7b8765246149801b8a16a9d3 4945590 libs optional libqt4-gui_4.2.2-1_i386.deb
5a44be538881d3ee8a649128ec37f65a 322854 libs optional libqt4-sql_4.2.2-1_i386.deb
690ff07eb08fcc592f958c9f06d4cdf9 1258808 libs optional libqt4-qt3support_4.2.2-1_i386.deb
9c877dda43df143f7ca7547561cf782a 1076058 devel optional qt4-designer_4.2.2-1_i386.deb
b0c1efc3141eaa00dcc43dfa5f241f20 57293146 libs optional libqt4-debug_4.2.2-1_i386.deb
5ad591b976689aa43003a604797fc388 754872 devel optional qt4-dev-tools_4.2.2-1_i386.deb
007b9c070775f277a3a4579a1bd1e445 103816 x11 optional qt4-qtconfig_4.2.2-1_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFF6yRq1Ng1YWbyRSERAtSXAJ9mZDA6T8Jvn0U2vnGU8++F4CAs6gCeMH07
T46dwmTnr7TuQ92j2ax3peM=
=/MEA
-----END PGP SIGNATURE-----
--- End Message ---