Hello community,
here is the log from the commit of package clementine for openSUSE:Factory
checked in at 2017-04-11 09:40:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/clementine (Old)
and /work/SRC/openSUSE:Factory/.clementine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clementine"
Tue Apr 11 09:40:50 2017 rev:41 rq:484883 version:1.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2017-02-03
17:34:42.374134568 +0100
+++ /work/SRC/openSUSE:Factory/.clementine.new/clementine.changes
2017-04-11 09:40:57.928659918 +0200
@@ -1,0 +2,5 @@
+Mon Apr 3 14:08:04 UTC 2017 - davejpla...@gmail.com
+
+- Fix gcc 7 build with clementine-gcc7fix.patch
+
+-------------------------------------------------------------------
New:
----
clementine-gcc7fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clementine.spec ++++++
--- /var/tmp/diff_new_pack.PO3TZ8/_old 2017-04-11 09:40:58.968513025 +0200
+++ /var/tmp/diff_new_pack.PO3TZ8/_new 2017-04-11 09:40:58.972512460 +0200
@@ -32,6 +32,8 @@
Patch2: clementine-1.3.1-fix-library-clicks.patch
# Patch fix factory build, add -fPIC to moodbar build
Patch3: clementine-moodbar-fpic.patch
+# PATCH-FIX-UPSTREAM clementine-gcc7fix.patch davejpla...@gmail.com -- add
<funtional> to includes.
+Patch4: clementine-gcc7fix.patch
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
%else
@@ -103,12 +105,19 @@
%patch1 -p1
%patch2 -p1
%patch3
+%patch4
# NOTE: Build using system versions of libraries.
rm -rvf 3rdparty/taglib
#rm -rvf 3rdparty/libmygpo-qt
#rm -rvf 3rdparty/sha2
%build
+%if 1 == 0
+%define gcc_version 7
+export CC=gcc-7
+export CPP=cpp-7
+export CXX=g++-7
+%endif
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
%cmake \
++++++ clementine-gcc7fix.patch ++++++
Index: src/core/mergedproxymodel.cpp
===================================================================
--- src/core/mergedproxymodel.cpp.orig 2015-12-15 14:13:23.000000000 +0200
+++ src/core/mergedproxymodel.cpp 2017-04-03 14:32:15.461279963 +0200
@@ -20,7 +20,7 @@
#include "mergedproxymodel.h"
#include "core/logging.h"
-
+#include <functional>
#include <QStringList>
#include <limits>
Index: src/devices/giolister.cpp
===================================================================
--- src/devices/giolister.cpp.orig 2015-12-15 14:13:23.000000000 +0200
+++ src/devices/giolister.cpp 2017-04-03 15:39:47.004508784 +0200
@@ -22,6 +22,7 @@
#include <QFile>
#include <QStringList>
#include <QtDebug>
+#include <functional>
#include "giolister.h"
#include "core/logging.h"
