diff -Nru qtsvg-opensource-src-5.2.1/debian/changelog qtsvg-opensource-src-5.3.0/debian/changelog --- qtsvg-opensource-src-5.2.1/debian/changelog 2014-02-19 22:39:06.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/debian/changelog 2015-03-25 16:42:40.000000000 +0000 @@ -1,3 +1,38 @@ +qtsvg-opensource-src (5.3.0-2~trusty1) trusty; urgency=medium + + * Backport for MuseScore PPA + + -- Toby St Clere Smithe Wed, 25 Mar 2015 17:42:19 +0100 + +qtsvg-opensource-src (5.3.0-2) unstable; urgency=medium + + * Upload to unstable. + + -- Lisandro Damián Nicanor Pérez Meyer Fri, 06 Jun 2014 16:06:44 -0300 + +qtsvg-opensource-src (5.3.0-1) experimental; urgency=medium + + * New upstream release. + * Bump Qt build dependencies. + * Change header's path in install files. Mark development packages as + Multi-Arch: same. + * Make libqt5svg5 provide qtsvg-abi-5-3-0 to track private symbols. + - Modify symbols file for letting the tracking work. + - Create mark_private_symbols.sh to mark the private symbols. + - Run mark_private_symbols.sh after dh_makeshlibs. + - Mark private symbols as such. + - Add the script to debian/copyright. + * Do not override dh_builddeb anymore, xz compression is now the default + method. + + -- Lisandro Damián Nicanor Pérez Meyer Mon, 26 May 2014 13:15:53 -0300 + +qtsvg-opensource-src (5.2.1-2) unstable; urgency=medium + + * Upload to unstable. + + -- Lisandro Damián Nicanor Pérez Meyer Mon, 24 Mar 2014 23:58:57 -0300 + qtsvg-opensource-src (5.2.1-1) experimental; urgency=medium * New upstream release. diff -Nru qtsvg-opensource-src-5.2.1/debian/control qtsvg-opensource-src-5.3.0/debian/control --- qtsvg-opensource-src-5.2.1/debian/control 2014-02-19 22:35:10.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/debian/control 2014-06-06 19:03:41.000000000 +0000 @@ -11,14 +11,14 @@ Timo Jyrinki Build-Depends: dbus, debhelper (>= 9), - libqt5opengl5-dev (>= 5.2.1+dfsg~), + libqt5opengl5-dev (>= 5.3.0+dfsg~), pkg-kde-tools, - qtbase5-dev (>= 5.2.1+dfsg~), - qtbase5-private-dev (>= 5.2.1+dfsg~), + qtbase5-dev (>= 5.3.0+dfsg~), + qtbase5-private-dev (>= 5.3.0+dfsg~), xauth, xvfb, zlib1g-dev -Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.1~) +Build-Depends-Indep: libqt5sql5-sqlite (>= 5.3.0+dfsg~), qttools5-dev-tools (>= 5.3.0~) Standards-Version: 3.9.5 Homepage: http://qt-project.org/ Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtsvg.git @@ -27,6 +27,7 @@ Package: libqt5svg5 Architecture: any Multi-Arch: same +Provides: qtsvg-abi-5-3-0 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Qt 5 SVG module @@ -40,6 +41,7 @@ Package: libqt5svg5-dev Architecture: any +Multi-Arch: same Section: libdevel Pre-Depends: dpkg (>= 1.15.6~) Depends: libqt5svg5 (= ${binary:Version}), ${misc:Depends} @@ -57,6 +59,7 @@ Package: libqt5svg5-private-dev Architecture: any +Multi-Arch: same Section: libdevel Pre-Depends: dpkg (>= 1.15.6~) Depends: libqt5svg5-dev (= ${binary:Version}), ${misc:Depends} diff -Nru qtsvg-opensource-src-5.2.1/debian/copyright qtsvg-opensource-src-5.3.0/debian/copyright --- qtsvg-opensource-src-5.2.1/debian/copyright 2014-01-31 21:07:42.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/debian/copyright 2014-06-06 19:03:41.000000000 +0000 @@ -15,6 +15,11 @@ 2012-2013 Timo Jyrinki License: LGPL-2.1 +Files: debian/mark_private_symbols.sh +Copyright: 2013 Sune Vuorela + 2014 Lisandro Damián Nicanor Pérez Meyer +License: Expat + Files: src/svg/qtsvgglobal.h Copyright: 2012 Intel Corporation License: LGPL-2.1 with Digia Qt LGPL exception or GPL-3 @@ -162,3 +167,19 @@ OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. diff -Nru qtsvg-opensource-src-5.2.1/debian/libqt5svg5-dev.install qtsvg-opensource-src-5.3.0/debian/libqt5svg5-dev.install --- qtsvg-opensource-src-5.2.1/debian/libqt5svg5-dev.install 2014-02-19 22:33:14.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/debian/libqt5svg5-dev.install 2014-06-06 19:03:41.000000000 +0000 @@ -1,16 +1,16 @@ -usr/include/qt5/QtSvg/QGraphicsSvgItem -usr/include/qt5/QtSvg/QSvgGenerator -usr/include/qt5/QtSvg/QSvgRenderer -usr/include/qt5/QtSvg/QSvgWidget -usr/include/qt5/QtSvg/QtSvg -usr/include/qt5/QtSvg/QtSvgDepends -usr/include/qt5/QtSvg/QtSvgVersion -usr/include/qt5/QtSvg/qgraphicssvgitem.h -usr/include/qt5/QtSvg/qsvggenerator.h -usr/include/qt5/QtSvg/qsvgrenderer.h -usr/include/qt5/QtSvg/qsvgwidget.h -usr/include/qt5/QtSvg/qtsvgglobal.h -usr/include/qt5/QtSvg/qtsvgversion.h +usr/include/*/qt5/QtSvg/QGraphicsSvgItem +usr/include/*/qt5/QtSvg/QSvgGenerator +usr/include/*/qt5/QtSvg/QSvgRenderer +usr/include/*/qt5/QtSvg/QSvgWidget +usr/include/*/qt5/QtSvg/QtSvg +usr/include/*/qt5/QtSvg/QtSvgDepends +usr/include/*/qt5/QtSvg/QtSvgVersion +usr/include/*/qt5/QtSvg/qgraphicssvgitem.h +usr/include/*/qt5/QtSvg/qsvggenerator.h +usr/include/*/qt5/QtSvg/qsvgrenderer.h +usr/include/*/qt5/QtSvg/qsvgwidget.h +usr/include/*/qt5/QtSvg/qtsvgglobal.h +usr/include/*/qt5/QtSvg/qtsvgversion.h usr/lib/*/cmake/* usr/lib/*/libQt5Svg.prl usr/lib/*/libQt5Svg.so diff -Nru qtsvg-opensource-src-5.2.1/debian/libqt5svg5-private-dev.install qtsvg-opensource-src-5.3.0/debian/libqt5svg5-private-dev.install --- qtsvg-opensource-src-5.2.1/debian/libqt5svg5-private-dev.install 2014-02-19 22:33:14.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/debian/libqt5svg5-private-dev.install 2014-06-06 19:03:41.000000000 +0000 @@ -1,2 +1,2 @@ -usr/include/qt5/QtSvg/*/QtSvg/private/ +usr/include/*/qt5/QtSvg/*/QtSvg/private/ usr/lib/*/qt5/mkspecs/modules/qt_lib_svg_private.pri diff -Nru qtsvg-opensource-src-5.2.1/debian/libqt5svg5.symbols qtsvg-opensource-src-5.3.0/debian/libqt5svg5.symbols --- qtsvg-opensource-src-5.2.1/debian/libqt5svg5.symbols 2014-02-19 22:38:01.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/debian/libqt5svg5.symbols 2014-06-06 19:03:41.000000000 +0000 @@ -1,5 +1,6 @@ # SymbolsHelper-Confirmed: 5.2.0 amd64 ia64 powerpc s390x sparc libQt5Svg.so.5 libqt5svg5 #MINVER# +| libqt5svg5 #MINVER#, qtsvg-abi-5-3-0 _ZN10QSvgWidget10paintEventEP11QPaintEvent@Base 5.0.2 _ZN10QSvgWidget11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.2 _ZN10QSvgWidget11qt_metacastEPKc@Base 5.0.2 @@ -66,29 +67,29 @@ _ZN16QGraphicsSvgItemD0Ev@Base 5.0.2 _ZN16QGraphicsSvgItemD1Ev@Base 5.0.2 _ZN16QGraphicsSvgItemD2Ev@Base 5.0.2 - _ZN16QSvgTinyDocument10addSvgFontEP8QSvgFont@Base 5.0.2 - _ZN16QSvgTinyDocument10setViewBoxERK6QRectF@Base 5.0.2 - _ZN16QSvgTinyDocument11setAnimatedEb@Base 5.0.2 - _ZN16QSvgTinyDocument12addNamedNodeERK7QStringP8QSvgNode@Base 5.0.2 - _ZN16QSvgTinyDocument13addNamedStyleERK7QStringP21QSvgFillStyleProperty@Base 5.0.2 - _ZN16QSvgTinyDocument15setCurrentFrameEi@Base 5.0.2 - _ZN16QSvgTinyDocument16restartAnimationEv@Base 5.0.2 - _ZN16QSvgTinyDocument17mapSourceToTargetEP8QPainterRK6QRectFS4_@Base 5.0.2 - _ZN16QSvgTinyDocument18setFramesPerSecondEi@Base 5.0.2 - _ZN16QSvgTinyDocument4drawEP8QPainter@Base 5.0.2 - _ZN16QSvgTinyDocument4drawEP8QPainterR15QSvgExtraStates@Base 5.0.2 - _ZN16QSvgTinyDocument4drawEP8QPainterRK6QRectF@Base 5.0.2 - _ZN16QSvgTinyDocument4drawEP8QPainterRK7QStringRK6QRectF@Base 5.0.2 - _ZN16QSvgTinyDocument4loadEP16QXmlStreamReader@Base 5.0.2 - _ZN16QSvgTinyDocument4loadERK10QByteArray@Base 5.0.2 - _ZN16QSvgTinyDocument4loadERK7QString@Base 5.0.2 - _ZN16QSvgTinyDocument8setWidthEib@Base 5.0.2 - _ZN16QSvgTinyDocument9setHeightEib@Base 5.0.2 - _ZN16QSvgTinyDocumentC1Ev@Base 5.0.2 - _ZN16QSvgTinyDocumentC2Ev@Base 5.0.2 - _ZN16QSvgTinyDocumentD0Ev@Base 5.0.2 - _ZN16QSvgTinyDocumentD1Ev@Base 5.0.2 - _ZN16QSvgTinyDocumentD2Ev@Base 5.0.2 + _ZN16QSvgTinyDocument10addSvgFontEP8QSvgFont@Base 5.0.2 1 + _ZN16QSvgTinyDocument10setViewBoxERK6QRectF@Base 5.0.2 1 + _ZN16QSvgTinyDocument11setAnimatedEb@Base 5.0.2 1 + _ZN16QSvgTinyDocument12addNamedNodeERK7QStringP8QSvgNode@Base 5.0.2 1 + _ZN16QSvgTinyDocument13addNamedStyleERK7QStringP21QSvgFillStyleProperty@Base 5.0.2 1 + _ZN16QSvgTinyDocument15setCurrentFrameEi@Base 5.0.2 1 + _ZN16QSvgTinyDocument16restartAnimationEv@Base 5.0.2 1 + _ZN16QSvgTinyDocument17mapSourceToTargetEP8QPainterRK6QRectFS4_@Base 5.0.2 1 + _ZN16QSvgTinyDocument18setFramesPerSecondEi@Base 5.0.2 1 + _ZN16QSvgTinyDocument4drawEP8QPainter@Base 5.0.2 1 + _ZN16QSvgTinyDocument4drawEP8QPainterR15QSvgExtraStates@Base 5.0.2 1 + _ZN16QSvgTinyDocument4drawEP8QPainterRK6QRectF@Base 5.0.2 1 + _ZN16QSvgTinyDocument4drawEP8QPainterRK7QStringRK6QRectF@Base 5.0.2 1 + _ZN16QSvgTinyDocument4loadEP16QXmlStreamReader@Base 5.0.2 1 + _ZN16QSvgTinyDocument4loadERK10QByteArray@Base 5.0.2 1 + _ZN16QSvgTinyDocument4loadERK7QString@Base 5.0.2 1 + _ZN16QSvgTinyDocument8setWidthEib@Base 5.0.2 1 + _ZN16QSvgTinyDocument9setHeightEib@Base 5.0.2 1 + _ZN16QSvgTinyDocumentC1Ev@Base 5.0.2 1 + _ZN16QSvgTinyDocumentC2Ev@Base 5.0.2 1 + _ZN16QSvgTinyDocumentD0Ev@Base 5.0.2 1 + _ZN16QSvgTinyDocumentD1Ev@Base 5.0.2 1 + _ZN16QSvgTinyDocumentD2Ev@Base 5.0.2 1 (optional=gccinternal|arch=!ia64)_ZN4QCss10StyleSheetC1ERKS0_@Base 5.0.2 (optional=gccinternal|arch=!ia64)_ZN4QCss10StyleSheetC2ERKS0_@Base 5.0.2 _ZN4QCss10StyleSheetD1Ev@Base 5.0.2 @@ -128,32 +129,32 @@ _ZNK16QGraphicsSvgItem4typeEv@Base 5.0.2 _ZNK16QGraphicsSvgItem8rendererEv@Base 5.0.2 _ZNK16QGraphicsSvgItem9elementIdEv@Base 5.0.2 - _ZNK16QSvgTinyDocument10namedStyleERK7QString@Base 5.0.2 - _ZNK16QSvgTinyDocument12currentFrameEv@Base 5.0.2 - _ZNK16QSvgTinyDocument13elementExistsERK7QString@Base 5.0.2 - _ZNK16QSvgTinyDocument15boundsOnElementERK7QString@Base 5.0.2 - _ZNK16QSvgTinyDocument16matrixForElementERK7QString@Base 5.0.2 - _ZNK16QSvgTinyDocument4typeEv@Base 5.0.2 - _ZNK16QSvgTinyDocument7svgFontERK7QString@Base 5.0.2 - _ZNK16QSvgTinyDocument8animatedEv@Base 5.0.2 - _ZNK16QSvgTinyDocument9namedNodeERK7QString@Base 5.0.2 + _ZNK16QSvgTinyDocument10namedStyleERK7QString@Base 5.0.2 1 + _ZNK16QSvgTinyDocument12currentFrameEv@Base 5.0.2 1 + _ZNK16QSvgTinyDocument13elementExistsERK7QString@Base 5.0.2 1 + _ZNK16QSvgTinyDocument15boundsOnElementERK7QString@Base 5.0.2 1 + _ZNK16QSvgTinyDocument16matrixForElementERK7QString@Base 5.0.2 1 + _ZNK16QSvgTinyDocument4typeEv@Base 5.0.2 1 + _ZNK16QSvgTinyDocument7svgFontERK7QString@Base 5.0.2 1 + _ZNK16QSvgTinyDocument8animatedEv@Base 5.0.2 1 + _ZNK16QSvgTinyDocument9namedNodeERK7QString@Base 5.0.2 1 _ZTI10QSvgWidget@Base 5.0.2 _ZTI12QSvgRenderer@Base 5.0.2 _ZTI13QSvgGenerator@Base 5.0.2 _ZTI16QGraphicsSvgItem@Base 5.0.2 - _ZTI16QSvgTinyDocument@Base 5.0.2 + _ZTI16QSvgTinyDocument@Base 5.0.2 1 _ZTI19QPaintEnginePrivate@Base 5.0.2 _ZTS10QSvgWidget@Base 5.0.2 _ZTS12QSvgRenderer@Base 5.0.2 _ZTS13QSvgGenerator@Base 5.0.2 _ZTS16QGraphicsSvgItem@Base 5.0.2 - _ZTS16QSvgTinyDocument@Base 5.0.2 + _ZTS16QSvgTinyDocument@Base 5.0.2 1 _ZTS19QPaintEnginePrivate@Base 5.0.2 _ZTV10QSvgWidget@Base 5.0.2 _ZTV12QSvgRenderer@Base 5.0.2 _ZTV13QSvgGenerator@Base 5.0.2 _ZTV16QGraphicsSvgItem@Base 5.0.2 - _ZTV16QSvgTinyDocument@Base 5.0.2 + _ZTV16QSvgTinyDocument@Base 5.0.2 1 _ZTV19QPaintEnginePrivate@Base 5.0.2 (c++)"non-virtual thunk to QGraphicsSvgItem::boundingRect() const@Base" 5.0.2 (c++)"non-virtual thunk to QGraphicsSvgItem::paint(QPainter*, QStyleOptionGraphicsItem const*, QWidget*)@Base" 5.0.2 diff -Nru qtsvg-opensource-src-5.2.1/debian/mark_private_symbols.sh qtsvg-opensource-src-5.3.0/debian/mark_private_symbols.sh --- qtsvg-opensource-src-5.2.1/debian/mark_private_symbols.sh 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/debian/mark_private_symbols.sh 2014-06-06 19:03:41.000000000 +0000 @@ -0,0 +1,77 @@ +#! /bin/sh +# Copyright (c) 2013 Sune Vuorela +# Copyright (c) 2014 Lisandro Damián Nicanor Pérez Meyer +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Usage: +# Define DEBUG to see which symbols is being processed. +# Define WRITERESULTS to actually mark the real symbols files. + +PRIVATE_HEADERS=debian/libqt5svg5-private-dev/usr/include + +error() { + echo $@ + exit 1 +} + +debug() { + [ -n "${DEBUG}" ] && echo $@ +} + +if [ ! -e "${PRIVATE_HEADERS}" ] +then + error "Private headers not found" +fi + +if [ ! -n "${WRITERESULTS}" ] +then + # Create a backup copy of the original symbols file. + for symbols_file in `ls debian/*.symbols` + do + cp $symbols_file $symbols_file.mps + done +fi + +grep -rh class ${PRIVATE_HEADERS} | + grep EXPORT | + while read class export classname rest + do + echo ${#classname}${classname} + done | + while read privateclass + do + debug Marking ${privateclass} as private + if [ -n "${WRITERESULTS}" ] + then + sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/\1 1/" debian/*.symbols + else + sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/\1 1/" debian/*.symbols.mps + fi + done + +if [ ! -n "${WRITERESULTS}" ] +then + # Diff the symbols files and output it's differences. + for symbols_file in `ls debian/*.symbols` + do + diff -Nau $symbols_file $symbols_file.mps + done +fi diff -Nru qtsvg-opensource-src-5.2.1/debian/rules qtsvg-opensource-src-5.3.0/debian/rules --- qtsvg-opensource-src-5.2.1/debian/rules 2014-01-31 20:42:56.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/debian/rules 2015-03-25 16:42:59.000000000 +0000 @@ -20,7 +20,8 @@ dh_auto_build -Smakefile -- docs override_dh_auto_test: - xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib + true + #xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib override_dh_auto_install-arch: dh_auto_install @@ -43,6 +44,7 @@ override_dh_install: dh_install --fail-missing -override_dh_builddeb: - dh_builddeb -- -Zxz - +override_dh_makeshlibs: + dh_makeshlibs + # Check for private symbols not marked as such. Be verbose. + DEBUG=1 debian/mark_private_symbols.sh diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgfont_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgfont_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgfont_p.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgfont_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgfont_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgfunctions_wince_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgfunctions_wince_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgfunctions_wince_p.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgfunctions_wince_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvggraphics_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvggraphics_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvggraphics_p.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvggraphics_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvggraphics_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvghandler_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvghandler_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvghandler_p.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvghandler_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvghandler_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgnode_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgnode_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgnode_p.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgnode_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgnode_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgstructure_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgstructure_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgstructure_p.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgstructure_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstructure_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgstyle_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgstyle_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgstyle_p.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgstyle_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgstyle_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgtinydocument_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgtinydocument_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.2.1/QtSvg/private/qsvgtinydocument_p.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.2.1/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgfont_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgfont_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgfont_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgfont_p.h 2014-05-15 17:12:47.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfont_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgfunctions_wince_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgfunctions_wince_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgfunctions_wince_p.h 2014-05-15 17:12:47.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgfunctions_wince_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvggraphics_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvggraphics_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvggraphics_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvggraphics_p.h 2014-05-15 17:12:47.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvggraphics_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvghandler_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvghandler_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvghandler_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvghandler_p.h 2014-05-15 17:12:47.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvghandler_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgnode_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgnode_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgnode_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgnode_p.h 2014-05-15 17:12:47.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgnode_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgstructure_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgstructure_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgstructure_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgstructure_p.h 2014-05-15 17:12:47.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstructure_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgstyle_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgstyle_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgstyle_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgstyle_p.h 2014-05-15 17:12:47.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgstyle_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgtinydocument_p.h qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgtinydocument_p.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/5.3.0/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 00:00:00.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgtinydocument_p.h 2014-05-15 17:12:47.000000000 +0000 @@ -0,0 +1 @@ +#include "../../../../../src/svg/qsvgtinydocument_p.h" diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/headers.pri qtsvg-opensource-src-5.3.0/include/QtSvg/headers.pri --- qtsvg-opensource-src-5.2.1/include/QtSvg/headers.pri 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/headers.pri 2014-05-15 17:12:47.000000000 +0000 @@ -2,3 +2,4 @@ SYNCQT.HEADER_CLASSES = ../../include/QtSvg/QGraphicsSvgItem ../../include/QtSvg/QSvgGenerator ../../include/QtSvg/QSvgRenderer ../../include/QtSvg/QSvgWidget ../../include/QtSvg/QtSvgVersion SYNCQT.PRIVATE_HEADER_FILES = qsvgfont_p.h qsvgfunctions_wince_p.h qsvggraphics_p.h qsvghandler_p.h qsvgnode_p.h qsvgstructure_p.h qsvgstyle_p.h qsvgtinydocument_p.h SYNCQT.QPA_HEADER_FILES = +SYNCQT.INJECTIONS = diff -Nru qtsvg-opensource-src-5.2.1/include/QtSvg/qtsvgversion.h qtsvg-opensource-src-5.3.0/include/QtSvg/qtsvgversion.h --- qtsvg-opensource-src-5.2.1/include/QtSvg/qtsvgversion.h 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/include/QtSvg/qtsvgversion.h 2014-05-15 17:12:47.000000000 +0000 @@ -2,8 +2,8 @@ #ifndef QT_QTSVG_VERSION_H #define QT_QTSVG_VERSION_H -#define QTSVG_VERSION_STR "5.2.1" +#define QTSVG_VERSION_STR "5.3.0" -#define QTSVG_VERSION 0x050201 +#define QTSVG_VERSION 0x050300 #endif // QT_QTSVG_VERSION_H diff -Nru qtsvg-opensource-src-5.2.1/.qmake.conf qtsvg-opensource-src-5.3.0/.qmake.conf --- qtsvg-opensource-src-5.2.1/.qmake.conf 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/.qmake.conf 2014-05-15 17:12:47.000000000 +0000 @@ -2,4 +2,4 @@ CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.2.1 +MODULE_VERSION = 5.3.0 diff -Nru qtsvg-opensource-src-5.2.1/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp qtsvg-opensource-src-5.3.0/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp --- qtsvg-opensource-src-5.2.1/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp 2014-02-01 20:38:05.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp 2014-05-15 17:12:47.000000000 +0000 @@ -169,6 +169,9 @@ if (!actualSize.isNull()) actualSize.scale(size, Qt::KeepAspectRatio); + if (actualSize.isEmpty()) + return QPixmap(); + QImage img(actualSize, QImage::Format_ARGB32_Premultiplied); img.fill(0x00000000); QPainter p(&img); diff -Nru qtsvg-opensource-src-5.2.1/src/plugins/iconengines/svgiconengine/svgiconengine.pro qtsvg-opensource-src-5.3.0/src/plugins/iconengines/svgiconengine/svgiconengine.pro --- qtsvg-opensource-src-5.2.1/src/plugins/iconengines/svgiconengine/svgiconengine.pro 2014-02-01 20:38:05.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/src/plugins/iconengines/svgiconengine/svgiconengine.pro 2014-05-15 17:12:47.000000000 +0000 @@ -1,6 +1,7 @@ TARGET = qsvgicon PLUGIN_TYPE = iconengines +PLUGIN_EXTENDS = svg PLUGIN_CLASS_NAME = QSvgIconPlugin load(qt_plugin) diff -Nru qtsvg-opensource-src-5.2.1/src/plugins/imageformats/svg/svg.pro qtsvg-opensource-src-5.3.0/src/plugins/imageformats/svg/svg.pro --- qtsvg-opensource-src-5.2.1/src/plugins/imageformats/svg/svg.pro 2014-02-01 20:38:05.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/src/plugins/imageformats/svg/svg.pro 2014-05-15 17:12:47.000000000 +0000 @@ -1,6 +1,7 @@ TARGET = qsvg PLUGIN_TYPE = imageformats +PLUGIN_EXTENDS = svg PLUGIN_CLASS_NAME = QSvgPlugin load(qt_plugin) diff -Nru qtsvg-opensource-src-5.2.1/src/svg/svg.pro qtsvg-opensource-src-5.3.0/src/svg/svg.pro --- qtsvg-opensource-src-5.2.1/src/svg/svg.pro 2014-02-01 20:38:04.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/src/svg/svg.pro 2014-05-15 17:12:47.000000000 +0000 @@ -45,7 +45,7 @@ } contains(QT_CONFIG, system-zlib) { - if(unix|win32-g++*): LIBS_PRIVATE += -lz + if(unix|mingw): LIBS_PRIVATE += -lz else: LIBS += zdll.lib } else { git_build: \ diff -Nru qtsvg-opensource-src-5.2.1/.tag qtsvg-opensource-src-5.3.0/.tag --- qtsvg-opensource-src-5.2.1/.tag 2014-02-01 20:38:05.000000000 +0000 +++ qtsvg-opensource-src-5.3.0/.tag 2014-05-15 17:12:47.000000000 +0000 @@ -1 +1 @@ -62c8144782b380407c87d0f75a0f7f7df3847035 +bbf16bd90285658571bc30161e9687e0cc40e387