diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
| commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
| tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/kde/patch/kate | |
| parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
| download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz | |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde/patch/kate')
| -rw-r--r-- | source/kde/patch/kate/kate4-fix_gcc7.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/source/kde/patch/kate/kate4-fix_gcc7.patch b/source/kde/patch/kate/kate4-fix_gcc7.patch new file mode 100644 index 00000000..080a114f --- /dev/null +++ b/source/kde/patch/kate/kate4-fix_gcc7.patch @@ -0,0 +1,54 @@ +--- a/part/search/kateregexp.cpp ++++ b/part/search/kateregexp.cpp +@@ -96,7 +96,7 @@ + + case L'n': + stillMultiLine = true; +- // FALLTROUGH ++ __attribute__((fallthrough)); + + default: + // copy "\?" unmodified +@@ -164,7 +164,7 @@ + + case L'n': + stillMultiLine = true; +- // FALLTROUGH ++ __attribute__((fallthrough)); + + default: + // copy "\?" unmodified +--- a/part/view/kateview.cpp ++++ b/part/view/kateview.cpp +@@ -310,7 +310,7 @@ + if (factory()) + factory()->removeClient (this); + +- KTextEditor::ViewBarContainer *viewBarContainer=qobject_cast<KTextEditor::ViewBarContainer*>( KateGlobal::self()->container() ); ++ KTextEditor::ViewBarContainer *viewBarContainer=qobject_cast<KTextEditor::ViewBarContainer*>( KateGlobal::self()->container() ); + if (viewBarContainer) { + viewBarContainer->deleteViewBarForView(this,KTextEditor::ViewBarContainer::BottomBar); + m_bottomViewBar=0; +--- a/part/view/kateviewaccessible.h ++++ b/part/view/kateviewaccessible.h +@@ -248,7 +248,8 @@ + + virtual int navigate(QAccessible::RelationFlag relation, int entry, QAccessibleInterface **target) const + { +- if ((relation == QAccessible::Child || QAccessible::FocusChild) && entry == KateCursorAccessible::ChildId) { ++ if ((relation == QAccessible::Child || relation == QAccessible::FocusChild) && ++ entry == KateCursorAccessible::ChildId) { + *target = new KateCursorAccessible(view()); + return KateCursorAccessible::ChildId; + } +--- a/part/view/kateviewhelpers.cpp ++++ b/part/view/kateviewhelpers.cpp +@@ -1703,7 +1703,7 @@ + if (realLine > -1) { + if (m_viewInternal->cache()->viewLine(z).startCol() == 0) { + if (m_viRelLineNumbersOn && m_view->viInputMode()) { +- int diff = abs(realLine - currentLine); ++ int diff = abs(static_cast<int>(realLine - currentLine)); + if (diff > 0) { + p.drawText( lnX + m_maxCharWidth / 2, y, lnWidth - m_maxCharWidth, h, + Qt::TextDontClip|Qt::AlignRight|Qt::AlignVCenter, QString("%1").arg(diff) ); |