From 16321f309a4a76a7cbdb062649432e64ebaccdc4 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 26 Sep 2016 21:01:16 +0200 Subject: [PATCH] Mark some symbols optional --- debian/changelog | 6 ++++++ debian/libqtermwidget5-0.symbols | 33 +++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8cd6e02..441f5d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qtermwidget (0.7.0-2) experimental; urgency=medium + + * Mark some symbols optional + + -- Alf Gaida Mon, 26 Sep 2016 21:01:01 +0200 + qtermwidget (0.7.0-1) experimental; urgency=medium * Cherry-picking upstream release: 0.7.0 diff --git a/debian/libqtermwidget5-0.symbols b/debian/libqtermwidget5-0.symbols index 9a99de5..c8fbb50 100644 --- a/debian/libqtermwidget5-0.symbols +++ b/debian/libqtermwidget5-0.symbols @@ -909,7 +909,6 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (c++)"QHash::values(int const&) const@Base" 0.6.0 (c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 (c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 - (c++)"QHash::erase(QHash::iterator)@Base" 0.6.0 (c++)"QHash::findNode(int const&, unsigned int) const@Base" 0.7.0 (c++)"QHash::findNode(int const&, unsigned int) const@Base" 0.7.0 @@ -1223,7 +1222,7 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (c++)"vtable for QTermWidget@Base" 0.6.0 (c++)"vtable for SearchBar@Base" 0.6.0 -## optional symbols +# optional symbols (optional|c++)"add_custom_color_scheme_dir(QString const&)@Base" 0.7.0 (optional|c++)"get_color_schemes_dirs()@Base" 0.7.0 (optional|c++)"get_kb_layout_dir()@Base" 0.6.0 @@ -1231,8 +1230,8 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (optional|c++)"string_width(QString const&)@Base" 0.6.0 (optional|c++)"operator+(QString const&, char)@Base" 0.6.0 (optional|c++)"QByteArray::~QByteArray()@Base" 0.6.0 - (optional|c++)"QHash::detach_helper()@Base" 0.6.0 + (optional|c++)"QHash::detach_helper()@Base" 0.6.0 (optional|c++)"QHash::findNode(Konsole::Session* const&, unsigned int*) const@Base" 0.7.0 (optional|c++)"QHash::detach_helper()@Base" 0.6.0 @@ -1240,6 +1239,7 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (optional|c++)"QHash::detach_helper()@Base" 0.6.0 (optional|c++)"QHash::findNode(QString const&, unsigned int*) const@Base" 0.6.0 (optional|c++)"QHash::detach_helper()@Base" 0.6.0 + (optional|c++)"QHash::erase(QHash::iterator)@Base" 0.6.0 (optional|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 (optional|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 @@ -1296,7 +1296,7 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (optional|c++)"QVector::~QVector()@Base" 0.6.0 (optional|c++)"QVector::reallocData(int, int, QFlags)@Base" 0.6.0 -## arch-bits=32 +# arch-bits=32 (arch-bits=32|c++)"Konsole::BlockArray::at(unsigned int)@Base" 0.6.0 (arch-bits=32|c++)"Konsole::BlockArray::decreaseBuffer(unsigned int)@Base" 0.6.0 (arch-bits=32|c++)"Konsole::BlockArray::has(unsigned int) const@Base" 0.6.0 @@ -1308,12 +1308,12 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (arch-bits=32|c++)"Konsole::HistoryScrollBlockArray::HistoryScrollBlockArray(unsigned int)@Base" 0.6.0 (arch-bits=32|c++)"Konsole::HistoryTypeBlockArray::HistoryTypeBlockArray(unsigned int)@Base" 0.6.0 -## arch-bits=32 optional +# arch-bits=32 optional (optional|arch-bits=32|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 (optional|arch-bits=32|c++)"QHash::detach_helper()@Base" 0.6.0 (optional|arch-bits=32|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 -## arch-bits=64 +# arch-bits=64 (arch-bits=64|c++)"Konsole::BlockArray::at(unsigned long)@Base" 0.6.0 (arch-bits=64|c++)"Konsole::BlockArray::decreaseBuffer(unsigned long)@Base" 0.6.0 (arch-bits=64|c++)"Konsole::BlockArray::has(unsigned long) const@Base" 0.6.0 @@ -1325,20 +1325,27 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (arch-bits=64|c++)"Konsole::HistoryScrollBlockArray::HistoryScrollBlockArray(unsigned long)@Base" 0.6.0 (arch-bits=64|c++)"Konsole::HistoryTypeBlockArray::HistoryTypeBlockArray(unsigned long)@Base" 0.6.0 -## arch-bits=64 optional +# arch-bits=64 optional (optional|arch-bits=64|c++)"QHash::deleteNode2(QHashData::Node*)@Base" 0.6.0 (optional|arch-bits=64|c++)"QHash::detach_helper()@Base" 0.6.0 (optional|arch-bits=64|c++)"QHash::duplicateNode(QHashData::Node*, void*)@Base" 0.6.0 -## some really weird symbols -## i don't want do break build with this one, so setting them optional is a good idea for now -## if the symbols file don't fully match, we can refine them with the output of the build +# some really weird symbols +# i don't want do break build with this one, so setting them optional is a good idea for now +# if the symbols file don't fully match, we can refine them with the output of the build (optional|arch= amd64 arm64 i386 kfreebsd64 m86k powerpc ppc64 ppc64el s390x sh4 sparc64 x32 |c++)"QHash::values() const@Base" 0.6.0 (optional|arch= armel armhf alpha hppa mips mipsel mips64el |c++)"QList::append(Konsole::ColorScheme const* const&)@Base" 0.6.0 -## missed in arm64, armel, mips, mipsel, powerpc, ppc64el, s390x, alpha, hppa, -## m68k, mips64el, ppc64, sh4, sparc64 +# missed in arm64, armel, mips, mipsel, powerpc, ppc64el, s390x, alpha, hppa, +# m68k, mips64el, ppc64, sh4, sparc64 (optional|c++)"QList::operator+=(QList const&)@Base" 0.6.0 -## missed in armel, mips, mipsel, alpha, hppa, mips64el, sparc64 +# missed in armel, mips, mipsel, alpha, hppa, mips64el, sparc64 (optional|c++)"QHash::keys() const@Base" 0.6.0 + +# new, possible Qt 5.7 + (optional|c++)"QHash::findNode(Konsole::Session* const&, unsigned int) const@Base" 0.7.0 + (optional|c++)"QHash::remove(Konsole::Session* const&)@Base" 0.7.0 + (optional|c++)"QHash::values() const@Base" 0.7.0 + (optional|c++)"QHash::erase(QHash::const_iterator)@Base" 0.7.0 + (optional|c++)"QHash::findNode(int const&, unsigned int) const@Base" 0.7.0