From 00289e3e43cebae99e4efefcb7e6ea27a12eada9fc45e842bd5da697fc30bbf8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Nov 2024 16:26:05 +0100 Subject: [PATCH] Add 0001-Clean-up-warnings-in-luasocket-and-box2d.patch --- ...n-up-warnings-in-luasocket-and-box2d.patch | 28 +++++++++++++++++++ love-0_7_2.changes | 6 ++++ love-0_7_2.spec | 22 +++++++-------- 3 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 0001-Clean-up-warnings-in-luasocket-and-box2d.patch diff --git a/0001-Clean-up-warnings-in-luasocket-and-box2d.patch b/0001-Clean-up-warnings-in-luasocket-and-box2d.patch new file mode 100644 index 0000000..83fea74 --- /dev/null +++ b/0001-Clean-up-warnings-in-luasocket-and-box2d.patch @@ -0,0 +1,28 @@ +From 6cf25f92098c192d22dc82b9888386fa52b4d797 Mon Sep 17 00:00:00 2001 +From: Bart van Strien +Date: Sun, 29 Sep 2013 12:56:48 +0200 +Subject: [PATCH] Clean up warnings in luasocket and box2d + +diff --git a/src/libraries/Box2D/README.MODIFIED b/src/libraries/Box2D/README.MODIFIED +new file mode 100644 +index 00000000..71388bce +--- /dev/null ++++ b/src/libraries/Box2D/README.MODIFIED +@@ -0,0 +1 @@ ++PLEASE NOTE, this version of Box2D is NOT original, it has been MODIFIED by the LÖVE Development Team. +diff --git a/src/libraries/luasocket/libluasocket/luasocket.c b/src/libraries/luasocket/libluasocket/luasocket.c +index 798a3116..0d10bb1d 100644 +--- a/src/libraries/luasocket/libluasocket/luasocket.c ++++ b/src/libraries/luasocket/libluasocket/luasocket.c +@@ -110,7 +110,7 @@ static int base_open(lua_State *L) { + /*-------------------------------------------------------------------------*\ + * Initializes all library modules. + \*-------------------------------------------------------------------------*/ +-LUASOCKET_API luaopen_socket_core(lua_State *L) { ++int LUASOCKET_API luaopen_socket_core(lua_State *L) { + int i; + base_open(L); + for (i = 0; mod[i].name; i++) mod[i].func(L); +-- +2.47.0 + diff --git a/love-0_7_2.changes b/love-0_7_2.changes index 73cee00..2f2d78b 100644 --- a/love-0_7_2.changes +++ b/love-0_7_2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 2 15:21:54 UTC 2024 - Jan Engelhardt + +- Add 0001-Clean-up-warnings-in-luasocket-and-box2d.patch to + resolve FTBFS with gcc-14 + ------------------------------------------------------------------- Thu Jan 3 01:24:03 UTC 2019 - Jan Engelhardt diff --git a/love-0_7_2.spec b/love-0_7_2.spec index 012d04f..ab9f331 100644 --- a/love-0_7_2.spec +++ b/love-0_7_2.spec @@ -1,7 +1,7 @@ # # spec file for package love-0_7_2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,11 @@ Release: 0 Summary: 2D gaming engine written in Lua License: Zlib Group: Development/Languages/Other -Url: http://love2d.org/ - -Source: https://bitbucket.org/rude/love/downloads/love-0.7.2-linux-src.tar.gz +URL: http://love2d.org/ +Source: https://bitbucket.org/rude/love/downloads/love-%version-linux-src.tar.gz Patch1: love-modplug.patch Patch2: system-packages.diff +Patch3: 0001-Clean-up-warnings-in-luasocket-and-box2d.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -50,8 +50,7 @@ BuildRequires: pkgconfig(vorbisfile) LÖVE is a framework for making 2D games in Lua. %prep -%setup -qn love-HEAD -%patch -P 1 -P 2 -p1 +%autosetup -n love-HEAD -p1 %build sed -i 's/\r$//' *.txt @@ -59,16 +58,15 @@ mv configure.{in,ac} autoreconf -fi export CPPFLAGS="-DGL_GLEXT_PROTOTYPES" %configure -make %{?_smp_mflags} +%make_build %install -b="%buildroot"; -make install DESTDIR="$b" -mv "$b/%_bindir"/love{,-0.7.2} +%make_install +mv "%buildroot/%_bindir/love" "%buildroot/%_bindir/love-0.7.2" %files -%defattr(-,root,root) -%doc changes.txt license.txt readme.txt +%license license.txt +%doc readme.txt %_bindir/love-0.7.2 %changelog