commit 15c93c61651bf290977c7eb48d8b03785df8fb14 Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Mon Sep 27 11:38:18 2021 +0200 Fix build for EL7 (gcc 4.8) lightspark-0.8.5-gcc48.patch | 108 +++++++++++++++++++++++++++++++++++++++++++ lightspark.spec | 14 ++++-- 2 files changed, 119 insertions(+), 3 deletions(-) --- diff --git a/lightspark-0.8.5-gcc48.patch b/lightspark-0.8.5-gcc48.patch new file mode 100644 index 0000000..9aed952 --- /dev/null +++ b/lightspark-0.8.5-gcc48.patch @@ -0,0 +1,108 @@ +From 4d81b0977433f52d944d89a3c527162eb4a15c2f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ludger=20Kr=C3=A4mer?= <dbluelle(a)onlinehome.de&gt; +Date: Fri, 24 Sep 2021 17:56:50 +0200 +Subject: [PATCH] fix copmpilation on CentOS 7 fixes #808 + +--- + src/scripting/abc_opcodes.cpp | 4 ++-- + src/scripting/flash/globalization/collator.cpp | 2 +- + src/scripting/flash/globalization/currencyformatter.cpp | 2 +- + src/scripting/flash/globalization/datetimeformatter.cpp | 2 +- + src/scripting/flash/globalization/localeid.cpp | 2 +- + src/scripting/flash/globalization/numberformatter.cpp | 2 +- + src/scripting/flash/globalization/stringtools.cpp | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/scripting/abc_opcodes.cpp b/src/scripting/abc_opcodes.cpp +index 5efa29bbb..a0f35ecfc 100644 +--- a/src/scripting/abc_opcodes.cpp ++++ b/src/scripting/abc_opcodes.cpp +@@ -2842,8 +2842,8 @@ void ABCVm::newClass(call_context* th, int n) + ret->getGlobalScope()->setVariableByQName(mname->name_s_id,mname->ns[0], ret,DECLARED_TRAIT); + th->mi->context->root->bindClass(className,ret); + +- auto j = th->mi->context->root->applicationDomain->classesSuperNotFilled.cbegin(); +- while (j != th->mi->context->root->applicationDomain->classesSuperNotFilled.cend()) ++ auto j = th->mi->context->root->applicationDomain->classesSuperNotFilled.begin(); ++ while (j != th->mi->context->root->applicationDomain->classesSuperNotFilled.end()) + { + if((*j)->super == ret) + { +diff --git a/src/scripting/flash/globalization/collator.cpp b/src/scripting/flash/globalization/collator.cpp +index 9c4e8deb9..2cda2dde9 100644 +--- a/src/scripting/flash/globalization/collator.cpp ++++ b/src/scripting/flash/globalization/collator.cpp +@@ -51,7 +51,7 @@ ASFUNCTIONBODY_ATOM(Collator,_constructor) + if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName)) + { + std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName); +- th->currlocale = std::locale(localeName); ++ th->currlocale = std::locale(localeName.c_str()); + th->actualLocaleIDName = th->requestedLocaleIDName; + th->lastOperationStatus="noError"; + } +diff --git a/src/scripting/flash/globalization/currencyformatter.cpp b/src/scripting/flash/globalization/currencyformatter.cpp +index bb717d163..dc0b18d86 100644 +--- a/src/scripting/flash/globalization/currencyformatter.cpp ++++ b/src/scripting/flash/globalization/currencyformatter.cpp +@@ -84,7 +84,7 @@ ASFUNCTIONBODY_ATOM(CurrencyFormatter,_constructor) + } + + std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName); +- th->currlocale = std::locale(localeName); ++ th->currlocale = std::locale(localeName.c_str()); + th->actualLocaleIDName = th->requestedLocaleIDName; + th->lastOperationStatus="noError"; + +diff --git a/src/scripting/flash/globalization/datetimeformatter.cpp b/src/scripting/flash/globalization/datetimeformatter.cpp +index b2a518db2..547473c10 100644 +--- a/src/scripting/flash/globalization/datetimeformatter.cpp ++++ b/src/scripting/flash/globalization/datetimeformatter.cpp +@@ -78,7 +78,7 @@ ASFUNCTIONBODY_ATOM(DateTimeFormatter,_constructor) + if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName)) + { + std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName); +- th->currlocale = std::locale(localeName); ++ th->currlocale = std::locale(localeName.c_str()); + th->actualLocaleIDName = th->requestedLocaleIDName; + th->lastOperationStatus="noError"; + } +diff --git a/src/scripting/flash/globalization/localeid.cpp b/src/scripting/flash/globalization/localeid.cpp +index 822fe3790..4d11de444 100644 +--- a/src/scripting/flash/globalization/localeid.cpp ++++ b/src/scripting/flash/globalization/localeid.cpp +@@ -58,7 +58,7 @@ ASFUNCTIONBODY_ATOM(LocaleID,_constructor) + if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName)) + { + std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName); +- th->currlocale = std::locale(localeName); ++ th->currlocale = std::locale(localeName.c_str()); + th->actualLocaleIDName = th->requestedLocaleIDName; + th->lastOperationStatus="noError"; + } +diff --git a/src/scripting/flash/globalization/numberformatter.cpp b/src/scripting/flash/globalization/numberformatter.cpp +index 54b190629..619a54198 100644 +--- a/src/scripting/flash/globalization/numberformatter.cpp ++++ b/src/scripting/flash/globalization/numberformatter.cpp +@@ -76,7 +76,7 @@ ASFUNCTIONBODY_ATOM(NumberFormatter,_constructor) + if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName)) + { + std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName); +- th->currlocale = std::locale(localeName); ++ th->currlocale = std::locale(localeName.c_str()); + th->actualLocaleIDName = th->requestedLocaleIDName; + th->lastOperationStatus="noError"; + } +diff --git a/src/scripting/flash/globalization/stringtools.cpp b/src/scripting/flash/globalization/stringtools.cpp +index 9f4f9115e..ce63769c6 100644 +--- a/src/scripting/flash/globalization/stringtools.cpp ++++ b/src/scripting/flash/globalization/stringtools.cpp +@@ -52,7 +52,7 @@ ASFUNCTIONBODY_ATOM(StringTools,_constructor) + if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName)) + { + std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName); +- th->currlocale = std::locale(localeName); ++ th->currlocale = std::locale(localeName.c_str()); + th->actualLocaleIDName = th->requestedLocaleIDName; + th->lastOperationStatus="noError"; + } diff --git a/lightspark.spec b/lightspark.spec index 59399a2..9b69586 100644 --- a/lightspark.spec +++ b/lightspark.spec @@ -7,7 +7,7 @@ Name: lightspark Version: 0.8.5 -Release: 2%{?git_snapshot:.%{date}git%{commit_short}}%{?dist} +Release: 3%{?git_snapshot:.%{date}git%{commit_short}}%{?dist} Summary: An alternative Flash Player implementation License: LGPLv3+ URL: http://lightspark.github.io/ @@ -17,6 +17,10 @@ Source0: https://github.com/lightspark/lightspark/archive/%{commit}.tar.g Source0: https://github.com/lightspark/lightspark/archive/%{version}/%{name}-%{ver... %endif +# Fix build on EL7 (gcc4.8) +# https://github.com/lightspark/lightspark/commit/4d81b0977433f52d944d89a3c... +Patch0: lightspark-0.8.5-gcc48.patch + BuildRequires: cmake3 BuildRequires: desktop-file-utils BuildRequires: ffmpeg-devel @@ -72,6 +76,7 @@ This is the Chromium compatible plugin for %{name}. %setup -q -n %{name}-%{commit} %else %setup -q -n %{name}-%{version} +%patch0 -p1 -b .gcc48 %endif @@ -83,11 +88,11 @@ This is the Chromium compatible plugin for %{name}. %{?with_tightspark: -DCOMPILE_TIGHTSPARK=1} \ . -%cmake_build +%cmake3_build %install -%cmake_install +%cmake3_install %find_lang %{name} %if %{with tightspark} @@ -125,6 +130,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Fri Nov 26 2021 Xavier Bachelot <xavier(a)bachelot.org&gt; - 0.8.5-3 +- Fix build for EL7 (gcc 4.8) + * Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 0.8.5-2 - Rebuilt for new ffmpeg snapshot