diff options
Diffstat (limited to 'debian')
26 files changed, 197 insertions, 134 deletions
diff --git a/debian/changelog b/debian/changelog index d0f679e..37db381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,53 @@ +qtbase-opensource-src (5.9.2+dfsg-5) UNRELEASED; urgency=medium + + [ Dmitry Shachnev ] + * Ship /usr/lib/${DEB_HOST_MULTIARCH}/qt.conf in qt5-qmake, it will be used + by debhelper for cross-building. + * Ship /usr/bin/${DEB_HOST_GNU_TYPE}-qmake wrapper script in qt5-qmake, for + using qmake with autoconf and AC_CHECK_TOOL. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 07 Nov 2017 13:57:18 +0300 + +qtbase-opensource-src (5.9.2+dfsg-4) unstable; urgency=medium + + * Upload to unstable. + + -- Dmitry Shachnev <mitya57@debian.org> Thu, 26 Oct 2017 14:16:31 +0300 + +qtbase-opensource-src (5.9.2+dfsg-3) experimental; urgency=medium + + * Merge 5.9.1+dfsg-12 upload from unstable. + * Move ${shlibs:Depends} from qt5-qmake to qt5-qmake-bin. + * Move all Qt binaries to a non-multiarch location, /usr/lib/qt5/bin/, for + improved cross-build support. Provide compatibility symlinks for the old + location. + * Bump qttools5-dev-tools build-dependency to 5.9.2-2, as the build system + now looks for qdoc and qtattributionsscanner in the new location. + * Use debhelper compat level 10 and dh_missing. + + -- Dmitry Shachnev <mitya57@debian.org> Thu, 19 Oct 2017 22:47:48 +0300 + +qtbase-opensource-src (5.9.2+dfsg-2) experimental; urgency=medium + + [ Lisandro Damián Nicanor Pérez Meyer ] + * Bump qtbase-abi to 5-9-2. We can't warrant that we catch all ABI changes + (specially with private stuff) and there is still the internal version + check, so we need to bump it even if we do not find API/ABI changes. + + -- Dmitry Shachnev <mitya57@debian.org> Sat, 14 Oct 2017 10:23:26 +0300 + +qtbase-opensource-src (5.9.2+dfsg-1) experimental; urgency=medium + + * New upstream release. + * Drop fix_atspi_condition.diff, it was coming from upstream. + * Port gnukfreebsd_cloexec.diff to new upstream code. + * Stop excluding src/3rdparty/zlib/doc/rfc*.txt from the tarball, + these files are no longer shipped by upstream. + * Update symbols files from the current build log. + * Update debian/copyright. + + -- Dmitry Shachnev <mitya57@debian.org> Fri, 06 Oct 2017 23:10:25 +0700 + qtbase-opensource-src (5.9.1+dfsg-12+dyson1) unstable; urgency=medium * Package for Dyson. Updated install and symbols files. diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 4b97471..62197d1 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Sune Vuorela <sune@debian.org>, Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>, Timo Jyrinki <timo@debian.org>, Dmitry Shachnev <mitya57@debian.org> -Build-Depends: debhelper (>= 9.20160114~), +Build-Depends: debhelper (>= 10.3), default-libmysqlclient-dev, dh-exec, dpkg-dev (>= 1.17.14), @@ -65,7 +65,7 @@ Build-Depends: debhelper (>= 9.20160114~), unixodbc-dev, zlib1g-dev Build-Depends-Indep: libqt5sql5-sqlite (>= 5.8.0+dfsg~) <!nodoc>, - qttools5-dev-tools (>= 5.8.0~) <!nodoc> + qttools5-dev-tools (>= 5.9.2-2~) <!nodoc> Standards-Version: 4.1.1 Homepage: http://qt-project.org/ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtbase.git @@ -75,7 +75,7 @@ Package: libqt5core5a Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Provides: qtbase-abi-5-9-0 +Provides: qtbase-abi-5-9-2 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: qttranslations5-l10n Suggests: libthai0 @@ -392,7 +392,7 @@ Package: qt5-qmake-bin Architecture: any Multi-Arch: foreign Section: devel -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Breaks: qt5-qmake (<< 5.9.1+dfsg-12~) Replaces: qt5-qmake (<< 5.9.1+dfsg-12~) Description: Qt 5 qmake Makefile generator tool — binary file @@ -408,8 +408,7 @@ Multi-Arch: same Section: devel Depends: qt5-qmake-bin (= ${binary:Version}), qtchooser (>= 55-gc9562a1-1~), - ${misc:Depends}, - ${shlibs:Depends} + ${misc:Depends} Description: Qt 5 qmake Makefile generator tool Qt is a cross-platform C++ application framework. Qt's primary feature is its rich set of widgets that provide standard GUI functionality. diff --git a/debian/copyright b/debian/copyright index 99c5221..c8cb237 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: qtbase-opensource-src Source: https://download.qt.io/official_releases/qt/*/submodules/ -Files-Excluded: src/3rdparty/zlib/doc/rfc*.txt - tests/auto/corelib/tools/qbytearray/rfc3252.txt +Files-Excluded: tests/auto/corelib/tools/qbytearray/rfc3252.txt tests/auto/corelib/io/qtextstream/rfc3261.txt tests/auto/network/access/qftp/rfc3252.txt tests/auto/network/access/qnetworkreply/rfc3252.txt @@ -569,6 +568,12 @@ Files: tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp Copyright: 2016 by Southwest Research Institute (R) License: GPL-3 with Qt-1.0 exception +## LGPL-2.1-or-3 with Qt-1.1 exception + +Files: tests/auto/tools/qmake/testdata/rawString/object2.h +Copyright: 2015 The Qt Company Ltd. +License: LGPL-2.1-or-3 with Qt-1.1 exception + ## LGPL-3 or GPL-2 Files: src/corelib/tools/qcollator_macx.cpp @@ -585,8 +590,7 @@ Copyright: 2013 Aleix Pol Gonzalez <aleixpol@kde.org> 2016 The Qt Company Ltd. License: LGPL-3 or GPL-2 -Files: config.tests/unix/sctp/sctp.cpp - src/network/socket/qsctpserver.cpp +Files: src/network/socket/qsctpserver.cpp src/network/socket/qsctpserver.h src/network/socket/qsctpserver_p.h src/network/socket/qsctpsocket.cpp @@ -601,12 +605,12 @@ Copyright: 2015-2016 Alex Trotsenko <alex1973tr@gmail.com> 2016 The Qt Company Ltd. License: LGPL-3 or GPL-2 -Files: config.tests/unix/lgmon/lgmon.cpp - config.tests/unix/objcopy/objcopy.cpp - config.tests/unix/pps/pps.cpp - config.tests/unix/qqnx_imf/qqnx_imf.cpp - config.tests/unix/slog2/slog2.cpp - mkspecs/common/qnx/qplatformdefs.h +Files: src/3rdparty/libpng/import_from_libpng_tarball.sh + src/3rdparty/zlib/import_from_zlib_tarball.sh +Copyright: 2017 André Klitzing +License: LGPL-3 or GPL-2 + +Files: mkspecs/common/qnx/qplatformdefs.h mkspecs/qnx-armle-v7-qcc/qplatformdefs.h mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/io/qfileselector.h @@ -920,15 +924,7 @@ Files: src/corelib/tools/qstring_mips_dsp_asm.S Copyright: 2013 Imagination Technologies Limited, www.imgtec.com License: LGPL-3 or GPL-2 -Files: config.tests/common/atomic64/atomic64.cpp - config.tests/common/atomicfptr/atomicfptr.cpp - config.tests/common/avx2/avx2.cpp - config.tests/common/avx512/avx512.cpp - config.tests/common/c++14/c++14.cpp - config.tests/common/c++1z/c++1z.cpp - config.tests/qpa/directfb/directfb.cpp - config.tests/unix/cloexec/cloexec.cpp - config.tests/unix/eventfd/main.cpp +Files: config.tests/avx512/avx512.cpp mkspecs/features/data/unix/findclasslist.pl src/corelib/global/qglobal_p.h src/corelib/global/qglobalstatic.h @@ -1093,6 +1089,7 @@ Files: bin/syncqt.pl src/network/kernel/qnetworkinterface.cpp src/network/kernel/qnetworkinterface_unix.cpp src/network/kernel/qnetworkinterface_win.cpp + src/network/kernel/qnetworkproxy_libproxy.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qabstractsocketengine_p.h src/network/socket/qnativesocketengine.cpp @@ -1105,7 +1102,7 @@ Files: bin/syncqt.pl src/testlib/qtest.h src/testlib/qtestcase.cpp src/widgets/kernel/qwidget.cpp -Copyright: 2016 Intel Corporation. +Copyright: 2016-2017 Intel Corporation. 2016-2017 The Qt Company Ltd. License: LGPL-3 or GPL-2 @@ -1196,13 +1193,7 @@ Copyright: 2016 Jolla Ltd, author: <gunnar.sletta@jollamobile.com> 2016 The Qt Company Ltd. License: LGPL-3 or GPL-2 -Files: config.tests/unix/journald/journald.c - config.tests/unix/mtdev/mtdev.cpp -Copyright: 2013-2014 Jolla Ltd, author: <robin.burchell@jollamobile.com> -License: LGPL-3 or GPL-2 - -Files: config.tests/unix/pcre2/pcre2.cpp - mkspecs/haiku-g++/qplatformdefs.h +Files: mkspecs/haiku-g++/qplatformdefs.h src/3rdparty/pcre2/import_from_pcre2_tarball.sh src/corelib/global/qhooks.cpp src/corelib/global/qhooks_p.h @@ -1527,10 +1518,6 @@ Copyright: 2013 Samuel Gaist <samuel.gaist@edeltech.ch> 2016 The Qt Company Ltd. License: LGPL-3 or GPL-2 -Files: config.tests/unix/syslog/syslog.c -Copyright: 2015 Tasuku Suzuki <stasuku@gmail.com> -License: LGPL-3 or GPL-2 - Files: src/plugins/platforms/xcb/qxcbsessionmanager.cpp src/plugins/platforms/xcb/qxcbsessionmanager.h Copyright: 2013 Teo Mrnjavac <teo@kde.org> @@ -1986,9 +1973,9 @@ License: wintab The text and information contained in this file may be freely used, copied, or distributed without compensation or licensing restrictions. -Files: src/3rdparty/zlib/* -Copyright: 1995-2010 Jean-loup Gailly - 1995-2010 Mark Adler +Files: src/3rdparty/zlib/src/* +Copyright: 1995-2017 Jean-loup Gailly + 1995-2017 Mark Adler License: Zlib This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -2008,6 +1995,47 @@ License: Zlib # License texts +License: LGPL-2.1-or-3 with Qt-1.1 exception + GNU Lesser General Public License: + This file may be used under the terms of the GNU Lesser 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. + . + In addition, as a special exception, The Qt Company gives you certain + additional rights. These rights are described in The Qt Company Qt LGPL + Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this + package. + . + On Debian systems, the complete text of the GNU Lesser General Public + License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`. + The complete text of the GNU Lesser General Public License version 3 can be + found in `/usr/share/common-licenses/LGPL-3`. + . + The Qt Company LGPL Exception version 1.1: + As an additional permission to the GNU Lesser General Public License version + 2.1, the object code form of a "work that uses the Library" may incorporate + material from a header file that is part of the Library. You may distribute + such object code under terms of your choice, provided that: + (i) the header files of the Library have not been modified; and + (ii) the incorporated material is limited to numerical parameters, data + structure layouts, accessors, macros, inline functions and + templates; and + (iii) you comply with the terms of Section 6 of the GNU Lesser General + Public License version 2.1. + . + Moreover, you may apply this exception to a modified version of the Library, + provided that such modification does not involve copying material from the + Library into the modified Library's header files unless such material is + limited to (i) numerical parameters; (ii) data structure layouts; + (iii) accessors; and (iv) small macros, templates and inline functions of + five lines or less in length. + . + Furthermore, you are not required to apply this additional permission to a + modified version of the Library. + License: LGPL-3 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License version 3 diff --git a/debian/libqt5concurrent5.symbols b/debian/libqt5concurrent5.symbols index bb43158..4468890 100644 --- a/debian/libqt5concurrent5.symbols +++ b/debian/libqt5concurrent5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.0~beta amd64 libQt5Concurrent.so.5 libqt5concurrent5 #MINVER# -| libqt5concurrent5 #MINVER#, qtbase-abi-5-9-0 +| libqt5concurrent5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/libqt5core5a.symbols b/debian/libqt5core5a.symbols index e459a2f..39ebd15 100644 --- a/debian/libqt5core5a.symbols +++ b/debian/libqt5core5a.symbols @@ -1,6 +1,6 @@ -# SymbolsHelper-Confirmed: 5.9.1 amd64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32 +# SymbolsHelper-Confirmed: 5.9.2 amd64 libQt5Core.so.5 libqt5core5a #MINVER# -| libqt5core5a #MINVER#, qtbase-abi-5-9-0 +| libqt5core5a #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta @@ -657,6 +657,8 @@ libQt5Core.so.5 libqt5core5a #MINVER# _ZN12QStorageInfoD1Ev@Qt_5 5.4.0 _ZN12QStorageInfoD2Ev@Qt_5 5.4.0 _ZN12QStorageInfoaSERKS_@Qt_5 5.4.0 + _ZN12QSystemError6stringENS_10ErrorScopeEi@Qt_5_PRIVATE_API 5.9.2 1 + _ZN12QSystemError9stdStringEi@Qt_5_PRIVATE_API 5.9.2 1 _ZN12QTextDecoder9toUnicodeEP7QStringPKci@Qt_5 5.0.2 _ZN12QTextDecoder9toUnicodeEPKci@Qt_5 5.0.2 _ZN12QTextDecoder9toUnicodeERK10QByteArray@Qt_5 5.0.2 @@ -1260,6 +1262,7 @@ libQt5Core.so.5 libqt5core5a #MINVER# _ZN16QEventTransitionD0Ev@Qt_5 5.0.2 _ZN16QEventTransitionD1Ev@Qt_5 5.0.2 _ZN16QEventTransitionD2Ev@Qt_5 5.0.2 + _ZN16QFileSystemEntry10isRootPathERK7QString@Qt_5 5.9.2 _ZN16QIODevicePrivate10seekBufferEx@Qt_5_PRIVATE_API 5.7.0 1 _ZN16QIODevicePrivate13putCharHelperEc@Qt_5_PRIVATE_API 5.0.2 1 _ZN16QIODevicePrivate19setReadChannelCountEi@Qt_5_PRIVATE_API 5.7.0 1 @@ -2206,6 +2209,7 @@ libQt5Core.so.5 libqt5core5a #MINVER# _ZN23QEventTransitionPrivateD1Ev@Qt_5_PRIVATE_API 5.6.0~beta 1 _ZN23QEventTransitionPrivateD2Ev@Qt_5_PRIVATE_API 5.6.0~beta 1 _ZN23QOperatingSystemVersion10Windows8_1E@Qt_5 5.9.0~beta + _ZN23QOperatingSystemVersion11AndroidOreoE@Qt_5 5.9.2 _ZN23QOperatingSystemVersion11MacOSSierraE@Qt_5 5.9.0~beta _ZN23QOperatingSystemVersion11OSXYosemiteE@Qt_5 5.9.0~beta _ZN23QOperatingSystemVersion12OSXElCapitanE@Qt_5 5.9.0~beta @@ -3787,7 +3791,6 @@ libQt5Core.so.5 libqt5core5a #MINVER# _ZNK12QStorageInfo9blockSizeEv@Qt_5 5.6.0~beta _ZNK12QStorageInfo9bytesFreeEv@Qt_5 5.4.0 _ZNK12QStorageInfo9subvolumeEv@Qt_5 5.9.0~beta - _ZNK12QSystemError8toStringEv@Qt_5_PRIVATE_API 5.6.0~beta 1 _ZNK12QTextDecoder10hasFailureEv@Qt_5 5.0.2 _ZNK12QTextEncoder10hasFailureEv@Qt_5 5.0.2 _ZNK13QElapsedTimer10hasExpiredEx@Qt_5 5.0.2 @@ -3801,6 +3804,7 @@ libQt5Core.so.5 libqt5core5a #MINVER# _ZNK13QFSFileEngine13caseSensitiveEv@Qt_5_PRIVATE_API 5.4.0 1 _ZNK13QFSFileEngine14isRelativePathEv@Qt_5_PRIVATE_API 5.4.0 1 _ZNK13QFSFileEngine17supportsExtensionEN19QAbstractFileEngine9ExtensionE@Qt_5_PRIVATE_API 5.4.0 1 + _ZNK13QFSFileEngine2idEv@Qt_5_PRIVATE_API 5.9.2 1 _ZNK13QFSFileEngine3posEv@Qt_5_PRIVATE_API 5.4.0 1 _ZNK13QFSFileEngine4sizeEv@Qt_5_PRIVATE_API 5.4.0 1 _ZNK13QFSFileEngine5mkdirERK7QStringb@Qt_5_PRIVATE_API 5.4.0 1 @@ -4224,6 +4228,7 @@ libQt5Core.so.5 libqt5core5a #MINVER# _ZNK19QAbstractFileEngine13caseSensitiveEv@Qt_5_PRIVATE_API 5.1.0 1 _ZNK19QAbstractFileEngine14isRelativePathEv@Qt_5_PRIVATE_API 5.1.0 1 _ZNK19QAbstractFileEngine17supportsExtensionENS_9ExtensionE@Qt_5_PRIVATE_API 5.1.0 1 + _ZNK19QAbstractFileEngine2idEv@Qt_5_PRIVATE_API 5.9.2 1 _ZNK19QAbstractFileEngine3posEv@Qt_5_PRIVATE_API 5.1.0 1 _ZNK19QAbstractFileEngine4sizeEv@Qt_5_PRIVATE_API 5.1.0 1 _ZNK19QAbstractFileEngine5atEndEv@Qt_5_PRIVATE_API 5.1.0 1 diff --git a/debian/libqt5dbus5.symbols b/debian/libqt5dbus5.symbols index 8dbbcd4..75b8452 100644 --- a/debian/libqt5dbus5.symbols +++ b/debian/libqt5dbus5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.1 amd64 armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390x libQt5DBus.so.5 libqt5dbus5 #MINVER# -| libqt5dbus5 #MINVER#, qtbase-abi-5-9-0 +| libqt5dbus5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/libqt5gui5.symbols b/debian/libqt5gui5.symbols index 5227be2..67d63d1 100644 --- a/debian/libqt5gui5.symbols +++ b/debian/libqt5gui5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.1 amd64 armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe libQt5Gui.so.5 libqt5gui5 #MINVER# -| libqt5gui5 #MINVER#, qtbase-abi-5-9-0 +| libqt5gui5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/libqt5network5.symbols b/debian/libqt5network5.symbols index 3c255ab..75d399f 100644 --- a/debian/libqt5network5.symbols +++ b/debian/libqt5network5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.1 alpha amd64 armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 libQt5Network.so.5 libqt5network5 #MINVER# -| libqt5network5 #MINVER#, qtbase-abi-5-9-0 +| libqt5network5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/libqt5opengl5.symbols b/debian/libqt5opengl5.symbols index b86be8d..720c0c6 100644 --- a/debian/libqt5opengl5.symbols +++ b/debian/libqt5opengl5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.0~beta amd64 libQt5OpenGL.so.5 libqt5opengl5 #MINVER# -| libqt5opengl5 #MINVER#, qtbase-abi-5-9-0 +| libqt5opengl5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/libqt5printsupport5.symbols b/debian/libqt5printsupport5.symbols index f7aa6fd..e65a2d1 100644 --- a/debian/libqt5printsupport5.symbols +++ b/debian/libqt5printsupport5.symbols @@ -1,6 +1,6 @@ -# SymbolsHelper-Confirmed: 5.9.0~beta amd64 +# SymbolsHelper-Confirmed: 5.9.2 amd64 libQt5PrintSupport.so.5 libqt5printsupport5 #MINVER# -| libqt5printsupport5 #MINVER#, qtbase-abi-5-9-0 +| libqt5printsupport5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta @@ -198,7 +198,7 @@ libQt5PrintSupport.so.5 libqt5printsupport5 #MINVER# _ZN23QPlatformPrinterSupport17createPaintEngineEP12QPrintEngineN8QPrinter11PrinterModeE@Qt_5_PRIVATE_API 5.9.0~beta 1 _ZN23QPlatformPrinterSupport17createPrintDeviceEP20QPlatformPrintDevice@Qt_5_PRIVATE_API 5.9.0~beta 1 _ZN23QPlatformPrinterSupport17createPrintDeviceERK7QString@Qt_5_PRIVATE_API 5.9.0~beta 1 - _ZN23QPlatformPrinterSupport23createNativePrintEngineEN8QPrinter11PrinterModeE@Qt_5_PRIVATE_API 5.9.0~beta 1 + _ZN23QPlatformPrinterSupport23createNativePrintEngineEN8QPrinter11PrinterModeERK7QString@Qt_5_PRIVATE_API 5.9.2 1 _ZN23QPlatformPrinterSupport24createDefaultPrintDeviceEv@Qt_5_PRIVATE_API 5.9.0~beta 1 _ZN23QPlatformPrinterSupportC1Ev@Qt_5_PRIVATE_API 5.9.0~beta 1 _ZN23QPlatformPrinterSupportC2Ev@Qt_5_PRIVATE_API 5.9.0~beta 1 diff --git a/debian/libqt5sql5.symbols b/debian/libqt5sql5.symbols index 35780ea..622e108 100644 --- a/debian/libqt5sql5.symbols +++ b/debian/libqt5sql5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.0~beta amd64 libQt5Sql.so.5 libqt5sql5 #MINVER# -| libqt5sql5 #MINVER#, qtbase-abi-5-9-0 +| libqt5sql5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/libqt5test5.symbols b/debian/libqt5test5.symbols index 49af025..5b12bb0 100644 --- a/debian/libqt5test5.symbols +++ b/debian/libqt5test5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.1 amd64 i386 libQt5Test.so.5 libqt5test5 #MINVER# -| libqt5test5 #MINVER#, qtbase-abi-5-9-0 +| libqt5test5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/libqt5widgets5.symbols b/debian/libqt5widgets5.symbols index f376558..9497fe0 100644 --- a/debian/libqt5widgets5.symbols +++ b/debian/libqt5widgets5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.1 amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe x32 libQt5Widgets.so.5 libqt5widgets5 #MINVER# -| libqt5widgets5 #MINVER#, qtbase-abi-5-9-0 +| libqt5widgets5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/libqt5xml5.symbols b/debian/libqt5xml5.symbols index 823e370..c3bc147 100644 --- a/debian/libqt5xml5.symbols +++ b/debian/libqt5xml5.symbols @@ -1,6 +1,6 @@ # SymbolsHelper-Confirmed: 5.9.0~beta amd64 libQt5Xml.so.5 libqt5xml5 #MINVER# -| libqt5xml5 #MINVER#, qtbase-abi-5-9-0 +| libqt5xml5 #MINVER#, qtbase-abi-5-9-2 * Build-Depends-Package: qtbase5-dev Qt_5.0@Qt_5.0 5.6.0~beta Qt_5.1@Qt_5.1 5.6.0~beta diff --git a/debian/patches/fix_atspi_condition.diff b/debian/patches/fix_atspi_condition.diff deleted file mode 100644 index 0d55f89..0000000 --- a/debian/patches/fix_atspi_condition.diff +++ /dev/null @@ -1,15 +0,0 @@ -Description: fix accessibility-atspi-bridge enablement condition -Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=386af91c57948b88 -Last-Update: 2017-06-30 - ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -434,7 +434,7 @@ - "features": { - "accessibility-atspi-bridge": { - "label": "ATSPI Bridge", -- "condition": "features.accessibility && features.xcb && features.dbus && config.atspi", -+ "condition": "features.accessibility && features.xcb && features.dbus && libs.atspi", - "output": [ "privateFeature", "feature" ] - }, - "angle": { diff --git a/debian/patches/gnukfreebsd_cloexec.diff b/debian/patches/gnukfreebsd_cloexec.diff index 6ff7c63..e97273a 100644 --- a/debian/patches/gnukfreebsd_cloexec.diff +++ b/debian/patches/gnukfreebsd_cloexec.diff @@ -1,14 +1,16 @@ Description: catch linker warnings in cloexec test Author: Dmitry Shachnev <mitya57@debian.org> -Forwarded: https://codereview.qt-project.org/163214 +Forwarded: https://codereview.qt-project.org/163214 (rejected) Bug: https://bugs.debian.org/827935 -Last-Update: 2016-06-23 +Last-Update: 2017-09-23 ---- a/config.tests/unix/cloexec/cloexec.pro -+++ b/config.tests/unix/cloexec/cloexec.pro -@@ -1,3 +1,5 @@ - SOURCES = cloexec.cpp - CONFIG -= qt - QT = -+ -+QMAKE_LFLAGS += -Wl,--fatal-warnings +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -236,6 +236,7 @@ + "label": "O_CLOEXEC", + "type": "compile", + "test": { ++ "qmake": "QMAKE_LFLAGS += -Wl,--fatal-warnings", + "head": "#define _GNU_SOURCE 1", + "include": [ "sys/types.h", "sys/socket.h", "fcntl.h", "unistd.h" ], + "main": [ diff --git a/debian/patches/link_fbclient.diff b/debian/patches/link_fbclient.diff index 02cba5b..cbc1ecd 100644 --- a/debian/patches/link_fbclient.diff +++ b/debian/patches/link_fbclient.diff @@ -6,8 +6,8 @@ Last-Update: 2017-06-30 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json -@@ -50,7 +50,7 @@ - "test": "unix/ibase", +@@ -54,7 +54,7 @@ + }, "sources": [ { "libs": "-lgds32_ms", "condition": "config.win32" }, - { "libs": "-lgds", "condition": "!config.win32" } diff --git a/debian/patches/mariadb_library_end.diff b/debian/patches/mariadb_library_end.diff deleted file mode 100644 index 2c77d69..0000000 --- a/debian/patches/mariadb_library_end.diff +++ /dev/null @@ -1,35 +0,0 @@ -Description: call mysql_library_end() only once when using MariaDB -Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=d25346417238b7dc -Last-Update: 2017-09-27 - ---- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -@@ -1158,16 +1158,22 @@ - } - # endif // MYSQL_VERSION_ID - #endif // Q_NO_MYSQL_EMBEDDED -+ -+#ifdef MARIADB_BASE_VERSION -+ qAddPostRoutine(mysql_server_end); -+#endif - } - - static void qLibraryEnd() - { --#ifndef Q_NO_MYSQL_EMBEDDED --# if MYSQL_VERSION_ID > 40000 --# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 -- mysql_library_end(); --# else -- mysql_server_end(); -+#if !defined(MARIADB_BASE_VERSION) -+# if !defined(Q_NO_MYSQL_EMBEDDED) -+# if MYSQL_VERSION_ID > 40000 -+# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 -+ mysql_library_end(); -+# else -+ mysql_server_end(); -+# endif - # endif - # endif - #endif diff --git a/debian/patches/series b/debian/patches/series index 270d885..3604e01 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,5 @@ # Backported from upstream. -fix_atspi_condition.diff qglxconvenience_nullptr.diff -mariadb_library_end.diff # Debian specific. gnukfreebsd.diff diff --git a/debian/qt5-qmake-bin.install b/debian/qt5-qmake-bin.install index 9e292b0..702f2f5 100644 --- a/debian/qt5-qmake-bin.install +++ b/debian/qt5-qmake-bin.install @@ -1 +1 @@ -usr/lib/*/qt5/bin/qmake +usr/lib/qt5/bin/qmake diff --git a/debian/qt5-qmake-bin.links b/debian/qt5-qmake-bin.links new file mode 100755 index 0000000..583a2c3 --- /dev/null +++ b/debian/qt5-qmake-bin.links @@ -0,0 +1,2 @@ +#! /usr/bin/dh-exec +usr/lib/qt5/bin/qmake usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qmake diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install index 7e73083..c00a21e 100644 --- a/debian/qt5-qmake.install +++ b/debian/qt5-qmake.install @@ -1 +1,3 @@ +usr/bin/*-qmake usr/lib/*/qt5/mkspecs/ +usr/lib/*/qt5/qmake.conf diff --git a/debian/qtbase5-dev-tools.install b/debian/qtbase5-dev-tools.install index 063597c..7d99ec2 100644 --- a/debian/qtbase5-dev-tools.install +++ b/debian/qtbase5-dev-tools.install @@ -1,8 +1,8 @@ -usr/lib/*/qt5/bin/fixqt4headers.pl -usr/lib/*/qt5/bin/moc -usr/lib/*/qt5/bin/qdbuscpp2xml -usr/lib/*/qt5/bin/qdbusxml2cpp -usr/lib/*/qt5/bin/qlalr -usr/lib/*/qt5/bin/rcc -usr/lib/*/qt5/bin/syncqt.pl -usr/lib/*/qt5/bin/uic +usr/lib/qt5/bin/fixqt4headers.pl +usr/lib/qt5/bin/moc +usr/lib/qt5/bin/qdbuscpp2xml +usr/lib/qt5/bin/qdbusxml2cpp +usr/lib/qt5/bin/qlalr +usr/lib/qt5/bin/rcc +usr/lib/qt5/bin/syncqt.pl +usr/lib/qt5/bin/uic diff --git a/debian/qtbase5-dev-tools.links b/debian/qtbase5-dev-tools.links new file mode 100755 index 0000000..d3e4785 --- /dev/null +++ b/debian/qtbase5-dev-tools.links @@ -0,0 +1,9 @@ +#! /usr/bin/dh-exec +usr/lib/qt5/bin/fixqt4headers.pl usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/fixqt4headers.pl +usr/lib/qt5/bin/moc usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/moc +usr/lib/qt5/bin/qdbuscpp2xml usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qdbuscpp2xml +usr/lib/qt5/bin/qdbusxml2cpp usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qdbusxml2cpp +usr/lib/qt5/bin/qlalr usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/qlalr +usr/lib/qt5/bin/rcc usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/rcc +usr/lib/qt5/bin/syncqt.pl usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/syncqt.pl +usr/lib/qt5/bin/uic usr/lib/${DEB_HOST_MULTIARCH}/qt5/bin/uic diff --git a/debian/rules b/debian/rules index 3e7e6cf..aab665e 100755 --- a/debian/rules +++ b/debian/rules @@ -61,14 +61,14 @@ else endif %: - dh $@ --parallel --with pkgkde_symbolshelper + dh $@ --with pkgkde_symbolshelper override_dh_auto_configure: MAKEFLAGS="-j$(NUMJOBS) ${CXXFLAGS:%=EXTRA_CXXFLAGS+=%} ${LDFLAGS:%=EXTRA_LFLAGS+=%}" \ ./configure \ -confirm-license \ -prefix "/usr" \ - -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \ + -bindir "/usr/lib/qt5/bin" \ -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \ -docdir "/usr/share/qt5/doc" \ -headerdir "/usr/include/$(DEB_HOST_MULTIARCH)/qt5" \ @@ -255,11 +255,29 @@ endif -regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \ -exec chmod a-x {} \; + # Helper files for cross-building + echo "[Paths]" > debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + echo "Prefix=/usr" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + echo "HostData=lib/$(DEB_HOST_MULTIARCH)/qt5" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + echo "HostBinaries=lib/qt5/bin" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + echo "Headers=include/$(DEB_HOST_MULTIARCH)/qt5" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + + echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake + echo "exec /usr/lib/qt5/bin/qmake" \ + "-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \ + 'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \ + 'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \ + "QMAKE_LINK='\$$(CXX)'" \ + "PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \ + '"$$@"' \ + >> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake + chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake + override_dh_auto_install-indep: dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs -override_dh_install: - dh_install --fail-missing +override_dh_missing: + dh_missing --fail-missing override_dh_installchangelogs: if [ -f $(upstream_changes) ] ; then \ |