Remove now unneeded patch, since it was integrated upstream

2 files changed, 3 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 464798034695..ee472bc2d14b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = knxd-git
 	pkgdesc = A server-daemon which provides an interface to a KNX/EIB installation
-	pkgver = 1909.r3fa3794
+	pkgver = 1914.r609dffd
 	pkgrel = 1
 	url = https://github.com/knxd/knxd
 	arch = i686
@@ -25,9 +25,7 @@ pkgbase = knxd-git
 	conflicts = eibd
 	replaces = eibd
 	source = git+https://github.com/knxd/knxd.git#branch=main
-	source = https://patch-diff.githubusercontent.com/raw/knxd/knxd/pull/549.diff
 	sha512sums = SKIP
-	sha512sums = 7a72256943e805eb77bdfd8cf1582eca71e2448c84ec3ffb6a36b9d701f11f1279fb6d0a06a1992272edbe139ee342e0558dca297ba08595c0b74ca6bc969e35
 
 pkgname = knxd-git
 	backup = etc/knxd.conf
diff --git a/PKGBUILD b/PKGBUILD
index 917bf70073d9..0e48d9c34c9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: vapourismo <ole at vprsm dot de>
 _pkgname=knxd
 pkgname='knxd-git'
-pkgver=1909.r3fa3794
+pkgver=1914.r609dffd
 pkgrel=1
 pkgdesc='A server-daemon which provides an interface to a KNX/EIB installation'
 license=('GPL')
@@ -15,7 +15,7 @@ depends=('fmt' 'gcc-libs' 'libev' 'libusb')
 optdepends=('libsystemd')
 makedepends=('git' 'libtool' 'autoconf' 'automake' 'pkgconfig')
 
-source=("git+https://github.com/knxd/${_pkgname}.git#branch=main" "https://patch-diff.githubusercontent.com/raw/knxd/knxd/pull/549.diff")
+source=("git+https://github.com/knxd/${_pkgname}.git#branch=main")
 sha512sums=('SKIP')
 url="https://github.com/knxd/knxd"
 
@@ -24,12 +24,6 @@ pkgver() {
   printf "%s.r%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd "$srcdir/$_pkgname"
-  # Apply patch to support recent fmt-library version >= 10.0.0
-  patch --forward --strip=1 --input="../549.diff"
-}
-
 build() {
   cd "$srcdir/$_pkgname"
   sh ./bootstrap.sh
@@ -48,6 +42,3 @@ package() {
   cd "$srcdir/$_pkgname"
   make DESTDIR="$pkgdir/" install
 }
-
-sha512sums=('SKIP'
-            '7a72256943e805eb77bdfd8cf1582eca71e2448c84ec3ffb6a36b9d701f11f1279fb6d0a06a1992272edbe139ee342e0558dca297ba08595c0b74ca6bc969e35')