Attachment #212309 for bug #244722

View | Details | Raw Unified | Return to bug 244722
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/games/devilutionX/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= devilutionX	3	PORTNAME= devilutionX
4	PORTVERSION= 1.0.0	4	PORTVERSION= 1.0.1
5	CATEGORIES= games	5	CATEGORIES= games
6		6
7	MAINTAINER= benny.goemans@gmail.com	7	MAINTAINER= benny.goemans@gmail.com

Lines 1-3 Link Here

(-)b/games/devilutionX/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1577908977	1	TIMESTAMP = 1583844955
2	SHA256 (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = fafb0bac935bbbee8e261d7fbd2d4ea769b88bbc78ba1affef74064a2cc77779	2	SHA256 (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 165564fefdbfd0b4fbf74688ea1beb1d811eb1d8e200b9faad5b70ae2ac7564e
3	SIZE (diasurgical-devilutionX-1.0.0_GH0.tar.gz) = 1798349	3	SIZE (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 2005920

Lines 1-4 Link Here

(-)b/games/devilutionX/files/patch-3rdParty_StormLib_src_StormPort.h (-1 / +9 lines)
1	--- 3rdParty/StormLib/src/StormPort.h.orig 2019-10-11 11:58:58 UTC	1	--- 3rdParty/StormLib/src/StormPort.h.orig 2020-03-10 14:00:26 UTC
2	+++ 3rdParty/StormLib/src/StormPort.h	2	+++ 3rdParty/StormLib/src/StormPort.h
3	@@ -165,6 +165,7 @@	3	@@ -165,6 +165,7 @@
4	#include <ctype.h>	4	#include <ctype.h>
Lines 6-10 Link Here
6	#include <errno.h>	6	#include <errno.h>
7	+ #include <strings.h>	7	+ #include <strings.h>
8		8
		9	#ifndef __BIG_ENDIAN__
		10	#define PLATFORM_LITTLE_ENDIAN
		11	@@ -193,6 +194,7 @@
		12	#include <ctype.h>
		13	#include <assert.h>
		14	#include <errno.h>
		15	+ #include <strings.h>
		16
9	#ifndef __BIG_ENDIAN__	17	#ifndef __BIG_ENDIAN__
10	#define PLATFORM_LITTLE_ENDIAN	18	#define PLATFORM_LITTLE_ENDIAN




--- CMakeLists.txt.orig	2020-03-10 14:00:26 UTC
+++ CMakeLists.txt
@@ -491,7 +491,7 @@ if(WIN32)
   endif()
 endif()
 

   # Enable POSIX extensions such as `readlink` and `ftruncate`.
   add_definitions(-D_POSIX_C_SOURCE=200809L)
 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

 
   if(DEBUG)
     # Note: For Valgrind suppor.
@@ -564,6 +564,12 @@ if(APPLE)
 
   include(CPack)
 endif()

+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")




--- Packaging/fedora/devilutionx.desktop.orig	2020-03-09 00:37:54 UTC
+++ Packaging/fedora/devilutionx.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 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
 Terminal=false
 Type=Application
 X-DCOP-ServiceType=Multi
 X-KDE-StartupNotify=true
-Categories=Qt;Game;RolePlaying;
+Categories=Game;RolePlaying;

Return to bug 244722

Lines 1-6 Link Here

(-)b/games/devilutionX/files/patch-CMakeLists.txt (-4 / +7 lines)
1	--- CMakeLists.txt.orig 2019-12-27 15:25:22 UTC	1	--- CMakeLists.txt.orig 2020-03-10 14:00:26 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -326,7 +326,7 @@ if(WIN32)	3	@@ -491,7 +491,7 @@ if(WIN32)
4	endif()	4	endif()
5	endif()	5	endif()
6		6
Lines 9-15 Link Here
9	# Enable POSIX extensions such as `readlink` and `ftruncate`.	9	# Enable POSIX extensions such as `readlink` and `ftruncate`.
10	add_definitions(-D_POSIX_C_SOURCE=200809L)	10	add_definitions(-D_POSIX_C_SOURCE=200809L)
11	endif()	11	endif()
12	@@ -337,8 +337,8 @@ endif()	12	@@ -502,8 +502,8 @@ endif()
13		13
14	if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")	14	if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
15	# Change __FILE__ to only show the path relative to the project folder	15	# Change __FILE__ to only show the path relative to the project folder
Lines 20-26 Link Here
20		20
21	if(DEBUG)	21	if(DEBUG)
22	# Note: For Valgrind suppor.	22	# Note: For Valgrind suppor.
23	@@ -399,3 +399,9 @@ if(APPLE)	23	@@ -564,6 +564,12 @@ if(APPLE)
24		24
25	include(CPack)	25	include(CPack)
26	endif()	26	endif()
Lines 30-32 Link Here
30	+install(FILES Packaging/resources/16.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/16x16/apps RENAME devilutionx.png)	30	+install(FILES Packaging/resources/16.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/16x16/apps RENAME devilutionx.png)
31	+install(FILES Packaging/resources/Diablo_32.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/32x32/apps RENAME devilutionx.png)	31	+install(FILES Packaging/resources/Diablo_32.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/32x32/apps RENAME devilutionx.png)
32	+install(FILES Packaging/resources/Diablo_48.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png)	32	+install(FILES Packaging/resources/Diablo_48.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png)
		33
		34	if(SWITCH)
		35	set(APP_TITLE "DevilutionX")

Lines 1-18 Link Here

(-)b/games/devilutionX/files/patch-Packaging_fedora_devilutionx.desktop (-11 / +8 lines)
1	--- Packaging/fedora/devilutionx.desktop.orig 2019-12-27 16:29:35 UTC	1	--- Packaging/fedora/devilutionx.desktop.orig 2020-03-09 00:37:54 UTC
2	+++ Packaging/fedora/devilutionx.desktop	2	+++ Packaging/fedora/devilutionx.desktop
3	@@ -1,11 +1,11 @@	3	@@ -1,9 +1,9 @@
4	[Desktop Entry]	4	[Desktop Entry]
5	-Name=devilutionX	5	Name=devilutionX
6	+Name=DevilutionX
7	GenericName=DevilutionX	6	GenericName=DevilutionX
8	-Comment=Play Diablo I on Linux	7	-Comment=Play Diablo I on Linux
		8	-Comment[da]=Spil Diablo I på Linux
		9	-Comment[hr]=Igrajte Diablo I na Linuxu
9	+Comment=Play Diablo I	10	+Comment=Play Diablo I
		11	+Comment[da]=Spil Diablo I
		12	+Comment[hr]=Igrajte Diablo I
10	Exec=devilutionx	13	Exec=devilutionx
11	-Icon=devilutionx.png	14	Icon=devilutionx.png
12	+Icon=devilutionx
13	Terminal=false	15	Terminal=false
14	Type=Application
15	X-DCOP-ServiceType=Multi
16	X-KDE-StartupNotify=true
17	-Categories=Qt;Game;RolePlaying;
18	+Categories=Game;RolePlaying;