From 69608a1846e9c52df2a6ffac0fc906133e8ef06d Mon Sep 17 00:00:00 2001
From: Swarnava Ghosh <swarnavaghosh04@gmail.com>
Date: Tue, 21 Sep 2021 14:41:38 -0400
Subject: [PATCH 1/4] krpc-cpp-git PKGBUILD added

---
 mingw-w64-krpc-cpp-git/PKGBUILD | 40 +++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 mingw-w64-krpc-cpp-git/PKGBUILD

diff --git a/mingw-w64-krpc-cpp-git/PKGBUILD b/mingw-w64-krpc-cpp-git/PKGBUILD
new file mode 100644
index 0000000000..f50a39a462
--- /dev/null
+++ b/mingw-w64-krpc-cpp-git/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Swarnava Ghosh <swarnavaghosh04@gmail.com>
+# Credits: Maximilian Schiller <manimax3@outlook.de> [https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=krpc-cpp]
+_realname=krpc-cpp
+pkgbase=mingw-w64-${_realname}-git
+pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-git
+pkgver=0.4.8
+pkgrel=1
+pkgdesc="KRPC Client for c++"
+arch=('x86_64' 'i686')
+url="https://github.com/krpc/krpc"
+license=('LGPL3')
+groups=()
+depends=(
+	"${MINGW_PACKAGE_PREFIX}-asio" 
+	"${MINGW_PACKAGE_PREFIX}-protobuf")
+makedepends=(
+	"git"
+	"${MINGW_PACKAGE_PREFIX}-make"
+	"${MINGW_PACKAGE_PREFIX}-cmake")
+source=("https://github.com/krpc/krpc/releases/download/v$pkgver/$_realname-$pkgver.zip" "https://gist.githubusercontent.com/swarnavaghosh04/35a551cc71d884847e519e4190a8d0e2/raw/58e8342c839eaf358149210611420f5b736192c4/krpc-cpp-0.4.8-fix.patch")
+md5sums=('143c6230784a699dbe21d62923f12672'
+         '3cc580ec8c6fc5b4c093503a5453bde9')
+
+prepare() {
+	cd "$_realname-$pkgver"
+	patch --forward --strip=1 --input="${srcdir}/krpc-cpp-0.4.8-fix.patch"	
+}
+
+build() {
+	cd "$_realname-$pkgver"
+	mkdir cmake-build && cd cmake-build
+	MSYS2_ARG_CONV_EXCL=* \
+	cmake .. -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}
+	mingw32-make
+}
+
+package() {
+	cd "$_realname-$pkgver/cmake-build"
+	mingw32-make DESTDIR="$pkgdir/" install
+}
\ No newline at end of file

From ab7ec8ceb32e61cc540ec00483db86dddda6c8d4 Mon Sep 17 00:00:00 2001
From: Swarnava Ghosh <swarnavaghosh04@gmail.com>
Date: Wed, 22 Sep 2021 13:37:25 -0400
Subject: [PATCH 2/4] update to version 0.4.9

---
 mingw-w64-krpc-cpp-git/PKGBUILD | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/mingw-w64-krpc-cpp-git/PKGBUILD b/mingw-w64-krpc-cpp-git/PKGBUILD
index f50a39a462..677f4c7304 100644
--- a/mingw-w64-krpc-cpp-git/PKGBUILD
+++ b/mingw-w64-krpc-cpp-git/PKGBUILD
@@ -3,7 +3,8 @@
 _realname=krpc-cpp
 pkgbase=mingw-w64-${_realname}-git
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-git
-pkgver=0.4.8
+pkgver=0.4.9
+_kspver=1.12.1
 pkgrel=1
 pkgdesc="KRPC Client for c++"
 arch=('x86_64' 'i686')
@@ -15,18 +16,27 @@ depends=(
 	"${MINGW_PACKAGE_PREFIX}-protobuf")
 makedepends=(
 	"git"
+	"patch"
+	"unzip"
 	"${MINGW_PACKAGE_PREFIX}-make"
 	"${MINGW_PACKAGE_PREFIX}-cmake")
