Index: head/games/devilutionX/Makefile =================================================================== --- head/games/devilutionX/Makefile (revision 529056) +++ head/games/devilutionX/Makefile (revision 529057) @@ -1,41 +1,41 @@ # $FreeBSD$ PORTNAME= devilutionX -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= games MAINTAINER= benny.goemans@gmail.com COMMENT= Diablo I engine for modern operating systems LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= ${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf:x11-fonts/charis BUILD_DEPENDS= ${MY_DEPENDS} LIB_DEPENDS= libsodium.so:security/libsodium RUN_DEPENDS= ${MY_DEPENDS} USES= cmake compiler:c++11-lang dos2unix sdl DOS2UNIX_GLOB= *.c *.h CMakeLists.txt USE_GITHUB= yes GH_ACCOUNT= diasurgical USE_SDL= mixer2 sdl2 ttf2 CMAKE_ARGS= -DCMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \ -DGIT_TAG=${PORTVERSION} .if defined(WITH_DEBUG) CMAKE_ON= NIGHTLY_BUILD .else CMAKE_ON= BINARY_RELEASE .endif CXXFLAGS+= -DTTF_FONT_PATH=\\\"${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf\\\" PLIST_FILES= bin/devilutionx \ share/applications/devilutionx.desktop \ share/icons/hicolor/16x16/apps/devilutionx.png \ share/icons/hicolor/32x32/apps/devilutionx.png \ share/icons/hicolor/48x48/apps/devilutionx.png .include Index: head/games/devilutionX/distinfo =================================================================== --- head/games/devilutionX/distinfo (revision 529056) +++ head/games/devilutionX/distinfo (revision 529057) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577908977 -SHA256 (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = fafb0bac935bbbee8e261d7fbd2d4ea769b88bbc78ba1affef74064a2cc77779 -SIZE (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = 1798349 +TIMESTAMP = 1583844955 +SHA256 (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 165564fefdbfd0b4fbf74688ea1beb1d811eb1d8e200b9faad5b70ae2ac7564e +SIZE (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 2005920 Index: head/games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h =================================================================== --- head/games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h (revision 529056) +++ head/games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h (revision 529057) @@ -1,10 +1,18 @@ ---- 3rdParty/StormLib/src/StormPort.h.orig 2019-10-11 11:58:58 UTC +--- 3rdParty/StormLib/src/StormPort.h.orig 2020-03-10 14:00:26 UTC +++ 3rdParty/StormLib/src/StormPort.h @@ -165,6 +165,7 @@ + #include + #include + #include ++ #include + + #ifndef __BIG_ENDIAN__ + #define PLATFORM_LITTLE_ENDIAN +@@ -193,6 +194,7 @@ #include #include #include + #include #ifndef __BIG_ENDIAN__ #define PLATFORM_LITTLE_ENDIAN Index: head/games/devilutionX/files/patch-CMakeLists.txt =================================================================== --- head/games/devilutionX/files/patch-CMakeLists.txt (revision 529056) +++ head/games/devilutionX/files/patch-CMakeLists.txt (revision 529057) @@ -1,32 +1,35 @@ ---- CMakeLists.txt.orig 2019-12-27 15:25:22 UTC +--- CMakeLists.txt.orig 2020-03-10 14:00:26 UTC +++ CMakeLists.txt -@@ -326,7 +326,7 @@ if(WIN32) +@@ -491,7 +491,7 @@ if(WIN32) endif() endif() -if(NOT WIN32 AND NOT APPLE) +if(NOT WIN32 AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD) # Enable POSIX extensions such as `readlink` and `ftruncate`. add_definitions(-D_POSIX_C_SOURCE=200809L) endif() -@@ -337,8 +337,8 @@ endif() +@@ -502,8 +502,8 @@ endif() if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC") # Change __FILE__ to only show the path relative to the project folder - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined") if(DEBUG) # Note: For Valgrind suppor. -@@ -399,3 +399,9 @@ if(APPLE) +@@ -564,6 +564,12 @@ if(APPLE) include(CPack) endif() + +install(TARGETS devilutionx DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(FILES Packaging/fedora/devilutionx.desktop DESTINATION ${CMAKE_INSTALL_SHAREDIR}/applications) +install(FILES Packaging/resources/16.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/16x16/apps RENAME devilutionx.png) +install(FILES Packaging/resources/Diablo_32.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/32x32/apps RENAME devilutionx.png) +install(FILES Packaging/resources/Diablo_48.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png) + + if(SWITCH) + set(APP_TITLE "DevilutionX") Index: head/games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop =================================================================== --- head/games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop (revision 529056) +++ head/games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop (revision 529057) @@ -1,18 +1,15 @@ ---- Packaging/fedora/devilutionx.desktop.orig 2019-12-27 16:29:35 UTC +--- Packaging/fedora/devilutionx.desktop.orig 2020-03-09 00:37:54 UTC +++ Packaging/fedora/devilutionx.desktop -@@ -1,11 +1,11 @@ +@@ -1,9 +1,9 @@ [Desktop Entry] --Name=devilutionX -+Name=DevilutionX + Name=devilutionX GenericName=DevilutionX -Comment=Play Diablo I on Linux +-Comment[da]=Spil Diablo I på Linux +-Comment[hr]=Igrajte Diablo I na Linuxu +Comment=Play Diablo I ++Comment[da]=Spil Diablo I ++Comment[hr]=Igrajte Diablo I Exec=devilutionx --Icon=devilutionx.png -+Icon=devilutionx + Icon=devilutionx.png Terminal=false - Type=Application - X-DCOP-ServiceType=Multi - X-KDE-StartupNotify=true --Categories=Qt;Game;RolePlaying; -+Categories=Game;RolePlaying;