Remove upstreamed patch

3 files changed, 4 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5229c01f1fe1..ba014b5204c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lincity-ng-git
 	pkgdesc = A city simulation game (development version)
-	pkgver = 2.9.0.r144.gd4066f9e
+	pkgver = 2.9.0.r151.g6e92aa57
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/lincity-ng/lincity-ng
@@ -23,8 +23,6 @@ pkgbase = lincity-ng-git
 	provides = lincity-ng=2.9.0
 	conflicts = lincity-ng
 	source = lincity-ng::git+https://github.com/lincity-ng/lincity-ng
-	source = fix_xml_eisdir.patch
 	sha256sums = SKIP
-	sha256sums = 6f034a0628ebcbeaafdd5e00fe911132eacd4e67ab1792752960e035ce117186
 
 pkgname = lincity-ng-git
diff --git a/PKGBUILD b/PKGBUILD
index 57dfab54e745..7bc7a8a12fbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=lincity-ng
 pkgname=${_pkgname}-git
 epoch=1
-pkgver=2.9.0.r144.gd4066f9e
+pkgver=2.9.0.r151.g6e92aa57
 pkgrel=1
 pkgdesc="A city simulation game (development version)"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
@@ -14,21 +14,14 @@ conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver%.r*}")
 depends=('sdl2_mixer' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx' 'physfs' 'libxml2' 'libgl')
 makedepends=('git' 'cmake' 'mesa' 'glu')
-source=("${_pkgname}::git+${url}"
-        "fix_xml_eisdir.patch") #https://github.com/lincity-ng/lincity-ng/pull/102
-sha256sums=('SKIP'
-            '6f034a0628ebcbeaafdd5e00fe911132eacd4e67ab1792752960e035ce117186')
+source=("${_pkgname}::git+${url}")
+sha256sums=('SKIP')
 
 pkgver() {
   cd ${_pkgname}
   git describe --long --tags | sed 's/^lincity-ng-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare () {
-  cd ${_pkgname}
-  patch -uNp1 -r- -i ../fix_xml_eisdir.patch
-}
-  
 build () {
   cd ${_pkgname}
   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
diff --git a/fix_xml_eisdir.patch b/fix_xml_eisdir.patch
deleted file mode 100644
index f18a7258bbe8..000000000000
--- a/fix_xml_eisdir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5ec1a353148baababa8b727d181b735f8a40d854 Mon Sep 17 00:00:00 2001
-From: dbear496 <70439542+dbear496@users.noreply.github.com>
-Date: Fri, 19 Jan 2024 21:13:06 -0500
-Subject: [PATCH 1/3] install data+info files from binary dir
-
----
- data/CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index d5a707a1..7a1e0eb9 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -22,7 +22,8 @@ foreach(dataFile ${allDataFiles})
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-     COMMENT "copying ${dataFile} to build directory"
-   )
--  install(FILES ${dataFile} DESTINATION ${CMAKE_INSTALL_APPDATADIR}/${dataFile})
-+  cmake_path(GET dataFile PARENT_PATH dataFileDst)
-+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${dataFile} DESTINATION ${CMAKE_INSTALL_APPDATADIR}/${dataFileDst})
- endforeach()
- add_custom_target(allDataFiles.target DEPENDS ${allDataFiles})
- add_dependencies(lincity-ng allDataFiles.target)
-@@ -91,7 +92,8 @@ foreach(infoFile ${infoFiles})
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-     COMMENT "copying ${infoFile} to build directory"
-   )
--  install(FILES ${infoFile} DESTINATION ${CMAKE_INSTALL_APPDATADIR}/${infoFile})
-+  cmake_path(GET infoFile PARENT_PATH infoFileDst)
-+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${infoFile} DESTINATION ${CMAKE_INSTALL_APPDATADIR}/${infoFileDst})
- endforeach()
- add_custom_target(infoFiles.target DEPENDS ${infoFiles})
- add_dependencies(lincity-ng infoFiles.target)