-source=("https://github.com/krpc/krpc/releases/download/v$pkgver/$_realname-$pkgver.zip" "https://gist.githubusercontent.com/swarnavaghosh04/35a551cc71d884847e519e4190a8d0e2/raw/58e8342c839eaf358149210611420f5b736192c4/krpc-cpp-0.4.8-fix.patch")
-md5sums=('143c6230784a699dbe21d62923f12672'
-         '3cc580ec8c6fc5b4c093503a5453bde9')
+source=("https://github.com/nullprofile/krpc/releases/download/$pkgver-$_kspver/krpc-$pkgver-$_kspver.zip"
+	    "https://gist.githubusercontent.com/swarnavaghosh04/452aa320a747ede48ea7f52403e45457/raw/514a82383f794314b71ad805a10cb04b7aef40f2/001-$_realname-$pkgver-cmake.patch")
+md5sums=('9d6b9357447e1adf40e09c1cede52bbb'
+        'e55b95137c27cc8654e4d254019e80e0')
+noextract=("krpc-$pkgver-$_kspver.zip")
 
 prepare() {
-	cd "$_realname-$pkgver"
-	patch --forward --strip=1 --input="${srcdir}/krpc-cpp-0.4.8-fix.patch"	
+	echo prepare
+	unzip krpc-$pkgver-$_kspver.zip client/$_realname-$pkgver.zip
+	unzip client/$_realname-$pkgver.zip
+	rm -rf client *.zip
+	cd $_realname-$pkgver
+	patch --forward --strip=1 --input="${srcdir}/001-$_realname-$pkgver-cmake.patch"	
 }
 
 build() {
+	echo build
 	cd "$_realname-$pkgver"
 	mkdir cmake-build && cd cmake-build
 	MSYS2_ARG_CONV_EXCL=* \
@@ -35,6 +45,7 @@ build() {
 }
 
 package() {
+	echo package
 	cd "$_realname-$pkgver/cmake-build"
 	mingw32-make DESTDIR="$pkgdir/" install
 }
\ No newline at end of file

From dc5aea08d18746568bbf9f2e5be8e57f4599b2bc Mon Sep 17 00:00:00 2001
From: Swarnava Ghosh <swarnavaghosh04@gmail.com>
Date: Sat, 25 Sep 2021 21:55:17 -0400
Subject: [PATCH 3/4] removed -git from name; switch from makefiles to ninja,
 included patch file

---
 mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch   | 11 +++++++
 .../PKGBUILD                                  | 29 +++++++------------
 2 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch
 rename {mingw-w64-krpc-cpp-git => mingw-w64-krpc-cpp}/PKGBUILD (52%)

diff --git a/mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch b/mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch
new file mode 100644
index 0000000000..e6abdd0ad1
--- /dev/null
+++ b/mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch
@@ -0,0 +1,11 @@
+diff -ruN krpc-cpp-0.4.9-patched/CMakeLists.txt krpc-cpp-0.4.9/CMakeLists.txt
+--- krpc-cpp-0.4.9-patched/CMakeLists.txt	2021-09-25 21:16:59 +0000
++++ krpc-cpp-0.4.9/CMakeLists.txt	2021-05-25 09:25:39 +0000
+@@ -90,7 +90,6 @@
+ endif()
+ 
+ install(TARGETS krpc
+-        RUNTIME DESTINATION bin
+         LIBRARY DESTINATION lib
+         ARCHIVE DESTINATION lib)
+ 
diff --git a/mingw-w64-krpc-cpp-git/PKGBUILD b/mingw-w64-krpc-cpp/PKGBUILD
similarity index 52%
rename from mingw-w64-krpc-cpp-git/PKGBUILD
rename to mingw-w64-krpc-cpp/PKGBUILD
index 677f4c7304..b0324e2269 100644
--- a/mingw-w64-krpc-cpp-git/PKGBUILD
+++ b/mingw-w64-krpc-cpp/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Swarnava Ghosh <swarnavaghosh04@gmail.com>
 # Credits: Maximilian Schiller <manimax3@outlook.de> [https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=krpc-cpp]
 _realname=krpc-cpp
-pkgbase=mingw-w64-${_realname}-git
-pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-git
+pkgbase=mingw-w64-${_realname}
+pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=0.4.9
 _kspver=1.12.1
 pkgrel=1
-pkgdesc="KRPC Client for c++"
-arch=('x86_64' 'i686')
+pkgdesc="KRPC Client for C++"
+arch=('any')
 url="https://github.com/krpc/krpc"
 license=('LGPL3')
 groups=()
@@ -15,37 +15,30 @@ depends=(
 	"${MINGW_PACKAGE_PREFIX}-asio" 
 	"${MINGW_PACKAGE_PREFIX}-protobuf")
 makedepends=(
-	"git"
 	"patch"
 	"unzip"
-	"${MINGW_PACKAGE_PREFIX}-make"
+	"${MINGW_PACKAGE_PREFIX}-ninja"
 	"${MINGW_PACKAGE_PREFIX}-cmake")
-source=("https://github.com/nullprofile/krpc/releases/download/$pkgver-$_kspver/krpc-$pkgver-$_kspver.zip"
-	    "https://gist.githubusercontent.com/swarnavaghosh04/452aa320a747ede48ea7f52403e45457/raw/514a82383f794314b71ad805a10cb04b7aef40f2/001-$_realname-$pkgver-cmake.patch")
-md5sums=('9d6b9357447e1adf40e09c1cede52bbb'
-        'e55b95137c27cc8654e4d254019e80e0')
+source=("https://github.com/nullprofile/krpc/releases/download/$pkgver-$_kspver/krpc-$pkgver-$_kspver.zip")
+md5sums=('9d6b9357447e1adf40e09c1cede52bbb')
 noextract=("krpc-$pkgver-$_kspver.zip")
 
 prepare() {
-	echo prepare
 	unzip krpc-$pkgver-$_kspver.zip client/$_realname-$pkgver.zip
 	unzip client/$_realname-$pkgver.zip
 	rm -rf client *.zip
 	cd $_realname-$pkgver
-	patch --forward --strip=1 --input="${srcdir}/001-$_realname-$pkgver-cmake.patch"	
+	patch --reverse --strip=1 --input="${startdir}/001-$_realname-cmake.patch"	
 }
 
 build() {
-	echo build
 	cd "$_realname-$pkgver"
 	mkdir cmake-build && cd cmake-build
-	MSYS2_ARG_CONV_EXCL=* \
-	cmake .. -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}
-	mingw32-make
+	cmake ..
+	cmake --build .
 }
 
 package() {
-	echo package
 	cd "$_realname-$pkgver/cmake-build"
-	mingw32-make DESTDIR="$pkgdir/" install
+	cmake --install . --prefix "$pkgdir/$MINGW_PREFIX"
 }
