Update cef91.patch and add it back

3 files changed, 16 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 555a32642368..507547be6620 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = obs-studio-browser
 	pkgdesc = Free and open source software for video recording and live streaming. Built with browser, vst plugins.
 	pkgver = 27.1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/obsproject/obs-studio
 	arch = i686
 	arch = x86_64
@@ -47,10 +47,12 @@ pkgbase = obs-studio-browser
 	source = git+https://github.com/obsproject/obs-browser.git
 	source = git+https://github.com/obsproject/obs-vst.git
 	source = fix_python_binary_loading.patch
+	source = cef91.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = 93ad704cef425073b417d1ed95e076f688a6e45cdf589472c65e437d77297303f31dd8f15c7d5e30f83276a6396b732dfb5a695db9c773911aaa0423c5262177
+	sha512sums = 27b816c79545e6039445e1487a258c1233f5d43df3178fd274a9ede607138fc6dbb58a21ec78431bc5774d18153f9c6a08f61649b9b1a6a628ce358d5cf12093
 
 pkgname = obs-studio-browser
diff --git a/PKGBUILD b/PKGBUILD
index 2c3564b78633..6fbf5dd8f382 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=obs-studio-browser
 pkgver=27.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Free and open source software for video recording and live streaming. Built with browser, vst plugins."
 arch=("i686" "x86_64")
 url="https://github.com/obsproject/obs-studio"
@@ -32,12 +32,14 @@ source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#tag=$pkgver"
         "git+https://github.com/Mixer/ftl-sdk.git"
         "git+https://github.com/obsproject/obs-browser.git"
         "git+https://github.com/obsproject/obs-vst.git"
-        "fix_python_binary_loading.patch")
+        "fix_python_binary_loading.patch"
+        "cef91.patch")
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '93ad704cef425073b417d1ed95e076f688a6e45cdf589472c65e437d77297303f31dd8f15c7d5e30f83276a6396b732dfb5a695db9c773911aaa0423c5262177')
+            '93ad704cef425073b417d1ed95e076f688a6e45cdf589472c65e437d77297303f31dd8f15c7d5e30f83276a6396b732dfb5a695db9c773911aaa0423c5262177'
+            '27b816c79545e6039445e1487a258c1233f5d43df3178fd274a9ede607138fc6dbb58a21ec78431bc5774d18153f9c6a08f61649b9b1a6a628ce358d5cf12093')
 
 prepare() {
     cd "$srcdir/$pkgname"
@@ -46,6 +48,7 @@ prepare() {
     git config submodule.plugins/obs-browser.url "$srcdir"/obs-browser
     git config submodule.plugins/obs-vst.url "$srcdir"/obs-vst
     git submodule update
+    patch -d "$srcdir/$pkgname/plugins/obs-browser" -Np1 < "$srcdir"/cef91.patch
 }
 
 build() {
diff --git a/cef91.patch b/cef91.patch
index e887bed138ba..c8fd75db2210 100644
--- a/cef91.patch
+++ b/cef91.patch
@@ -1,8 +1,8 @@
 diff --git a/browser-app.cpp b/browser-app.cpp
-index c1da827..1760c62 100644
+index f0aba74..df16c0a 100644
 --- a/browser-app.cpp
 +++ b/browser-app.cpp
-@@ -110,7 +110,7 @@ void BrowserApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
+@@ -117,7 +117,7 @@ void BrowserApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
  {
  	CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
  
@@ -11,7 +11,7 @@ index c1da827..1760c62 100644
  	globalObj->SetValue("obsstudio", obsStudioObj,
  			    V8_PROPERTY_ATTRIBUTE_NONE);
  
-@@ -156,7 +156,7 @@ void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
+@@ -154,7 +154,7 @@ void BrowserApp::ExecuteJSFunction(CefRefPtr<CefBrowser> browser,
  	CefRefPtr<CefV8Value> jsFunction = obsStudioObj->GetValue(functionName);
  
  	if (jsFunction && jsFunction->IsFunction())
@@ -20,7 +20,7 @@ index c1da827..1760c62 100644
  
  	context->Exit();
  }
-@@ -312,7 +312,7 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
+@@ -310,7 +310,7 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
  
  		CefRefPtr<CefV8Value> dispatchEvent =
  			globalObj->GetValue("dispatchEvent");
@@ -29,7 +29,7 @@ index c1da827..1760c62 100644
  
  		context->Exit();
  
-@@ -342,7 +342,7 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
+@@ -340,7 +340,7 @@ bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
  		args.push_back(retval);
  
  		if (callback)
@@ -38,24 +38,11 @@ index c1da827..1760c62 100644
  
  		context->Exit();
  
-diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp
-index 1a6a009..0911b7b 100644
---- a/obs-browser-plugin.cpp
-+++ b/obs-browser-plugin.cpp
-@@ -298,7 +298,7 @@ static void BrowserInit(void)
- 	prod_ver << std::to_string(obs_maj) << "." << std::to_string(obs_min)
- 		 << "." << std::to_string(obs_pat);
- 
--	CefString(&settings.product_version) = prod_ver.str();
-+	CefString(&settings.user_agent) = prod_ver.str();
- 
- #ifdef USE_QT_LOOP
- 	settings.external_message_pump = true;
 diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp
-index ab1181e..bc5d664 100644
+index 113a9f6..abac2a5 100644
 --- a/obs-browser-source.cpp
 +++ b/obs-browser-source.cpp
-@@ -177,12 +177,15 @@ bool BrowserSource::CreateBrowser()
+@@ -178,12 +178,15 @@ bool BrowserSource::CreateBrowser()
  		cefBrowserSettings.default_font_size = 16;
  		cefBrowserSettings.default_fixed_font_size = 16;