Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2017-04-24 09:45:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Mon Apr 24 09:45:52 2017 rev:326 rq:484856 version:4.11.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2016-05-31 12:11:06.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2017-04-24 09:45:53.776461338 +0200
@@ -1,0 +2,5 @@
+Mon Apr 3 09:47:34 UTC 2017 - [email protected]
+
+- Add gcc7-fix.diff to fix an error reported by GCC7 (boo#1031317)
+
+-------------------------------------------------------------------
New:
----
gcc7-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.QPbje7/_old 2017-04-24 09:45:55.980149651 +0200
+++ /var/tmp/diff_new_pack.QPbje7/_new 2017-04-24 09:45:55.984149086 +0200
@@ -150,6 +150,8 @@
Patch73: systemsettings-desktop-kde4.diff
# PATCH-FIX-OPENSUSE gcc6-fixes.diff -- Fix errors reported by GCC6 compiler
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-ksysguardd = %{version}
Requires: %{name}-liboxygenstyle = %{version}
@@ -385,6 +387,7 @@
%patch52
%endif
%patch74
+%patch75 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
++++++ gcc7-fix.diff ++++++
>From f28130d1365f43e28bb5490ca821340a0b37d262 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <[email protected]>
Date: Mon, 3 Apr 2017 12:53:31 +0200
Subject: [PATCH] Fix error reported by GCC7 (boo#1031317)
/home/abuild/rpmbuild/BUILD/kde-workspace-4.11.22/libs/oxygen/oxygenhelper.cpp:
In member function 'bool Oxygen::Helper::hasHint(WId, Atom) const':
/home/abuild/rpmbuild/BUILD/kde-workspace-4.11.22/libs/oxygen/oxygenhelper.cpp:1092:21:
error: ISO C++ forbids comparison between pointer and integer
[-fpermissive]
if( data == None || n != 1 ) return false;
^~~~
---
libs/oxygen/oxygenhelper.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/oxygen/oxygenhelper.cpp b/libs/oxygen/oxygenhelper.cpp
index bc05ecc5a5..208a7f65d2 100644
--- a/libs/oxygen/oxygenhelper.cpp
+++ b/libs/oxygen/oxygenhelper.cpp
@@ -1089,7 +1089,7 @@ namespace Oxygen
&data);
// finish if no data is found
- if( data == None || n != 1 ) return false;
+ if( data == NULL || n != 1 ) return false;
else return *data;
}
--
2.12.0
