Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2022-02-24 18:19:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Thu Feb 24 18:19:14 2022 rev:105 rq:954223 version:5.91.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2022-01-14 23:13:25.274638776 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new.1958/frameworkintegration.changes
2022-02-24 18:21:12.982694160 +0100
@@ -1,0 +2,15 @@
+Sun Feb 6 10:16:46 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 5.91.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.91.0
+- Changes since 5.90.0:
+ * Add Linux Qt6 CI
+ * Install plugin in kf<version>
+ * Fix wrong porting of KNSCore::Engine::configSearchLocations (kde#448237)
+ * Change build system for building against qt6
+- Drop 0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch
+ Merged upstream
+
+-------------------------------------------------------------------
Old:
----
0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch
frameworkintegration-5.90.0.tar.xz
frameworkintegration-5.90.0.tar.xz.sig
New:
----
frameworkintegration-5.91.0.tar.xz
frameworkintegration-5.91.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.QjcpRs/_old 2022-02-24 18:21:16.814693136 +0100
+++ /var/tmp/diff_new_pack.QjcpRs/_new 2022-02-24 18:21:16.818693135 +0100
@@ -17,7 +17,7 @@
%define lname libKF5Style5
-%define _tar_path 5.90
+%define _tar_path 5.91
# 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 released
Name: frameworkintegration
-Version: 5.90.0
+Version: 5.91.0
Release: 0
Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
License: LGPL-2.1-or-later
@@ -36,8 +36,6 @@
Source1: %{name}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
-# PATCH-FIX-UPSTREAM
-Patch0: 0001-Fix-wrong-porting-of-KNSCore-Engine-configSearchLoca.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -130,8 +128,7 @@
%files devel
%{_kf5_libdir}/libKF5Style.so
%{_kf5_libdir}/cmake/KF5FrameworkIntegration/
-%dir %{_kf5_includedir}/KStyle/
%{_kf5_includedir}/KStyle/
-%{_kf5_includedir}/*.h
+%{_kf5_includedir}/FrameworkIntegration/
%changelog
++++++ frameworkintegration-5.90.0.tar.xz -> frameworkintegration-5.91.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.90.0/.gitlab-ci.yml
new/frameworkintegration-5.91.0/.gitlab-ci.yml
--- old/frameworkintegration-5.90.0/.gitlab-ci.yml 2022-01-01
13:10:55.000000000 +0100
+++ new/frameworkintegration-5.91.0/.gitlab-ci.yml 2022-02-05
16:09:04.000000000 +0100
@@ -4,3 +4,4 @@
include:
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.90.0/.kde-ci.yml
new/frameworkintegration-5.91.0/.kde-ci.yml
--- old/frameworkintegration-5.90.0/.kde-ci.yml 2022-01-01 13:10:55.000000000
+0100
+++ new/frameworkintegration-5.91.0/.kde-ci.yml 2022-02-05 16:09:04.000000000
+0100
@@ -12,7 +12,6 @@
'frameworks/knotifications' : '@same'
'frameworks/ki18n' : '@same'
'frameworks/kio' : '@same'
- 'frameworks/kinit' : '@same'
'frameworks/oxygen-icons5' : '@same'
'frameworks/kpackage' : '@same'
'frameworks/knewstuff' : '@same'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.90.0/CMakeLists.txt
new/frameworkintegration-5.91.0/CMakeLists.txt
--- old/frameworkintegration-5.90.0/CMakeLists.txt 2022-01-01
13:10:55.000000000 +0100
+++ new/frameworkintegration-5.91.0/CMakeLists.txt 2022-02-05
16:09:04.000000000 +0100
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "5.90.0") # handled by release scripts
-set(KF_DEP_VERSION "5.90.0") # handled by release scripts
+set(KF_VERSION "5.91.0") # handled by release scripts
+set(KF_DEP_VERSION "5.91.0") # handled by release scripts
project(FrameworkIntegration VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 5.90.0 NO_MODULE)
+find_package(ECM 5.91.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)
@@ -24,7 +24,7 @@
include(KDEGitCommitHooks)
set(REQUIRED_QT_VERSION 5.15.2)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets)
+find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui
Widgets)
ecm_setup_version(PROJECT VARIABLE_PREFIX FRAMEWORKINTEGRATION
@@ -45,7 +45,7 @@
find_package(KF5Package ${KF_DEP_VERSION} REQUIRED)
find_package(KF5I18n ${KF_DEP_VERSION} REQUIRED)
- find_package(packagekitqt5)
+ find_package(packagekitqt${QT_MAJOR_VERSION})
find_package(AppStreamQt 0.10.4)
endif()
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
@@ -72,9 +72,9 @@
install(EXPORT KF5FrameworkIntegrationTargets DESTINATION
"${CMAKECONFIG_INSTALL_DIR}" FILE KF5FrameworkIntegrationTargets.cmake
NAMESPACE KF5:: )
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/FrameworkIntegration
COMPONENT Devel)
-install(FILES plasma_workspace.notifyrc DESTINATION
${KDE_INSTALL_KNOTIFY5RCDIR})
+install(FILES plasma_workspace.notifyrc DESTINATION
${KDE_INSTALL_KNOTIFYRCDIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.90.0/autotests/CMakeLists.txt
new/frameworkintegration-5.91.0/autotests/CMakeLists.txt
--- old/frameworkintegration-5.90.0/autotests/CMakeLists.txt 2022-01-01
13:10:55.000000000 +0100
+++ new/frameworkintegration-5.91.0/autotests/CMakeLists.txt 2022-02-05
16:09:04.000000000 +0100
@@ -2,14 +2,14 @@
include(ECMMarkNonGuiExecutable)
include(ECMAddTests)
-find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
+find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} CONFIG QUIET)
-if(NOT Qt5Test_FOUND)
- message(STATUS "Qt5Test not found, autotests will not be built.")
+if(NOT TARGET Qt${QT_MAJOR_VERSION}::Test)
+ message(STATUS "Qt${QT_MAJOR_VERSION}Test not found, autotests will not be
built.")
return()
endif()
-include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS} )
+include_directories( Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS )
set(CONFIGFILE "${CMAKE_CURRENT_SOURCE_DIR}/kdeplatformtheme_kdeglobals")
configure_file(kdeplatformtheme_config.h.in
${CMAKE_CURRENT_BINARY_DIR}/kdeplatformtheme_config.h)
@@ -18,7 +18,7 @@
macro(FRAMEWORKINTEGRATION_TESTS _testname)
ecm_add_test(${_testname}.cpp ${ARGN}
- LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets KF5::ConfigCore
KF5::IconThemes KF5::Style KF5::Notifications
+ LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ConfigWidgets
KF5::ConfigCore KF5::IconThemes KF5::Style KF5::Notifications
TEST_NAME ${_testname}
NAME_PREFIX "frameworkintegration-")
set_target_properties(${_testname} PROPERTIES COMPILE_FLAGS "-DUNIT_TEST")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.90.0/src/infopage/CMakeLists.txt
new/frameworkintegration-5.91.0/src/infopage/CMakeLists.txt
--- old/frameworkintegration-5.90.0/src/infopage/CMakeLists.txt 2022-01-01
13:10:55.000000000 +0100
+++ new/frameworkintegration-5.91.0/src/infopage/CMakeLists.txt 2022-02-05
16:09:04.000000000 +0100
@@ -24,4 +24,4 @@
box-center.png
kde_infopage.css
kde_infopage_rtl.css
- DESTINATION ${KDE_INSTALL_DATADIR_KF5}/infopage)
+ DESTINATION ${KDE_INSTALL_DATADIR_KF}/infopage)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.90.0/src/integrationplugin/CMakeLists.txt
new/frameworkintegration-5.91.0/src/integrationplugin/CMakeLists.txt
--- old/frameworkintegration-5.90.0/src/integrationplugin/CMakeLists.txt
2022-01-01 13:10:55.000000000 +0100
+++ new/frameworkintegration-5.91.0/src/integrationplugin/CMakeLists.txt
2022-02-05 16:09:04.000000000 +0100
@@ -10,4 +10,4 @@
)
install(TARGETS FrameworkIntegrationPlugin
- DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5)
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.90.0/src/kpackage-install-handlers/appstream/CMakeLists.txt
new/frameworkintegration-5.91.0/src/kpackage-install-handlers/appstream/CMakeLists.txt
---
old/frameworkintegration-5.90.0/src/kpackage-install-handlers/appstream/CMakeLists.txt
2022-01-01 13:10:55.000000000 +0100
+++
new/frameworkintegration-5.91.0/src/kpackage-install-handlers/appstream/CMakeLists.txt
2022-02-05 16:09:04.000000000 +0100
@@ -1,3 +1,3 @@
add_executable(appstreamhandler main.cpp)
target_link_libraries(appstreamhandler PK::packagekitqt5 AppStreamQt)
-install(TARGETS appstreamhandler DESTINATION
${KDE_INSTALL_LIBEXECDIR_KF5}/kpackagehandlers)
+install(TARGETS appstreamhandler DESTINATION
${KDE_INSTALL_LIBEXECDIR_KF}/kpackagehandlers)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.90.0/src/kpackage-install-handlers/kns/CMakeLists.txt
new/frameworkintegration-5.91.0/src/kpackage-install-handlers/kns/CMakeLists.txt
---
old/frameworkintegration-5.90.0/src/kpackage-install-handlers/kns/CMakeLists.txt
2022-01-01 13:10:55.000000000 +0100
+++
new/frameworkintegration-5.91.0/src/kpackage-install-handlers/kns/CMakeLists.txt
2022-02-05 16:09:04.000000000 +0100
@@ -1,11 +1,11 @@
configure_file(knshandlerversion.h.in knshandlerversion.h)
add_executable(knshandler main.cpp)
-target_link_libraries(knshandler KF5::NewStuffCore KF5::I18n
KF5::Notifications Qt5::Xml)
+target_link_libraries(knshandler KF5::NewStuffCore KF5::I18n
KF5::Notifications Qt${QT_MAJOR_VERSION}::Xml)
-install(TARGETS knshandler DESTINATION
${KDE_INSTALL_LIBEXECDIR_KF5}/kpackagehandlers)
+install(TARGETS knshandler DESTINATION
${KDE_INSTALL_LIBEXECDIR_KF}/kpackagehandlers)
add_executable(knshandlertest main.cpp)
-target_link_libraries(knshandlertest KF5::NewStuffCore KF5::I18n
KF5::Notifications Qt5::Xml)
+target_link_libraries(knshandlertest KF5::NewStuffCore KF5::I18n
KF5::Notifications Qt${QT_MAJOR_VERSION}::Xml)
target_compile_definitions(knshandlertest PRIVATE -DTEST)
if(EXISTS "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_CONFDIR}/colorschemes.knsrc")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.90.0/src/kpackage-install-handlers/kns/main.cpp
new/frameworkintegration-5.91.0/src/kpackage-install-handlers/kns/main.cpp
--- old/frameworkintegration-5.90.0/src/kpackage-install-handlers/kns/main.cpp
2022-01-01 13:10:55.000000000 +0100
+++ new/frameworkintegration-5.91.0/src/kpackage-install-handlers/kns/main.cpp
2022-02-05 16:09:04.000000000 +0100
@@ -17,7 +17,7 @@
#include <KLocalizedString>
-#include <KNotifications/KNotification>
+#include <KNotification>
#include <KNSCore/Engine>
#include <KNSCore/QuestionManager>
@@ -70,17 +70,16 @@
Q_ASSERT(url.scheme() == QLatin1String("kns"));
QString knsname;
- for (const auto &location : KNSCore::Engine::availableConfigFiles()) {
- QString candidate = location + QLatin1Char('/') + url.host();
- if (QFile::exists(candidate)) {
- knsname = candidate;
- break;
- }
- }
+ const QStringList availableConfigFiles =
KNSCore::Engine::availableConfigFiles();
+ auto knsNameIt = std::find_if(availableConfigFiles.begin(),
availableConfigFiles.end(), [&url](const QString &availableFile) {
+ return availableFile.endsWith(QLatin1String("/") + url.host());
+ });
- if (knsname.isEmpty()) {
+ if (knsNameIt == availableConfigFiles.end()) {
qWarning() << "couldn't find knsrc file for" << url.host();
return 1;
+ } else {
+ knsname = *knsNameIt;
}
const auto pathParts = url.path().split(QLatin1Char('/'),
Qt::SkipEmptyParts);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.90.0/src/kstyle/CMakeLists.txt
new/frameworkintegration-5.91.0/src/kstyle/CMakeLists.txt
--- old/frameworkintegration-5.90.0/src/kstyle/CMakeLists.txt 2022-01-01
13:10:55.000000000 +0100
+++ new/frameworkintegration-5.91.0/src/kstyle/CMakeLists.txt 2022-02-05
16:09:04.000000000 +0100
@@ -5,11 +5,12 @@
generate_export_header(KF5Style BASE_NAME KStyle)
add_library(KF5::Style ALIAS KF5Style)
-target_include_directories(KF5Style INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KStyle>")
+target_include_directories(KF5Style
+ INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/FrameworkIntegration>;$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KStyle>")
target_link_libraries(KF5Style
PUBLIC
- Qt5::Widgets
+ Qt${QT_MAJOR_VERSION}::Widgets
PRIVATE
KF5::ConfigWidgets
KF5::IconThemes
@@ -32,6 +33,6 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kstyle_export.h
${KStyle_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KStyle
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KStyle
COMPONENT Devel)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.90.0/tests/CMakeLists.txt
new/frameworkintegration-5.91.0/tests/CMakeLists.txt
--- old/frameworkintegration-5.90.0/tests/CMakeLists.txt 2022-01-01
13:10:55.000000000 +0100
+++ new/frameworkintegration-5.91.0/tests/CMakeLists.txt 2022-02-05
16:09:04.000000000 +0100
@@ -1,3 +1,3 @@
add_executable(kstyletest kstyletest.cpp)
-target_link_libraries(kstyletest Qt5::Widgets KF5::Style)
+target_link_libraries(kstyletest Qt${QT_MAJOR_VERSION}::Widgets KF5::Style)
