Hello community, here is the log from the commit of package openscap for openSUSE:Factory checked in at 2020-03-25 23:48:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openscap (Old) and /work/SRC/openSUSE:Factory/.openscap.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openscap" Wed Mar 25 23:48:03 2020 rev:65 rq:788259 version:1.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/openscap/openscap.changes 2020-01-21 21:00:54.428864107 +0100 +++ /work/SRC/openSUSE:Factory/.openscap.new.3160/openscap.changes 2020-03-25 23:50:03.444024362 +0100 @@ -1,0 +2,6 @@ +Wed Mar 25 13:53:51 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch to fix the scap-workbench build: + * 0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch + +------------------------------------------------------------------- New: ---- 0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openscap.spec ++++++ --- /var/tmp/diff_new_pack.IOIRSB/_old 2020-03-25 23:50:04.524024077 +0100 +++ /var/tmp/diff_new_pack.IOIRSB/_new 2020-03-25 23:50:04.524024077 +0100 @@ -39,7 +39,9 @@ Source5: oscap-scan.service Source6: oscap-scan.sh Patch0: openscap-new-suse.patch -Url: http://www.open-scap.org/ +# PATCH-FIX-UPSTREAM +Patch1: 0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch +Url: https://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: asciidoc BuildRequires: doxygen @@ -172,6 +174,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %if 0%{?with_bindings} ++++++ 0001-Do-not-use-C-keyword-operator-as-a-function-paramete.patch ++++++ >From 0ba7c9423f64a88ceef50318f1a382059484f737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <[email protected]> Date: Wed, 15 Jan 2020 13:54:45 +0100 Subject: [PATCH] Do not use C++ keyword operator as a function parameter name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes SCAP Workbench build. Addressing: [ 37%] Building CXX object CMakeFiles/scap-workbench.dir/scap-workbench_autogen/mocs_compilation.cpp.o In file included from /usr/local/include/openscap/xccdf_policy.h:39, from /home/jcerny/work/git/scap-workbench/include/TailoringDockWidgets.h:31, from /home/jcerny/work/git/scap-workbench/build/scap-workbench_autogen/6YEA5652QU/moc_TailoringDockWidgets.cpp:10, from /home/jcerny/work/git/scap-workbench/build/scap-workbench_autogen/mocs_compilation.cpp:18: /usr/local/include/openscap/oval_definitions.h:1676:117: error: declaration of ‘operator,’ as parameter 1676 | restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint); | ^ Fixes: #1462 --- src/OVAL/public/oval_definitions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OVAL/public/oval_definitions.h b/src/OVAL/public/oval_definitions.h index ea9d3aaf8..b5fe77154 100644 --- a/src/OVAL/public/oval_definitions.h +++ b/src/OVAL/public/oval_definitions.h @@ -1669,7 +1669,7 @@ OSCAP_API void oval_variable_possible_value_iterator_free(struct oval_variable_p * @param hint A short description of what the value means or represents. * @memberof oval_variable_possible_restriction */ -OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t operator, const char *hint); +OSCAP_API struct oval_variable_possible_restriction *oval_variable_possible_restriction_new(oval_operator_t, const char *); /** -- 2.25.1
