[telegram-desktop] Add Buildrequires webkitgtk4-devel and enable gtk integration
by Leigh Scott
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 {
2 years, 8 months
[tg_owt/f34] (4 commits) ...Add all X11 build requires
by Leigh Scott
Summary of changes:
3589bb5... Updated to latest Git snapshot. (*)
d849310... fix (*)
a602a17... fix (*)
b5d6d4e... Add all X11 build requires (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 8 months
[xtables-addons-kmod] Manually install .ko files
by Leigh Scott
commit e4bd453126cc27b3fcaddd2ae75b92f3b90d164b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jul 27 14:14:11 2021 +0100
Manually install .ko files
xtables-addons-kmod.spec | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/xtables-addons-kmod.spec b/xtables-addons-kmod.spec
index 1912ccf..c8ba2d9 100644
--- a/xtables-addons-kmod.spec
+++ b/xtables-addons-kmod.spec
@@ -11,7 +11,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 3.18
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: https://inai.de/projects/xtables-addons/
Source0: https://inai.de/files/xtables-addons/xtables-addons-%{version}.tar.xz
@@ -54,20 +54,17 @@ done
%install
-for kernel_version in %{?kernel_versions} ; do
- export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
- make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" \
- M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions _emodinst_ \
-%if 0%{?fedora} < 33 || 0%{?rhel}
- INSTALL_MOD_PATH=%{buildroot}%{_prefix} \
-%else
- INSTALL_MOD_PATH=%{buildroot} \
-%endif
- ext-mod-dir=%{kmodinstdir_postfix}
+for kernel_version in %{?kernel_versions}; do
+ mkdir -p $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/extensions/*.ko \
+ $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
done
%{?akmod_install}
%changelog
+* Tue Jul 27 2021 Leigh Scott <leigh123linux(a)gmail.com> - 3.18-3
+- Manually install .ko files
+
* Tue Jun 08 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 3.18-2
- rebuilt
2 years, 8 months
[telegram-desktop] Add all X11 build requires
by Leigh Scott
commit 4c5ebc6f5221637109affd2267952c1c52b077ea
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jul 27 13:40:22 2021 +0100
Add all X11 build requires
telegram-desktop.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 8a44ff3..dc608a6 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -46,7 +46,6 @@ BuildRequires: cmake(dbusmenu-qt5)
BuildRequires: cmake(range-v3)
BuildRequires: cmake(tg_owt)
BuildRequires: cmake(tl-expected)
-
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glibmm-2.4)
@@ -60,12 +59,10 @@ BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
-BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libxxhash)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
-BuildRequires: pkgconfig(rnnoise)
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -95,7 +92,9 @@ Requires: gtk3%{?_isa}
BuildRequires: pkgconfig(tgvoip) >= 2.4.4
%else
BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(rnnoise)
Provides: bundled(libtgvoip) = 2.4.4
%endif
@@ -118,6 +117,12 @@ BuildRequires: pkgconfig(xcb-keysyms)
BuildRequires: pkgconfig(xcb-record)
BuildRequires: pkgconfig(xcb-screensaver)
BuildRequires: pkgconfig(xcomposite)
+BuildRequires: pkgconfig(xdamage)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xtst)
%endif
# Telegram Desktop require exact version of Qt due to Qt private API usage.
2 years, 8 months
[telegram-desktop] fix
by Leigh Scott
commit 7bfcec8340631242f64b702dd75f13dcac69a1cf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jul 27 13:18:37 2021 +0100
fix
telegram-desktop.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index c16d87d..8a44ff3 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -117,6 +117,7 @@ BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-keysyms)
BuildRequires: pkgconfig(xcb-record)
BuildRequires: pkgconfig(xcb-screensaver)
+BuildRequires: pkgconfig(xcomposite)
%endif
# Telegram Desktop require exact version of Qt due to Qt private API usage.
2 years, 8 months
[telegram-desktop] fix
by Leigh Scott
commit 34378803b93e4c3f5d7fefa3b7a43760ee8eaf89
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jul 27 13:10:28 2021 +0100
fix
telegram-desktop.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 0fdf74f..c16d87d 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -60,6 +60,7 @@ BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
+BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libxxhash)
BuildRequires: pkgconfig(openssl)
2 years, 8 months