Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2016-10-18 10:15:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2016-10-03 09:35:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2016-10-18 10:15:31.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Oct 11 20:51:41 UTC 2016 - lbeltr...@kde.org + +- KDE Applications 16.08.2 +https://www.kde.org/announcements/announce-applications-16.08.2.php + +------------------------------------------------------------------- +Mon Oct 10 21:36:22 UTC 2016 - hrvoje.sen...@gmail.com + +- Try to fix build on Leap 42.1 with newer KF5 + +------------------------------------------------------------------- Old: ---- kate-16.08.1.tar.xz New: ---- kate-16.08.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.0gnsXg/_old 2016-10-18 10:15:33.000000000 +0200 +++ /var/tmp/diff_new_pack.0gnsXg/_new 2016-10-18 10:15:33.000000000 +0200 @@ -16,8 +16,9 @@ # +%define _appstreamkpackage 0%(cat %{_kf5_libdir}/cmake/KF5Package/KF5PackageMacros.cmake | grep -q 'appstream-metainfo' && echo 1) Name: kate -Version: 16.08.1 +Version: 16.08.2 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ @@ -138,7 +139,7 @@ %{_kf5_sharedir}/katexmltools/ %{_kf5_sharedir}/plasma/ %{_kf5_servicesdir}/ -%if 0%{?sle_version} != 120100 +%if 0%{?_appstreamkpackage} %{_kf5_appstreamdir}/org.kde.plasma.katesessions.appdata.xml %endif ++++++ kate-16.08.1.tar.xz -> kate-16.08.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-16.08.1/CMakeLists.txt new/kate-16.08.2/CMakeLists.txt --- old/kate-16.08.1/CMakeLists.txt 2016-09-05 21:10:32.000000000 +0200 +++ new/kate-16.08.2/CMakeLists.txt 2016-10-10 14:24:53.000000000 +0200 @@ -9,7 +9,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # we need some parts of the ECM CMake helpers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-16.08.1/addons/tabswitcher/tabswitcher.cpp new/kate-16.08.2/addons/tabswitcher/tabswitcher.cpp --- old/kate-16.08.1/addons/tabswitcher/tabswitcher.cpp 2016-09-05 21:10:32.000000000 +0200 +++ new/kate-16.08.2/addons/tabswitcher/tabswitcher.cpp 2016-10-10 14:24:53.000000000 +0200 @@ -137,6 +137,10 @@ void TabSwitcherPluginView::registerDocument(KTextEditor::Document * document) { + // insert into hash + m_documents.insert(document); + + // add to model auto item = new QStandardItem(iconForDocument(document), document->documentName()); item->setData(QVariant::fromValue(document)); m_model->insertRow(0, item); @@ -148,6 +152,13 @@ void TabSwitcherPluginView::unregisterDocument(KTextEditor::Document * document) { + // remove from hash + if (!m_documents.contains(document)) { + return; + } + m_documents.remove(document); + + // remove from model const auto rowCount = m_model->rowCount(); for (int i = 0; i < rowCount; ++i) { auto doc = m_model->item(i)->data().value<KTextEditor::Document*>(); @@ -164,6 +175,10 @@ void TabSwitcherPluginView::updateDocumentName(KTextEditor::Document * document) { + if (!m_documents.contains(document)) { + return; + } + const auto rowCount = m_model->rowCount(); for (int i = 0; i < rowCount; ++i) { auto doc = m_model->item(i)->data().value<KTextEditor::Document*>(); @@ -176,7 +191,7 @@ void TabSwitcherPluginView::raiseView(KTextEditor::View * view) { - if (!view) { + if (!view || !m_documents.contains(view->document())) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-16.08.1/addons/tabswitcher/tabswitcher.h new/kate-16.08.2/addons/tabswitcher/tabswitcher.h --- old/kate-16.08.1/addons/tabswitcher/tabswitcher.h 2016-09-05 21:10:32.000000000 +0200 +++ new/kate-16.08.2/addons/tabswitcher/tabswitcher.h 2016-10-10 14:24:53.000000000 +0200 @@ -25,6 +25,7 @@ #include <KTextEditor/MainWindow> #include <QList> +#include <QSet> #include <QVariant> #include <KXMLGUIClient> @@ -136,6 +137,7 @@ TabSwitcherPlugin *m_plugin; KTextEditor::MainWindow *m_mainWindow; QStandardItemModel * m_model; + QSet<KTextEditor::Document *> m_documents; TabSwitcherTreeView * m_treeView; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-16.08.1/addons/xmlcheck/katexmlcheck.desktop new/kate-16.08.2/addons/xmlcheck/katexmlcheck.desktop --- old/kate-16.08.1/addons/xmlcheck/katexmlcheck.desktop 2016-09-05 21:10:32.000000000 +0200 +++ new/kate-16.08.2/addons/xmlcheck/katexmlcheck.desktop 2016-10-10 14:24:53.000000000 +0200 @@ -27,6 +27,7 @@ Name[hu]=XML-ellenőrző Name[ia]=Validation XML Name[it]=Validazione XML +Name[ja]=XML 検証 Name[kk]=XML-ды тексеруі Name[km]=សុពលកម្ម XML Name[ko]=XML 검사기 @@ -81,6 +82,7 @@ Comment[hu]=XML-fájlok ellenőrzése az xmllint programmal Comment[ia]=Valida files XML per usar xmllint Comment[it]=Convalida i file XML usando xmllint +Comment[ja]=xmllint で XML ファイルを検証します Comment[kk]=xmllint көмегімен XML файлдарды тексеру Comment[km]=ធ្វើឲ្យឯកសារ XML មានសុពលភាពដោយប្រើ xmllint Comment[ko]=xmllint로 XML 파일 검사하기 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-16.08.1/kate/session/katesessionchooser.cpp new/kate-16.08.2/kate/session/katesessionchooser.cpp --- old/kate-16.08.1/kate/session/katesessionchooser.cpp 2016-09-05 21:10:32.000000000 +0200 +++ new/kate-16.08.2/kate/session/katesessionchooser.cpp 2016-10-10 14:24:53.000000000 +0200 @@ -52,10 +52,10 @@ header << QString(); m_sessions->setHeaderLabels(header); m_sessions->header()->setStretchLastSection(false); - m_sessions->header()->resizeSection(0, (m_sessions->size().width() - 32) * 2 / 3); - m_sessions->header()->resizeSection(1, (m_sessions->size().width() - 32) / 3); + m_sessions->header()->setSectionResizeMode(0, QHeaderView::Stretch); + m_sessions->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents); + m_sessions->header()->setSectionResizeMode(2, QHeaderView::Fixed); m_sessions->header()->resizeSection(2, 32); - m_sessions->header()->setSectionResizeMode(QHeaderView::Fixed); m_sessions->setRootIsDecorated(false); m_sessions->setItemsExpandable(false); m_sessions->setAllColumnsShowFocus(true); @@ -117,17 +117,9 @@ connect(newButton, SIGNAL(clicked()), this, SLOT(slotNew())); setResult(resultNone); - //m_sessions->resizeColumnToContents(0); selectionChanged(NULL, NULL); } -void KateSessionChooser::resizeEvent(QResizeEvent *) -{ - m_sessions->header()->resizeSection(0, (m_sessions->size().width() - 32) * 2 / 3); - m_sessions->header()->resizeSection(1, (m_sessions->size().width() - 32) / 3); - m_sessions->header()->resizeSection(2, 32); -} - KateSessionChooser::~KateSessionChooser() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-16.08.1/kate/session/katesessionchooser.h new/kate-16.08.2/kate/session/katesessionchooser.h --- old/kate-16.08.1/kate/session/katesessionchooser.h 2016-09-05 21:10:32.000000000 +0200 +++ new/kate-16.08.2/kate/session/katesessionchooser.h 2016-10-10 14:24:53.000000000 +0200 @@ -61,9 +61,6 @@ */ void selectionChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); -protected: - void resizeEvent(QResizeEvent *); - private: QTreeWidget *m_sessions; QCheckBox *m_useLast;
