From b6c96506984abac1bb47448758b46057907060e0 Mon Sep 17 00:00:00 2001
From: HurricanePootis <hurricanepootis@protonmail.com>
Date: Sat, 6 Jul 2024 18:06:30 -0500
Subject: [PATCH] Add back miniupnpc

---
 .SRCINFO |  5 ++++-
 PKGBUILD | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 5dc35a7..e017b4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = godot3
 	pkgdesc = Advanced cross-platform 2D and 3D game engine (3.x Branch)
 	pkgver = 3.5.3
-	pkgrel = 4
+	pkgrel = 5
 	url = https://godotengine.org
 	arch = x86_64
 	license = MIT
@@ -24,11 +24,14 @@ pkgbase = godot3
 	depends = libxinerama
 	depends = libxrandr
 	depends = opusfile
+	depends = miniupnpc
 	optdepends = pipewire-alsa
 	optdepends = pipewire-pulse
 	source = godot-3.5.3.tar.gz::https://github.com/godotengine/godot/archive/3.5.3-stable.tar.gz
+	source = https://gitlab.archlinux.org/archlinux/packaging/packages/godot/-/raw/main/miniupnpc-2.2.8.patch
 	source = godot3.patch
 	b2sums = 07ee037803e103f863e56a00c6106d00834870881ec75ecc43f947ea3d6e04a560763aa183661fa6437c4c8307f9231b250f2d51462057add1720d71d2ada827
+	b2sums = ad308b3ed7fdd0ee305151c584e1a37c753dc5856b0afc631342c03f386a45723d2193d5a6937598a1b883d847dc3ac9c5f7db3d66ec3f9283f636e301235e50
 	b2sums = 5ed41b79e0121e66614cce997d8c05b3efafefb45d93a426fe4f63bc9917a8dad8519d3f11021a62d6b3a8f7210f2cc86d03361a51dcf79007b0eb71289c1370
 
 pkgname = godot3
diff --git a/PKGBUILD b/PKGBUILD
index a1f06b0..ba49b68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,19 +9,20 @@
 _pkgname=godot
 pkgname=godot3
 pkgver=3.5.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Advanced cross-platform 2D and 3D game engine (3.x Branch)'
 url='https://godotengine.org'
 license=(MIT)
 arch=(x86_64)
 makedepends=(gcc scons yasm alsa-lib pulseaudio)
 depends=(embree3 freetype2 libglvnd libtheora libvorbis libvpx libwebp libwslay
-         libsquish libxcursor libxi libxinerama libxrandr opusfile)
-	 #miniupnpc removed due to 2.2.8 update
+         libsquish libxcursor libxi libxinerama libxrandr opusfile miniupnpc)
 optdepends=(pipewire-alsa pipewire-pulse)
 source=("$_pkgname-$pkgver.tar.gz::https://github.com/godotengine/godot/archive/$pkgver-stable.tar.gz"
+	"https://gitlab.archlinux.org/archlinux/packaging/packages/godot/-/raw/main/miniupnpc-2.2.8.patch"
         "godot3.patch")
 b2sums=('07ee037803e103f863e56a00c6106d00834870881ec75ecc43f947ea3d6e04a560763aa183661fa6437c4c8307f9231b250f2d51462057add1720d71d2ada827'
+        'ad308b3ed7fdd0ee305151c584e1a37c753dc5856b0afc631342c03f386a45723d2193d5a6937598a1b883d847dc3ac9c5f7db3d66ec3f9283f636e301235e50'
         '5ed41b79e0121e66614cce997d8c05b3efafefb45d93a426fe4f63bc9917a8dad8519d3f11021a62d6b3a8f7210f2cc86d03361a51dcf79007b0eb71289c1370')
 
 prepare() {
@@ -31,6 +32,7 @@ prepare() {
   # Make godot build a binary compatible with Godot 4
   cd "$srcdir/$_pkgname-$pkgver-stable"
   patch -p1 < "$srcdir/godot3.patch"
+  patch -p1 < "$srcdir/miniupnpc-2.2.8.patch"
 }
 
 build() {
@@ -39,9 +41,8 @@ build() {
   #  certs (FS#72762)
   #  enet (contains no upstreamed IPv6 support)
   #  recast, xatlas
-  #  miniupnpc updated to 2.2.8
   #  AUR: libwebm
-  local to_unbundle="embree freetype libogg libpng libsquish libtheora libvorbis libvpx libwebp opus pcre2 wslay zlib zstd"
+  local to_unbundle="embree freetype libogg libpng libsquish libtheora libvorbis libvpx libwebp opus pcre2 wslay zlib zstd miniupnpc"
   local system_libs=""
   for _lib in $to_unbundle; do
     system_libs+="builtin_"$_lib"=no "