From 7ebd89063b05f5c18376d192528d3212824fad1d Mon Sep 17 00:00:00 2001 From: liheavy <17865196565@163.com> Date: Mon, 2 Aug 2021 15:39:24 +0800 Subject: [PATCH] fix complication failed due to gcc upgrade --- fix-compilation-failed.patch | 12 ++++++++++++ game-music-emu.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 fix-compilation-failed.patch diff --git a/fix-compilation-failed.patch b/fix-compilation-failed.patch new file mode 100644 index 0000000..36b2c2a --- /dev/null +++ b/fix-compilation-failed.patch @@ -0,0 +1,12 @@ +diff -Nur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2016-12-15 09:23:52.000000000 +0800 ++++ b/CMakeLists.txt 2021-08-02 15:26:00.325790200 +0800 +@@ -66,7 +66,7 @@ + if (__LIBGME_TEST_VISIBILITY) + # get the gcc version + exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) +- string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") ++ string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" _gcc_version "${_gcc_version_info}") + + # gcc <4.1 had poor support for symbol visibility + if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1")) diff --git a/game-music-emu.spec b/game-music-emu.spec index fd9d806..3547ef6 100644 --- a/game-music-emu.spec +++ b/game-music-emu.spec @@ -1,6 +1,6 @@ Name: game-music-emu Version: 0.6.1 -Release: 7 +Release: 8 Summary: Video game music file emulation/playback library,Demo player utilizing Game_Music_Emu License: LGPLv2+ and MIT URL: https://bitbucket.org/mpyne/game-music-emu/wiki/Home @@ -8,6 +8,8 @@ Source0: https://bitbucket.org/mpyne/game-music-emu/downloads/%{name}-%{v Provides: libgme = %{version}-%{release} %{name}-player = %{version}-%{release} Obsoletes: %{name}-player < %{version}-%{release} +Patch01: fix-compilation-failed.patch + BuildRequires: gcc-c++ cmake SDL-devel %package devel @@ -65,5 +67,8 @@ cd player %{_libdir}/pkgconfig/libgme.pc %changelog +* Mon Aug 2 2021 Haiwei Li - 0.6.1-8 +- Fix complication failed due to gcc upgrade + * Thu Nov 28 2019 yangjian - 0.6.1-7 - Package init