git » freerdp.git » commit bfa31ef

use patch instead of sed

author Christian Hesse
2024-03-25 19:15:31 UTC
committer Christian Hesse
2024-03-25 19:15:31 UTC
parent 9b968256e977e1c31a553e97524c33e85782d3df

use patch instead of sed

.SRCINFO +3 -0
0001-Use-webkit2gtk-4.1.patch +25 -0
PKGBUILD +6 -3

diff --git a/.SRCINFO b/.SRCINFO
index 8fef592..4b9098b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -54,8 +54,11 @@ pkgbase = freerdp
 	provides = libwinpr-tools3.so
 	provides = libwinpr3.so
 	source = https://github.com/freerdp/freerdp/archive/3.4.0/freerdp-3.4.0.tar.gz
+	source = 0001-Use-webkit2gtk-4.1.patch
 	sha512sums = aa96ad2bf30dbe09849ecfb64ec6e60ba4fd3bc2d144c7d576b1e59476ef45d9d744da37806b1c00e3a0413390b35c6d3d4401b89c07c5663122280eca39e501
+	sha512sums = 0bfdf8825f586a548eaef309f64fb50ea9e2598592f778aa835bbec1a0600d715b8fb28f5950aaeb5ef981a33d5f9f3f39f4fd1800bdf9e5630d9925a9fbab04
 	b2sums = d260fb47406d36b728ab24e323d06624d53c01bbdc877b3b97f3c1c159e87baaffa418279ba1cc6e4ba82f0f890deba357ddb325a54316a23f0dbfdff4609eff
+	b2sums = bbee3975cdcd0ce421ecd8825d1b6dbdbd1565b612a51e7d9423e79226579587031b5ebe7e5251c88015e9047cd35818bad338a7048acfddac137ffe23197b71
 
 pkgname = freerdp
 	depends = cjson
diff --git a/0001-Use-webkit2gtk-4.1.patch b/0001-Use-webkit2gtk-4.1.patch
new file mode 100644
index 0000000..432d9fd
--- /dev/null
+++ b/0001-Use-webkit2gtk-4.1.patch
@@ -0,0 +1,25 @@
+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 f4085c7..1e20349 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -67,15 +67,18 @@ provides=(
 )
 source=(
   https://github.com/$pkgname/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz
+  0001-Use-webkit2gtk-4.1.patch
 )
-sha512sums=('aa96ad2bf30dbe09849ecfb64ec6e60ba4fd3bc2d144c7d576b1e59476ef45d9d744da37806b1c00e3a0413390b35c6d3d4401b89c07c5663122280eca39e501')
-b2sums=('d260fb47406d36b728ab24e323d06624d53c01bbdc877b3b97f3c1c159e87baaffa418279ba1cc6e4ba82f0f890deba357ddb325a54316a23f0dbfdff4609eff')
+sha512sums=('aa96ad2bf30dbe09849ecfb64ec6e60ba4fd3bc2d144c7d576b1e59476ef45d9d744da37806b1c00e3a0413390b35c6d3d4401b89c07c5663122280eca39e501'
+            '0bfdf8825f586a548eaef309f64fb50ea9e2598592f778aa835bbec1a0600d715b8fb28f5950aaeb5ef981a33d5f9f3f39f4fd1800bdf9e5630d9925a9fbab04')
+b2sums=('d260fb47406d36b728ab24e323d06624d53c01bbdc877b3b97f3c1c159e87baaffa418279ba1cc6e4ba82f0f890deba357ddb325a54316a23f0dbfdff4609eff'
+        'bbee3975cdcd0ce421ecd8825d1b6dbdbd1565b612a51e7d9423e79226579587031b5ebe7e5251c88015e9047cd35818bad338a7048acfddac137ffe23197b71')
 
 prepare() {
   cd $_name-$pkgver
 
   # Use the newer WebKit
-  sed -i 's/webkit2gtk-4\.0/webkit2gtk-4.1/g' client/SDL/aad/CMakeLists.txt
+  patch -Np1 < ../0001-Use-webkit2gtk-4.1.patch
 }
 
 build() {