On Mon, August 28, 2023 18:43, Christopher Zimmermann wrote: > Hi, > > I'm looking for oks for this update of games/widelands to 1.1. The PLIST > diff is too large to attach uncompressed, so I include that only in the > attached gzipped diff.
Hi, You've lost a chunk in patch-CMakeLists_txt wich turns off -O3 optimization. BTW, do we need bundled minizip? It builds fine with the system one. No run tests yet. > > Christopher > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/games/widelands/Makefile,v > retrieving revision 1.36 > diff -u -p -r1.36 Makefile > --- Makefile 24 Apr 2023 11:40:42 -0000 1.36 > +++ Makefile 28 Aug 2023 11:52:34 -0000 > @@ -2,8 +2,7 @@ COMMENT = economic and military simulati > > GH_ACCOUNT = widelands > GH_PROJECT = widelands > -GH_TAGNAME = v1.0 > -REVISION = 0 > +GH_TAGNAME = v1.1 > > CATEGORIES = games > > @@ -13,21 +12,19 @@ HOMEPAGE = https://www.widelands.org/ > PERMIT_PACKAGE = Yes > > WANTLIB += ${COMPILER_LIBCXX} GL GLEW SDL2 SDL2_image SDL2_mixer > -WANTLIB += SDL2_ttf boost_unit_test_framework-mt boost_system-mt > -WANTLIB += c curl execinfo iconv icudata icuuc intl m png z > +WANTLIB += SDL2_ttf c execinfo iconv icudata icuuc intl m png z > > # c++11 > COMPILER = base-clang ports-gcc > > -BUILD_DEPENDS = devel/gettext,-tools > -LIB_DEPENDS = devel/boost \ > - devel/gettext,-runtime \ > +BUILD_DEPENDS = devel/asio \ > + devel/gettext,-tools > +LIB_DEPENDS = devel/gettext,-runtime \ > devel/sdl2-image \ > devel/sdl2-mixer \ > devel/sdl2-ttf \ > graphics/png \ > graphics/glew \ > - net/curl \ > textproc/icu4c > RUN_DEPENDS = devel/desktop-file-utils \ > x11/gtk+4,-guic > @@ -40,7 +37,10 @@ MODPY_RUNDEP= No > > CONFIGURE_ARGS = -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands \ > -DWL_INSTALL_BASEDIR=${PREFIX}/share/widelands \ > + -DWL_INSTALL_BINDIR=${PREFIX}/share/widelands \ > + -DWL_INSTALL_MANDIR=${PREFIX}/man \ > -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \ > + -DOPTION_FORCE_EMBEDDED_MINIZIP=ON \ > -DGTK_UPDATE_ICON_CACHE=False \ > -Wno-dev > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/games/widelands/distinfo,v > retrieving revision 1.6 > diff -u -p -r1.6 distinfo > --- distinfo 26 Jun 2021 05:31:16 -0000 1.6 > +++ distinfo 28 Aug 2023 11:52:34 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (widelands-1.0.tar.gz) = HasMQGKHPMcsXgVY+eliCw7xhfGniSOnfEzlue12Axo= > -SIZE (widelands-1.0.tar.gz) = 792124780 > +SHA256 (widelands-1.1.tar.gz) = aFP889rsm2YAVpHlvLADJmNLrwmFrYmn5lEVAmEvZBI= > +SIZE (widelands-1.1.tar.gz) = 416104611 > Index: patches/patch-CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/games/widelands/patches/patch-CMakeLists_txt,v > retrieving revision 1.7 > diff -u -p -r1.7 patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 11 Mar 2022 19:05:11 -0000 1.7 > +++ patches/patch-CMakeLists_txt 28 Aug 2023 11:52:34 -0000 > @@ -1,56 +1,12 @@ > -- Don't set -O3. > - Don't install source docs. > -- Unbreak build with cmake 3.15 > > Index: CMakeLists.txt > --- CMakeLists.txt.orig > +++ CMakeLists.txt > -@@ -192,21 +192,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug") > - endif() > - option(OPTION_ASAN "Build with AddressSanitizer" ON) > - elseif(CMAKE_BUILD_TYPE STREQUAL "Release") > -- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND > (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2)) > -- message(STATUS "GCC >6.2.0 breaks -03, setting -02") > -- set(WL_OPTIMIZE_FLAGS "-O2") > -- else() > -- set(WL_OPTIMIZE_FLAGS "-O3") > -- endif () > - set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE") > - option(OPTION_ASAN "Build with AddressSanitizer" OFF) > - elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") > -- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND > (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2)) > -- message(STATUS "GCC >6.2.0 breaks -03, setting -02") > -- set(WL_OPTIMIZE_FLAGS "-O2") > -- else() > -- set(WL_OPTIMIZE_FLAGS "-O3") > -- endif () > - set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE") > - option(OPTION_ASAN "Build with AddressSanitizer" ON) > - else() > -@@ -255,7 +243,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") > - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-unreachable-code") > - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-documentation") > - > -- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated") > -+ #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated") > - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs") > - > - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments") > -@@ -313,7 +301,7 @@ if(NOT MSVC) > - # Turn some warnings into errors. > - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security") > - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type") > -- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow") > -+# wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow") > - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized") > - > - wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11") > -@@ -469,15 +457,6 @@ install( > - DESTINATION ${WL_INSTALL_BASEDIR} > - CONFIGURATIONS Debug;Release > +@@ -564,15 +564,6 @@ install( > COMPONENT CoreLicenseFiles > --) > -- > + ) > + > -install( > - DIRECTORY > - doc > @@ -58,6 +14,8 @@ Index: CMakeLists.txt > - CONFIGURATIONS Debug > - COMPONENT DocFiles > - PATTERN "CMakeLists.txt" EXCLUDE > - ) > - > - set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES > ${WL_INSTALL_DATADIR}/locale) > +-) > +- > + if(OPTION_BUILD_TRANSLATIONS) > + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES > ${WL_INSTALL_DATADIR}/locale) > + install( > Index: patches/patch-cmake_WlFunctions_cmake > =================================================================== > RCS file: /cvs/ports/games/widelands/patches/patch-cmake_WlFunctions_cmake,v > retrieving revision 1.5 > diff -u -p -r1.5 patch-cmake_WlFunctions_cmake > --- patches/patch-cmake_WlFunctions_cmake 11 Mar 2022 19:05:11 -0000 > 1.5 > +++ patches/patch-cmake_WlFunctions_cmake 28 Aug 2023 11:52:34 -0000 > @@ -1,10 +1,21 @@ > +NOT APPLE is not the same as LINUX > + > Index: cmake/WlFunctions.cmake > --- cmake/WlFunctions.cmake.orig > +++ cmake/WlFunctions.cmake > -@@ -325,5 +325,5 @@ function(wl_binary NAME) > +@@ -101,7 +101,7 @@ macro(_common_compile_tasks) > + endif() > + endif() > > +- if(ARG_USES_ATOMIC AND NOT APPLE AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL > "Clang")) > ++ if(ARG_USES_ATOMIC AND LINUX AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL > "Clang")) > + # clang on linux needs explicit linkage against standard library atomic > + target_link_libraries(${NAME} atomic) > + endif() > +@@ -326,5 +326,5 @@ function(wl_binary NAME) > + > #Quoting the CMake documentation on DESTINATION: > #"If a relative path is given it is interpreted relative to the value of > CMAKE_INSTALL_PREFIX" > -- install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles) > +- install(TARGETS ${NAME} DESTINATION "${WL_INSTALL_BINDIR}" COMPONENT > ExecutableFiles) > + install(TARGETS ${NAME} DESTINATION "bin" COMPONENT ExecutableFiles) > endfunction() > Index: patches/patch-src_base_macros_h > =================================================================== > RCS file: patches/patch-src_base_macros_h > diff -N patches/patch-src_base_macros_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_base_macros_h 28 Aug 2023 11:52:34 -0000 > @@ -0,0 +1,21 @@ > +Index: src/base/macros.h > +--- src/base/macros.h.orig > ++++ src/base/macros.h > +@@ -128,6 +128,9 @@ > + #define PRINTF_FORMAT(b, c) > + #endif > + > ++#ifdef PRIuPTR > ++#define PRIuS PRIuPTR > ++#else > + #ifdef _WIN32 > + #ifdef _WIN64 > + #define PRIuS PRIu64 > +@@ -142,6 +145,7 @@ > + #define PRIuS "lu" > + #else > + #define PRIuS "u" > ++#endif > + #endif > + #endif > + #endif > Index: patches/patch-src_network_bufferedconnection_h > =================================================================== > RCS file: patches/patch-src_network_bufferedconnection_h > diff -N patches/patch-src_network_bufferedconnection_h > --- patches/patch-src_network_bufferedconnection_h 11 Mar 2022 19:05:11 > -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,13 +0,0 @@ > -Fix build with Boost 1.77. > - > -Index: src/network/bufferedconnection.h > ---- src/network/bufferedconnection.h.orig > -+++ src/network/bufferedconnection.h > -@@ -20,6 +20,7 @@ > - #ifndef WL_NETWORK_BUFFEREDCONNECTION_H > - #define WL_NETWORK_BUFFEREDCONNECTION_H > - > -+#include <map> > - #include <memory> > - #include <mutex> > - #include <thread> > Index: patches/patch-xdg_CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/games/widelands/patches/patch-xdg_CMakeLists_txt,v > retrieving revision 1.2 > diff -u -p -r1.2 patch-xdg_CMakeLists_txt > --- patches/patch-xdg_CMakeLists_txt 11 Mar 2022 19:05:11 -0000 1.2 > +++ patches/patch-xdg_CMakeLists_txt 28 Aug 2023 11:52:34 -0000 > @@ -1,22 +1,12 @@ > Index: xdg/CMakeLists.txt > --- xdg/CMakeLists.txt.orig > +++ xdg/CMakeLists.txt > -@@ -6,14 +6,14 @@ set(XDG_APPLICATION_ID "org.widelands.Widelands") > - list(APPEND icon_sizes "16" "32" "48" "64" "128") > - foreach (icon_size ${icon_sizes}) > - #install(FILES > ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION > ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${icon_size}x${icon_size}/apps > RENAME ${XDG_APPLICATION_ID}.png) > -- install(FILES > ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION > ../share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME > ${XDG_APPLICATION_ID}.png) > -+ install(FILES > ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION > share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME > ${XDG_APPLICATION_ID}.png) > +@@ -9,7 +9,7 @@ foreach (icon_size ${icon_sizes}) > + install(FILES > ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION > ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/${icon_size}x${icon_size}/apps > RENAME ${XDG_APPLICATION_ID}.png) > endforeach (icon_size ${icon_sizes}) > #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 > DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) > --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 > DESTINATION ../share/man/man6) > -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 > DESTINATION man/man6) > +-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 > DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6) > ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 > DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6) > #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop > DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) > --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop > DESTINATION ../share/applications) > -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop > DESTINATION share/applications) > + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop > DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) > #install(FILES > ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION > ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) > --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml > DESTINATION ../share/metainfo) > -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml > DESTINATION share/metainfo) > - > - find_program(GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache) > - if (GTK_UPDATE_ICON_CACHE) > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/games/widelands/pkg/PLIST,v > retrieving revision 1.10 > diff -u -p -r1.10 PLIST > --- pkg/PLIST 11 Mar 2022 19:05:11 -0000 1.10 > +++ pkg/PLIST 28 Aug 2023 11:52:34 -0000 > [?] >
