Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fillets-ng for openSUSE:Factory checked in at 2025-12-15 11:57:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fillets-ng (Old) and /work/SRC/openSUSE:Factory/.fillets-ng.new.1939 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fillets-ng" Mon Dec 15 11:57:11 2025 rev:29 rq:1322677 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fillets-ng/fillets-ng.changes 2024-03-07 22:02:39.987319105 +0100 +++ /work/SRC/openSUSE:Factory/.fillets-ng.new.1939/fillets-ng.changes 2025-12-15 12:03:56.853334738 +0100 @@ -1,0 +2,10 @@ +Thu Dec 11 13:54:06 UTC 2025 - Dominique Leuenberger <[email protected]> + +- Build using system default lua version: + + Replacelua51-devel BuildRequires with lua-devel + + Import patches from Fedora to fix build: + - fillets-ng-1.0.1-lua-5.2.patch + - fillets-ng-1.0.1-lua-5.4.patch +- Rebase fillets-ng-0.9.3-datadir.patch to apply as -p1 + +------------------------------------------------------------------- New: ---- fillets-ng-1.0.1-lua-5.2.patch fillets-ng-1.0.1-lua-5.4.patch ----------(New B)---------- New: + Import patches from Fedora to fix build: - fillets-ng-1.0.1-lua-5.2.patch - fillets-ng-1.0.1-lua-5.4.patch New: - fillets-ng-1.0.1-lua-5.2.patch - fillets-ng-1.0.1-lua-5.4.patch - Rebase fillets-ng-0.9.3-datadir.patch to apply as -p1 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fillets-ng.spec ++++++ --- /var/tmp/diff_new_pack.OWlfZX/_old 2025-12-15 12:03:57.357355964 +0100 +++ /var/tmp/diff_new_pack.OWlfZX/_new 2025-12-15 12:03:57.357355964 +0100 @@ -1,7 +1,7 @@ # # spec file for package fillets-ng # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,18 +22,20 @@ Summary: Fish Fillets - Next Generation License: GPL-2.0-or-later Group: Amusements/Games/Action/Arcade -Url: http://fillets.sourceforge.net/ +URL: http://fillets.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/fillets/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png Patch0: %{name}-0.9.3-datadir.patch +Patch1: fillets-ng-1.0.1-lua-5.2.patch +Patch2: fillets-ng-1.0.1-lua-5.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_ttf-devel BuildRequires: fribidi-devel BuildRequires: gcc-c++ -BuildRequires: lua51-devel +BuildRequires: lua-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files Requires: %{name}-data = %{version} @@ -46,7 +48,7 @@ your fish. The whole game is accompanied by quiet, comforting music. %prep -%autosetup -p0 +%autosetup -p1 %build %configure ++++++ fillets-ng-0.9.3-datadir.patch ++++++ --- /var/tmp/diff_new_pack.OWlfZX/_old 2025-12-15 12:03:57.385357143 +0100 +++ /var/tmp/diff_new_pack.OWlfZX/_new 2025-12-15 12:03:57.389357312 +0100 @@ -1,7 +1,7 @@ Index: src/gengine/Makefile.in =================================================================== ---- src/gengine/Makefile.in.orig -+++ src/gengine/Makefile.in +--- a/src/gengine/Makefile.in.orig ++++ b/src/gengine/Makefile.in @@ -226,7 +226,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ ++++++ fillets-ng-1.0.1-lua-5.2.patch ++++++ Index: src/gengine/ScriptState.cpp =================================================================== RCS file: /cvsroot/fillets/fillets-ng/src/gengine/ScriptState.cpp,v retrieving revision 1.13 diff -u -r1.13 ScriptState.cpp --- a/src/gengine/ScriptState.cpp 6 Jul 2005 18:50:18 -0000 1.13 +++ b/src/gengine/ScriptState.cpp 6 Apr 2014 22:11:01 -0000 @@ -22,11 +22,11 @@ //----------------------------------------------------------------- ScriptState::ScriptState() { - m_state = lua_open(); - luaopen_base(m_state); - luaopen_string(m_state); - luaopen_math(m_state); - luaopen_table(m_state); + m_state = luaL_newstate(); + luaL_requiref(m_state, "_G", luaopen_base, true); + luaL_requiref(m_state, LUA_STRLIBNAME, luaopen_string, true); + luaL_requiref(m_state, LUA_MATHLIBNAME, luaopen_math, true); + luaL_requiref(m_state, LUA_TABLIBNAME, luaopen_table, true); prepareErrorHandler(); } @@ -42,9 +42,11 @@ void ScriptState::prepareErrorHandler() { + lua_pushglobaltable(m_state); lua_pushliteral(m_state, "_TRACEBACK"); lua_pushcfunction(m_state, script_debugStack); - lua_settable(m_state, LUA_GLOBALSINDEX); + lua_settable(m_state, -3); + lua_pop(m_state, 1); } //----------------------------------------------------------------- /** @@ -53,9 +55,11 @@ void ScriptState::insertErrorHandler(int index) { + lua_pushglobaltable(m_state); lua_pushliteral(m_state, "_TRACEBACK"); - lua_rawget(m_state, LUA_GLOBALSINDEX); + lua_rawget(m_state, -2); lua_insert(m_state, index); + lua_pop(m_state, 1); } //----------------------------------------------------------------- /** ++++++ fillets-ng-1.0.1-lua-5.4.patch ++++++ diff -Naur fillets-ng-1.0.1-orig/src/gengine/options-script.cpp fillets-ng-1.0.1-new/src/gengine/options-script.cpp --- fillets-ng-1.0.1-orig/src/gengine/options-script.cpp 2004-09-24 17:09:28.000000000 +0300 +++ fillets-ng-1.0.1-new/src/gengine/options-script.cpp 2021-04-29 03:41:02.114798219 +0300 @@ -32,7 +32,7 @@ message = new StringMsg(listener, msg, string_value); } else if (lua_isnumber(L, 3)) { - int int_value = luaL_checkint(L, 3); + int int_value = luaL_checkinteger(L, 3); message = new IntMsg(listener, msg, int_value); } else { diff -Naur fillets-ng-1.0.1-orig/src/level/game-script.cpp fillets-ng-1.0.1-new/src/level/game-script.cpp --- fillets-ng-1.0.1-orig/src/level/game-script.cpp 2009-10-11 16:50:16.000000000 +0300 +++ fillets-ng-1.0.1-new/src/level/game-script.cpp 2021-04-29 03:43:46.592794046 +0300 @@ -70,8 +70,8 @@ { BEGIN_NOEXCEPTION; const char *kind = luaL_checkstring(L, 1); - int x = luaL_checkint(L, 2); - int y = luaL_checkint(L, 3); + int x = luaL_checkinteger(L, 2); + int y = luaL_checkinteger(L, 3); const char *shape = luaL_checkstring(L, 4); Cube *model = ModelFactory::createModel(kind, V2(x, y), shape); @@ -111,12 +111,12 @@ BEGIN_NOEXCEPTION; std::string decor_name = luaL_checkstring(L, 1); if ("rope" == decor_name) { - int model_index1 = luaL_checkint(L, 2); - int model_index2 = luaL_checkint(L, 3); - int shift_x1 = luaL_checkint(L, 4); - int shift_y1 = luaL_checkint(L, 5); - int shift_x2 = luaL_checkint(L, 6); - int shift_y2 = luaL_checkint(L, 7); + int model_index1 = luaL_checkinteger(L, 2); + int model_index2 = luaL_checkinteger(L, 3); + int shift_x1 = luaL_checkinteger(L, 4); + int shift_y1 = luaL_checkinteger(L, 5); + int shift_x2 = luaL_checkinteger(L, 6); + int shift_y2 = luaL_checkinteger(L, 7); Cube *model1 = getModel(L, model_index1); Cube *model2 = getModel(L, model_index2); @@ -139,8 +139,8 @@ script_game_setScreenShift(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int x = luaL_checkint(L, 1); - int y = luaL_checkint(L, 2); + int x = luaL_checkinteger(L, 1); + int y = luaL_checkinteger(L, 2); getLevelScript(L)->room()->setScreenShift(V2(x, y)); END_NOEXCEPTION; return 0; @@ -211,11 +211,11 @@ script_model_addAnim(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); const char *anim_name = luaL_checkstring(L, 2); const char *picture = luaL_checkstring(L, 3); Anim::eSide lookDir = static_cast<Anim::eSide>( - luaL_optint(L, 4, Anim::SIDE_LEFT)); + luaL_optinteger(L, 4, Anim::SIDE_LEFT)); Cube *model = getModel(L, model_index); if (picture[0] == '\0') { @@ -236,9 +236,9 @@ script_model_runAnim(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); const char *anim_name = luaL_checkstring(L, 2); - int phase = luaL_optint(L, 3, 0); + int phase = luaL_optinteger(L, 3, 0); Cube *model = getModel(L, model_index); model->anim()->runAnim(anim_name, phase); @@ -253,9 +253,9 @@ script_model_setAnim(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); const char *anim_name = luaL_checkstring(L, 2); - int phase = luaL_checkint(L, 3); + int phase = luaL_checkinteger(L, 3); Cube *model = getModel(L, model_index); model->anim()->setAnim(anim_name, phase); @@ -272,9 +272,9 @@ script_model_useSpecialAnim(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); const char *anim_name = luaL_checkstring(L, 2); - int phase = luaL_checkint(L, 3); + int phase = luaL_checkinteger(L, 3); Cube *model = getModel(L, model_index); model->anim()->useSpecialAnim(anim_name, phase); @@ -289,7 +289,7 @@ script_model_countAnims(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); const char *anim_name = luaL_checkstring(L, 2); Cube *model = getModel(L, model_index); @@ -310,7 +310,7 @@ script_model_setEffect(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); std::string effectName = luaL_checkstring(L, 2); Cube *model = getModel(L, model_index); model->anim()->setEffect(effectName); @@ -326,7 +326,7 @@ script_model_getLoc(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); V2 loc = model->getLocation(); @@ -346,7 +346,7 @@ script_model_getAction(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); std::string action = model->rules()->getAction(); @@ -363,7 +363,7 @@ script_model_getState(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); std::string state = model->rules()->getState(); @@ -380,7 +380,7 @@ script_model_getDir(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); Dir::eDir dir = model->getLastMoveDir(); @@ -397,7 +397,7 @@ script_model_getTouchDir(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); Dir::eDir dir = model->rules()->getTouchDir(); @@ -414,7 +414,7 @@ script_model_isAlive(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); bool alive = model->isAlive(); @@ -433,7 +433,7 @@ script_model_isOut(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); bool out = model->isOut(); @@ -452,7 +452,7 @@ script_model_isLeft(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); bool left = model->isLeft(); @@ -471,7 +471,7 @@ script_model_isAtBorder(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); bool atBorder = model->rules()->isAtBorder(); @@ -490,7 +490,7 @@ script_model_getW(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); int width = model->shape()->getW(); @@ -509,7 +509,7 @@ script_model_getH(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); int height = model->shape()->getH(); @@ -531,7 +531,7 @@ { //NOTE: (const char*)== does not compare string equality BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); std::string goalname = luaL_checkstring(L, 2); Cube *model = getModel(L, model_index); @@ -570,7 +570,7 @@ script_model_change_turnSide(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); model->change_turnSide(); @@ -586,9 +586,9 @@ script_model_change_setLocation(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); - int x = luaL_checkint(L, 2); - int y = luaL_checkint(L, 3); + int model_index = luaL_checkinteger(L, 1); + int x = luaL_checkinteger(L, 2); + int y = luaL_checkinteger(L, 3); Cube *model = getModel(L, model_index); model->rules()->change_setLocation(V2(x, y)); @@ -604,9 +604,9 @@ script_model_setViewShift(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); - int shift_x = luaL_checkint(L, 2); - int shift_y = luaL_checkint(L, 3); + int model_index = luaL_checkinteger(L, 1); + int shift_x = luaL_checkinteger(L, 2); + int shift_y = luaL_checkinteger(L, 3); Cube *model = getModel(L, model_index); model->anim()->setViewShift(V2(shift_x, shift_y)); @@ -621,7 +621,7 @@ script_model_getViewShift(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); V2 shift = model->anim()->getViewShift(); @@ -639,7 +639,7 @@ script_model_setBusy(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); bool busy = lua_toboolean(L, 2); Cube *model = getModel(L, model_index); model->setBusy(busy); @@ -657,7 +657,7 @@ script_model_getExtraParams(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); Cube *model = getModel(L, model_index); lua_newtable(L); @@ -690,19 +690,19 @@ script_model_change_setExtraParams(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); lua_pushstring(L, "outDir"); lua_gettable(L, 2); - int outDir = luaL_checkint(L, -1); + int outDir = luaL_checkinteger(L, -1); lua_pushstring(L, "outCapacity"); lua_gettable(L, 2); - int outCapacity = luaL_checkint(L, -1); + int outCapacity = luaL_checkinteger(L, -1); lua_pushstring(L, "weight"); lua_gettable(L, 2); - int weight = luaL_checkint(L, -1); + int weight = luaL_checkinteger(L, -1); lua_pushstring(L, "anim"); lua_gettable(L, 2); @@ -729,9 +729,9 @@ script_model_equals(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); - int x = luaL_checkint(L, 2); - int y = luaL_checkint(L, 3); + int model_index = luaL_checkinteger(L, 1); + int x = luaL_checkinteger(L, 2); + int y = luaL_checkinteger(L, 3); Cube *other = getLevelScript(L)->askField(V2(x, y)); bool equals = false; @@ -782,7 +782,7 @@ { BEGIN_NOEXCEPTION; const char *name = luaL_checkstring(L, 1); - int volume = luaL_optint(L, 2, 100); + int volume = luaL_optinteger(L, 2, 100); getLevelScript(L)->playSound(name, volume); END_NOEXCEPTION; diff -Naur fillets-ng-1.0.1-orig/src/level/level-script.cpp fillets-ng-1.0.1-new/src/level/level-script.cpp --- fillets-ng-1.0.1-orig/src/level/level-script.cpp 2009-06-07 00:37:25.000000000 +0300 +++ fillets-ng-1.0.1-new/src/level/level-script.cpp 2021-04-29 03:41:57.227796827 +0300 @@ -136,8 +136,8 @@ script_level_createRoom(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int w = luaL_checkint(L, 1); - int h = luaL_checkint(L, 2); + int w = luaL_checkinteger(L, 1); + int h = luaL_checkinteger(L, 2); const char *picture = luaL_checkstring(L, 3); getLevel(L)->createRoom(w, h, picture); diff -Naur fillets-ng-1.0.1-orig/src/menu/worldmap-script.cpp fillets-ng-1.0.1-new/src/menu/worldmap-script.cpp --- fillets-ng-1.0.1-orig/src/menu/worldmap-script.cpp 2004-09-25 02:00:16.000000000 +0300 +++ fillets-ng-1.0.1-new/src/menu/worldmap-script.cpp 2021-04-29 03:40:32.436798978 +0300 @@ -50,8 +50,8 @@ const char *parent = luaL_checkstring(L, 1); const char *codename = luaL_checkstring(L, 2); const char *datafile = luaL_checkstring(L, 3); - int nodeX = luaL_checkint(L, 4); - int nodeY = luaL_checkint(L, 5); + int nodeX = luaL_checkinteger(L, 4); + int nodeY = luaL_checkinteger(L, 5); bool hidden = lua_toboolean(L, 6); const char *poster = luaL_optstring(L, 7, ""); @@ -88,7 +88,7 @@ { BEGIN_NOEXCEPTION; const char *codename = luaL_checkstring(L, 1); - int moves = luaL_checkint(L, 2); + int moves = luaL_checkinteger(L, 2); const char *author = luaL_checkstring(L, 3); getWorld(L)->bestSolution(codename, moves, author); diff -Naur fillets-ng-1.0.1-orig/src/plan/dialog-script.cpp fillets-ng-1.0.1-new/src/plan/dialog-script.cpp --- fillets-ng-1.0.1-orig/src/plan/dialog-script.cpp 2005-01-19 06:14:25.000000000 +0200 +++ fillets-ng-1.0.1-new/src/plan/dialog-script.cpp 2021-04-29 03:43:37.913794268 +0300 @@ -99,9 +99,9 @@ { BEGIN_NOEXCEPTION; const char *name = luaL_checkstring(L, 1); - int red = luaL_checkint(L, 2); - int green = luaL_checkint(L, 3); - int blue = luaL_checkint(L, 4); + int red = luaL_checkinteger(L, 2); + int green = luaL_checkinteger(L, 3); + int blue = luaL_checkinteger(L, 4); SubTitleAgent::agent()->addFont(name, new Color(red, green, blue)); @@ -137,7 +137,7 @@ script_model_isTalking(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); bool talking = getDialogs(L)->isTalking(model_index); lua_pushboolean(L, talking); @@ -153,10 +153,10 @@ script_model_talk(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); const char *name = luaL_checkstring(L, 2); - int volume = luaL_optint(L, 3, 75); - int loops = luaL_optint(L, 4, 0); + int volume = luaL_optinteger(L, 3, 75); + int loops = luaL_optinteger(L, 4, 0); bool dialogFlag = lua_toboolean(L, 5); getDialogs(L)->actorTalk(model_index, name, volume, loops, dialogFlag); @@ -171,7 +171,7 @@ script_model_killSound(lua_State *L) throw() { BEGIN_NOEXCEPTION; - int model_index = luaL_checkint(L, 1); + int model_index = luaL_checkinteger(L, 1); getDialogs(L)->killSound(model_index); END_NOEXCEPTION; diff -Naur fillets-ng-1.0.1-orig/src/state/demo-script.cpp fillets-ng-1.0.1-new/src/state/demo-script.cpp --- fillets-ng-1.0.1-orig/src/state/demo-script.cpp 2004-09-24 17:09:31.000000000 +0300 +++ fillets-ng-1.0.1-new/src/state/demo-script.cpp 2021-04-29 03:40:16.808799379 +0300 @@ -30,8 +30,8 @@ { BEGIN_NOEXCEPTION; const char *filename = luaL_checkstring(L, 1); - int x = luaL_checkint(L, 2); - int y = luaL_checkint(L, 3); + int x = luaL_checkinteger(L, 2); + int y = luaL_checkinteger(L, 3); Picture *picture = new Picture(Path::dataReadPath(filename), V2(x, y)); getDemo(L)->action_display(picture);
