Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2016-05-31 12:11:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2016-01-23 01:13:45.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2016-05-31 12:11:06.000000000 +0200
@@ -1,0 +2,14 @@
+Wed May 25 11:48:53 UTC 2016 - [email protected]
+
+- Changed kdm-sysconfig-values.diff:
+ Add "-listen tcp" to the Xserver cmdline for Xorg 1.17 and up if
+ DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN="yes" in
+ /etc/syconfig/displaymanager, newer versions have -nolisten as
+ default (boo#978262)
+
+-------------------------------------------------------------------
+Tue May 24 12:42:43 UTC 2016 - [email protected]
+
+- Add patch gcc6-fixes.diff to fix errors reported by GCC6 compiler
+
+-------------------------------------------------------------------
New:
----
gcc6-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.USY5U8/_old 2016-05-31 12:11:08.000000000 +0200
+++ /var/tmp/diff_new_pack.USY5U8/_new 2016-05-31 12:11:08.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kdebase4-workspace
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -32,7 +32,7 @@
BuildRequires: libdbusmenu-qt-devel
BuildRequires: libkactivities-devel
BuildRequires: libkde4-devel >= %{_kde_platform_version}
-BuildRequires: libkdepimlibs4-devel >= %{_kde_platform_version}
+#BuildRequires: libkdepimlibs4-devel >= %{_kde_platform_version}
BuildRequires: libpolkit-qt-1-devel
BuildRequires: libprison-devel
BuildRequires: libqalculate-devel
@@ -148,6 +148,8 @@
Patch72: much-more-plasma-debug.patch
# PATCH-FIX-OPENSUSE systemsettings-desktop-kde4.diff -- Changes name of
System Settings to Configure KDE 4 Applications
Patch73: systemsettings-desktop-kde4.diff
+# PATCH-FIX-OPENSUSE gcc6-fixes.diff -- Fix errors reported by GCC6 compiler
+Patch74: gcc6-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-ksysguardd = %{version}
Requires: %{name}-liboxygenstyle = %{version}
@@ -301,19 +303,6 @@
%description liboxygenstyle
This package contains the libraries of the oxygen style.
-%package plasma-calendar
-Summary: The calendar Plasma engine and applet
-Group: System/GUI/KDE
-Provides: kdebase4-workspace:%_libdir/kde4/plasma_engine_calendar.so
-# calendar applet/engine and akonadi engine link to kdepimlibs and akonadi
-# but it is still usable without akonadi, so it should be recommended
-%kde4_pimlibs_requires
-Recommends: akonadi-runtime
-%kde4_runtime_requires
-
-%description plasma-calendar
-This packages contains the calendar Plasma engine and applet, which are based
on Akonadi.
-
%package -n python-kdebase4
Summary: Python bindings for KDE 4 desktop shell
Group: System/GUI/KDE
@@ -395,6 +384,7 @@
%else
%patch52
%endif
+%patch74
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
@@ -408,6 +398,7 @@
%install
cd build
%kde4_makeinstall
+ rm -rf %{buildroot}½{_kde4_modulesdir}/plasma_applet_calendar.so
install -m 644 %{SOURCE2} %{buildroot}%{_kde4_appsdir}/kwin/
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/
install -m 644 %{SOURCE4}
%{buildroot}%{_localstatedir}/adm/fillup-templates/
@@ -595,13 +586,6 @@
%dir %{_kde4_appsdir}/kwin
%{_kde4_appsdir}/kwin/oxygenclient.desktop
-%files plasma-calendar
-%defattr(-,root,root)
-%{_kde4_modulesdir}/plasma_*_akonadi.so
-%{_kde4_modulesdir}/plasma_*_calendar.so
-%{_kde4_servicesdir}/plasma-*-akonadi.desktop
-%{_kde4_servicesdir}/plasma-*-calendar.desktop
-
%files devel -f filelists/devel
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
@@ -901,8 +885,6 @@
%exclude %{_kde4_modulesdir}/kded_randrmonitor.so
%exclude %{_kde4_modulesdir}/kgreet_*.so
%exclude %{_kde4_modulesdir}/kstyle_oxygen_config.so
-%exclude %{_kde4_modulesdir}/plasma_*_akonadi.so
-%exclude %{_kde4_modulesdir}/plasma_*_calendar.so
%exclude %{_kde4_modulesdir}/plugins/designer/ksysguardlsofwidgets.so
%exclude %{_kde4_modulesdir}/plugins/styles
%exclude %{_kde4_modulesdir}/plugins/styles/oxygen.so
@@ -910,8 +892,6 @@
%exclude %{_kde4_modulesdir}/plugins/gui_platform/libkde.so
%exclude %{_kde4_servicesdir}/kded/randrmonitor.desktop
%exclude %{_kde4_servicesdir}/kwin
-%exclude %{_kde4_servicesdir}/plasma-*-akonadi.desktop
-%exclude %{_kde4_servicesdir}/plasma-*-calendar.desktop
%exclude %{_kde4_servicesdir}/plasma-scriptengine-applet-python.desktop
%exclude %{_kde4_servicesdir}/plasma-scriptengine-dataengine-python.desktop
%exclude %{_kde4_servicesdir}/plasma-scriptengine-runner-python.desktop
++++++ gcc6-fixes.diff ++++++
--- kcontrol/randr/randroutput.cpp
+++ kcontrol/randr/randroutput.cpp
@@ -202,12 +202,12 @@
m_connected = (event->connection == RR_Connected);
loadSettings(false);
if (!m_connected && currentCrtc != None)
- setCrtc(None);
+ setCrtc(NULL);
}
// check if we are still connected, if not, release the crtc connection
if(!m_connected && m_crtc->isValid())
- setCrtc(None);
+ setCrtc(NULL);
if(changed)
emit outputChanged(m_id, changed);
@@ -267,7 +267,7 @@
RandRMode RandROutput::mode() const
{
if (!isConnected())
- return None;
+ return NULL;
if (!m_crtc)
return RandRMode();
--- kwin/glxbackend.cpp
+++ kwin/glxbackend.cpp
@@ -45,7 +45,7 @@
, window(None)
, fbconfig(NULL)
, glxWindow(None)
- , ctx(None)
+ , ctx(NULL)
, m_bufferAge(0)
, haveSwapInterval(false)
{
--- libs/kephal/service/xrandr12/randroutput.cpp
+++ libs/kephal/service/xrandr12/randroutput.cpp
@@ -227,7 +227,7 @@
RandRMode RandROutput::mode() const
{
if (!isConnected())
- return None;
+ return NULL;
if (!m_crtc)
return RandRMode();
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.USY5U8/_old 2016-05-31 12:11:08.000000000 +0200
+++ /var/tmp/diff_new_pack.USY5U8/_new 2016-05-31 12:11:08.000000000 +0200
@@ -594,7 +594,7 @@
{
--- kdm/kfrontend/read_sysconfig.sh 1970-01-01 01:00:00.000000000 +0100
+++ kdm/kfrontend/read_sysconfig.sh 2013-09-03 21:28:38.522493296 +0200
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,128 @@
+#!/bin/bash
+#
+# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany.
@@ -664,8 +664,20 @@
+else
+ echo "AutoLoginEnable=false"
+fi
++# get xserver command
++ xserver=`type -p $DISPLAYMANAGER_XSERVER`
++ if [ "x$xserver" = "x" ]; then
++ # binary not found, fall back to /usr/bin/X
++ xserver=/usr/bin/X
++ fi
+if [ "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ]; then
-+ echo "ServerArgsLocal=${DISPLAYMANAGER_KDM_LOCALARGS}"
++ eval $($xserver -version 2>&1| grep "^X.Org" | sed -e 's%.*
\([0-9]\+\)\.\([0-9]\+\).*%{ max=\1; min=\2; }%')
++ if [ -n "$max" -a -n "$min" ] && [ $max -gt 1 -o $min -ge 17 ]
++ then
++ echo "ServerArgsLocal=-listen tcp ${DISPLAYMANAGER_KDM_LOCALARGS}"
++ else
++ echo "ServerArgsLocal=${DISPLAYMANAGER_KDM_LOCALARGS}"
++ fi
+else
+ echo "ServerArgsLocal=-nolisten tcp ${DISPLAYMANAGER_KDM_LOCALARGS}"
+fi
@@ -690,17 +702,15 @@
+
+case "x$DISPLAYMANAGER_XSERVER" in
+ xXgl)
-+ xgl=`type -p Xgl`
-+ echo "ServerCmd=$xgl $DISPLAYMANAGER_XGL_OPTS -br"
++ echo "ServerCmd=$xserver $DISPLAYMANAGER_XGL_OPTS -br"
+ echo "ServerTimeout=50"
+ ;;
+ xXorg)
-+ xorg=`type -p Xorg`
-+ echo "ServerCmd=$xorg -br"
++ echo "ServerCmd=$xserver -br"
+ ;;
+ x)
+ # empty value - younger than 11.0
-+ echo "ServerCmd=/usr/bin/X -br"
++ echo "ServerCmd=$xserver -br"
+ ;;
+ *)
+ echo "#Unknown X server - leaving X"
