remove unnecesary patch

1 files changed, 14 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7f9590473ccf..d9093c794d46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,58 +16,52 @@ optdepends=('soundfont-fluid: Default MIDI soundfont for music'
             'simutrans-extended-pak128.sweden: High resolution graphics set for Simutrans Extended, with a swedish theme'
             'simutrans-extended-pak256: Highest resolution graphics set for Simutrans Extended')
 conflicts=('simutrans-extended')
-source=(git+https://github.com/jamespetts/simutrans-extended/
-        https://raw.githubusercontent.com/aburch/simutrans/8593f5b1248d03f907a149f7abc41ae6512009e1/simutrans.svg
+source=($pkgname::git+https://github.com/jamespetts/simutrans-extended/
         settings-folder.patch
         path-for-game-data.patch
         simutrans-extended.desktop
-        miniupnpc.patch
         "How to add files and paksets.md")
 sha256sums=('SKIP'
-            'c0c2dd5da146f64901b00c6ee67e0818a166b983a81cee7897c4843aa9f21c81'
             '7ed69019ba97849b65e2b8ac5ad8bf2110a7f048e3590d67c76c9cfca8a10b8d'
             'd1609eb40c9bbcdb6f13e10d1150f7995700249053aaa56da8b4a0aaf24f7260'
             '0efcf72d3670c53de99c44cb0d8f43f7e7663fda5df0f631ba6c687cc85967d3'
-            'b62cfde4070e533825b8800738ef191cb144f081ee91a195ca4f5c28cc024538'
             '1707b5adff4174af173ac4d7a5cab1fbcda9245e55c0149ed5c3274e7bfc586c')
 
 prepare() {
-  cd simutrans-extended
+  cd $pkgname
 
   # Adjust paths
   patch -Np0 -i ../settings-folder.patch
   patch -Np0 -i ../path-for-game-data.patch
-
-  # Configure the build process
-  patch -Np0 -i ../miniupnpc.patch
 }
 
 build() {
-  cd simutrans-extended
-  mkdir build
-  cd build
-  cmake -DSIMUTRANS_USE_FREETYPE=ON ..
-  make
+  cd $pkgname
+  cmake -S . -B build 
+  cmake build -DCMAKE_BUILD_TYPE=Release
+  cmake --build build -j$(nproc) --target simutrans-extended
 }
 
 package() {
   #binary
-  install -Dm755 simutrans-extended/build/simutrans/simutrans-extended "$pkgdir/usr/bin/simutrans-extended"
+  install -Dm755 $pkgname/build/simutrans/simutrans-extended "$pkgdir/usr/bin/simutrans-extended"
+  rm $pkgname/build/simutrans/simutrans-extended
   
   #data
   mkdir -p "$pkgdir/usr/share/games/simutrans-extended"
-  cp -r simutrans-extended/simutrans/* "$pkgdir/usr/share/games/simutrans-extended"
-  cp -r "How to add files and paksets.md" "$pkgdir/usr/share/games/simutrans-extended"
+  cp -r $pkgname/simutrans/* "$pkgdir/usr/share/games/simutrans-extended"
 
   #desktop file and icon
-  install -Dm644 simutrans.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/simutrans-extended.svg"
+  install -Dm644 $pkgname/simutrans.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/simutrans-extended.svg"
   install -Dm644 simutrans-extended.desktop "$pkgdir/usr/share/applications/simutrans-extended.desktop"
 
   #license
-  install -Dm644 simutrans-extended/LICENSE.txt "$pkgdir/usr/share/licenses/simutrans-extended/license.txt"
+  install -Dm644 $pkgname/LICENSE.txt "$pkgdir/usr/share/licenses/simutrans-extended/license.txt"
+  
+  install -Dm644 "How to add files and paksets.md" "$pkgdir/usr/share/games/simutrans-extended/How to add files and paksets.md"
 }
 
 pkgver() {
-    cd "$srcdir/simutrans-extended"
+    cd $pkgname
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }