Index: Makefile =================================================================== --- Makefile (revision 552402) +++ Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= devilutionX -PORTVERSION= 1.0.1 +PORTVERSION= 1.1.0 CATEGORIES= games MAINTAINER= benny.goemans@gmail.com @@ -34,8 +34,7 @@ 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 + share/icons/hicolor/512x512/apps/devilutionx.png \ + share/icons/hicolor/512x512/apps/devilutionx_solid.png .include Index: distinfo =================================================================== --- distinfo (revision 552402) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583844955 -SHA256 (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 165564fefdbfd0b4fbf74688ea1beb1d811eb1d8e200b9faad5b70ae2ac7564e -SIZE (diasurgical-devilutionX-1.0.1_GH0.tar.gz) = 2005920 +TIMESTAMP = 1602752246 +SHA256 (diasurgical-devilutionX-1.1.0_GH0.tar.gz) = 395ec298df5383abe60550d45adba5e5811984589ccb1e504891b267b3c467c1 +SIZE (diasurgical-devilutionX-1.1.0_GH0.tar.gz) = 2271614 Index: files/patch-CMakeLists.txt =================================================================== --- files/patch-CMakeLists.txt (revision 552402) +++ files/patch-CMakeLists.txt (working copy) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2020-03-10 14:00:26 UTC +--- CMakeLists.txt.orig 2020-10-15 09:55:17 UTC +++ CMakeLists.txt -@@ -491,7 +491,7 @@ if(WIN32) +@@ -513,7 +513,7 @@ if(WIN32) endif() endif() @@ -9,27 +9,15 @@ # 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 -- 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() +@@ -651,6 +651,11 @@ if(CPACK) + set(CPACK_STRIP_FILES TRUE) + set(CPACK_GENERATOR "DragNDrop") + 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) ++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) - if(SWITCH) - set(APP_TITLE "DevilutionX") + set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) + set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) Index: files/patch-Packaging_fedora_devilutionx.desktop =================================================================== --- files/patch-Packaging_fedora_devilutionx.desktop (revision 552402) +++ files/patch-Packaging_fedora_devilutionx.desktop (working copy) @@ -1,8 +1,8 @@ ---- Packaging/fedora/devilutionx.desktop.orig 2020-03-09 00:37:54 UTC +--- Packaging/fedora/devilutionx.desktop.orig 2020-10-10 22:26:16 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 @@ -11,5 +11,5 @@ +Comment[da]=Spil Diablo I +Comment[hr]=Igrajte Diablo I Exec=devilutionx - Icon=devilutionx.png + Icon=devilutionx Terminal=false