\ No newline at end of file

From 06d9eebdc86b2b60fde024660614e27212e839d7 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 9 Oct 2021 10:48:54 +0200
Subject: [PATCH 4/4] cleanup

---
 mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch | 12 ++---
 mingw-w64-krpc-cpp/PKGBUILD                 | 54 +++++++++++++--------
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch b/mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch
index e6abdd0ad1..9913ea7bec 100644
--- a/mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch
+++ b/mingw-w64-krpc-cpp/001-krpc-cpp-cmake.patch
@@ -1,11 +1,11 @@
-diff -ruN krpc-cpp-0.4.9-patched/CMakeLists.txt krpc-cpp-0.4.9/CMakeLists.txt
---- krpc-cpp-0.4.9-patched/CMakeLists.txt	2021-09-25 21:16:59 +0000
-+++ krpc-cpp-0.4.9/CMakeLists.txt	2021-05-25 09:25:39 +0000
-@@ -90,7 +90,6 @@
+diff '--color=auto' -ruN krpc-cpp-0.4.8/CMakeLists.txt krpc-cpp-0.4.8-patch/CMakeLists.txt
+--- krpc-cpp-0.4.8/CMakeLists.txt	2018-10-28 08:06:50.000000000 -0400
++++ krpc-cpp-0.4.8-patch/CMakeLists.txt	2021-09-13 21:28:01.741800400 -0400
+@@ -86,6 +86,7 @@
  endif()
  
  install(TARGETS krpc
--        RUNTIME DESTINATION bin
++        RUNTIME DESTINATION bin
          LIBRARY DESTINATION lib
          ARCHIVE DESTINATION lib)
