🔖 Update package, version 10.0.15-1

* Upstream version update
* Various bugfixes
* See upstream changelog for details

3 files changed, 18 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9630fd7617e..66bc005e2f4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dpp
 	pkgdesc = Lightweight and Scalable C++ Discord API Bot Library
-	pkgver = 10.0.14
+	pkgver = 10.0.15
 	pkgrel = 1
 	url = https://dpp.dev/
 	install = dpp.install
@@ -8,12 +8,13 @@ pkgbase = dpp
 	arch = x86_64
 	license = Apache
 	makedepends = cmake
+	depends = gcc-libs
 	depends = openssl
 	depends = zlib
 	depends = opus
 	depends = libsodium
 	depends = nlohmann-json
-	source = dpp-10.0.14.tar.gz::https://github.com/brainboxdotcc/DPP/archive/refs/tags/v10.0.14.tar.gz
-	sha256sums = 5eb4cf3b4f4ba200d5f0d57929a1b96cc79e2398004afccc9d9c63aee865ca9d
+	source = dpp-10.0.15.tar.gz::https://github.com/brainboxdotcc/DPP/archive/refs/tags/v10.0.15.tar.gz
+	sha256sums = 5370e7fa3e76ed78b87dc4d9c01cc5a5f1a5789ebf1d3d0e8deff05cb665c539
 
 pkgname = dpp
diff --git a/PKGBUILD b/PKGBUILD
index 687ff6217bd8..5691e9f3a74a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # See also https://github.com/eremiell-aur/dpp
 pkgname=dpp
 _pkgname=DPP
-pkgver=10.0.14
+pkgver=10.0.15
 pkgrel=1
 pkgdesc="Lightweight and Scalable C++ Discord API Bot Library"
 arch=('x86_64')
@@ -13,12 +13,12 @@ makedepends=('cmake')
 install="${pkgname}.install"
 changelog="${pkgname}.changelog"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/brainboxdotcc/${_pkgname}/archive/refs/tags/v${pkgver}.tar.gz")
-sha256sums=('5eb4cf3b4f4ba200d5f0d57929a1b96cc79e2398004afccc9d9c63aee865ca9d')
+sha256sums=('5370e7fa3e76ed78b87dc4d9c01cc5a5f1a5789ebf1d3d0e8deff05cb665c539')
 
 prepare() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
-	find . \( -iname "*.h" -o -iname "*.cpp" \) -exec sed -i -E "s/dpp\/(nlohmann|fmt)\//\1\//" '{}' \+
-	sed -i -E "s/install\(TARGETS dpp LIBRARY DESTINATION (.*)\)/install\(TARGETS dpp EXPORT dpp-targets LIBRARY DESTINATION \1\)\ninstall\(EXPORT dpp-targets DESTINATION \1\)/" "CMakeLists.txt"
+	find . \( -iname "*.h" -o -iname "*.cpp" \) -exec sed -i -E "s/dpp\/(nlohmann)\//\1\//" '{}' \+
+	sed -i -E "s/install\(TARGETS dpp LIBRARY DESTINATION (.*)\)/install\(TARGETS dpp EXPORT dpp-targets LIBRARY DESTINATION \1\)\ninstall\(EXPORT dpp-targets DESTINATION \1\)/" "library/CMakeLists.txt"
 	sed -i -E "s/libdpp/dpp/" "CMakeLists.txt" "cmake/libdpp-config.cmake"
 	sed -i -E "s/libdpp-config/dpp-config/" "cmake/CPackSetup.cmake"
 	mv "cmake/libdpp-config.cmake" "cmake/dpp-config.cmake"
@@ -28,14 +28,13 @@ build() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	mkdir -p build
 	cd build
-	cmake -DDPP_BUILD_TEST=OFF -DRUN_LDCONFIG=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_MESSAGE=NEVER -Wno-dev ..
+	cmake -DDPP_BUILD_TEST=OFF -DRUN_LDCONFIG=OFF -DDPP_NO_VCPKG=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_MESSAGE=NEVER -Wno-dev ..
 	make
 }
 
 package() {
 	cd "${srcdir}/${_pkgname}-${pkgver}/build"
 	make DESTDIR="${pkgdir}/" install
-	rm -rf "${pkgdir}/usr/include/dpp/fmt"
 	rm -rf "${pkgdir}/usr/include/dpp/nlohmann"
 	rm -rf "${pkgdir}/usr/include/dpp-${pkgver%.*}"
 	install -dm755 "${pkgdir}/usr/lib/cmake/${pkgname}/"
diff --git a/dpp.changelog b/dpp.changelog
index 28499240f1eb..7df4e1750e26 100644
--- a/dpp.changelog
+++ b/dpp.changelog
@@ -1,6 +1,13 @@
+# 10.0.15-1 / 2022-08-02
+
+* bump to new library version
+	* vendored fmt removed in upstream (by accident :) )
+		* less patching on our end
+	* see library changelog for full list
+
 # 10.0.14-1 / 2022-08-02
 
-* bump to new libary version
+* bump to new library version
 	* internal use of fmt got removed
 		* library still vendored for now
 	* clusters an now shutdown and start
@@ -29,7 +36,7 @@
 * bump to new library version
 	* automod is now supported
 	* see library changelog for full list
-* nothing chaged for the package itself
+* nothing changed for the package itself
 	* all previously mentioned issues are still present
 
 # 10.0.10-1 / 2022-06-14