commit clementine for openSUSE:Factory
Hello community,
here is the log from the commit of package clementine for openSUSE:Factory checked in at 2013-04-29 09:52:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/clementine (Old)
and /work/SRC/openSUSE:Factory/.clementine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clementine", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2013-04-06 19:53:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.clementine.new/clementine.changes 2013-04-29 09:52:38.000000000 +0200
@@ -1,0 +2,7 @@
+Sun Apr 28 09:15:24 UTC 2013 - davejplater@gmail.com
+
+- Fixed bnc#815434 with "-DCMAKE_BUILD_TYPE:STRING=Release" flag.
+- Fixed factory build with clementine-1.1.1-fixboostparseerror.patch
+ see also QTBUG-22829
+
+-------------------------------------------------------------------
New:
----
clementine-1.1.1-fixboostparseerror.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clementine.spec ++++++
--- /var/tmp/diff_new_pack.nylFqR/_old 2013-04-29 09:52:41.000000000 +0200
+++ /var/tmp/diff_new_pack.nylFqR/_new 2013-04-29 09:52:41.000000000 +0200
@@ -36,6 +36,9 @@
# Patch to fix factory build which fails on glib's depreciated mark of "void g_type_init" in gobject/gtype.h
# Reported upstream, issue: https://code.google.com/p/clementine-player/issues/detail?id=3596
Patch1: clementine-nowerror.patch
+# Patch to fix factory build failure due to an issue between boost and qt4. See :
+# https://bugreports.qt-project.org/browse/QTBUG-22829
+Patch2: clementine-1.1.1-fixboostparseerror.patch
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: fdupes
@@ -102,6 +105,7 @@
%setup -q
%patch0
%patch1
+%patch2
# Remote control support cannot be enabled without the owner of gloox (http://camaya.net/gloox)
# first giving permission for relicensing to GPLv2 or later. See bnc#695820
rm -rf --verbose 3rdparty/gloox
@@ -116,12 +120,14 @@
export CFLAGS="$CXXFLAGS"
mkdir build && cd build && \
cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
%if 0%{?suse_version} >= 1230
-DENABLE_GOOGLE_DRIVE=ON \
%endif
- -DENABLE_MOODBAR=ON ..
-#cat %%{_includedir}/glib-2.0/gobject/gtype.h
+ -DENABLE_MOODBAR=ON \
+ ..
+find ../ %{_includedir} -name 'has_binary_operator.hp'
make %{?_smp_mflags}
%install
++++++ clementine-1.1.1-fixboostparseerror.patch ++++++
Index: src/core/mergedproxymodel.h
===================================================================
--- src/core/mergedproxymodel.h.orig 2012-10-11 13:16:39.000000000 +0200
+++ src/core/mergedproxymodel.h 2013-04-28 10:32:44.561601516 +0200
@@ -20,10 +20,12 @@
#include <QAbstractProxyModel>
+#ifndef Q_MOC_RUN
#include
participants (1)
-
root@hilbert.suse.de