- 
+ 
\ No newline at end of file
diff --git a/mingw-w64-krpc-cpp/PKGBUILD b/mingw-w64-krpc-cpp/PKGBUILD
index b0324e2269..1d52008445 100644
--- a/mingw-w64-krpc-cpp/PKGBUILD
+++ b/mingw-w64-krpc-cpp/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Swarnava Ghosh <swarnavaghosh04@gmail.com>
 # Credits: Maximilian Schiller <manimax3@outlook.de> [https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=krpc-cpp]
+
 _realname=krpc-cpp
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
@@ -10,35 +11,46 @@ pkgdesc="KRPC Client for C++"
 arch=('any')
 url="https://github.com/krpc/krpc"
 license=('LGPL3')
-groups=()
 depends=(
-	"${MINGW_PACKAGE_PREFIX}-asio" 
-	"${MINGW_PACKAGE_PREFIX}-protobuf")
+  "${MINGW_PACKAGE_PREFIX}-asio" 
+  "${MINGW_PACKAGE_PREFIX}-protobuf")
 makedepends=(
-	"patch"
-	"unzip"
-	"${MINGW_PACKAGE_PREFIX}-ninja"
-	"${MINGW_PACKAGE_PREFIX}-cmake")
-source=("https://github.com/nullprofile/krpc/releases/download/$pkgver-$_kspver/krpc-$pkgver-$_kspver.zip")
-md5sums=('9d6b9357447e1adf40e09c1cede52bbb')
+  "patch"
+  "unzip"
+  "${MINGW_PACKAGE_PREFIX}-ninja"
+  "${MINGW_PACKAGE_PREFIX}-cmake")
+source=("https://github.com/nullprofile/krpc/releases/download/$pkgver-$_kspver/krpc-$pkgver-$_kspver.zip"
+        "001-krpc-cpp-cmake.patch")
+sha256sums=('d86eb6ec6dc250b5a6ef9d4c5fd2c2d8180e1825320ba9f79c0b314e4f9a0699'
+            '77e6028756bcfd06aa7ca6265327f9cf43ccade1ebcc657e826fea85d12aa0fd')
 noextract=("krpc-$pkgver-$_kspver.zip")
 
 prepare() {
-	unzip krpc-$pkgver-$_kspver.zip client/$_realname-$pkgver.zip
-	unzip client/$_realname-$pkgver.zip
-	rm -rf client *.zip
-	cd $_realname-$pkgver
-	patch --reverse --strip=1 --input="${startdir}/001-$_realname-cmake.patch"	
+  unzip krpc-$pkgver-$_kspver.zip client/$_realname-$pkgver.zip
+  unzip client/$_realname-$pkgver.zip
+  rm -rf client *.zip
+
+  cd "${_realname}-${pkgver}"
+
+  patch -Np1 -i "${srcdir}"/001-$_realname-cmake.patch
 }
 
 build() {
-	cd "$_realname-$pkgver"
-	mkdir cmake-build && cd cmake-build
-	cmake ..
-	cmake --build .
+  cd "${srcdir}/${_realname}-${pkgver}"
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+    ${MINGW_PREFIX}/bin/cmake.exe \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+      -DCMAKE_BUILD_TYPE=Release \
+      ../${_realname}-${pkgver}
+
+  ${MINGW_PREFIX}/bin/cmake.exe --build .
 }
 
 package() {
-	cd "$_realname-$pkgver/cmake-build"
-	cmake --install . --prefix "$pkgdir/$MINGW_PREFIX"
-}
\ No newline at end of file
+  cd "${srcdir}"/build-${MSYSTEM}
+
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
+}