Hello community,
here is the log from the commit of package openomf for openSUSE:Factory checked
in at 2020-06-15 20:29:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openomf (Old)
and /work/SRC/openSUSE:Factory/.openomf.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openomf"
Mon Jun 15 20:29:49 2020 rev:3 rq:814583 version:0.6.5+git.20190205
Changes:
--------
--- /work/SRC/openSUSE:Factory/openomf/openomf.changes 2019-02-28
21:44:38.701493286 +0100
+++ /work/SRC/openSUSE:Factory/.openomf.new.3606/openomf.changes
2020-06-15 20:30:05.610287634 +0200
@@ -1,0 +2,6 @@
+Sat Jun 13 18:17:49 UTC 2020 - Martin Hauke <mar...@gmx.de>
+
+- Add patch to workaround gcc10 compilation errors (boo#1160244):
+ * openomf-set-cflags.patch
+
+-------------------------------------------------------------------
New:
----
openomf-set-cflags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openomf.spec ++++++
--- /var/tmp/diff_new_pack.PBDl0M/_old 2020-06-15 20:30:06.842291902 +0200
+++ /var/tmp/diff_new_pack.PBDl0M/_new 2020-06-15 20:30:06.850291930 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openomf
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2019, Martin Hauke <mar...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -29,8 +29,10 @@
Source: %{name}-%{version}.tar.xz
Source2: %{name}.README.SUSE
Patch0: libshadowdive-soversion.patch
+Patch1: openomf-set-cflags.patch
BuildRequires: ImageMagick
BuildRequires: cmake
+BuildRequires: enet-devel
BuildRequires: git-core
BuildRequires: hicolor-icon-theme
BuildRequires: libpng16-compat-devel
@@ -39,7 +41,6 @@
BuildRequires: pkgconfig(argtable2)
BuildRequires: pkgconfig(cunit)
BuildRequires: pkgconfig(libconfuse)
-BuildRequires: pkgconfig(libenet)
BuildRequires: pkgconfig(libxmp)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(sdl2)
@@ -86,6 +87,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%cmake \
++++++ openomf-set-cflags.patch ++++++
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7459eb..f67a6b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ OPTION(USE_SUBMODULES "Add libsd as submodule" ON)
OPTION(USE_SANITIZERS "Enable Asan and Ubsan" OFF)
# These flags are used for all builds
-set(CMAKE_C_FLAGS "-Wall")
+set(CMAKE_C_FLAGS "-Wall -fcommon")
set(CMAKE_C_FLAGS_DEBUG "-ggdb -DDEBUGMODE -Werror -fno-omit-frame-pointer")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O2 -fno-omit-frame-pointer -DNDEBUG")
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
