Hello community, here is the log from the commit of package qsapecng for openSUSE:Factory checked in at 2016-04-28 16:54:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qsapecng (Old) and /work/SRC/openSUSE:Factory/.qsapecng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qsapecng" Changes: -------- --- /work/SRC/openSUSE:Factory/qsapecng/qsapecng.changes 2014-10-31 12:31:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qsapecng.new/qsapecng.changes 2016-04-28 16:57:49.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 18 18:01:35 UTC 2016 - [email protected] + +- Fix build on Tumbleweed: + * Add qsapecng-2.0.0-boost_join_fix.patch (boo#975911, workaround + to qt#22829) + +------------------------------------------------------------------- New: ---- qsapecng-2.0.0-boost_join_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qsapecng.spec ++++++ --- /var/tmp/diff_new_pack.z3qUHn/_old 2016-04-28 16:57:51.000000000 +0200 +++ /var/tmp/diff_new_pack.z3qUHn/_new 2016-04-28 16:57:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package qsapecng # -# Copyright (c) 2014 SUSE LINUX Products 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 @@ -24,6 +24,8 @@ Group: Productivity/Scientific/Electronics Url: http://qsapecng.sourceforge.net/ Source0: http://downloads.sourceforge.net/qsapecng/QSapecNG-%{version}-source.tar.gz +# PATCH-FIX-UPSTREAM qsapecng-2.0.0-boost_join_fix.patch -- Fix build, workaround to qt#22829, picked from Debian +Patch0: qsapecng-2.0.0-boost_join_fix.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: hicolor-icon-theme @@ -43,6 +45,7 @@ %prep %setup -q -n QSapecNG-%{version}-source +%patch0 -p1 sed -i 's/\r$//' README sed -i 's/add_definitions( -ansi -Wall -O0 -g )/add_definitions( -ansi -Wall )/' CMakeLists.txt ++++++ qsapecng-2.0.0-boost_join_fix.patch ++++++ Description: Fix parse error at "BOOST_JOIN" Wrapped any Boost include directive with '#ifndef Q_MOC_RUN [...] #endif' as described here https://bugreports.qt.io/browse/QTBUG-22829 Bug-Debian: http://bugs.debian.org/799998 Author: Simone Rossetto <[email protected]> Last-Update: 2015-09-25 Index: qsapecng-2.0.0/src/parser/ir_circuit.cpp =================================================================== --- qsapecng-2.0.0.orig/src/parser/ir_circuit.cpp +++ qsapecng-2.0.0/src/parser/ir_circuit.cpp @@ -19,8 +19,11 @@ #include "parser/ir_circuit.h" +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include <boost/lexical_cast.hpp> #include <boost/foreach.hpp> +#endif + namespace sapecng Index: qsapecng-2.0.0/src/parser/ir_circuit.h =================================================================== --- qsapecng-2.0.0.orig/src/parser/ir_circuit.h +++ qsapecng-2.0.0/src/parser/ir_circuit.h @@ -26,9 +26,12 @@ #include <stack> #include <iostream> + +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include <boost/property_tree/info_parser.hpp> #include <boost/property_tree/xml_parser.hpp> #include <boost/property_tree/ptree.hpp> +#endif namespace sapecng Index: qsapecng-2.0.0/src/gui/editor/schematicsceneparser.cpp =================================================================== --- qsapecng-2.0.0.orig/src/gui/editor/schematicsceneparser.cpp +++ qsapecng-2.0.0/src/gui/editor/schematicsceneparser.cpp @@ -31,7 +31,10 @@ #include <QtCore/QPointer> #include <QtGui/QGraphicsItem> +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include <boost/assign.hpp> +#endif + #include <memory> Index: qsapecng-2.0.0/src/model/graph.h =================================================================== --- qsapecng-2.0.0.orig/src/model/graph.h +++ qsapecng-2.0.0/src/model/graph.h @@ -22,7 +22,10 @@ #include "boost-sapecng/edge_properties.hpp" + +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include <boost/graph/adjacency_list.hpp> +#endif namespace sapecng Index: qsapecng-2.0.0/src/boost-sapecng/edge_properties.hpp =================================================================== --- qsapecng-2.0.0.orig/src/boost-sapecng/edge_properties.hpp +++ qsapecng-2.0.0/src/boost-sapecng/edge_properties.hpp @@ -20,8 +20,9 @@ #ifndef EDGE_PROPERTIES_H #define EDGE_PROPERTIES_H - +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include <boost/graph/properties.hpp> +#endif namespace boost Index: qsapecng-2.0.0/src/boost-sapecng/mrt.hpp =================================================================== --- qsapecng-2.0.0.orig/src/boost-sapecng/mrt.hpp +++ qsapecng-2.0.0/src/boost-sapecng/mrt.hpp @@ -22,7 +22,7 @@ #ifndef MRT_H #define MRT_H - +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include <boost/config.hpp> #include <boost/bimap.hpp> @@ -32,6 +32,7 @@ #include <boost/graph/undirected_dfs.hpp> #include <boost/graph/connected_components.hpp> #include <boost/graph/filtered_graph.hpp> +#endif #include <vector> #include <stack> #include <map>
