git » freerdp.git » commit 2082b99

upgpkg: 2:3.6.2-2 - Fix dependencies (json-c/cJSON)

author Balló György
2024-07-08 00:01:05 UTC
committer Balló György
2024-07-08 00:01:05 UTC
parent 85f6ed7528f295a677aea45363c7021690fc7358

upgpkg: 2:3.6.2-2 - Fix dependencies (json-c/cJSON)

FreeRDP supports both, but json-c is the default and more common.

.SRCINFO +8 -7
PKGBUILD +5 -4

diff --git a/.SRCINFO b/.SRCINFO
index 7b26fb4..babbd8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freerdp
 	pkgdesc = Free implementation of the Remote Desktop Protocol (RDP)
 	pkgver = 3.6.2
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 2
 	url = https://www.freerdp.com/
 	arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = freerdp
 	makedepends = glib2
 	makedepends = gtk3
 	makedepends = icu
+	makedepends = json-c
 	makedepends = krb5
 	makedepends = libjpeg-turbo
 	makedepends = libp11
@@ -28,7 +29,6 @@ pkgbase = freerdp
 	makedepends = xmlto
 	makedepends = xorgproto
 	makedepends = zlib
-	depends = cjson
 	depends = fuse3
 	depends = gcc-libs
 	depends = glibc
@@ -61,7 +61,6 @@ pkgbase = freerdp
 	b2sums = 85810c05a797119c84c9483f02e46f8cd8f1d720d13deef4c4b55809b65e2e4bac2e3d70f768470b81326d22db5bbb7762d20fda34c5ce923b16a3f435edc36c
 
 pkgname = freerdp
-	depends = cjson
 	depends = fuse3
 	depends = gcc-libs
 	depends = glibc
@@ -97,15 +96,17 @@ pkgname = freerdp
 	depends = libgtk-3.so
 	depends = icu
 	depends = libicuuc.so
+	depends = json-c
+	depends = libjson-c.so
 	depends = krb5
 	depends = libk5crypto.so
 	depends = libkrb5.so
-	depends = libpulse
-	depends = libpulse.so
-	depends = libpng
-	depends = libpng16.so
 	depends = libjpeg-turbo
 	depends = libjpeg.so
+	depends = libpng
+	depends = libpng16.so
+	depends = libpulse
+	depends = libpulse.so
 	depends = libusb
 	depends = libusb-1.0.so
 	depends = libwebp
diff --git a/PKGBUILD b/PKGBUILD
index 1eb4835..20ffee9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,13 @@ _name=FreeRDP
 pkgname=freerdp
 pkgver=3.6.2
 _libver=${pkgver/.*/}
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
 arch=(x86_64)
 url="https://www.freerdp.com/"
 license=(Apache-2.0)
 depends=(
-  cjson
   fuse3
   gcc-libs
   glibc
@@ -43,6 +42,7 @@ makedepends=(
   glib2
   gtk3
   icu
+  json-c
   krb5
   libjpeg-turbo
   libp11
@@ -135,10 +135,11 @@ package() {
     glib2 libglib-2.0.so libgobject-2.0.so
     gtk3 libgtk-3.so
     icu libicuuc.so
+    json-c libjson-c.so
     krb5 libk5crypto.so libkrb5.so
-    libpulse libpulse.so
-    libpng libpng16.so
     libjpeg-turbo libjpeg.so
+    libpng libpng16.so
+    libpulse libpulse.so
     libusb libusb-1.0.so
     libwebp libwebp.so
     openssl libcrypto.so libssl.so