commit frameworkintegration for openSUSE:Factory
Hello community, here is the log from the commit of package frameworkintegration for openSUSE:Factory checked in at 2017-01-31 11:54:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old) and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frameworkintegration" Changes: -------- --- /work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes 2016-12-17 11:18:14.888517978 +0100 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes 2017-02-03 17:36:57.730976445 +0100 @@ -1,0 +2,7 @@ +Sun Jan 8 23:37:26 UTC 2017 - hrvoje.senjan@gmail.com + +- Update to 5.30.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.30.0.php + +------------------------------------------------------------------- Old: ---- frameworkintegration-5.29.0.tar.xz New: ---- frameworkintegration-5.30.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.YHI2lF/_old 2017-02-03 17:36:58.346889270 +0100 +++ /var/tmp/diff_new_pack.YHI2lF/_new 2017-02-03 17:36:58.346889270 +0100 @@ -1,7 +1,7 @@ # # spec file for package frameworkintegration # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ %define lname libKF5Style5 -%define _tar_path 5.29 +%define _tar_path 5.30 Name: frameworkintegration -Version: 5.29.0 +Version: 5.30.0 Release: 0 %define kf5_version %{version} -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kconfig-devel >= %{_tar_path} @@ -39,6 +39,7 @@ BuildRequires: cmake(Qt5Widgets) >= 5.5.0 BuildRequires: cmake(Qt5X11Extras) >= 5.5.0 #BuildRequires: cmake(packagekitqt5) +BuildRequires: cmake(KF5NewStuff) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcursor) @@ -123,7 +124,7 @@ %doc COPYING* README* %{_kf5_datadir}/infopage/ %{_kf5_plugindir}/ -#{_kf5_libexecdir}/ +%{_kf5_libexecdir}/ %{_kf5_notifydir}/ %files devel ++++++ frameworkintegration-5.29.0.tar.xz -> frameworkintegration-5.30.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.29.0/CMakeLists.txt new/frameworkintegration-5.30.0/CMakeLists.txt --- old/frameworkintegration-5.29.0/CMakeLists.txt 2016-12-03 11:07:03.000000000 +0100 +++ new/frameworkintegration-5.30.0/CMakeLists.txt 2017-01-08 16:13:48.000000000 +0100 @@ -1,9 +1,11 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0) -project(FrameworkIntegration) +set(KF5_VERSION "5.30.0") # handled by release scripts +set(KF5_DEP_VERSION "5.30.0") # handled by release scripts +project(FrameworkIntegration VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.29.0 NO_MODULE) +find_package(ECM 5.30.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) @@ -12,7 +14,7 @@ include(GenerateExportHeader) -include(ECMPackageConfigHelpers) +include(CMakePackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) @@ -23,10 +25,8 @@ set(REQUIRED_QT_VERSION 5.5.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets) -set(KF5_VERSION "5.29.0") # handled by release scripts -set(KF5_DEP_VERSION "5.29.0") # handled by release scripts -ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION +ecm_setup_version(PROJECT VARIABLE_PREFIX FRAMEWORKINTEGRATION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5FrameworkIntegrationConfigVersion.cmake" SOVERSION 5) @@ -37,9 +37,10 @@ find_package(KF5Notifications ${KF5_DEP_VERSION} REQUIRED) find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Package ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5NewStuff ${KF5_DEP_VERSION} REQUIRED) find_package(packagekitqt5) -find_package(AppStreamQt 0.10) +find_package(AppStreamQt 0.10.4) add_subdirectory(src) add_subdirectory(autotests) @@ -48,7 +49,7 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5FrameworkIntegration") -ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5FrameworkIntegrationConfig.cmake.in" +configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5FrameworkIntegrationConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5FrameworkIntegrationConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.29.0/KF5FrameworkIntegrationConfig.cmake.in new/frameworkintegration-5.30.0/KF5FrameworkIntegrationConfig.cmake.in --- old/frameworkintegration-5.29.0/KF5FrameworkIntegrationConfig.cmake.in 2016-12-03 11:07:03.000000000 +0100 +++ new/frameworkintegration-5.30.0/KF5FrameworkIntegrationConfig.cmake.in 2017-01-08 16:13:48.000000000 +0100 @@ -1,5 +1,6 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@") find_dependency(KF5IconThemes "@KF5_DEP_VERSION@") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.29.0/metainfo.yaml new/frameworkintegration-5.30.0/metainfo.yaml --- old/frameworkintegration-5.29.0/metainfo.yaml 2016-12-03 11:07:03.000000000 +0100 +++ new/frameworkintegration-5.30.0/metainfo.yaml 2017-01-08 16:13:48.000000000 +0100 @@ -8,6 +8,8 @@ - name: MacOSX - name: Linux note: XCB is needed for KStyle + - name: FreeBSD + note: XCB is needed for KStyle portingAid: false deprecated: false release: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.29.0/plasma_workspace.notifyrc new/frameworkintegration-5.30.0/plasma_workspace.notifyrc --- old/frameworkintegration-5.29.0/plasma_workspace.notifyrc 2016-12-03 11:07:03.000000000 +0100 +++ new/frameworkintegration-5.30.0/plasma_workspace.notifyrc 2017-01-08 16:13:48.000000000 +0100 @@ -2,7 +2,7 @@ IconName=kde Comment=Plasma Workspace Comment[ar]=مساحة عمل بلازما -Comment[ast]=Estaya de trabayu Plasma +Comment[ast]=Estaya de trabayu de Plasma Comment[bs]=Plazma radni prostor Comment[ca]=Espai de treball del Plasma Comment[ca@valencia]=Espai de treball del Plasma @@ -47,7 +47,7 @@ [Event/Trash: emptied] Name=Trash: Emptied Name[ar]=المهملات: أُفرغت -Name[ast]=Papelera: balerada +Name[ast]=Papelera: Balerada Name[bs]=Smeće: ispražnjeno Name[ca]=Paperera: s'ha buidat Name[ca@valencia]=Paperera: s'ha buidat @@ -137,7 +137,6 @@ [Event/Textcompletion: rotation] Name=Textcompletion: Rotation Name[ar]=إكمال النّصّ: دوران -Name[ast]=Completáu de testu: Rotación Name[bs]=Dopuna teksta: rotacija Name[ca]=Compleció del text: rotació Name[ca@valencia]=Compleció del text: rotació @@ -225,7 +224,6 @@ [Event/Textcompletion: no match] Name=Textcompletion: No Match Name[ar]=إكمال النصّ: لا تطابق -Name[ast]=Completáu de testu: Ensin coincidencies Name[bs]=Dopuna teksta: nema poklapanja Name[ca]=Compleció del text: sense coincidència Name[ca@valencia]=Compleció del text: sense coincidència @@ -267,7 +265,7 @@ Name[zh_TW]=文字補完：沒有符合 Comment=No matching completion was found Comment[ar]=لم تُعثر على تطابقات -Comment[ast]=Nun s'alcontró un completáu que concase +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 Comment[ca@valencia]=No s'ha trobat cap compleció coincident @@ -313,7 +311,6 @@ [Event/Textcompletion: partial match] Name=Textcompletion: Partial Match Name[ar]=إكمال النصّ: تطابق جزئيّ -Name[ast]=Completáu de testu: Coincidencia parcial Name[bs]=Dopuna teksta: delimično poklapanje Name[ca]=Compleció del text: coincidència parcial Name[ca@valencia]=Compleció del text: coincidència parcial @@ -622,7 +619,7 @@ Name[zh_TW]=警告 Comment=There was an error in the program which may cause problems Comment[ar]=حدث خطأ في البرنامج مما تسبّب بمشاكل -Comment[ast]=Hebo un fallu nel programa que quiciabes cause problemes +Comment[ast]=Hebo una fallu nel programa que quiciabes cause problemes Comment[bs]=Došlo je do greške u programu koja može izazvati probleme Comment[ca]=S'ha produït un error en el programa que pot provocar problemes Comment[ca@valencia]=S'ha produït un error en el programa que pot provocar problemes @@ -710,7 +707,7 @@ Name[zh_TW]=發生大災難 Comment=A very serious error occurred, at least causing the program to exit Comment[ar]=حدث خطأ جادّ جدًّا، تسبّب للبرنامج بإنهائه على أقلّ تقدير -Comment[ast]=Asocedió un fallu perseriu, polo menos faciendo que'l programa colara +Comment[ast]=Asocedió un fallu perseriu, polo menos causando que'l programa colara Comment[bs]=Došlo je do vrlo ozbiljne greške, zbog koje je bar program obustavljen Comment[ca]=S'ha produït un error molt seriós, com a mínim ha provocat la sortida del programa Comment[ca@valencia]=S'ha produït un error molt seriós, com a mínim ha provocat l'eixida del programa @@ -788,7 +785,7 @@ Name[zh_CN]=应用程序崩溃 Name[zh_TW]=應用程式當掉 Comment=An application just closed unexpectedly -Comment[ast]=Una aplicación ta acabantes zarrase inesperadamente +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 Comment[da]=Et program lukkede netop uventet ned @@ -825,7 +822,7 @@ [Event/startkde] Name=Login Name[ar]=ولوج -Name[ast]=Aniciar sesión +Name[ast]=Aniciu de sesión Name[bs]=Prijava Name[ca]=Entrada Name[ca@valencia]=Entrada @@ -914,7 +911,7 @@ [Event/exitkde] Name=Logout Name[ar]=خروج -Name[ast]=Zarrar sesión +Name[ast]=Zarru de sesión Name[bs]=Odjavi se Name[ca]=Sortida Name[ca@valencia]=Eixida @@ -957,7 +954,7 @@ Name[zh_TW]=登出 Comment=Session is exiting Comment[ar]=الجلسة تخرج -Comment[ast]=La sesión ta colando +Comment[ast]=Ta zarrándose una sesión Comment[bs]=Izlaz iz sesije Comment[ca]=La sessió està finalitzant Comment[ca@valencia]=La sessió està finalitzant @@ -1004,7 +1001,7 @@ [Event/cancellogout] Name=Logout Canceled Name[ar]=أُلغيَ الخروج -Name[ast]=Encaboxóse'l zarru de sesión +Name[ast]=Zarru de sesión encaboxáu Name[bs]=Odjava otkazana Name[ca]=S'ha cancel·lat la sortida Name[ca@valencia]=S'ha cancel·lat l'eixida @@ -1581,7 +1578,7 @@ Name[zh_TW]=嗶聲 Comment=Sound bell Comment[ar]=جرس صوت -Comment[ast]=Pitíu del ordenador +Comment[ast]=Campana del sistema Comment[bs]=Zvučno zvono Comment[ca]=So de campana Comment[ca@valencia]=So de campana @@ -1696,7 +1693,7 @@ [Event/plasmoidDeleted] Name=Widget deleted Name[ar]=حُذفت ودجة -Name[ast]=Desanicióse'l widget +Name[ast]=Widget desaniciáu Name[ca]=Estri suprimit Name[ca@valencia]=Estri suprimit Name[cs]=Widget byl smazán diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.29.0/src/kpackage-install-handlers/CMakeLists.txt new/frameworkintegration-5.30.0/src/kpackage-install-handlers/CMakeLists.txt --- old/frameworkintegration-5.29.0/src/kpackage-install-handlers/CMakeLists.txt 2016-12-03 11:07:03.000000000 +0100 +++ new/frameworkintegration-5.30.0/src/kpackage-install-handlers/CMakeLists.txt 2017-01-08 16:13:48.000000000 +0100 @@ -1,3 +1,5 @@ +add_subdirectory(kns) + if(AppStreamQt_FOUND AND packagekitqt5_FOUND) add_subdirectory(appstream) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.29.0/src/kpackage-install-handlers/kns/CMakeLists.txt new/frameworkintegration-5.30.0/src/kpackage-install-handlers/kns/CMakeLists.txt --- old/frameworkintegration-5.29.0/src/kpackage-install-handlers/kns/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.30.0/src/kpackage-install-handlers/kns/CMakeLists.txt 2017-01-08 16:13:48.000000000 +0100 @@ -0,0 +1,16 @@ +add_executable(knshandler main.cpp) +target_link_libraries(knshandler KF5::NewStuffCore) + +install(TARGETS knshandler DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5}/kpackagehandlers) + +add_executable(knshandlertest main.cpp) +target_link_libraries(knshandlertest KF5::NewStuffCore) +target_compile_definitions(knshandlertest PRIVATE -DTEST) + +if(EXISTS "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}/colorschemes.knsrc") + add_test(NAME test_kns-kpackage COMMAND knshandlertest kns://colorschemes.knsrc/api.kde-look.org/1136471) + + add_test(NAME test_kns-kpackage-fail COMMAND knshandlertest kns://colorschemes.knsrc/xxx/1136471) + set_tests_properties(test_kns-kpackage-fail PROPERTIES WILL_FAIL TRUE) + message(STATUS "KNS-KPackage test enabled") +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.29.0/src/kpackage-install-handlers/kns/main.cpp new/frameworkintegration-5.30.0/src/kpackage-install-handlers/kns/main.cpp --- old/frameworkintegration-5.29.0/src/kpackage-install-handlers/kns/main.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.30.0/src/kpackage-install-handlers/kns/main.cpp 2017-01-08 16:13:48.000000000 +0100 @@ -0,0 +1,95 @@ +/* This file is part of the KDE libraries + * Copyright 2016 Aleix Pol Gonzalez <aleixpol@kde.org> + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License or ( at + * your option ) version 3 or, at the discretion of KDE e.V. ( which shall + * act as a proxy as in section 14 of the GPLv3 ), any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include <QCoreApplication> +#include <QUrl> +#include <QTimer> +#include <QDebug> +#include <QStandardPaths> + +#include <KNSCore/Engine> + +int main(int argc, char** argv) +{ + QCoreApplication app(argc, argv); + app.setQuitLockEnabled(false); + Q_ASSERT(app.arguments().count() == 2); + +#ifdef TEST + QStandardPaths::setTestModeEnabled(true); +#endif + + const QUrl url(app.arguments().last()); + Q_ASSERT(url.isValid()); + Q_ASSERT(url.scheme() == QLatin1String("kns")); + + const auto knsname = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, url.host()); + if (knsname.isEmpty()) { + qWarning() << "couldn't find knsrc file for" << url.host(); + return 1; + } + + const auto pathParts = url.path().split(QLatin1Char('/'), QString::SkipEmptyParts); + if (pathParts.size() != 2) { + qWarning() << "wrong format in the url path" << url << pathParts; + return 1; + } + const auto providerid = pathParts.at(0); + const auto entryid = pathParts.at(1); + + KNSCore::Engine engine; + int installedCount = 0; + + QObject::connect(&engine, &KNSCore::Engine::signalProvidersLoaded, &engine, [&engine, entryid](){ + engine.fetchEntryById(entryid); + }); + + QObject::connect(&engine, &KNSCore::Engine::signalError, &engine, [](const QString &error) { + qWarning() << "kns error:" << error; + QCoreApplication::exit(1); + }); + QObject::connect(&engine, &KNSCore::Engine::signalEntryDetailsLoaded, &engine, [providerid, &engine, &installedCount](const KNSCore::EntryInternal &entry) { +// qDebug() << "checking..." << entry.status() << entry.providerId(); + if (providerid != QUrl(entry.providerId()).host()) { + qWarning() << "Wrong provider" << providerid << "instead of" << QUrl(entry.providerId()).host(); + QCoreApplication::exit(1); + } else if (entry.status() == KNS3::Entry::Downloadable) { + qDebug() << "installing..."; + installedCount++; + engine.install(entry); + } else if (installedCount == 0) { + qDebug() << "already installed."; + QCoreApplication::exit(0); + } + }); + QObject::connect(&engine, &KNSCore::Engine::signalEntryChanged, &engine, [&engine, &installedCount](const KNSCore::EntryInternal &entry) { + if (entry.status() == KNS3::Entry::Installed) { + installedCount--; + } + if (installedCount == 0) + QCoreApplication::exit(0); + }); + + if (!engine.init(knsname)) { + qWarning() << "couldn't initialize" << knsname; + return 1; + } + return app.exec(); +}
participants (1)
-
root＠hilbertn.suse.de