Date: Mon, 27 Jul 2020 18:53:37 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543545 - in head/games/widelands: . files Message-ID: <202007271853.06RIrbN2044673@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Jul 27 18:53:37 2020 New Revision: 543545 URL: https://svnweb.freebsd.org/changeset/ports/543545 Log: - Update to build21 Added: head/games/widelands/files/patch-src_game__io_game_preload_packet.h (contents, props changed) head/games/widelands/files/patch-src_wui_savegamedata.h (contents, props changed) head/games/widelands/files/patch-xdg_CMakeLists.txt (contents, props changed) Modified: head/games/widelands/Makefile head/games/widelands/distinfo head/games/widelands/files/patch-CMakeLists.txt head/games/widelands/files/patch-cmake_WlFunctions.cmake head/games/widelands/pkg-plist Modified: head/games/widelands/Makefile ============================================================================== --- head/games/widelands/Makefile Mon Jul 27 18:50:49 2020 (r543544) +++ head/games/widelands/Makefile Mon Jul 27 18:53:37 2020 (r543545) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= widelands -DISTVERSION= build20 -PORTREVISION= 6 +DISTVERSION= build21 CATEGORIES= games MASTER_SITES= https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \ - http://mirror.amdmi3.ru/distfiles/ + https://mirror.amdmi3.ru/distfiles/ +EXTRACT_SUFX= -source.tar.gz MAINTAINER= amdmi3@FreeBSD.org COMMENT= Realtime strategy game inspired by Settlers II @@ -18,8 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png \ libicuuc.so:devel/icu \ libboost_regex.so:devel/boost-libs -USES= cmake compiler:c++11-lib gettext gl \ - tar:bzip2 python:build sdl +USES= cmake compiler:c++11-lib gettext gl python:build sdl CMAKE_ARGS= -DWL_INSTALL_BASEDIR="${PREFIX}" \ -DWL_INSTALL_DATADIR="${DATADIR}" \ -DWL_INSTALL_DOCDIR="${DOCSDIR}" \ Modified: head/games/widelands/distinfo ============================================================================== --- head/games/widelands/distinfo Mon Jul 27 18:50:49 2020 (r543544) +++ head/games/widelands/distinfo Mon Jul 27 18:53:37 2020 (r543545) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557150118 -SHA256 (widelands-build20.tar.bz2) = 38594d98c74f357d4c31dd8ee2b056bfe921f42935935af915d11b792677bcb2 -SIZE (widelands-build20.tar.bz2) = 232364340 +TIMESTAMP = 1595332760 +SHA256 (widelands-build21-source.tar.gz) = 601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357 +SIZE (widelands-build21-source.tar.gz) = 381374149 Modified: head/games/widelands/files/patch-CMakeLists.txt ============================================================================== --- head/games/widelands/files/patch-CMakeLists.txt Mon Jul 27 18:50:49 2020 (r543544) +++ head/games/widelands/files/patch-CMakeLists.txt Mon Jul 27 18:53:37 2020 (r543545) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-05-02 05:23:39 UTC +--- CMakeLists.txt.orig 2020-07-12 19:33:44 UTC +++ CMakeLists.txt -@@ -164,7 +164,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") +@@ -202,7 +202,6 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE") option(OPTION_ASAN "Build with AddressSanitizer" ON) else() @@ -8,26 +8,17 @@ endif() wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11") -@@ -181,7 +180,7 @@ endif(OPTION_ASAN) +@@ -219,7 +218,7 @@ endif(OPTION_ASAN) # This is set to avoid linker errors when using GLVND-libs on Linux if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND") -- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL") -+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenGL_GL_LIBRARY}") +- link_libraries("GL") ++ link_libraries(${OpenGL_GL_LIBRARY}) add_compile_definitions(WL_USE_GLVND) message(STATUS "Adding linker flags for GLVND.") endif() -@@ -293,7 +292,7 @@ if (NOT DEFINED WL_VERSION) - else (NOT DEFINED WL_VERSION) - add_custom_target ( - InputRevision ALL -- COMMAND ${CMAKE_COMMAND -DWL_INSTALL_BASEDIR=${WL_INSTALL_BASEDIR} -DWL_VERSION=${WL_VERSION} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/InputRevision.cmake -+ COMMAND ${CMAKE_COMMAND} -DWL_INSTALL_BASEDIR=${WL_INSTALL_BASEDIR} -DWL_VERSION=${WL_VERSION} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/InputRevision.cmake - ) - endif (NOT DEFINED WL_VERSION) +@@ -352,7 +351,7 @@ endif (OPTION_BUILD_TESTS) -@@ -312,7 +311,7 @@ add_custom_target(_run_all_tests ALL - install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION - DESTINATION ${WL_INSTALL_BASEDIR} @@ -35,7 +26,7 @@ CONFIGURATIONS Debug;Release COMPONENT CoreVersionFile ) -@@ -361,10 +360,9 @@ install( +@@ -401,10 +400,9 @@ install( install( FILES @@ -47,7 +38,7 @@ CONFIGURATIONS Debug;Release COMPONENT CoreLicenseFiles ) -@@ -372,7 +370,7 @@ install( +@@ -412,7 +410,7 @@ install( install( DIRECTORY doc Modified: head/games/widelands/files/patch-cmake_WlFunctions.cmake ============================================================================== --- head/games/widelands/files/patch-cmake_WlFunctions.cmake Mon Jul 27 18:50:49 2020 (r543544) +++ head/games/widelands/files/patch-cmake_WlFunctions.cmake Mon Jul 27 18:53:37 2020 (r543545) @@ -1,6 +1,6 @@ ---- cmake/WlFunctions.cmake.orig 2019-05-02 05:23:39 UTC +--- cmake/WlFunctions.cmake.orig 2020-07-12 19:33:44 UTC +++ cmake/WlFunctions.cmake -@@ -270,5 +270,5 @@ function(wl_binary NAME) +@@ -289,5 +289,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" Added: head/games/widelands/files/patch-src_game__io_game_preload_packet.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/widelands/files/patch-src_game__io_game_preload_packet.h Mon Jul 27 18:53:37 2020 (r543545) @@ -0,0 +1,11 @@ +--- src/game_io/game_preload_packet.h.orig 2020-07-12 19:33:44 UTC ++++ src/game_io/game_preload_packet.h +@@ -20,6 +20,8 @@ + #ifndef WL_GAME_IO_GAME_PRELOAD_PACKET_H + #define WL_GAME_IO_GAME_PRELOAD_PACKET_H + ++#include <ctime> ++ + #include "game_io/game_data_packet.h" + #include "logic/game_controller.h" + Added: head/games/widelands/files/patch-src_wui_savegamedata.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/widelands/files/patch-src_wui_savegamedata.h Mon Jul 27 18:53:37 2020 (r543545) @@ -0,0 +1,10 @@ +--- src/wui/savegamedata.h.orig 2020-07-12 19:33:44 UTC ++++ src/wui/savegamedata.h +@@ -2,6 +2,7 @@ + #define WL_WUI_SAVEGAMEDATA_H + + #include <string> ++#include <ctime> + + #include "io/filesystem/filesystem.h" + #include "logic/game_controller.h" Added: head/games/widelands/files/patch-xdg_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/widelands/files/patch-xdg_CMakeLists.txt Mon Jul 27 18:53:37 2020 (r543545) @@ -0,0 +1,27 @@ +--- xdg/CMakeLists.txt.orig 2020-07-12 19:33:44 UTC ++++ xdg/CMakeLists.txt +@@ -5,20 +5,8 @@ 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) + 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}/${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}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/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) +- #install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor ||: )") +- install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/../share/icons/hicolor ||: )") +-else (GTK_UPDATE_ICON_CACHE) +- message(WARNING "gtk-update-icon-cache not found!") +-endif (GTK_UPDATE_ICON_CACHE) ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION share/man/man6) ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION share/applications) ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION share/metainfo) Modified: head/games/widelands/pkg-plist ============================================================================== --- head/games/widelands/pkg-plist Mon Jul 27 18:50:49 2020 (r543544) +++ head/games/widelands/pkg-plist Mon Jul 27 18:53:37 2020 (r543545) @@ -1,51 +1,12 @@ bin/widelands +bin/wl_create_spritesheet bin/wl_map_info bin/wl_map_object_info -@dir %%DATADIR%%/maps/Archipelago_Sea.wmf/scripting -@dir %%DATADIR%%/maps/Atoll.wmf/scripting -@dir %%DATADIR%%/maps/Calvisson.wmf/scripting -@dir %%DATADIR%%/maps/Checkmate.wmf/scripting -@dir %%DATADIR%%/maps/Comet_Island_v2.wmf/scripting -@dir %%DATADIR%%/maps/Crater.wmf/scripting -@dir %%DATADIR%%/maps/Crossing_the_Horizon_v2.wmf/scripting -@dir %%DATADIR%%/maps/Desert_Tournament.wmf/scripting -@dir %%DATADIR%%/maps/Dolomites_v2.wmf/scripting -@dir %%DATADIR%%/maps/Elven_Forests.wmf/scripting -@dir %%DATADIR%%/maps/Fellowships_v2.wmf/scripting -@dir %%DATADIR%%/maps/Finnish_Lakes.wmf/scripting -@dir %%DATADIR%%/maps/Firegames.wmf/scripting -@dir %%DATADIR%%/maps/Four_Castles.wmf/scripting -@dir %%DATADIR%%/maps/Four_Mountains.wmf/scripting -@dir %%DATADIR%%/maps/Full_Moon_v2.wmf/scripting -@dir %%DATADIR%%/maps/Glacier_Lake_v2.wmf/scripting -@dir %%DATADIR%%/maps/Golden_Peninsula.wmf/scripting -@dir %%DATADIR%%/maps/Ice_wars.wmf/scripting -@dir %%DATADIR%%/maps/Impact.wmf/scripting -@dir %%DATADIR%%/maps/Islands_at_War.wmf/scripting -@dir %%DATADIR%%/maps/Kings_and_Queens_v2.wmf/scripting -@dir %%DATADIR%%/maps/Lake_of_Tranquility.wmf/scripting -@dir %%DATADIR%%/maps/Last_Bastion_v2.wmf/scripting -@dir %%DATADIR%%/maps/Last_Survivors.wmf/scripting -@dir %%DATADIR%%/maps/Mystical_Maze.wmf/scripting -@dir %%DATADIR%%/maps/Rendez-Vous.wmf/scripting -@dir %%DATADIR%%/maps/River_Explorers.wmf/scripting -@dir %%DATADIR%%/maps/Riverlands.wmf/scripting -@dir %%DATADIR%%/maps/Sun_of_Fire.wmf/scripting -@dir %%DATADIR%%/maps/Swamp_Island.wmf/scripting -@dir %%DATADIR%%/maps/Swamp_Monks.wmf/scripting -@dir %%DATADIR%%/maps/The_Big_Lake.wmf/scripting -@dir %%DATADIR%%/maps/The_Far_North.wmf/scripting -@dir %%DATADIR%%/maps/The_Long_Way.wmf/scripting -@dir %%DATADIR%%/maps/The_Nile_v2.wmf/scripting -@dir %%DATADIR%%/maps/The_Oasis_Triangle.wmf/scripting -@dir %%DATADIR%%/maps/The_Pass_Through_the_Mountains.wmf/scripting -@dir %%DATADIR%%/maps/The_Thaw.wmf/scripting -@dir %%DATADIR%%/maps/Three_Warriors.wmf/scripting -@dir %%DATADIR%%/maps/Together_We're_Strong.wmf/scripting -@dir %%DATADIR%%/maps/Twin_Lagoons_v2.wmf/scripting -@dir %%DATADIR%%/maps/Twinkling_Waves.wmf/scripting -@dir %%DATADIR%%/maps/Two_Frontiers.wmf/scripting -@dir %%DATADIR%%/maps/Volcanic_Winter.wmf/scripting -@dir %%DATADIR%%/maps/Wideworld.wmf/scripting -@dir %%DATADIR%%/maps/Wisent_Valley.wmf/scripting -@dir %%DATADIR%%/tribes/buildings/markets/barbarians +share/applications/org.widelands.Widelands.desktop +share/icons/hicolor/128x128/apps/org.widelands.Widelands.png +share/icons/hicolor/16x16/apps/org.widelands.Widelands.png +share/icons/hicolor/32x32/apps/org.widelands.Widelands.png +share/icons/hicolor/48x48/apps/org.widelands.Widelands.png +share/icons/hicolor/64x64/apps/org.widelands.Widelands.png +share/man/man6/widelands.6.gz +share/metainfo/org.widelands.Widelands.appdata.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007271853.06RIrbN2044673>