commit c6780a8e1f5f2fb5bbe0adce79e205502920b11b Author: Andrea Musuruane <musuruan(a)gmail.com&gt; Date: Sat Mar 25 14:32:02 2017 +0100 Fix comparison between pointer and integer errors / fix FTBFS frogatto-1.3-comparison.patch | 24 ++++++++++++++++++++++++ frogatto.spec | 11 +++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) --- diff --git a/frogatto-1.3-comparison.patch b/frogatto-1.3-comparison.patch new file mode 100644 index 0000000..adcee93 --- /dev/null +++ b/frogatto-1.3-comparison.patch @@ -0,0 +1,24 @@ +diff -dur frogatto-a7ef3bfa0c32df4852bf057fab969c1a080edf4d.orig/src/surface_cache.cpp frogatto-a7ef3bfa0c32df4852bf057fab969c1a080edf4d/src/surface_cache.cpp +--- frogatto-a7ef3bfa0c32df4852bf057fab969c1a080edf4d.orig/src/surface_cache.cpp 2013-08-21 22:34:37.000000000 +0200 ++++ frogatto-a7ef3bfa0c32df4852bf057fab969c1a080edf4d/src/surface_cache.cpp 2017-03-25 12:48:59.682281227 +0100 +@@ -116,7 +116,7 @@ + } + #endif // ANDROID + //std::cerr << "loading image '" << fname << "'\n"; +- if(surf.get() == false || surf->w == 0) { ++ if(surf.get() == NULL || surf->w == 0) { + if(key != "") { + std::cerr << "failed to load image '" << key << "'\n"; + } +diff -dur frogatto-a7ef3bfa0c32df4852bf057fab969c1a080edf4d.orig/src/variant.cpp frogatto-a7ef3bfa0c32df4852bf057fab969c1a080edf4d/src/variant.cpp +--- frogatto-a7ef3bfa0c32df4852bf057fab969c1a080edf4d.orig/src/variant.cpp 2013-08-21 22:34:37.000000000 +0200 ++++ frogatto-a7ef3bfa0c32df4852bf057fab969c1a080edf4d/src/variant.cpp 2017-03-25 11:56:39.383302278 +0100 +@@ -685,7 +685,7 @@ + case VARIANT_TYPE_CALLABLE: + return callable_ != NULL; + case VARIANT_TYPE_LIST: +- return !list_->size() == 0; ++ return list_->size() != 0; + case VARIANT_TYPE_MAP: + return !map_->elements.empty(); + case VARIANT_TYPE_STRING: diff --git a/frogatto.spec b/frogatto.spec index 5de7998..549d429 100644 --- a/frogatto.spec +++ b/frogatto.spec @@ -3,7 +3,7 @@ Name: frogatto Version: 1.3.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An old-school 2D platform game # Artwork and music not released under an open license @@ -22,6 +22,9 @@ Patch2: %{name}-1.3-fonts.patch # Fix gcc6 build only fixes some of the narrowing conversion warnings, there # are too many, so we add -Wno-narrowing to the CXXFLAGS as a workaround Patch3: %{name}-1.3-narrowing-conversion-fixes.patch +# Fix comparison between pointer and integer errors +# https://github.com/anura-engine/anura/commit/18ad198565f7a3280d991a587831... +Patch4: %{name}-1.3-comparison.patch BuildRequires: SDL-devel >= 1.2.7 BuildRequires: SDL_image-devel @@ -55,13 +58,14 @@ in game, and work to unravel Big Bad Milgram's plot against the townsfolk! %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Fix locale file path sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp %build -make %{?_smp_mflags} \ +%make_build \ BASE_CXXFLAGS="$RPM_OPT_FLAGS -fno-inline-functions -fthreadsafe-statics -Wno-narrowing" @@ -136,6 +140,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Mar 25 2017 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.3.3-7 +- Fix comparison between pointer and integer errors / fix FTBFS + * Thu Jul 7 2016 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 1.3.3-6 - Fix building with gcc6 / fix FTBFS