git » freerdp.git » commit 25cfa32

upgpkg: 2:3.6.0-1

author David Runge
2024-07-04 07:06:24 UTC
committer David Runge
2024-07-04 07:06:24 UTC
parent 6c45cd9341bb1c53a9a1f47a8124a1bba7688563

upgpkg: 2:3.6.0-1

.SRCINFO +5 -8
0001-Use-webkit2gtk-4.1.patch +0 -25
PKGBUILD +4 -10

diff --git a/.SRCINFO b/.SRCINFO
index 432cc1a..e63b061 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freerdp
 	pkgdesc = Free implementation of the Remote Desktop Protocol (RDP)
-	pkgver = 3.5.1
-	pkgrel = 3
+	pkgver = 3.6.0
+	pkgrel = 1
 	epoch = 2
 	url = https://www.freerdp.com/
 	arch = x86_64
@@ -56,12 +56,9 @@ pkgbase = freerdp
 	provides = libfreerdp3.so
 	provides = libwinpr-tools3.so
 	provides = libwinpr3.so
-	source = https://github.com/freerdp/freerdp/archive/3.5.1/freerdp-3.5.1.tar.gz
-	source = 0001-Use-webkit2gtk-4.1.patch
-	sha512sums = 28082ca5a714362c684f2c551b0ac5823c1708d8e929db93f0ab3911601d3b0d724bbdc06eed517542fb4bd957bb61fcdd00e34c0bda017f0019d52d59cb6b07
-	sha512sums = 0bfdf8825f586a548eaef309f64fb50ea9e2598592f778aa835bbec1a0600d715b8fb28f5950aaeb5ef981a33d5f9f3f39f4fd1800bdf9e5630d9925a9fbab04
-	b2sums = 7f243593c2da1fb8cef483cd423c3e4d1127cac16ab857eaf7d5c222deaeca6657f32010fd40e90f1b47bd925e493848a3ab6b6b1e9db01a5355d0177c42953a
-	b2sums = bbee3975cdcd0ce421ecd8825d1b6dbdbd1565b612a51e7d9423e79226579587031b5ebe7e5251c88015e9047cd35818bad338a7048acfddac137ffe23197b71
+	source = https://github.com/freerdp/freerdp/archive/3.6.0/freerdp-3.6.0.tar.gz
+	sha512sums = 307beda8fe59257ce0931e95b17405cb7dce27b0a7fc8beee5bac81411ac898deb4a0ed182a36f3a8f6cc2ee7a13552ff845f76913181e778e9f359e70a9b427
+	b2sums = 0ba1def1644339f48bbbcb0eaf33f4b3061a3b89d12a23807b9d4f65acff7cda2c3fcfebccc8568cb66c49d0e1c1cc7988cfcb078953b206130ad0aa24f0c80c
 
 pkgname = freerdp
 	depends = cjson
diff --git a/0001-Use-webkit2gtk-4.1.patch b/0001-Use-webkit2gtk-4.1.patch
deleted file mode 100644
index 432d9fd..0000000
--- a/0001-Use-webkit2gtk-4.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3de172e7da393e8d544b7eb38ce9db7d18c468b1 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Mon, 25 Mar 2024 20:12:08 +0100
-Subject: [PATCH 1/1] Use webkit2gtk-4.1
-
----
- client/SDL/aad/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/SDL/aad/CMakeLists.txt b/client/SDL/aad/CMakeLists.txt
-index 228654262..d13fb907e 100644
---- a/client/SDL/aad/CMakeLists.txt
-+++ b/client/SDL/aad/CMakeLists.txt
-@@ -44,7 +44,7 @@ if (WITH_WEBVIEW)
-       )
-     else()
-       find_package(PkgConfig REQUIRED)
--      pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.0 REQUIRED)
-+      pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.1 REQUIRED)
-       include_directories(${WEBVIEW_GTK_INCLUDE_DIRS})
-       list(APPEND LIBS
-         ${WEBVIEW_GTK_LIBRARIES}
--- 
-2.44.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 47eae71..cfd3e5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 
 _name=FreeRDP
 pkgname=freerdp
-pkgver=3.5.1
+pkgver=3.6.0
 _libver=${pkgver/.*/}
-pkgrel=3
+pkgrel=1
 epoch=2
 pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
 arch=(x86_64)
@@ -70,18 +70,12 @@ provides=(
 )
 source=(
   https://github.com/$pkgname/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz
-  0001-Use-webkit2gtk-4.1.patch
 )
-sha512sums=('28082ca5a714362c684f2c551b0ac5823c1708d8e929db93f0ab3911601d3b0d724bbdc06eed517542fb4bd957bb61fcdd00e34c0bda017f0019d52d59cb6b07'
-            '0bfdf8825f586a548eaef309f64fb50ea9e2598592f778aa835bbec1a0600d715b8fb28f5950aaeb5ef981a33d5f9f3f39f4fd1800bdf9e5630d9925a9fbab04')
-b2sums=('7f243593c2da1fb8cef483cd423c3e4d1127cac16ab857eaf7d5c222deaeca6657f32010fd40e90f1b47bd925e493848a3ab6b6b1e9db01a5355d0177c42953a'
-        'bbee3975cdcd0ce421ecd8825d1b6dbdbd1565b612a51e7d9423e79226579587031b5ebe7e5251c88015e9047cd35818bad338a7048acfddac137ffe23197b71')
+sha512sums=('307beda8fe59257ce0931e95b17405cb7dce27b0a7fc8beee5bac81411ac898deb4a0ed182a36f3a8f6cc2ee7a13552ff845f76913181e778e9f359e70a9b427')
+b2sums=('0ba1def1644339f48bbbcb0eaf33f4b3061a3b89d12a23807b9d4f65acff7cda2c3fcfebccc8568cb66c49d0e1c1cc7988cfcb078953b206130ad0aa24f0c80c')
 
 prepare() {
   cd $_name-$pkgver
-
-  # Use the newer WebKit
-  patch -Np1 < ../0001-Use-webkit2gtk-4.1.patch
 }
 
 build() {