Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2017-03-03 17:46:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Fri Mar 3 17:46:48 2017 rev:41 rq:461392 version:5.31.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2017-02-03 17:36:57.730976445 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2017-03-03 17:47:56.856197283 +0100
@@ -1,0 +2,12 @@
+Mon Feb 13 08:42:38 UTC 2017 - [email protected]
+
+- Build with AppStream-Qt again, right version now available
+
+-------------------------------------------------------------------
+Thu Feb 9 09:22:42 UTC 2017 - [email protected]
+
+- Update to 5.31.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.31.0.php
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.30.0.tar.xz
New:
----
frameworkintegration-5.31.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.ITSLKd/_old 2017-03-03 17:47:57.484108605 +0100
+++ /var/tmp/diff_new_pack.ITSLKd/_new 2017-03-03 17:47:57.484108605 +0100
@@ -17,9 +17,9 @@
%define lname libKF5Style5
-%define _tar_path 5.30
+%define _tar_path 5.31
Name: frameworkintegration
-Version: 5.30.0
+Version: 5.31.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 3.0
@@ -34,10 +34,10 @@
BuildRequires: knotifications-devel >= %{_tar_path}
BuildRequires: kpackage-devel >= %{_tar_path}
BuildRequires: kwidgetsaddons-devel >= %{_tar_path}
-#BuildRequires: cmake(AppstreamQt)
-BuildRequires: cmake(Qt5DBus) >= 5.5.0
-BuildRequires: cmake(Qt5Widgets) >= 5.5.0
-BuildRequires: cmake(Qt5X11Extras) >= 5.5.0
+BuildRequires: cmake(AppStreamQt) >= 0.10.4
+BuildRequires: cmake(Qt5DBus) >= 5.6.0
+BuildRequires: cmake(Qt5Widgets) >= 5.6.0
+BuildRequires: cmake(Qt5X11Extras) >= 5.6.0
#BuildRequires: cmake(packagekitqt5)
BuildRequires: cmake(KF5NewStuff)
BuildRequires: pkgconfig(x11)
++++++ frameworkintegration-5.30.0.tar.xz -> frameworkintegration-5.31.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.30.0/CMakeLists.txt
new/frameworkintegration-5.31.0/CMakeLists.txt
--- old/frameworkintegration-5.30.0/CMakeLists.txt 2017-01-08
16:13:48.000000000 +0100
+++ new/frameworkintegration-5.31.0/CMakeLists.txt 2017-02-05
06:03:46.000000000 +0100
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.30.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.30.0") # handled by release scripts
+set(KF5_VERSION "5.31.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.31.0") # handled by release scripts
project(FrameworkIntegration VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.30.0 NO_MODULE)
+find_package(ECM 5.31.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)
@@ -22,7 +22,7 @@
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.5.0)
+set(REQUIRED_QT_VERSION 5.6.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets)
@@ -38,6 +38,7 @@
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Package ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5NewStuff ${KF5_DEP_VERSION} REQUIRED)
+find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
find_package(packagekitqt5)
find_package(AppStreamQt 0.10.4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.30.0/autotests/kstyle_unittest.cpp
new/frameworkintegration-5.31.0/autotests/kstyle_unittest.cpp
--- old/frameworkintegration-5.30.0/autotests/kstyle_unittest.cpp
2017-01-08 16:13:48.000000000 +0100
+++ new/frameworkintegration-5.31.0/autotests/kstyle_unittest.cpp
2017-02-05 06:03:46.000000000 +0100
@@ -71,10 +71,10 @@
QToolBar *toolbar = new QToolBar();
QToolButton *btn = new QToolButton(toolbar);
- QCOMPARE(qApp->style()->styleHint(QStyle::SH_ToolButtonStyle, 0, btn),
(int) Qt::ToolButtonTextOnly);
+ QCOMPARE(qApp->style()->styleHint(QStyle::SH_ToolButtonStyle, nullptr,
btn), (int) Qt::ToolButtonTextOnly);
toolbar->setProperty("otherToolbar", true);
- QCOMPARE(qApp->style()->styleHint(QStyle::SH_ToolButtonStyle, 0, btn),
(int) Qt::ToolButtonTextUnderIcon);
+ QCOMPARE(qApp->style()->styleHint(QStyle::SH_ToolButtonStyle, nullptr,
btn), (int) Qt::ToolButtonTextUnderIcon);
}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.30.0/plasma_workspace.notifyrc
new/frameworkintegration-5.31.0/plasma_workspace.notifyrc
--- old/frameworkintegration-5.30.0/plasma_workspace.notifyrc 2017-01-08
16:13:48.000000000 +0100
+++ new/frameworkintegration-5.31.0/plasma_workspace.notifyrc 2017-02-05
06:03:46.000000000 +0100
@@ -264,7 +264,7 @@
Name[zh_CN]=文本补全：没有匹配
Name[zh_TW]=文字補完：沒有符合
Comment=No matching completion was found
-Comment[ar]=لم تُعثر على تطابقات
+Comment[ar]=لم توجد تطابقات
Comment[ast]=Nun s'alcontró un completáu que concasara
Comment[bs]=Nije nađeno nijedno poklapanje za dopunu
Comment[ca]=No s'ha trobat cap compleció coincident
@@ -752,6 +752,7 @@
[Event/applicationcrash]
Name=Application Crash
+Name[ar]=انهيار التّطبيقات
Name[ast]=Casque d'aplicación
Name[ca]=Fallada d'aplicació
Name[ca@valencia]=Fallada d'aplicació
@@ -763,8 +764,9 @@
Name[et]=Rakenduse krahh
Name[fi]=Ohjelman kaatuminen
Name[gd]=Thuislich aplacaid
-Name[gl]=Quebra dun programa
+Name[gl]=Quebra dun aplicativo
Name[he]=היישום קרס
+Name[ia]=Crash de application
Name[it]=Chiusura inattesa dell'applicazione
Name[ko]=프로그램 충돌
Name[nl]=Crash van toepassing
@@ -785,6 +787,7 @@
Name[zh_CN]=应用程序崩溃
Name[zh_TW]=應用程式當掉
Comment=An application just closed unexpectedly
+Comment[ar]=أُغلق تطبيق ما للتّو بشكل غير متوقّع
Comment[ast]=Una aplicación ta acabante zarrase inesperadamente
Comment[ca]=Una aplicació s'ha tancat inesperadament
Comment[ca@valencia]=Una aplicació s'ha tancat inesperadament
@@ -796,8 +799,9 @@
Comment[et]=Rakendus lõpetas lihtsalt ootamatult töö
Comment[fi]=Ohjelma sulkeutui juuri odottamattomasti
Comment[gd]=Tha aplacaid air a dùnadh gun dùil
-Comment[gl]=Un programa pechouse inesperadamente
+Comment[gl]=Un aplicativo pechouse inesperadamente
Comment[he]=היישום קרס בצורה לא צפוייה
+Comment[ia]=Un application justo ora claudeva inopinatemente
Comment[it]=Un'applicazione si è appena chiusa in modo inatteso
Comment[ko]=프로그램이 예상하지 못하게 충돌했습니다
Comment[nl]=Een toepassing is zojuist onverwacht afgesloten
@@ -1060,6 +1064,7 @@
Comment[gl]=Cancelouse a saída de Plasma
Comment[he]=היציאה מאת Plasma בוטלה
Comment[hu]=A KDE kijelentkezési folyamata megszakadt
+Comment[ia]=Clausura de session de Plasma esseva cancellate
Comment[it]=La chiusura di Plasma è stata annullata
Comment[ko]=Plasma 로그아웃 취소됨
Comment[lt]=Plasma išsiregistravimas buvo nutrauktas
@@ -1623,6 +1628,7 @@
[Event/plasmoidInstallationFailed]
Name=Widget failed to install
+Name[ar]=فشل تثبيت الودجات
Name[ast]=El widget falló al instalase
Name[ca]=Ha fallat en instal·lar l'estri
Name[ca@valencia]=Ha fallat en instal·lar l'estri
@@ -1636,6 +1642,7 @@
Name[gd]=Cha deach le stàladh a' widget
Name[gl]=Fallo de instalación dun trebello
Name[he]=התקנת היישומון נכשלה
+Name[ia]=Widget falleva a installar
Name[it]=Installazione dell'oggetto non riuscita
Name[ko]=위젯을 설치할 수 없음
Name[nl]=Widget kan niet geïnstalleerd worden
@@ -1656,6 +1663,7 @@
Name[zh_CN]=安装部件失败
Name[zh_TW]=Widget 安裝失敗
Comment=A widget could not be installed
+Comment[ar]=تعذّر تثبيت أحد الودجات
Comment[ast]=Nun pudo instalase un widget
Comment[ca]=No s'ha pogut instal·lar un estri
Comment[ca@valencia]=No s'ha pogut instal·lar un estri
@@ -1669,6 +1677,7 @@
Comment[gd]=Cha b' urrainn dhuinn a' widget a stàladh
Comment[gl]=Non foi posíbel instalar un trebello.
Comment[he]=אי אפשר להתקין את היישומון
+Comment[ia]=un widget non poteva esser installate
Comment[it]=Un oggetto non può essere installato
Comment[ko]=위젯을 설치할 수 없음
Comment[nl]=Een widget kon niet geïnstalleerd worden
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.30.0/src/integrationplugin/frameworkintegrationplugin.h
new/frameworkintegration-5.31.0/src/integrationplugin/frameworkintegrationplugin.h
---
old/frameworkintegration-5.30.0/src/integrationplugin/frameworkintegrationplugin.h
2017-01-08 16:13:48.000000000 +0100
+++
new/frameworkintegration-5.31.0/src/integrationplugin/frameworkintegrationplugin.h
2017-02-05 06:03:46.000000000 +0100
@@ -29,7 +29,7 @@
class KMessageBoxDontAskAgainConfigStorage : public
KMessageBoxDontAskAgainInterface
{
public:
- KMessageBoxDontAskAgainConfigStorage() : KMessageBox_againConfig(0) {}
+ KMessageBoxDontAskAgainConfigStorage() : KMessageBox_againConfig(nullptr)
{}
virtual ~KMessageBoxDontAskAgainConfigStorage() {}
bool shouldBeShownYesNo(const QString &dontShowAgainName,
KMessageBox::ButtonCode &result) Q_DECL_OVERRIDE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.30.0/src/kpackage-install-handlers/kns/CMakeLists.txt
new/frameworkintegration-5.31.0/src/kpackage-install-handlers/kns/CMakeLists.txt
---
old/frameworkintegration-5.30.0/src/kpackage-install-handlers/kns/CMakeLists.txt
2017-01-08 16:13:48.000000000 +0100
+++
new/frameworkintegration-5.31.0/src/kpackage-install-handlers/kns/CMakeLists.txt
2017-02-05 06:03:46.000000000 +0100
@@ -1,10 +1,10 @@
add_executable(knshandler main.cpp)
-target_link_libraries(knshandler KF5::NewStuffCore)
+target_link_libraries(knshandler KF5::NewStuffCore KF5::I18n
KF5::Notifications)
install(TARGETS knshandler DESTINATION
${KDE_INSTALL_LIBEXECDIR_KF5}/kpackagehandlers)
add_executable(knshandlertest main.cpp)
-target_link_libraries(knshandlertest KF5::NewStuffCore)
+target_link_libraries(knshandlertest KF5::NewStuffCore KF5::I18n
KF5::Notifications)
target_compile_definitions(knshandlertest PRIVATE -DTEST)
if(EXISTS "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}/colorschemes.knsrc")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.30.0/src/kpackage-install-handlers/kns/main.cpp
new/frameworkintegration-5.31.0/src/kpackage-install-handlers/kns/main.cpp
--- old/frameworkintegration-5.30.0/src/kpackage-install-handlers/kns/main.cpp
2017-01-08 16:13:48.000000000 +0100
+++ new/frameworkintegration-5.31.0/src/kpackage-install-handlers/kns/main.cpp
2017-02-05 06:03:46.000000000 +0100
@@ -24,7 +24,12 @@
#include <QDebug>
#include <QStandardPaths>
+#include <KLocalizedString>
+
+#include <KNotifications/KNotification>
+
#include <KNSCore/Engine>
+#include <KNSCore/QuestionManager>
int main(int argc, char** argv)
{
@@ -54,8 +59,33 @@
const auto providerid = pathParts.at(0);
const auto entryid = pathParts.at(1);
+
KNSCore::Engine engine;
int installedCount = 0;
+ QObject::connect(KNSCore::QuestionManager::instance(),
&KNSCore::QuestionManager::askQuestion, &engine, [](KNSCore::Question*
question){
+ auto discardQuestion = [question]() {
question->setResponse(KNSCore::Question::InvalidResponse); };
+ switch(question->questionType()) {
+ case KNSCore::Question::YesNoQuestion: {
+ auto f =
KNotification::event(KNotification::StandardEvent::Notification,
question->title(), question->question());
+ f->setActions({i18n("Yes"), i18n("No")});
+ QObject::connect(f, &KNotification::action1Activated,
question, [question](){ question->setResponse(KNSCore::Question::YesResponse);
});
+ QObject::connect(f, &KNotification::action2Activated,
question, [question](){ question->setResponse(KNSCore::Question::NoResponse);
});
+ QObject::connect(f, &KNotification::closed, question,
discardQuestion);
+ } break;
+ case KNSCore::Question::ContinueCancelQuestion: {
+ auto f =
KNotification::event(KNotification::StandardEvent::Notification,
question->title(), question->question());
+ f->setActions({i18n("Continue"), i18n("Cancel")});
+ QObject::connect(f, &KNotification::action1Activated,
question, [question](){
question->setResponse(KNSCore::Question::ContinueResponse); });
+ QObject::connect(f, &KNotification::action2Activated,
question, [question](){
question->setResponse(KNSCore::Question::CancelResponse); });
+ QObject::connect(f, &KNotification::closed, question,
discardQuestion);
+ } break;
+ case KNSCore::Question::InputTextQuestion:
+ case KNSCore::Question::SelectFromListQuestion:
+ case KNSCore::Question::PasswordQuestion:
+ discardQuestion();
+ break;
+ }
+ });
QObject::connect(&engine, &KNSCore::Engine::signalProvidersLoaded,
&engine, [&engine, entryid](){
engine.fetchEntryById(entryid);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.30.0/src/kstyle/kstyle.cpp
new/frameworkintegration-5.31.0/src/kstyle/kstyle.cpp
--- old/frameworkintegration-5.30.0/src/kstyle/kstyle.cpp 2017-01-08
16:13:48.000000000 +0100
+++ new/frameworkintegration-5.31.0/src/kstyle/kstyle.cpp 2017-02-05
06:03:46.000000000 +0100
@@ -80,7 +80,7 @@
class ColorSchemeFilter : public QObject
{
public:
- ColorSchemeFilter(QObject *parent = Q_NULLPTR);
+ ColorSchemeFilter(QObject *parent = nullptr);
bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
private:
void installColorScheme(QWidget *w);
@@ -116,7 +116,7 @@
if (atom == XCB_ATOM_NONE) {
const QByteArray name = QByteArrayLiteral("_KDE_NET_WM_COLOR_SCHEME");
const xcb_intern_atom_cookie_t cookie = xcb_intern_atom(c, false,
name.length(), name.constData());
- QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter>
reply(xcb_intern_atom_reply(c, cookie, Q_NULLPTR));
+ QScopedPointer<xcb_intern_atom_reply_t, QScopedPointerPodDeleter>
reply(xcb_intern_atom_reply(c, cookie, nullptr));
if (!reply.isNull()) {
atom = reply->atom;
} else {
@@ -164,7 +164,7 @@
const QString originalName = widget->objectName();
widget->setObjectName(element);
- const int id = widget->style()->styleHint(type, 0, widget);
+ const int id = widget->style()->styleHint(type, nullptr, widget);
widget->setObjectName(originalName);
return id;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.30.0/src/kstyle/kstyle.h
new/frameworkintegration-5.31.0/src/kstyle/kstyle.h
--- old/frameworkintegration-5.30.0/src/kstyle/kstyle.h 2017-01-08
16:13:48.000000000 +0100
+++ new/frameworkintegration-5.31.0/src/kstyle/kstyle.h 2017-02-05
06:03:46.000000000 +0100
@@ -131,7 +131,7 @@
public:
//@{
- int pixelMetric(PixelMetric m, const QStyleOption *opt = 0, const QWidget
*widget = 0) const Q_DECL_OVERRIDE;
+ int pixelMetric(PixelMetric m, const QStyleOption *opt = nullptr, const
QWidget *widget = nullptr) const Q_DECL_OVERRIDE;
virtual int styleHint(StyleHint hint, const QStyleOption *opt,
const QWidget *w, QStyleHintReturn *returnData)
const Q_DECL_OVERRIDE;
@@ -140,8 +140,8 @@
QPalette standardPalette() const Q_DECL_OVERRIDE;
- virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption
*option = 0,
- const QWidget *widget = 0) const
Q_DECL_OVERRIDE;
+ virtual QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption
*option = nullptr,
+ const QWidget *widget = nullptr) const
Q_DECL_OVERRIDE;
//@}
private:
KStylePrivate *const d;
