Update to widelands-1.0.
Release notes: https://www.widelands.org/news/2021/Jun/15/widelands-1-0-released/ One less py2 consumer. Switch HOMEPAGE to https while here.
This commit is contained in:
kirby
parent
565d5e9e11
commit
f91af10450
@ -1,22 +1,21 @@
|
||||
# $OpenBSD: Makefile,v 1.33 2021/06/09 19:50:08 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.34 2021/06/26 05:31:16 kirby Exp $
|
||||
|
||||
COMMENT = economic and military simulation game
|
||||
|
||||
V = 21
|
||||
DISTNAME = widelands-build${V}-source
|
||||
PKGNAME = widelands-0.${V}
|
||||
CATEGORIES = games
|
||||
REVISION = 0
|
||||
GH_ACCOUNT = widelands
|
||||
GH_PROJECT = widelands
|
||||
GH_TAGNAME = v1.0
|
||||
|
||||
HOMEPAGE = https://wl.widelands.org/
|
||||
MASTER_SITES = https://launchpad.net/widelands/build${V}/build${V}/+download/
|
||||
CATEGORIES = games
|
||||
|
||||
HOMEPAGE = https://www.widelands.org/
|
||||
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} GL GLEW SDL2 SDL2_image SDL2_mixer
|
||||
WANTLIB += SDL2_ttf boost_regex-mt boost_unit_test_framework-mt boost_system-mt
|
||||
WANTLIB += c execinfo iconv icuuc intl m png z
|
||||
WANTLIB += SDL2_ttf boost_unit_test_framework-mt boost_system-mt
|
||||
WANTLIB += c curl execinfo iconv icudata icuuc intl m png z
|
||||
|
||||
# c++11
|
||||
COMPILER = base-clang ports-gcc
|
||||
@ -29,18 +28,22 @@ LIB_DEPENDS = devel/boost \
|
||||
devel/sdl2-ttf \
|
||||
graphics/png \
|
||||
graphics/glew \
|
||||
net/curl \
|
||||
textproc/icu4c
|
||||
RUN_DEPENDS = devel/desktop-file-utils \
|
||||
x11/gtk+3,-guic
|
||||
|
||||
MODULES = devel/cmake \
|
||||
lang/lua \
|
||||
lang/python
|
||||
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
|
||||
|
||||
MODPY_RUNDEP= No
|
||||
|
||||
CONFIGURE_ARGS = -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands \
|
||||
-DWL_INSTALL_BASEDIR=${PREFIX}/share/widelands \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
|
||||
-DGTK_UPDATE_ICON_CACHE=False \
|
||||
-Wno-dev
|
||||
|
||||
CONFIGURE_ENV = LDFLAGS="${LDFLAGS} -lGL -lexecinfo -lintl -liconv \
|
||||
-L${LOCALBASE}/lib -L${X11BASE}/lib"
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (widelands-build21-source.tar.gz) = YB4OTG+Rs/sOzizRuD7PsCNEobkZT7tw7z9w4GmU41c=
|
||||
SIZE (widelands-build21-source.tar.gz) = 381374149
|
||||
SHA256 (widelands-1.0.tar.gz) = HasMQGKHPMcsXgVY+eliCw7xhfGniSOnfEzlue12Axo=
|
||||
SIZE (widelands-1.0.tar.gz) = 792124780
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.5 2020/07/31 16:09:38 kirby Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.6 2021/06/26 05:31:16 kirby Exp $
|
||||
|
||||
- Don't set -O3.
|
||||
- Don't install source docs.
|
||||
@ -7,8 +7,8 @@ $OpenBSD: patch-CMakeLists_txt,v 1.5 2020/07/31 16:09:38 kirby Exp $
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -184,21 +184,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(WL_DEBUG_FLAGS "-g -DDEBUG")
|
||||
@@ -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))
|
||||
@ -29,7 +29,7 @@ Index: CMakeLists.txt
|
||||
set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
|
||||
option(OPTION_ASAN "Build with AddressSanitizer" ON)
|
||||
else()
|
||||
@@ -248,7 +236,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
@@ -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")
|
||||
|
||||
@ -38,16 +38,16 @@ Index: CMakeLists.txt
|
||||
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs")
|
||||
|
||||
wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Qunused-arguments")
|
||||
@@ -299,7 +287,7 @@ endif()
|
||||
# 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")
|
||||
@@ -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")
|
||||
|
||||
IF (WIN32)
|
||||
@@ -407,15 +395,6 @@ install(
|
||||
wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
|
||||
@@ -469,15 +457,6 @@ install(
|
||||
DESTINATION ${WL_INSTALL_BASEDIR}
|
||||
CONFIGURATIONS Debug;Release
|
||||
COMPONENT CoreLicenseFiles
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-cmake_WlFunctions_cmake,v 1.3 2020/07/31 16:09:38 kirby Exp $
|
||||
$OpenBSD: patch-cmake_WlFunctions_cmake,v 1.4 2021/06/26 05:31:16 kirby Exp $
|
||||
|
||||
Index: cmake/WlFunctions.cmake
|
||||
--- cmake/WlFunctions.cmake.orig
|
||||
+++ cmake/WlFunctions.cmake
|
||||
@@ -289,5 +289,5 @@ function(wl_binary NAME)
|
||||
@@ -325,5 +325,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"
|
||||
|
||||
24
games/widelands/patches/patch-xdg_CMakeLists_txt
Normal file
24
games/widelands/patches/patch-xdg_CMakeLists_txt
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-xdg_CMakeLists_txt,v 1.1 2021/06/26 05:31:16 kirby Exp $
|
||||
|
||||
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)
|
||||
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}/${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}.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)
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user