From fc67ea611e8f38e30d7fc8e52d343d08c1e17e44 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Jan 31 2020 13:27:20 +0000 Subject: fix FTBFS --- diff --git a/enlightenment-0.23.1-gcc10.patch b/enlightenment-0.23.1-gcc10.patch new file mode 100644 index 0000000..a8c1a49 --- /dev/null +++ b/enlightenment-0.23.1-gcc10.patch @@ -0,0 +1,17 @@ +diff -up enlightenment-0.23.1/src/modules/mixer/lib/emix.c.gcc10 enlightenment-0.23.1/src/modules/mixer/lib/emix.c +--- enlightenment-0.23.1/src/modules/mixer/lib/emix.c.gcc10 2020-01-31 08:06:59.963675596 -0500 ++++ enlightenment-0.23.1/src/modules/mixer/lib/emix.c 2020-01-31 08:07:14.336385244 -0500 +@@ -6,11 +6,11 @@ + + #ifdef HAVE_PULSE + E_API Emix_Backend *emix_backend_pulse_get(void); +-E_API const char *emix_backend_pulse_name; ++extern E_API const char *emix_backend_pulse_name; + #endif + #ifdef HAVE_ALSA + E_API Emix_Backend *emix_backend_alsa_get(void); +-E_API const char *emix_backend_alsa_name; ++extern E_API const char *emix_backend_alsa_name; + #endif + + static int _log_domain; diff --git a/enlightenment.spec b/enlightenment.spec index ea116ff..0d91834 100644 --- a/enlightenment.spec +++ b/enlightenment.spec @@ -2,12 +2,15 @@ Name: enlightenment Version: 0.23.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Summary: Enlightenment window manager Url: http://enlightenment.org Source0: http://download.enlightenment.org/rel/apps/enlightenment/%{name}-%{version}.tar.xz Patch0: enlightenment-0.22.30-fix-desktop-files.patch +# gcc 10 (-fno-common) +# https://phab.enlightenment.org/D11260 +Patch1: enlightenment-0.23.1-gcc10.patch BuildRequires: gcc, gcc-c++ BuildRequires: alsa-lib-devel BuildRequires: bluez-libs-devel @@ -57,6 +60,7 @@ Headers, test programs and documentation for enlightenment. %prep %setup -q %patch0 -p1 -b .fixme +%patch1 -p1 -b .gcc10 %build %{meson} \ @@ -113,6 +117,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %{_includedir}/enlightenment %changelog +* Fri Jan 31 2020 Tom Callaway - 0.23.1-3 +- fix FTBFS + * Tue Jan 28 2020 Fedora Release Engineering - 0.23.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild