Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2017-12-05 01:26:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Tue Dec 5 01:26:21 2017 rev:331 rq:547677 version:4.11.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2017-11-30 12:37:44.422609415 +0100
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2017-12-05 01:26:23.605679051 +0100
@@ -1,0 +2,8 @@
+Sat Dec 2 18:13:59 UTC 2017 - [email protected]
+
+- Add patch to not build against Qt4 WebKit:
+ * skip-qtwebkit-parts.patch
+ * Drop ksysguard, not built anymore
+ * Adjust filelist
+
+-------------------------------------------------------------------
New:
----
skip-qtwebkit-parts.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.xeplhn/_old 2017-12-05 01:26:25.049626592 +0100
+++ /var/tmp/diff_new_pack.xeplhn/_new 2017-12-05 01:26:25.053626447 +0100
@@ -31,7 +31,6 @@
BuildRequires: fdupes
BuildRequires: gpsd-devel
BuildRequires: kde4-filesystem
-BuildRequires: libQtWebKit-devel
BuildRequires: libdbusmenu-qt-devel
BuildRequires: libkactivities-devel
BuildRequires: libkde4-devel >= %{_kde_platform_version}
@@ -154,8 +153,9 @@
Patch74: gcc6-fixes.diff
# PATCH-FIX-OPENSUSE gcc7-fix.diff boo#1031317 [email protected] -- Fix an error
reported by the GCC7 compiler
Patch75: gcc7-fix.diff
+# PATCH-FIX-OPENSUSE
+Patch76: skip-qtwebkit-parts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: %{name}-ksysguardd = %{version}
Requires: %{name}-liboxygenstyle = %{version}
# Requires /etc/xdg/menus/applications.menu (bnc#754104)
%if !0%{?is_opensuse}
@@ -223,18 +223,6 @@
This package contains the upstream branding for KDE's display manager
kdm.
-%package ksysguardd
-Summary: KDE base package: ksysguard daemon
-Group: System/GUI/KDE
-Requires(pre): %insserv_prereq
-%kde4_runtime_requires
-
-%description ksysguardd
-This package contains the ksysguard daemon and application.
-
-This package can be installed on servers without any other KDE packages
-to enable monitoring them remotely with ksysguard.
-
%package -n kwin
Summary: KDE Window Manager
Group: System/GUI/KDE
@@ -274,7 +262,6 @@
Requires: %{name}-liboxygenstyle = %{version}
Requires: %{name}-libs = %{version}
Requires: kwin = %{version}
-Requires: libQtWebKit-devel
Requires: libkde4-devel >= %{_kde_platform_version}
Provides: plasma-devel = %{_kde_platform_version}
%kde4_runtime_requires
@@ -390,6 +377,7 @@
%endif
%patch74
%patch75 -p1
+%patch76 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
@@ -409,7 +397,6 @@
install -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/
%create_subdir_filelist -d kdm -v devel
%create_subdir_filelist -d kwin -v devel
- %create_subdir_filelist -d ksysguard -v devel
%create_subdir_filelist -d systemsettings -v devel
cd ..
sed -ri "s,.*%{_kde4_configdir}/kdm/backgroundrc,," filelists/kdm
@@ -427,13 +414,11 @@
cat filelists/devel filelists/systemsettings filelists/kdm filelists/kwin
| while read line; do echo "%exclude $line";done >filelists/exclude
popd
%suse_update_desktop_file systemsettings X-SuSE-core
- %suse_update_desktop_file ksysguard System Monitor
%suse_update_desktop_file kmenuedit Core-Configuration
%suse_update_desktop_file -r klipper System TrayIcon
%suse_update_desktop_file -r krandrtray System TrayIcon
mkdir -p %{buildroot}%{_kde4_sbindir}
mkdir -p %{buildroot}%{_kde4_sysconfdir}/init.d
- install -D -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/ksysguardd.service
ln -sf rcxdm %{buildroot}%{_kde4_sbindir}/rckdm
mkdir -p %{buildroot}%{_kde4_sysconfdir}/logrotate.d/
install -m 644 %{SOURCE6} %{buildroot}%{_kde4_sysconfdir}/logrotate.d/kdm
@@ -494,21 +479,6 @@
%post -n kdm-branding-upstream
%{fillup_only -n displaymanager -s kdm}
-%pre ksysguardd
-%service_add_pre ksysguardd.service
-
-%preun ksysguardd
-%service_del_preun ksysguardd.service
-
-%post ksysguardd
-/sbin/ldconfig
-%service_add_post ksysguardd.service
-
-%postun ksysguardd
-/sbin/ldconfig
-%service_del_postun ksysguardd.service
-exit 0
-
%pre
rm -rf %{_kde4_appsdir}/ksmserver/ksmserver.notifyrc/
@@ -553,16 +523,6 @@
%{_kde4_appsdir}/kdm/pics
%{_fillupdir}/sysconfig.displaymanager-kdm
-%files ksysguardd -f filelists/ksysguard
-%defattr(-,root,root)
-%doc COPYING COPYING.DOC README
-%{_unitdir}/ksysguardd.service
-%config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
-%{_kde4_appsdir}/ksysguard/
-%{_kde4_bindir}/ksysguard
-%{_kde4_bindir}/ksysguardd
-%{_kde4_configdir}/ksysguard.knsrc
-
%files -n kwin -f filelists/kwin
%defattr(-,root,root)
%doc COPYING COPYING.DOC README kwin/clients/aurorae/theme-description
@@ -614,7 +574,6 @@
%{_kde4_libdir}/libkfontinstui.so
%{_kde4_libdir}/libkscreensaver.so
%{_kde4_libdir}/libksgrd.so
-%{_kde4_libdir}/libksignalplotter.so
%{_kde4_libdir}/libkworkspace.so
%{_kde4_libdir}/liblsofui.so
%{_kde4_libdir}/liboxygenstyle.so
@@ -627,7 +586,6 @@
%{_kde4_libdir}/libpowerdevilcore.so
%{_kde4_libdir}/libpowerdevilui.so
%{_kde4_libdir}/libprocesscore.so
-%{_kde4_libdir}/libprocessui.so
%{_kde4_libdir}/libsystemsettingsview.so
%{_kde4_libdir}/libtaskmanager.so
%{_kde4_libdir}/libweather_ion.so
@@ -713,7 +671,6 @@
%{_kde4_appsdir}/kwrited/
%{_kde4_appsdir}/solid/
%dir %{_kde4_configkcfgdir}
-%{_kde4_configkcfgdir}/klaunch.kcfg
%{_kde4_configkcfgdir}/freespacenotifier.kcfg
%dir %{_kde4_configdir}
%config %{_kde4_configdir}/activities.knsrc
@@ -784,7 +741,6 @@
#blacklist
%exclude
%{_kde4_appsdir}/kwin/default_rules/plasma_desktop_containment.kwinrules
%exclude %{_kde4_applicationsdir}/krandrtray.desktop
-%exclude %{_kde4_applicationsdir}/ksysguard.desktop
%exclude %{_kde4_appsdir}/cmake
%exclude %{_kde4_appsdir}/doc
%exclude %{_kde4_appsdir}/doc/kdm
@@ -793,7 +749,6 @@
%exclude %{_kde4_appsdir}/kdm
%exclude %{_kde4_appsdir}/kwin/cubecap.png
%exclude %{_kde4_appsdir}/kwin/titlebar_decor.png
-%exclude %{_kde4_appsdir}/ksysguard
%exclude %{_kde4_appsdir}/plasma_scriptengine_python
%exclude %{_kde4_appsdir}/color-schemes/
%exclude %{_kde4_appsdir}/kaccess/
@@ -816,13 +771,10 @@
%exclude %{_kde4_appsdir}/solid/
%exclude %{_kde4_bindir}/krandrstartup
%exclude %{_kde4_bindir}/krandrtray
-%exclude %{_kde4_bindir}/ksysguard
-%exclude %{_kde4_bindir}/ksysguardd
%exclude %{_kde4_bindir}/oxygen-demo
%exclude %{_kde4_bindir}/oxygen-settings
%exclude %{_kde4_configdir}/kdm
%exclude %{_kde4_configdir}/kdm/backgroundrc
-%exclude %{_kde4_configdir}/ksysguard.knsrc
%exclude %{_kde4_configdir}/activities.knsrc
%exclude %{_kde4_configdir}/colorschemes.knsrc
%exclude %{_kde4_configdir}/kfontinst.knsrc
@@ -831,17 +783,6 @@
%exclude %{_kde4_configdir}/wallpaper.knsrc
%exclude %{_kde4_configdir}/xcursor.knsrc
%exclude %{_kde4_htmldir}/en/kdm
-%exclude %{_kde4_htmldir}/en/ksysguard
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/computer.png
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/daemon.png
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/kdeapp.png
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/kernel.png
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/ksysguardd.png
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/running.png
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/shell.png
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/unknownapp.png
-%exclude %{_kde4_iconsdir}/oxygen/16x16/apps/waiting.png
-%exclude %{_kde4_libdir}/libkdeinit4_ksysguard.so
%exclude %{_kde4_libdir}/libkephal.so
%exclude %{_kde4_libdir}/libkephal.so.*
%exclude %{_kde4_libdir}/libkfontinst.so
@@ -852,8 +793,6 @@
%exclude %{_kde4_libdir}/libkscreensaver.so.*
%exclude %{_kde4_libdir}/libksgrd.so
%exclude %{_kde4_libdir}/libksgrd.so.*
-%exclude %{_kde4_libdir}/libksignalplotter.so
-%exclude %{_kde4_libdir}/libksignalplotter.so.*
%exclude %{_kde4_libdir}/libkworkspace.so
%exclude %{_kde4_libdir}/libkworkspace.so.*
%exclude %{_kde4_libdir}/liblsofui.so
@@ -877,8 +816,6 @@
%exclude %{_kde4_libdir}/libpowerdevilui.so.*
%exclude %{_kde4_libdir}/libprocesscore.so
%exclude %{_kde4_libdir}/libprocesscore.so.*
-%exclude %{_kde4_libdir}/libprocessui.so
-%exclude %{_kde4_libdir}/libprocessui.so.*
%exclude %{_kde4_libdir}/libsystemsettingsview.so
%exclude %{_kde4_libdir}/libsystemsettingsview.so.*
%exclude %{_kde4_libdir}/libtaskmanager.so
@@ -974,7 +911,6 @@
%{_kde4_libdir}/libkfontinstui.so.*
%{_kde4_libdir}/libkscreensaver.so.*
%{_kde4_libdir}/libksgrd.so.*
-%{_kde4_libdir}/libksignalplotter.so.*
%{_kde4_libdir}/libkworkspace.so.*
%{_kde4_libdir}/liblsofui.so.*
%{_kde4_libdir}/libplasma-geolocation-interface.so.*
@@ -985,7 +921,6 @@
%{_kde4_libdir}/libpowerdevilcore.so.*
%{_kde4_libdir}/libpowerdevilui.so.*
%{_kde4_libdir}/libprocesscore.so.*
-%{_kde4_libdir}/libprocessui.so.*
%{_kde4_libdir}/libsystemsettingsview.so.*
%{_kde4_libdir}/libtaskmanager.so.*
%{_kde4_libdir}/libweather_ion.so.*
++++++ skip-qtwebkit-parts.patch ++++++
From: Fabian Vogt <[email protected]>
Subject: Do not build parts depending on Qt WebKit
Qt WebKit is unmaintained and must not be used anymore.
Index: kde-workspace-4.11.22/libs/ksysguard/CMakeLists.txt
===================================================================
--- kde-workspace-4.11.22.orig/libs/ksysguard/CMakeLists.txt
+++ kde-workspace-4.11.22/libs/ksysguard/CMakeLists.txt
@@ -17,8 +17,6 @@ configure_file(config-ksysguard.h.cmake
add_subdirectory( lsofui )
add_subdirectory( processcore )
-add_subdirectory( processui )
-add_subdirectory( signalplotter )
add_subdirectory( ksgrd )
add_subdirectory( tests )
Index: kde-workspace-4.11.22/plasma/generic/dataengines/CMakeLists.txt
===================================================================
--- kde-workspace-4.11.22.orig/plasma/generic/dataengines/CMakeLists.txt
+++ kde-workspace-4.11.22/plasma/generic/dataengines/CMakeLists.txt
@@ -36,7 +36,6 @@ endif(Boost_FOUND AND KdepimLibs_FOUND)
if(NOT WIN32)
add_subdirectory(mouse)
- add_subdirectory(systemmonitor)
if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
add_subdirectory(tasks)
endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
Index: kde-workspace-4.11.22/CMakeLists.txt
===================================================================
--- kde-workspace-4.11.22.orig/CMakeLists.txt
+++ kde-workspace-4.11.22/CMakeLists.txt
@@ -231,16 +231,12 @@ if(NOT WIN32)
macro_optional_add_subdirectory( powerdevil )
macro_optional_add_subdirectory( qguiplatformplugin_kde )
- if (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
- macro_optional_add_subdirectory( ksysguard )
- endif (NOT CMAKE_SYSTEM_NAME MATCHES Darwin)
endif(NOT WIN32)
if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
macro_optional_add_subdirectory(kcontrol)
macro_optional_add_subdirectory(klipper)
macro_optional_add_subdirectory(kmenuedit)
- macro_optional_add_subdirectory(krunner)
macro_optional_add_subdirectory(solid-actions-kcm)
macro_optional_add_subdirectory(kstartupconfig)
macro_optional_add_subdirectory(freespacenotifier)
