[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-4-7-g5af5f5a
Pino Toscano
pino at moszumanska.debian.org
Tue Dec 30 23:20:46 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=5af5f5a
The following commit has been merged in the experimental branch:
commit 5af5f5a999bf59b47b4ee86109cb6ab8b7e2d22f
Author: Pino Toscano <pino at debian.org>
Date: Wed Dec 31 00:20:25 2014 +0100
update gnukfreebsd.diff
... according to the more recent hurd-g++ mkspec
---
debian/changelog | 1 +
debian/patches/gnukfreebsd.diff | 58 ++++++++++++++++++-----------------------
2 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d0d62ff..978e5bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
backport of upstream commit 13972476ad2c3178fe89f2d96f398de10394c6f6.
* Replace (rename) patch bigendian_qimage_conversions.diff with
upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch.
+ * Update gnukfreebsd.diff according to the more recent hurd-g++ mkspec.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 30 Dec 2014 23:42:00 +0100
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index e7849f0..63d5951 100644
--- a/debian/patches/gnukfreebsd.diff
+++ b/debian/patches/gnukfreebsd.diff
@@ -2,29 +2,30 @@ 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
+Last-Update: 2014-12-31
Forwarded: no
---
mkspecs/features/qt_functions.prf | 2
- mkspecs/gnukfreebsd-g++/qmake.conf | 52 ++++++++++++++++++
- mkspecs/gnukfreebsd-g++/qplatformdefs.h | 92 ++++++++++++++++++++++++++++++++
- 3 files changed, 146 insertions(+)
+ mkspecs/gnukfreebsd-g++/qmake.conf | 54 ++++++++++++++++++++
+ mkspecs/gnukfreebsd-g++/qplatformdefs.h | 84 ++++++++++++++++++++++++++++++++
+ 3 files changed, 140 insertions(+)
--- /dev/null
+++ b/mkspecs/gnukfreebsd-g++/qmake.conf
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,54 @@
+#
+# qmake configuration for gnukfreebsd-g++
+#
+
+MAKEFILE_GENERATOR = UNIX
-+QMAKE_PLATFORM = gnukfreebsd
-+CONFIG += incremental gdb_dwarf_index
++QMAKE_PLATFORM += gnukfreebsd
++CONFIG += incremental
+QMAKE_INCREMENTAL_STYLE = sublib
+
+QMAKE_CFLAGS_THREAD += -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
++QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
+
+QMAKE_INCDIR =
+QMAKE_LIBDIR =
@@ -32,8 +33,6 @@ Forwarded: no
+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 =
@@ -47,11 +46,14 @@ Forwarded: no
+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_CFLAGS_XCB =
++QMAKE_LIBS_XCB =
++QMAKE_DEFINES_XCB =
++
+QMAKE_AR = ar cqs
+QMAKE_OBJCOPY = objcopy
+QMAKE_NM = nm -P
@@ -68,44 +70,36 @@ Forwarded: no
+load(qt_config)
--- /dev/null
+++ b/mkspecs/gnukfreebsd-g++/qplatformdefs.h
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,84 @@
+/****************************************************************************
+**
-+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2014 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$
++** $QT_BEGIN_LICENSE:LGPL21$
+** 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
++** 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.
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** 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
++** 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$
+**
+****************************************************************************/
@@ -156,8 +150,8 @@ Forwarded: no
+#include "../common/posix/qplatformdefs.h"
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
-+#define QT_SNPRINTF ::snprintf
-+#define QT_VSNPRINTF ::vsnprintf
++#define QT_SNPRINTF ::snprintf
++#define QT_VSNPRINTF ::vsnprintf
+#endif
+
+#endif // QPLATFORMDEFS_H
--
qtbase packaging
More information about the pkg-kde-commits
mailing list