[telegram-desktop] Add Buildrequires webkitgtk4-devel and enable gtk integration
commit 45923d68c29c1fdef031b25062e2b0281775ce77
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jul 28 12:07:52 2021 +0100
Add Buildrequires webkitgtk4-devel and enable gtk integration
telegram-desktop.spec | 9 +++++++--
webview_extern_c.patch | 25 +++++++++++++++++++++++++
2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index dc608a6..a4749e2 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -2,7 +2,7 @@
# Build conditionals (with - OFF, without - ON)...
%bcond_with clang
-%bcond_with gtk3
+%bcond_without gtk3
%bcond_with libtgvoip
%bcond_with rlottie
%bcond_with wayland
@@ -19,7 +19,7 @@
Name: telegram-desktop
Version: 2.8.8
-Release: 1%{?dist}
+Release: 2%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
@@ -29,6 +29,7 @@ License: GPLv3+ and LGPLv2+ and LGPLv3
URL: https://github.com/telegramdesktop/%{appname}
Summary: Telegram Desktop official messaging app
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
+Patch0: webview_extern_c.patch
# Telegram Desktop require more than 8 GB of RAM on linking stage.
# Disabling all low-memory architectures.
@@ -85,6 +86,7 @@ BuildRequires: llvm
%if %{with gtk3}
BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(webkit2gtk-4.0)
Requires: gtk3%{?_isa}
%endif
@@ -229,6 +231,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Wed Jul 28 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.8-2
+- Add Buildrequires webkitgtk4-devel and enable gtk integration
+
* Tue Jul 27 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.8-1
- Updated to version 2.8.8.
diff --git a/webview_extern_c.patch b/webview_extern_c.patch
new file mode 100644
index 0000000..ce5b6de
--- /dev/null
+++ b/webview_extern_c.patch
@@ -0,0 +1,25 @@
+From 90b3b39fa96edfe9d1698b77a1857ae322177825 Mon Sep 17 00:00:00 2001
+From: Vitaly Lipatov <lav(a)altlinux.ru>
+Date: Fri, 9 Jul 2021 16:56:50 +0300
+Subject: [PATCH] webview_linux_webkit_gtk.h: there are already exists extern C
+ in the included headers
+
+---
+ webview/platform/linux/webview_linux_webkit_gtk.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+index 8d180c1..e894c75 100644
+--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -6,11 +6,9 @@
+ //
+ #pragma once
+
+-extern "C" {
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+-} // extern "C"
+
+ namespace Webview::WebkitGtk {