Hello community, here is the log from the commit of package kactivities5 for openSUSE:Leap:15.2 checked in at 2020-02-16 18:26:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kactivities5 (Old) and /work/SRC/openSUSE:Leap:15.2/.kactivities5.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Sun Feb 16 18:26:24 2020 rev:60 rq:773892 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kactivities5/kactivities5.changes 2020-01-19 15:49:12.801764062 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.kactivities5.new.26092/kactivities5.changes 2020-02-16 18:27:34.362694512 +0100 @@ -1,0 +2,16 @@ +Sun Feb 2 18:06:42 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:32:27 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- Changes since 5.66.0: + * Remove files that Windows cannot handle. + * Ensure to store resource uri without a trailing slash + +------------------------------------------------------------------- Old: ---- kactivities-5.66.0.tar.xz kactivities-5.66.0.tar.xz.sig New: ---- kactivities-5.67.0.tar.xz kactivities-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.IvEqFN/_old 2020-02-16 18:27:34.730694705 +0100 +++ /var/tmp/diff_new_pack.IvEqFN/_new 2020-02-16 18:27:34.730694705 +0100 @@ -17,7 +17,7 @@ %define lname libKF5Activities5 -%define _tar_path 5.66 +%define _tar_path 5.67 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kactivities5 -Version: 5.66.0 +Version: 5.67.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0-or-later @@ -46,13 +46,13 @@ BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5Core) >= 5.11.0 -BuildRequires: cmake(Qt5DBus) >= 5.11.0 -BuildRequires: cmake(Qt5Gui) >= 5.11.0 -BuildRequires: cmake(Qt5Qml) >= 5.11.0 -BuildRequires: cmake(Qt5Quick) >= 5.11.0 -BuildRequires: cmake(Qt5Sql) >= 5.11.0 -BuildRequires: cmake(Qt5Test) >= 5.11.0 +BuildRequires: cmake(Qt5Core) >= 5.12.0 +BuildRequires: cmake(Qt5DBus) >= 5.12.0 +BuildRequires: cmake(Qt5Gui) >= 5.12.0 +BuildRequires: cmake(Qt5Qml) >= 5.12.0 +BuildRequires: cmake(Qt5Quick) >= 5.12.0 +BuildRequires: cmake(Qt5Sql) >= 5.12.0 +BuildRequires: cmake(Qt5Test) >= 5.12.0 %description Kactivities provides an API for using and interacting with the Plasma Activities Manager. @@ -85,7 +85,7 @@ Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules >= 1.7.0 -Requires: cmake(Qt5Core) >= 5.11.0 +Requires: cmake(Qt5Core) >= 5.12.0 %description devel Kactivities provides an API for using and interacting with the Plasma Activities Manager. @@ -96,7 +96,7 @@ %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ kactivities-5.66.0.tar.xz -> kactivities-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.66.0/.vim-template:cpp new/kactivities-5.67.0/.vim-template:cpp --- old/kactivities-5.66.0/.vim-template:cpp 2020-01-04 00:09:28.000000000 +0100 +++ new/kactivities-5.67.0/.vim-template:cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -/* - * Copyright (C) %YEAR% %USER% <%MAIL%> - * - * 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.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. - * If not, see <http://www.gnu.org/licenses/>. - */ - -#include "%FILE%.h" - -namespace KActivities { - -%HERE% - -} // namespace KActivities - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.66.0/.vim-template:h new/kactivities-5.67.0/.vim-template:h --- old/kactivities-5.66.0/.vim-template:h 2020-01-04 00:09:28.000000000 +0100 +++ new/kactivities-5.67.0/.vim-template:h 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -/* - * Copyright (C) %YEAR% %USER% <%MAIL%> - * - * 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.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. - * If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef KACTIVITIES_STATS_%GUARD% -#define KACTIVITIES_STATS_%GUARD% - -namespace KActivities { - -%HERE% - -} // namespace KActivities - -#endif // KACTIVITIES_STATS_%GUARD% - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.66.0/CMakeLists.txt new/kactivities-5.67.0/CMakeLists.txt --- old/kactivities-5.66.0/CMakeLists.txt 2020-01-04 00:09:28.000000000 +0100 +++ new/kactivities-5.67.0/CMakeLists.txt 2020-02-01 09:59:21.000000000 +0100 @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.5) # KDE Frameworks -set(KF5_VERSION "5.66.0") # handled by release scripts -set(KF5_DEP_VERSION "5.66.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts +set(KF5_DEP_VERSION "5.67.0") # handled by release scripts project (KActivities VERSION ${KF5_VERSION}) option (KACTIVITIES_LIBRARY_ONLY "If true, compiles only the KActivities library, without the QML imports." OFF) @@ -24,7 +24,7 @@ # Extra CMake stuff include(FeatureSummary) -find_package(ECM 5.66.0 NO_MODULE) +find_package(ECM 5.67.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -72,7 +72,7 @@ ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) add_definitions(-DQT_NO_FOREACH) add_subdirectory (src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.66.0/src/imports/resourceinstance.cpp new/kactivities-5.67.0/src/imports/resourceinstance.cpp --- old/kactivities-5.66.0/src/imports/resourceinstance.cpp 2020-01-04 00:09:28.000000000 +0100 +++ new/kactivities-5.67.0/src/imports/resourceinstance.cpp 2020-02-01 09:59:21.000000000 +0100 @@ -52,19 +52,7 @@ // qDebug() << "Creating a new instance of the resource" << m_uri << "window id" << wid; m_resourceInstance.reset(new KActivities::ResourceInstance(wid, m_uri, m_mimetype, m_title)); } else { - - if (m_uri.scheme().startsWith(QLatin1String("http")) && !m_uri.hasQuery() && m_uri.path().endsWith(QLatin1Char('/'))) { - const QString &oldPath = m_uri.path(); - m_uri.setPath(oldPath.left(oldPath.length() - 1)); - - // qDebug() << "Old and new path" << oldPath << m_uri; - - } else { - m_resourceInstance->setUri(m_uri); - } - - // qDebug() << "Setting" << m_uri << m_mimetype << "to window" << wid; - + m_resourceInstance->setUri(m_uri); m_resourceInstance->setMimetype(m_mimetype); m_resourceInstance->setTitle(m_title); } @@ -81,7 +69,7 @@ return; } - m_uri = uri; + m_uri = uri.adjusted(QUrl::StripTrailingSlash); m_syncTimer->start(100); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.66.0/src/lib/resourceinstance.cpp new/kactivities-5.67.0/src/lib/resourceinstance.cpp --- old/kactivities-5.66.0/src/lib/resourceinstance.cpp 2020-01-04 00:09:28.000000000 +0100 +++ new/kactivities-5.67.0/src/lib/resourceinstance.cpp 2020-02-01 09:59:21.000000000 +0100 @@ -95,7 +95,7 @@ { qCDebug(KAMD_CORELIB) << "Creating ResourceInstance: " << resourceUri; d->wid = wid; - d->uri = resourceUri; + d->uri = resourceUri.adjusted(QUrl::StripTrailingSlash); d->application = application.isEmpty() ? QCoreApplication::instance()->applicationName() : application; d->openResource(); @@ -134,7 +134,7 @@ d->closeResource(); } - d->uri = newUri; + d->uri = newUri.adjusted(QUrl::StripTrailingSlash); d->openResource(); }
