[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri Jan 31 15:35:33 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=645778b
The following commit has been merged in the master branch:
commit 645778b3901817e4d286948d893599577c02c423
Author: Pino Toscano <pino at debian.org>
Date: Sat Dec 21 01:59:25 2013 +0100
initial support for GNU/kFreeBSD
- provide qmake mkspec, and use LD_LIBRARY_PATH; patch gnukfreebsd.diff
- rules: use the gnukfreebsd-g++ when configure'ing
---
debian/changelog | 3 +
debian/patches/gnukfreebsd.diff | 168 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +
4 files changed, 174 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ce9f109..f7e6288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtbase-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=low
* Further fix for MIPS, also in the orderedMemoryFence implementation;
patch mips_more_pre-mips32.diff.
* rules: small simplification in the platform_arg (mkspec) selection.
+ * Initial support for GNU/kFreeBSD:
+ - provide qmake mkspec, and use LD_LIBRARY_PATH; patch gnukfreebsd.diff
+ - rules: use the gnukfreebsd-g++ when configure'ing
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 20 Dec 2013 21:31:31 +0100
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
new file mode 100644
index 0000000..e18b88f
--- /dev/null
+++ b/debian/patches/gnukfreebsd.diff
@@ -0,0 +1,168 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Initial GNU/kFreeBSD support
+ - add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
+ - properly use LD_LIBRARY_PATH on GNU/* systems
+Last-Update: 2013-12-21
+Forwarded: no
+
+--- /dev/null
++++ b/mkspecs/gnukfreebsd-g++/qmake.conf
+@@ -0,0 +1,52 @@
++#
++# qmake configuration for gnukfreebsd-g++
++#
++
++MAKEFILE_GENERATOR = UNIX
++QMAKE_PLATFORM = gnukfreebsd
++CONFIG += incremental gdb_dwarf_index
++QMAKE_INCREMENTAL_STYLE = sublib
++
++QMAKE_CFLAGS_THREAD += -D_REENTRANT
++QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
++
++QMAKE_INCDIR =
++QMAKE_LIBDIR =
++QMAKE_INCDIR_X11 =
++QMAKE_LIBDIR_X11 =
++QMAKE_INCDIR_OPENGL =
++QMAKE_LIBDIR_OPENGL =
++QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
++QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
++QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
++QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
++QMAKE_INCDIR_EGL =
++QMAKE_LIBDIR_EGL =
++QMAKE_INCDIR_OPENVG =
++QMAKE_LIBDIR_OPENVG =
++
++QMAKE_LIBS =
++QMAKE_LIBS_DYNLOAD = -ldl
++QMAKE_LIBS_X11 = -lXext -lX11 -lm
++QMAKE_LIBS_NIS = -lnsl
++QMAKE_LIBS_EGL = -lEGL
++QMAKE_LIBS_OPENGL = -lGL
++QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
++QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
++QMAKE_LIBS_OPENVG = -lOpenVG
++QMAKE_LIBS_THREAD = -lpthread
++
++QMAKE_AR = ar cqs
++QMAKE_OBJCOPY = objcopy
++QMAKE_NM = nm -P
++QMAKE_RANLIB =
++
++QMAKE_STRIP = strip
++QMAKE_STRIPFLAGS_LIB += --strip-unneeded
++QMAKE_INSTALL_FILE = install -m 644 -p
++QMAKE_INSTALL_PROGRAM = install -m 755 -p
++
++include(../common/unix.conf)
++include(../common/gcc-base-unix.conf)
++include(../common/g++-unix.conf)
++load(qt_config)
+--- /dev/null
++++ b/mkspecs/gnukfreebsd-g++/qplatformdefs.h
+@@ -0,0 +1,92 @@
++/****************************************************************************
++**
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the qmake spec of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QPLATFORMDEFS_H
++#define QPLATFORMDEFS_H
++
++// Get Qt defines/settings
++
++#include "qglobal.h"
++
++// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
++
++// 1) need to reset default environment if _BSD_SOURCE is defined
++// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
++// 3) it seems older glibc need this to include the X/Open stuff
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE
++#endif
++
++#include <unistd.h>
++
++
++// We are hot - unistd.h should have turned on the specific APIs we requested
++
++
++#include <pthread.h>
++#include <dirent.h>
++#include <fcntl.h>
++#include <grp.h>
++#include <pwd.h>
++#include <signal.h>
++#include <dlfcn.h>
++
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/ipc.h>
++#include <sys/time.h>
++#include <sys/shm.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++#include <sys/wait.h>
++#include <netinet/in.h>
++#ifndef QT_NO_IPV6IFNAME
++#include <net/if.h>
++#endif
++
++#include "../common/posix/qplatformdefs.h"
++
++#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
++#define QT_SNPRINTF ::snprintf
++#define QT_VSNPRINTF ::vsnprintf
++#endif
++
++#endif // QPLATFORMDEFS_H
+--- a/mkspecs/features/qt_functions.prf
++++ b/mkspecs/features/qt_functions.prf
+@@ -259,6 +259,8 @@ defineTest(qtAddTargetEnv) {
+ deppath.name = PATH
+ } else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
+ deppath.name = LD_LIBRARY_PATH
++ } else:contains(QMAKE_HOST.os, ^GNU/.*) {
++ deppath.name = LD_LIBRARY_PATH
+ } else:equals(QMAKE_HOST.os, Darwin) {
+ contains(QT_CONFIG, qt_framework): \
+ deppath.name = DYLD_FRAMEWORK_PATH
diff --git a/debian/patches/series b/debian/patches/series
index 4e74b9c..79d1a8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,6 @@ fix_power_atomic_code.patch
support_mips_atomic_on_pre-mips32_archs.patch
uname_include.diff
mips_more_pre-mips32.diff
+gnukfreebsd.diff
# Debian specific.
diff --git a/debian/rules b/debian/rules
index 6988a91..ecd5029 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,8 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
endif
else ifeq ($(DEB_HOST_ARCH_OS),hurd)
platform_arg = hurd-g++
+else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ platform_arg = gnukfreebsd-g++
else
platform_arg = glibc-g++
endif
--
qtbase packaging
More information about the pkg-kde-commits
mailing list