Attachment 210391 Details for Bug 242940 – Patch to upgrade devilutionX to version 1.0.0 and fix issues post review

[patch] Patch to upgrade devilutionX to version 1.0.0 and fix issues post review

patch-devilutionx-1.0.0-post-review (text/plain), 5.52 KB, created by malavon on 2020-01-02 14:22:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: malavon

Created: 2020-01-02 14:22:18 UTC

Size: 5.52 KB

patch

obsolete

>diff --git a/games/devilutionX/Makefile b/games/devilutionX/Makefile
>index e27348beeaaa..52557b947bbc 100644
>--- a/games/devilutionX/Makefile
>+++ b/games/devilutionX/Makefile
>@@ -1,41 +1,41 @@
> # $FreeBSD$
> 
> PORTNAME=	devilutionX
>-PORTVERSION=	0.5.0
>+PORTVERSION=	1.0.0
> PORTREVISION=	0
> CATEGORIES=	games
> 
> MAINTAINER=	benny.goemans@gmail.com
>-COMMENT=	Open-source implementation of Diablo Game engine
>+COMMENT=	Diablo I engine for modern operating systems
> 
> LICENSE=	UNLICENSE
> 
> LIB_DEPENDS=	libsodium.so:security/libsodium
> 
>+BUILD_DEPENDS=	${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf:x11-fonts/charis
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
>+
> USES=		cmake compiler:c++11-lang dos2unix sdl
> USE_SDL=	mixer2 sdl2 ttf2
>-
>-PLIST_FILES=	bin/devilutionx
>+DOS2UNIX_GLOB=  *.c *.h CMakeLists.txt
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	diasurgical
> 
>+CMAKE_ARGS+=	-D CMAKE_CXX_FLAGS=-DTTF_FONT_PATH=\"${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf\" \
>+		-D CMAKE_INSTALL_BINDIR:PATH=${BINDIR} \
>+		-D CMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \
>+		-D GIT_TAG=${PORTVERSION}
>+
> OPTIONS_DEFAULT=	RELEASE
> 
> OPTIONS_SINGLE=		TYPE
> OPTIONS_SINGLE_TYPE=	NIGHTLY RELEASE
> 
>-RELEASE_DESC=	Build a release build
>-NIGHTLY_DESC=	Build a debug build
>+RELEASE_DESC=		Build a release build
>+NIGHTLY_DESC=		Build a debug build
> 
> RELEASE_CMAKE_BOOL=	BINARY_RELEASE
> NIGHTLY_CMAKE_BOOL=	NIGHTLY_BUILD
> 
>-DESKTOP_ENTRIES=	"DevilutionX" \
>-			"" \
>-			"" \
>-			"devilutionx" \
>-			"Game;AdventureGame;" \
>-			false
>-
> .include <bsd.port.mk>
>diff --git a/games/devilutionX/distinfo b/games/devilutionX/distinfo
>index bcab00f5633b..01598271b6b5 100644
>--- a/games/devilutionX/distinfo
>+++ b/games/devilutionX/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1570734030
>-SHA256 (diasurgical-devilutionX-0.5.0_GH0.tar.gz) = 45f779084aa7459880e5eab1bf3d63dcd223d937485a840dc055e7d1e8eace5c
>-SIZE (diasurgical-devilutionX-0.5.0_GH0.tar.gz) = 1767600
>+TIMESTAMP = 1577908977
>+SHA256 (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = fafb0bac935bbbee8e261d7fbd2d4ea769b88bbc78ba1affef74064a2cc77779
>+SIZE (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = 1798349
>diff --git a/games/devilutionX/files/patch-CMakeLists.txt b/games/devilutionX/files/patch-CMakeLists.txt
>index e7d501226325..76d3e8f6fbec 100644
>--- a/games/devilutionX/files/patch-CMakeLists.txt
>+++ b/games/devilutionX/files/patch-CMakeLists.txt
>@@ -1,16 +1,15 @@
>---- CMakeLists.txt.orig	2019-10-11 23:27:07 UTC
>+--- CMakeLists.txt.orig	2019-12-27 15:25:22 UTC
> +++ CMakeLists.txt
>-@@ -68,6 +68,9 @@ list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DI
>- if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
>-   set(ASAN OFF)
>-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
>-+  add_definitions(-D__BSD_VISIBLE=1)
>-+  add_definitions(-D__POSIX_VISIBLE=200809L)
>-+  add_definitions(-D__XSI_VISIBLE=1)
>+@@ -326,7 +326,7 @@ if(WIN32)
>+   endif()
>  endif()
>  
>- if(WIN32)
>-@@ -337,8 +340,8 @@ 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()
>  
>  if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
>    # Change __FILE__ to only show the path relative to the project folder
>@@ -21,12 +20,13 @@
>  
>    if(DEBUG)
>      # Note: For Valgrind suppor.
>-@@ -368,6 +371,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
>-   # Silence appfat.cpp warnings
>-   set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wno-narrowing")
>+@@ -399,3 +399,9 @@ if(APPLE)
>+ 
>+   include(CPack)
>  endif()
> +
>-+install(TARGETS devilutionx DESTINATION ${BINDIR})
>- 
>- if(APPLE)
>-   set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
>++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)
>diff --git a/games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop b/games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop
>new file mode 100644
>index 000000000000..1701e566bf25
>--- /dev/null
>+++ b/games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop
>@@ -0,0 +1,18 @@
>+--- Packaging/fedora/devilutionx.desktop.orig	2019-12-27 16:29:35 UTC
>++++ Packaging/fedora/devilutionx.desktop
>+@@ -1,11 +1,11 @@
>+ [Desktop Entry]
>+-Name=devilutionX
>++Name=DevilutionX
>+ GenericName=DevilutionX
>+-Comment=Play Diablo I on Linux
>++Comment=Play Diablo I
>+ Exec=devilutionx
>+-Icon=devilutionx.png
>++Icon=devilutionx
>+ Terminal=false
>+ Type=Application
>+ X-DCOP-ServiceType=Multi
>+ X-KDE-StartupNotify=true
>+-Categories=Qt;Game;RolePlaying;
>++Categories=Game;RolePlaying;
>diff --git a/games/devilutionX/pkg-plist b/games/devilutionX/pkg-plist
>new file mode 100644
>index 000000000000..04a1c59629bb
>--- /dev/null
>+++ b/games/devilutionX/pkg-plist
>@@ -0,0 +1,5 @@
>+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

Flags:

benny.goemans: maintainer-approval+

Actions: View | Diff

Attachments on bug 242940: 210282 | 210283 | 210375 | 210391 | 210393