From ea8bd86610e79690f11303e4f0b6154fcd403ac8 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sun, 11 Oct 2020 02:24:27 -0300
Subject: [PATCH] devilutionX: update to 1.1.0

By ericonr:
- don't define our own do_install
- remove INSTALL.msg (mostly unnecessary)

Closes: #25511 [via git-merge-pr]
---
 srcpkgs/devilutionX/INSTALL.msg               |  1 -
 ...6fe89ea1977aa296277694a6e94314aca0a8.patch | 30 -------------------
 srcpkgs/devilutionX/template                  | 18 ++---------
 3 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/devilutionX/INSTALL.msg
 delete mode 100644 srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch

diff --git a/srcpkgs/devilutionX/INSTALL.msg b/srcpkgs/devilutionX/INSTALL.msg
deleted file mode 100644
index 82d521f6983..00000000000
--- a/srcpkgs/devilutionX/INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-This package does NOT include the Diablo I game data.
diff --git a/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch b/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch
deleted file mode 100644
index 9dfe2413e72..00000000000
--- a/srcpkgs/devilutionX/patches/201c6fe89ea1977aa296277694a6e94314aca0a8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 201c6fe89ea1977aa296277694a6e94314aca0a8 Mon Sep 17 00:00:00 2001
-From: Alex Sweet <sweet.giorni@gmail.com>
-Date: Mon, 23 Mar 2020 01:59:33 -0700
-Subject: [PATCH] Fix ninja-build build error
-
----
- CMakeLists.txt | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a8f0c4492..89051b7bc 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -502,8 +502,14 @@ 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 $<))\"'")
-+  get_target_property(devilution_SRCS devilution SOURCES)
-+  foreach(SOURCE_FILE ${devilution_SRCS} ${devilutionx_SRCS})
-+    set_source_files_properties(${SOURCE_FILE} PROPERTIES
-+      COMPILE_DEFINITIONS __FILE__="${SOURCE_FILE}"
-+    )
-+  endforeach(SOURCE_FILE)
-+  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.
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 43963071c58..dfef90b4f40 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,6 +1,6 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=cmake
 configure_args="-DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
@@ -10,21 +10,9 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=165564fefdbfd0b4fbf74688ea1beb1d811eb1d8e200b9faad5b70ae2ac7564e
-
+checksum=395ec298df5383abe60550d45adba5e5811984589ccb1e504891b267b3c467c1
 nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/25453/steps/shell_3/logs/stdio"
 
-do_install() {
-	vbin build/devilutionx
-	vmkdir usr/share/applications
-	vmkdir usr/share/fonts/truetype
-	vmkdir usr/share/icons/hicolor/16x16/apps
-	vmkdir usr/share/icons/hicolor/32x32/apps
-	vmkdir usr/share/icons/hicolor/48x48/apps
-	vinstall Packaging/fedora/devilutionx.desktop 0644 usr/share/applications
-	vinstall Packaging/resources/CharisSILB.ttf 0644 usr/share/fonts/truetype
-	cp Packaging/resources/16.png ${DESTDIR}/usr/share/icons/hicolor/16x16/apps/devilutionx.png
-	cp Packaging/resources/Diablo_32.png ${DESTDIR}/usr/share/icons/hicolor/32x32/apps/devilutionx.png
-	cp Packaging/resources/Diablo_48.png ${DESTDIR}/usr/share/icons/hicolor/48x48/apps/devilutionx.png
+post_install() {
 	vlicense LICENSE
 }