Attachment #218759 for bug #250365

Lines 1-7 Link Here

(-)Makefile (-4 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= devilutionX	3	PORTNAME= devilutionX
4	PORTVERSION= 1.0.1	4	PORTVERSION= 1.1.0
5	CATEGORIES= games	5	CATEGORIES= games
6		6
7	MAINTAINER= benny.goemans@gmail.com	7	MAINTAINER= benny.goemans@gmail.com
Lines 34-41 Link Here
34		34
35	PLIST_FILES= bin/devilutionx \	35	PLIST_FILES= bin/devilutionx \
36	share/applications/devilutionx.desktop \	36	share/applications/devilutionx.desktop \
37	share/icons/hicolor/16x16/apps/devilutionx.png \	37	share/icons/hicolor/512x512/apps/devilutionx.png \
38	share/icons/hicolor/32x32/apps/devilutionx.png \	38	share/icons/hicolor/512x512/apps/devilutionx_solid.png
39	share/icons/hicolor/48x48/apps/devilutionx.png
40		39
41	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1583844955	1	TIMESTAMP = 1602752246
2	SHA256 (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 165564fefdbfd0b4fbf74688ea1beb1d811eb1d8e200b9faad5b70ae2ac7564e	2	SHA256 (diasurgical-devilutionX-1.1.0_GH0.tar.gz) = 395ec298df5383abe60550d45adba5e5811984589ccb1e504891b267b3c467c1
3	SIZE (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 2005920	3	SIZE (diasurgical-devilutionX-1.1.0_GH0.tar.gz) = 2271614




--- CMakeLists.txt.orig	2020-10-15 09:55:17 UTC
+++ CMakeLists.txt
@@ -513,7 +513,7 @@ if(WIN32)
   endif()
 endif()
 

   # Enable POSIX extensions such as `readlink` and `ftruncate`.
   add_definitions(-D_POSIX_C_SOURCE=200809L)
 endif()
@@ -651,6 +651,11 @@ if(CPACK)
     set(CPACK_STRIP_FILES TRUE)
     set(CPACK_GENERATOR "DragNDrop")
   endif()
-  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.
@@ -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/icon.png 		DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/512x512/apps RENAME devilutionx.png)
+install(FILES   Packaging/resources/icon_solid.png 	DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/512x512/apps RENAME devilutionx_solid.png)
+install(FILES   Packaging/resources/Diablo_48.png 	DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png)
 
   set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
   set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})

Lines 1-8 Link Here

(-)files/patch-Packaging_fedora_devilutionx.desktop (-3 / +3 lines)
1	--- Packaging/fedora/devilutionx.desktop.orig 2020-03-09 00:37:54 UTC	1	--- Packaging/fedora/devilutionx.desktop.orig 2020-10-10 22:26:16 UTC
2	+++ Packaging/fedora/devilutionx.desktop	2	+++ Packaging/fedora/devilutionx.desktop
3	@@ -1,9 +1,9 @@	3	@@ -1,9 +1,9 @@
4	[Desktop Entry]	4	[Desktop Entry]
5	Name=devilutionX	5	Name=devilutionx
6	GenericName=DevilutionX	6	GenericName=DevilutionX
7	-Comment=Play Diablo I on Linux	7	-Comment=Play Diablo I on Linux
8	-Comment[da]=Spil Diablo I på Linux	8	-Comment[da]=Spil Diablo I på Linux
Lines 11-15 Link Here
11	+Comment[da]=Spil Diablo I	11	+Comment[da]=Spil Diablo I
12	+Comment[hr]=Igrajte Diablo I	12	+Comment[hr]=Igrajte Diablo I
13	Exec=devilutionx	13	Exec=devilutionx
14	Icon=devilutionx.png	14	Icon=devilutionx
15	Terminal=false	15	Terminal=false

Return to bug 250365

Lines 1-6 Link Here

(-)files/patch-CMakeLists.txt (-22 / +10 lines)
1	--- CMakeLists.txt.orig 2020-03-10 14:00:26 UTC	1	--- CMakeLists.txt.orig 2020-10-15 09:55:17 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -491,7 +491,7 @@ if(WIN32)	3	@@ -513,7 +513,7 @@ if(WIN32)
4	endif()	4	endif()
5	endif()	5	endif()
6		6
Lines 9-35 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	@@ -502,8 +502,8 @@ endif()	12	@@ -651,6 +651,11 @@ if(CPACK)
13		13	set(CPACK_STRIP_FILES TRUE)
14	if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")	14	set(CPACK_GENERATOR "DragNDrop")
15	# Change __FILE__ to only show the path relative to the project folder	15	endif()
16	- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'")
17	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'")
18	+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined")
19	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined")
20
21	if(DEBUG)
22	# Note: For Valgrind suppor.
23	@@ -564,6 +564,12 @@ if(APPLE)
24
25	include(CPack)
26	endif()
27	+	16	+
28	+install(TARGETS devilutionx DESTINATION ${CMAKE_INSTALL_BINDIR})	17	+install(TARGETS devilutionx DESTINATION ${CMAKE_INSTALL_BINDIR})
29	+install(FILES Packaging/fedora/devilutionx.desktop DESTINATION ${CMAKE_INSTALL_SHAREDIR}/applications)	18	+install(FILES Packaging/fedora/devilutionx.desktop DESTINATION ${CMAKE_INSTALL_SHAREDIR}/applications)
30	+install(FILES Packaging/resources/16.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/16x16/apps RENAME devilutionx.png)	19	+install(FILES Packaging/resources/icon.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/512x512/apps RENAME devilutionx.png)
31	+install(FILES Packaging/resources/Diablo_32.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/32x32/apps RENAME devilutionx.png)	20	+install(FILES Packaging/resources/icon_solid.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/512x512/apps RENAME devilutionx_solid.png)
32	+install(FILES Packaging/resources/Diablo_48.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png)
33		21
34	if(SWITCH)	22	set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
35	set(APP_TITLE "DevilutionX")	23	set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})