From 847d1510e8eeb470f89b9f8d874e6692593dc274 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 7 Jun 2024 02:45:44 -0400 Subject: [PATCH] blobby2: update to 1.1.1. devendor desktop file/icon --- srcpkgs/blobby2/files/blobby.desktop | 7 - srcpkgs/blobby2/files/blobby.png | Bin 8151 -> 0 bytes srcpkgs/blobby2/patches/01_sdl_default.patch | 20 --- .../blobby2/patches/02_use_system_lua.patch | 60 ------- .../patches/04_use_system_tinyxml.patch | 74 -------- .../blobby2/patches/07_cxxflags_append.patch | 17 -- .../blobby2/patches/08_config_loading.patch | 170 ------------------ .../blobby2/patches/10_ostream_include.patch | 13 -- .../patches/fix-missing-ctime-include.patch | 10 -- srcpkgs/blobby2/patches/system-deps.patch | 76 ++++++++ srcpkgs/blobby2/template | 16 +- 11 files changed, 82 insertions(+), 381 deletions(-) delete mode 100644 srcpkgs/blobby2/files/blobby.desktop delete mode 100644 srcpkgs/blobby2/files/blobby.png delete mode 100644 srcpkgs/blobby2/patches/01_sdl_default.patch delete mode 100644 srcpkgs/blobby2/patches/02_use_system_lua.patch delete mode 100644 srcpkgs/blobby2/patches/04_use_system_tinyxml.patch delete mode 100644 srcpkgs/blobby2/patches/07_cxxflags_append.patch delete mode 100644 srcpkgs/blobby2/patches/08_config_loading.patch delete mode 100644 srcpkgs/blobby2/patches/10_ostream_include.patch delete mode 100644 srcpkgs/blobby2/patches/fix-missing-ctime-include.patch create mode 100644 srcpkgs/blobby2/patches/system-deps.patch diff --git a/srcpkgs/blobby2/files/blobby.desktop b/srcpkgs/blobby2/files/blobby.desktop deleted file mode 100644 index 1c547d36594..00000000000 --- a/srcpkgs/blobby2/files/blobby.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Blobby Volley -Exec=blobby -Icon=blobby -Categories=Game;ArcadeGame -Terminal=false diff --git a/srcpkgs/blobby2/files/blobby.png b/srcpkgs/blobby2/files/blobby.png deleted file mode 100644 index cb707faf63b1328a2a638d519dee5dfe6a83acef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8151 zcmV;|A1L67P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 - ---- - src/main.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -212,8 +212,8 @@ int main(int argc, char* argv[]) - else - { - std::cerr << "Warning: Unknown renderer selected!"; -- std::cerr << "Falling back to OpenGL" << std::endl; -- rmanager = RenderManager::createRenderManagerGL2D(); -+ std::cerr << "Falling back to SDL" << std::endl; -+ rmanager = RenderManager::createRenderManagerSDL(); - } - #else - #if MAC_OS_X diff --git a/srcpkgs/blobby2/patches/02_use_system_lua.patch b/srcpkgs/blobby2/patches/02_use_system_lua.patch deleted file mode 100644 index adc679248d3..00000000000 --- a/srcpkgs/blobby2/patches/02_use_system_lua.patch +++ /dev/null @@ -1,60 +0,0 @@ -Description: Use system lua library instead of building a local copy -Author: Felix Geyer - ---- - src/CMakeLists.txt | 5 ++--- - src/GameLogic.cpp | 6 +++--- - src/ScriptedInputSource.cpp | 6 +++--- - 3 files changed, 8 insertions(+), 9 deletions(-) - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,4 +1,3 @@ --add_subdirectory(lua) - add_subdirectory(tinyxml) - ADD_DEFINITIONS(-std=c++11) - add_subdirectory(raknet) -@@ -101,11 +101,11 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) - endif (CMAKE_SYSTEM_NAME STREQUAL Windows) - - add_executable(blobby ${blobby_SRC}) --target_link_libraries(blobby lua raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${OPENGL_LIBRARIES} ${SDL2_LIBRARIES} pthread) -+target_link_libraries(blobby lua5.2 raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${OPENGL_LIBRARIES} ${SDL2_LIBRARIES} pthread) - - if (UNIX) - add_executable(blobby-server ${blobby-server_SRC}) -- target_link_libraries(blobby-server lua raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) -+ target_link_libraries(blobby-server lua5.2 raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) - endif (UNIX) - - if (CMAKE_SYSTEM_NAME STREQUAL Windows) ---- a/src/ScriptedInputSource.cpp -+++ b/src/ScriptedInputSource.cpp -@@ -30,9 +30,9 @@ Foundation, Inc., 59 Temple Place, Suite - - extern "C" - { --#include "lua/lua.h" --#include "lua/lauxlib.h" --#include "lua/lualib.h" -+#include -+#include -+#include - } - - #include "DuelMatch.h" ---- a/src/GameLogic.cpp -+++ b/src/GameLogic.cpp -@@ -28,9 +28,9 @@ Foundation, Inc., 59 Temple Place, Suite - - extern "C" - { --#include "lua/lua.h" --#include "lua/lauxlib.h" --#include "lua/lualib.h" -+#include -+#include -+#include - } - - #include "FileRead.h" diff --git a/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch b/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch deleted file mode 100644 index cf49bafcd2b..00000000000 --- a/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch +++ /dev/null @@ -1,74 +0,0 @@ -Description: Use system tinyxml library instead of building a local copy -Author: Felix Geyer - ---- - src/CMakeLists.txt | 1 - - src/FileRead.cpp | 2 +- - src/ReplayRecorder.cpp | 2 +- - src/TextManager.cpp | 2 +- - src/UserConfig.cpp | 2 +- - src/state/NetworkSearchState.cpp | 2 +- - 6 files changed, 5 insertions(+), 6 deletions(-) - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,4 +1,3 @@ --add_subdirectory(tinyxml) - ADD_DEFINITIONS(-std=c++11) - add_subdirectory(raknet) - add_subdirectory(blobnet) ---- a/src/FileRead.cpp -+++ b/src/FileRead.cpp -@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite - #include - #include - --#include "tinyxml/tinyxml.h" -+#include - - extern "C" - { ---- a/src/ReplayRecorder.cpp -+++ b/src/ReplayRecorder.cpp -@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite - - #include - --#include "tinyxml/tinyxml.h" -+#include - - #include "raknet/BitStream.h" - ---- a/src/TextManager.cpp -+++ b/src/TextManager.cpp -@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite - #include - #include - --#include "tinyxml/tinyxml.h" -+#include - - #include "Global.h" - #include "FileRead.h" ---- a/src/UserConfig.cpp -+++ b/src/UserConfig.cpp -@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite - - #include - --#include "tinyxml/tinyxml.h" -+#include - - #include "Global.h" - #include "FileRead.h" ---- a/src/state/NetworkSearchState.cpp -+++ b/src/state/NetworkSearchState.cpp -@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite - #include "blobnet/layer/Http.hpp" - #include "blobnet/exception/HttpException.hpp" - --#include "tinyxml/tinyxml.h" -+#include - - #include "NetworkState.h" - #include "LobbyState.h" diff --git a/srcpkgs/blobby2/patches/07_cxxflags_append.patch b/srcpkgs/blobby2/patches/07_cxxflags_append.patch deleted file mode 100644 index 445cc3eaa9c..00000000000 --- a/srcpkgs/blobby2/patches/07_cxxflags_append.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Append CXXFLAGS instead of overwriting them. - Otherwise the dpkg-buildflags are ignored. -Author: Felix Geyer - ---- blobby-1.0~rc4.orig/src/CMakeLists.txt -+++ blobby-1.0~rc4/src/CMakeLists.txt -@@ -3,8 +3,8 @@ add_subdirectory(raknet) - add_subdirectory(blobnet) - - add_definitions(-DTIXML_USE_STL) --set(CMAKE_CXX_FLAGS "-std=c++11") --set(CMAKE_CXX_FLAGS "-Wall") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") - include_directories(.) - - set(common_SRC diff --git a/srcpkgs/blobby2/patches/08_config_loading.patch b/srcpkgs/blobby2/patches/08_config_loading.patch deleted file mode 100644 index e8f35481432..00000000000 --- a/srcpkgs/blobby2/patches/08_config_loading.patch +++ /dev/null @@ -1,170 +0,0 @@ -Description: Cherry-pick upstream commits 1528, 1530 and 1531. -Origin: upstream - -Index: src/main.cpp -=================================================================== ---- a/src/main.cpp (revision 1529) -+++ b/src/main.cpp (revision 1531) -@@ -26,16 +26,16 @@ - - #include - --#ifndef __APPLE__ --#ifndef __ANDROID__ --#include "config.h" --#endif --#endif -+#include "Global.h" - - #ifdef __APPLE__ - #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR - #include -- #else -+ #endif -+#endif -+ -+#if __DESKTOP__ -+ #ifndef WIN32 - #include "config.h" - #endif - #endif -@@ -99,14 +99,6 @@ - #if defined(WIN32) - // Just write in installation directory - fs.setWriteDir("data"); -- -- // handle the case when it is installed -- fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby"); -- fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/gfx.zip"); -- fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/sounds.zip"); -- fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/scripts.zip"); -- fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/backgrounds.zip"); -- fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/rules.zip"); - #else - #ifndef __ANDROID__ - // Create a search path in the home directory and ensure that -@@ -118,7 +110,16 @@ - std::string userdir = fs.getUserDir(); - #endif - #else -+ // Linux - std::string userdir = fs.getUserDir(); -+ -+ // handle the case when it is installed -+ fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby"); -+ fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/gfx.zip"); -+ fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/sounds.zip"); -+ fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/scripts.zip"); -+ fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/backgrounds.zip"); -+ fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/rules.zip"); - #endif - std::string userAppend = ".blobby"; - std::string homedir = userdir + userAppend; -Index: src/server/servermain.cpp -=================================================================== ---- a/src/server/servermain.cpp (revision 1529) -+++ b/src/server/servermain.cpp (revision 1531) -@@ -36,6 +36,7 @@ - #include "SpeedController.h" - #include "FileSystem.h" - #include "UserConfig.h" -+#include "Global.h" - - // platform specific - #ifndef WIN32 -@@ -45,8 +46,14 @@ - #include - #endif - -+#if __DESKTOP__ -+#ifndef WIN32 -+#include "config.h" -+#endif -+#endif - - -+ - /* implementation */ - - #ifdef WIN32 -@@ -60,7 +67,7 @@ - static bool g_run_in_foreground = false; - static bool g_print_syslog_to_stderr = false; - static bool g_workaround_memleaks = false; --static std::string g_config_file = "server/server.xml"; -+static std::string g_config_file = "server.xml"; - static std::string g_rules_file = ""; - - // ... -@@ -85,8 +92,7 @@ - process_arguments(argc, argv); - - FileSystem fileSys(argv[0]); -- fileSys.addToSearchPath("data" + fileSys.getDirSeparator() + "rules.zip"); -- -+ - if (!g_run_in_foreground) - { - fork_to_background(); -@@ -312,7 +318,15 @@ - void setup_physfs(char* argv0) - { - FileSystem& fs = FileSystem::getSingleton(); -+ -+ #if __DESKTOP__ -+ #ifndef WIN32 -+ fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby"); -+ fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/rules.zip"); -+ #endif -+ #endif - fs.addToSearchPath("data"); -+ fs.addToSearchPath("data" + fs.getDirSeparator() + "rules.zip"); - } - - -Index: data/server/server.xml -=================================================================== ---- a/data/server/server.xml (revision 1529) -+++ b/data/server/server.xml (revision 1531) -@@ -1,10 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -Index: data/server.xml -=================================================================== ---- a/data/server.xml (revision 0) -+++ b/data/server.xml (revision 1531) -@@ -0,0 +1,10 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -Index: data/CMakeLists.txt -=================================================================== ---- a/data/CMakeLists.txt (revision 1527) -+++ b/data/CMakeLists.txt (revision 1531) -@@ -24,9 +24,10 @@ - ${CMAKE_CURRENT_BINARY_DIR}/scripts.zip - ${CMAKE_CURRENT_BINARY_DIR}/backgrounds.zip - ${CMAKE_CURRENT_BINARY_DIR}/rules.zip -+ Icon.bmp - config.xml - inputconfig.xml -- server/server.xml -+ server.xml - lang_de.xml - lang_en.xml - lang_fr.xml) diff --git a/srcpkgs/blobby2/patches/10_ostream_include.patch b/srcpkgs/blobby2/patches/10_ostream_include.patch deleted file mode 100644 index cccd77e8fb2..00000000000 --- a/srcpkgs/blobby2/patches/10_ostream_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: added inlude -Origin: upstream, http://sourceforge.net/p/blobby/code/1542/ - ---- a/src/NetworkMessage.cpp -+++ b/src/NetworkMessage.cpp -@@ -23,6 +23,7 @@ - - /* includes */ - #include -+#include - - #include "UserConfig.h" - #include "SpeedController.h" diff --git a/srcpkgs/blobby2/patches/fix-missing-ctime-include.patch b/srcpkgs/blobby2/patches/fix-missing-ctime-include.patch deleted file mode 100644 index cc21349374f..00000000000 --- a/srcpkgs/blobby2/patches/fix-missing-ctime-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Clock.h -+++ b/src/Clock.h -@@ -21,6 +21,7 @@ - #pragma once - - #include -+#include - - /*! \class Clock - \brief Game Timing Management diff --git a/srcpkgs/blobby2/patches/system-deps.patch b/srcpkgs/blobby2/patches/system-deps.patch new file mode 100644 index 00000000000..e80fad4292e --- /dev/null +++ b/srcpkgs/blobby2/patches/system-deps.patch @@ -0,0 +1,76 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,7 +10,6 @@ + + add_subdirectory(data) + add_subdirectory(src) +-add_subdirectory(deps) + + add_subdirectory(linux) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -82,8 +82,11 @@ + server/servermain.cpp + ) + ++find_package(PkgConfig REQUIRED) + find_package(Boost REQUIRED) + find_package(OpenGL) ++find_package(tinyxml2) ++pkg_check_modules(lua lua5.2) + add_subdirectory(raknet) + add_subdirectory(blobnet) + +@@ -103,7 +103,7 @@ + add_definitions("-DBLOBBY_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/blobby\"") + endif() + +-set(BLOBBY_COMMON_LIBS lua::lua blobnet::blobnet tinyxml2::tinyxml2 PhysFS::PhysFS SDL2::SDL2main SDL2::SDL2 Boost::boost) ++set(BLOBBY_COMMON_LIBS lua5.2 blobnet::blobnet tinyxml2::tinyxml2 PhysFS::PhysFS SDL2::SDL2main SDL2::SDL2 Boost::boost) + + # other additional dependencies + if (NOT WIN32) +--- a/src/FileRead.cpp ++++ b/src/FileRead.cpp +@@ -30,7 +30,7 @@ + #include + + #include "tinyxml2.h" +-#include "lua.hpp" ++#include + + + /* implementation */ +--- a/src/IScriptableComponent.cpp ++++ b/src/IScriptableComponent.cpp +@@ -1,6 +1,6 @@ + #include "IScriptableComponent.h" + +-#include "lua.hpp" ++#include + + #include "Global.h" + #include "GameConstants.h" +--- a/src/GameLogic.cpp ++++ b/src/GameLogic.cpp +@@ -26,7 +26,7 @@ + #include + #include + +-#include "lua.hpp" ++#include + + #include "FileRead.h" + #include "GameLogicState.h" +--- a/src/ScriptedInputSource.cpp ++++ b/src/ScriptedInputSource.cpp +@@ -26,7 +26,7 @@ + + #include + +-#include "lua.hpp" ++#include + + #include "DuelMatch.h" + #include "DuelMatchState.h" diff --git a/srcpkgs/blobby2/template b/srcpkgs/blobby2/template index 4dfebe680c8..c62dcfd8fd6 100644 --- a/srcpkgs/blobby2/template +++ b/srcpkgs/blobby2/template @@ -1,19 +1,15 @@ # Template file for 'blobby2' pkgname=blobby2 -version=1.0 -revision=2 +version=1.1.1 +revision=1 build_style=cmake hostmakedepends="cmake pkg-config zip" -makedepends="boost-devel SDL2-devel physfs-devel tinyxml-devel lua52-devel" +makedepends="boost-devel SDL2-devel physfs-devel tinyxml2-devel lua52-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Arcade style volleyball game" maintainer="selfsigned " license="GPL-2.0-or-later" homepage="http://blobbyvolley.de" -distfiles="${SOURCEFORGE_SITE}/blobby/${pkgname}-linux-${version}.tar.gz" -checksum=ba7a049e298aaa2014c1e1ac1faf3b0256b4c66266cd4db06e7939e8695bf5e2 - -post_install() { - vinstall ${FILESDIR}/blobby.desktop 644 usr/share/applications - vinstall ${FILESDIR}/blobby.png 644 usr/share/pixmaps -} +changelog="https://github.com/danielknobe/blobbyvolley2/raw/master/ChangeLog" +distfiles="${SOURCEFORGE_SITE}/blobby/blobby2-linux-${version}.tar.gz" +checksum=357ee513e69d3b50f67fc063d4acb7959a5fe88977817f0aab14ccc70db214ba