Mercurial > mxe-octave
changeset 1964:c1be05e8502a
package qt: add support for Debian GNU/kFreeBSD
author | Tony Theodore <tonyt@logyst.com> |
---|---|
date | Sun, 28 Aug 2011 04:30:53 +1000 |
parents | 4a30e1db1f90 |
children | 6559e3a6c75d |
files | src/qt-2-kfreebsd.patch |
diffstat | 1 files changed, 42 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt-2-kfreebsd.patch Sun Aug 28 04:30:53 2011 +1000 @@ -0,0 +1,42 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: + +http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/patches/50_kfreebsd_Q_OS.diff;h=4a8db71ff07a91efdf822baa120a3542ccf1d7f2;hb=HEAD + +Author: Pino Toscano <pino@kde.org> +Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL. +Last-Update: 2010-10-06 + +--- a/src/corelib/global/qglobal.h ++++ b/src/corelib/global/qglobal.h +@@ -221,6 +221,8 @@ namespace QT_NAMESPACE {} + #elif defined(__FreeBSD__) || defined(__DragonFly__) + # define Q_OS_FREEBSD + # define Q_OS_BSD4 ++#elif defined(__FreeBSD_kernel__) ++# define Q_OS_FREEBSD_KERNEL + #elif defined(__NetBSD__) + # define Q_OS_NETBSD + # define Q_OS_BSD4 + + +This patch is inspired by: + +http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/rules;h=47e5efbf09f77e6da51a3d719d2f6be47f69d096;hb=HEAD + +For the time being, glibc-g++ is simply a copy of linux-g++. + +--- qt-everywhere-opensource-src-4.7.2/configure.orig 2011-03-16 18:27:09.000000000 +1100 ++++ qt-everywhere-opensource-src-4.7.2/configure 2011-03-16 18:28:55.000000000 +1100 +@@ -2638,6 +2638,9 @@ + GNU:*) + PLATFORM=hurd-g++ + ;; ++ GNU/kFreeBSD:*) ++ PLATFORM=linux-g++ ++ ;; + dgux:*) + PLATFORM=dgux-g++ + ;;