Hello community, here is the log from the commit of package kguiaddons for openSUSE:Factory checked in at 2015-11-24 22:23:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kguiaddons (Old) and /work/SRC/openSUSE:Factory/.kguiaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kguiaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kguiaddons/kguiaddons.changes 2015-10-19 22:24:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kguiaddons.new/kguiaddons.changes 2015-11-24 22:23:32.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 8 17:00:22 UTC 2015 - [email protected] + +- Update to 5.16.0 (boo#955067) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.16.0.php + +------------------------------------------------------------------- Old: ---- kguiaddons-5.15.0.tar.xz New: ---- kguiaddons-5.16.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kguiaddons.spec ++++++ --- /var/tmp/diff_new_pack.034g3U/_old 2015-11-24 22:23:33.000000000 +0100 +++ /var/tmp/diff_new_pack.034g3U/_new 2015-11-24 22:23:33.000000000 +0100 @@ -17,9 +17,9 @@ %define lname libKF5GuiAddons5 -%define _tar_path 5.15 +%define _tar_path 5.16 Name: kguiaddons -Version: 5.15.0 +Version: 5.16.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kguiaddons-5.15.0.tar.xz -> kguiaddons-5.16.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.15.0/CMakeLists.txt new/kguiaddons-5.16.0/CMakeLists.txt --- old/kguiaddons-5.15.0/CMakeLists.txt 2015-10-03 12:20:01.000000000 +0200 +++ new/kguiaddons-5.16.0/CMakeLists.txt 2015-11-08 12:06:57.000000000 +0100 @@ -3,7 +3,7 @@ project(KGuiAddons) include(FeatureSummary) -find_package(ECM 5.15.0 NO_MODULE) +find_package(ECM 5.16.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -25,7 +25,7 @@ include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.15.0") # handled by release scripts +set(KF5_VERSION "5.16.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KGUIADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kguiaddons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.15.0/autotests/kwordwraptest.cpp new/kguiaddons-5.16.0/autotests/kwordwraptest.cpp --- old/kguiaddons-5.15.0/autotests/kwordwraptest.cpp 2015-10-03 12:20:01.000000000 +0200 +++ new/kguiaddons-5.16.0/autotests/kwordwraptest.cpp 2015-11-08 12:06:57.000000000 +0100 @@ -41,15 +41,15 @@ void oldTruncationTest() { - QFont font("helvetica", 12); // let's hope we all have the same... + QFont font(QStringLiteral("helvetica"), 12); // let's hope we all have the same... QFontMetrics fm(font); QRect r(0, 0, 100, -1); - QString str = "test wadabada [/foo/bar/waba] and some more text here"; + QString str = QStringLiteral("test wadabada [/foo/bar/waba] and some more text here"); KWordWrap ww = KWordWrap::formatText(fm, r, 0, str); //qDebug() << str << " => " << ww.truncatedString(); QVERIFY(ww.truncatedString().endsWith("...")); - str = "</p></p></p></p>"; + str = QStringLiteral("</p></p></p></p>"); for (; r.width() > 0; r.setWidth(r.width() - 10)) { ww = KWordWrap::formatText(fm, r, 0, str); //qDebug() << str << " => " << ww.truncatedString(); @@ -60,9 +60,9 @@ void testWithExistingNewlines() // when the input string has \n already { QRect r(0, 0, 1000, -1); // very wide - QFont font("helvetica", 12); // let's hope we all have the same... + QFont font(QStringLiteral("helvetica"), 12); // let's hope we all have the same... QFontMetrics fm(font); - QString inputString = "The title here\nFoo (bar)\nFoo2 (bar2)"; + QString inputString = QStringLiteral("The title here\nFoo (bar)\nFoo2 (bar2)"); KWordWrap ww = KWordWrap::formatText(fm, r, 0, inputString); QString str = ww.wrappedString(); QCOMPARE(str, inputString); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.15.0/src/colors/kcolorcollection.cpp new/kguiaddons-5.16.0/src/colors/kcolorcollection.cpp --- old/kguiaddons-5.15.0/src/colors/kcolorcollection.cpp 2015-10-03 12:20:01.000000000 +0200 +++ new/kguiaddons-5.16.0/src/colors/kcolorcollection.cpp 2015-11-08 12:06:57.000000000 +0100 @@ -111,7 +111,7 @@ QStringList KColorCollection::installedCollections() { QStringList paletteDirs = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, - QLatin1String("colors"), + QStringLiteral("colors"), QStandardPaths::LocateDirectory); QStringList paletteList; @@ -152,7 +152,7 @@ QTextStream str(&sf); QString description = d->desc.trimmed(); - description = QLatin1Char('#') + description.split(QLatin1Char('\n'), QString::KeepEmptyParts).join(QLatin1String("\n#")); + description = QLatin1Char('#') + description.split(QLatin1Char('\n'), QString::KeepEmptyParts).join(QStringLiteral("\n#")); str << QLatin1String("KDE RGB Palette\n"); str << description << QLatin1Char('\n'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.15.0/src/text/kwordwrap.cpp new/kguiaddons-5.16.0/src/text/kwordwrap.cpp --- old/kguiaddons-5.15.0/src/text/kwordwrap.cpp 2015-10-03 12:20:01.000000000 +0200 +++ new/kguiaddons-5.16.0/src/text/kwordwrap.cpp 2015-11-08 12:06:57.000000000 +0100 @@ -175,11 +175,11 @@ int start = 0; for (int i = 0; i < d->m_breakPositions.count(); ++i) { int end = d->m_breakPositions.at(i); - ws += d->m_text.mid(start, end - start + 1); + ws += d->m_text.midRef(start, end - start + 1); ws += QLatin1Char('\n'); start = end + 1; } - ws += d->m_text.mid(start); + ws += d->m_text.midRef(start); return ws; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.15.0/src/util/urlhandler.cpp new/kguiaddons-5.16.0/src/util/urlhandler.cpp --- old/kguiaddons-5.15.0/src/util/urlhandler.cpp 2015-10-03 12:20:01.000000000 +0200 +++ new/kguiaddons-5.16.0/src/util/urlhandler.cpp 2015-11-08 12:06:57.000000000 +0100 @@ -26,6 +26,7 @@ #include <QCoreApplication> #include <QProcess> #include <QDesktopServices> +#include <QLocale> class UrlHandler : public QObject { @@ -41,9 +42,15 @@ u.setPath(QCoreApplication::applicationName()); } - QString helpcenter = QStandardPaths::findExecutable(QLatin1String("khelpcenter")); + QString helpcenter = QStandardPaths::findExecutable(QStringLiteral("khelpcenter")); if (helpcenter.isEmpty()) { - QDesktopServices::openUrl(u); + if (QCoreApplication::organizationDomain() == QLatin1String("kde.org")) { + //if khelpcenter is not installed and it's a KDE application, use docs.kde.org + const QUrl httpUrl(QStringLiteral("https://docs.kde.org/index.php?branch=stable5&language=";)+QLocale().name()+QStringLiteral("&application=") + + QCoreApplication::applicationName() + QStringLiteral("&path=") + url.path()); + QDesktopServices::openUrl(httpUrl); + } else + QDesktopServices::openUrl(u); } else { QProcess::startDetached(helpcenter, QStringList(u.toString())); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.15.0/tests/kcolorcollectiontest.cpp new/kguiaddons-5.16.0/tests/kcolorcollectiontest.cpp --- old/kguiaddons-5.15.0/tests/kcolorcollectiontest.cpp 2015-10-03 12:20:01.000000000 +0200 +++ new/kguiaddons-5.16.0/tests/kcolorcollectiontest.cpp 2015-11-08 12:06:57.000000000 +0100 @@ -11,7 +11,7 @@ int main(int argc, char **argv) { - QApplication::setApplicationName("KColorCollectionTest"); + QApplication::setApplicationName(QStringLiteral("KColorCollectionTest")); QApplication a(argc, argv); QStringList collections = KColorCollection::installedCollections(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.15.0/tests/kmodifierkeyinfotest.cpp new/kguiaddons-5.16.0/tests/kmodifierkeyinfotest.cpp --- old/kguiaddons-5.15.0/tests/kmodifierkeyinfotest.cpp 2015-10-03 12:20:01.000000000 +0200 +++ new/kguiaddons-5.16.0/tests/kmodifierkeyinfotest.cpp 2015-11-08 12:06:57.000000000 +0100 @@ -74,23 +74,23 @@ TestWidget::TestWidget() : QWidget(0), m_lock(this) { QMap<Qt::Key, QString> mods; - mods.insert(Qt::Key_Shift, "Shift"); - mods.insert(Qt::Key_Control, "Ctrl"); - mods.insert(Qt::Key_Alt, "Alt"); - mods.insert(Qt::Key_Meta, "Meta"); - mods.insert(Qt::Key_Super_L, "Super"); - mods.insert(Qt::Key_Hyper_L, "Hyper"); - mods.insert(Qt::Key_AltGr, "AltGr"); - mods.insert(Qt::Key_NumLock, "NumLock"); - mods.insert(Qt::Key_CapsLock, "CapsLock"); - mods.insert(Qt::Key_ScrollLock, "ScrollLock"); + mods.insert(Qt::Key_Shift, QStringLiteral("Shift")); + mods.insert(Qt::Key_Control, QStringLiteral("Ctrl")); + mods.insert(Qt::Key_Alt, QStringLiteral("Alt")); + mods.insert(Qt::Key_Meta, QStringLiteral("Meta")); + mods.insert(Qt::Key_Super_L, QStringLiteral("Super")); + mods.insert(Qt::Key_Hyper_L, QStringLiteral("Hyper")); + mods.insert(Qt::Key_AltGr, QStringLiteral("AltGr")); + mods.insert(Qt::Key_NumLock, QStringLiteral("NumLock")); + mods.insert(Qt::Key_CapsLock, QStringLiteral("CapsLock")); + mods.insert(Qt::Key_ScrollLock, QStringLiteral("ScrollLock")); QMap<Qt::MouseButton, QString> buttons; - buttons.insert(Qt::LeftButton, "Left Button"); - buttons.insert(Qt::RightButton, "Right Button"); - buttons.insert(Qt::MidButton, "Middle Button"); - buttons.insert(Qt::XButton1, "First X Button"); - buttons.insert(Qt::XButton2, "Second X Button"); + buttons.insert(Qt::LeftButton, QStringLiteral("Left Button")); + buttons.insert(Qt::RightButton, QStringLiteral("Right Button")); + buttons.insert(Qt::MidButton, QStringLiteral("Middle Button")); + buttons.insert(Qt::XButton1, QStringLiteral("First X Button")); + buttons.insert(Qt::XButton2, QStringLiteral("Second X Button")); QVBoxLayout *layout = new QVBoxLayout(this); @@ -102,10 +102,10 @@ QCheckBox *pressed = new QCheckBox(this); QCheckBox *latched = new QCheckBox(this); QCheckBox *locked = new QCheckBox(this); - QPushButton *latch = new QPushButton("latch", this); + QPushButton *latch = new QPushButton(QStringLiteral("latch"), this); latch->setProperty("modifier", it.key()); connect(latch, SIGNAL(clicked()), SLOT(latch())); - QPushButton *lock = new QPushButton("lock", this); + QPushButton *lock = new QPushButton(QStringLiteral("lock"), this); lock->setProperty("modifier", it.key()); connect(lock, SIGNAL(clicked()), SLOT(lock())); pressed->setChecked(m_lock.isKeyPressed(it.key())); @@ -187,7 +187,7 @@ int main(int argc, char *argv[]) { - QApplication::setApplicationName("simple"); + QApplication::setApplicationName(QStringLiteral("simple")); QApplication app(argc, argv); TestWidget mainWidget; ++++++ kguiaddons-use-susehelp.patch ++++++ --- /var/tmp/diff_new_pack.034g3U/_old 2015-11-24 22:23:33.000000000 +0100 +++ /var/tmp/diff_new_pack.034g3U/_new 2015-11-24 22:23:33.000000000 +0100 @@ -1,13 +1,13 @@ diff --git a/src/util/urlhandler.cpp b/src/util/urlhandler.cpp -index 5b46be2..b9fb3c4 100644 +index 1fd5984..20dc957 100644 --- a/src/util/urlhandler.cpp +++ b/src/util/urlhandler.cpp -@@ -41,7 +41,7 @@ public Q_SLOTS: +@@ -42,7 +42,7 @@ public Q_SLOTS: u.setPath(QCoreApplication::applicationName()); } -- QString helpcenter = QStandardPaths::findExecutable(QLatin1String("khelpcenter")); -+ QString helpcenter = QStandardPaths::findExecutable(QLatin1String("susehelp")); +- QString helpcenter = QStandardPaths::findExecutable(QStringLiteral("khelpcenter")); ++ QString helpcenter = QStandardPaths::findExecutable(QStringLiteral("susehelp")); if (helpcenter.isEmpty()) { - QDesktopServices::openUrl(u); - } else { + if (QCoreApplication::organizationDomain() == QLatin1String("kde.org")) { + //if khelpcenter is not installed and it's a KDE application, use docs.kde.org
