summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD24
-rw-r--r--fix-gcc11-assert.patch24
-rw-r--r--fix-tgcalls-gcc10.patch22
4 files changed, 49 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b8d64a30ee35..3c12c3544b86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = 64gram-desktop
pkgdesc = Unofficial desktop version of Telegram messaging app
- pkgver = 2.7.1.2
+ pkgver = 2.8.1.1
pkgrel = 1
url = https://github.com/TDesktop-x64/tdesktop
arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = 64gram-desktop
makedepends = tl-expected
makedepends = microsoft-gsl
makedepends = libtg_owt
+ makedepends = extra-cmake-modules
depends = hunspell
depends = ffmpeg
depends = hicolor-icon-theme
@@ -25,15 +26,19 @@ pkgbase = 64gram-desktop
depends = kwayland
depends = gtk3
depends = glibmm
+ depends = webkit2gtk
+ depends = rnnoise
+ depends = pipewire
+ depends = libxtst
+ depends = libxrandr
optdepends = ttf-opensans: default Open Sans font family
provides = 64gram-desktop
conflicts = telegram-desktop
conflicts = tdesktop-x64
replaces = tdesktop-x64
- source = https://github.com/TDesktop-x64/tdesktop/releases/download/v2.7.1.2/64Gram-2.7.1.2-full.tar.gz
- source = fix-tgcalls-gcc10.patch
- sha512sums = b9f4e540d2d5e6b80a2934dbd2857743a28ca12135ca1a5d5acc9e365f35b2debff0f13e18d261eeda866082a7843776da31c874961909a5399ed66d23b30012
- sha512sums = 05e3dcc3d090087525287bb9254a4440b44faa7443fa0f9f942e94c5e5ea3bad41b1df2e6f10594e173a1d41188a75e918118228f5715e537f3c3ac65346cb80
+ source = https://github.com/TDesktop-x64/tdesktop/releases/download/v2.8.1.1/64Gram-2.8.1.1-full.tar.gz
+ source = fix-gcc11-assert.patch
+ sha512sums = 8b51aa32ff31e61fc8ef8afaef2c961f4a60df3ea8dba72a12ca173ce4e5dcfdba0f5b0beae5f27c66262e19cd114212acc6440e525219687fe033cd620b1a71
+ sha512sums = 29f4ddf6eba62e14dac1a00aa3ba96f9f6767b82f2c85c98931d9be967fb4398a1337b9716e2d423ecfe56e672bfa15d81898e87ce8b85cd8a3be976336fd682
pkgname = 64gram-desktop
-
diff --git a/PKGBUILD b/PKGBUILD
index 7ce615c19b35..2f208a6f2415 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,35 @@
# Maintainer: KspLite <ksplite@outlook.com>
pkgname=64gram-desktop
_pkgname=64Gram
-pkgver=2.7.1.2
+pkgver=2.8.1.1
pkgrel=1
pkgdesc='Unofficial desktop version of Telegram messaging app'
arch=('x86_64')
url="https://github.com/TDesktop-x64/tdesktop"
license=('GPL3')
depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
- 'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'kwayland' 'gtk3' 'glibmm')
-makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libtg_owt')
+ 'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'kwayland' 'gtk3' 'glibmm'
+ 'webkit2gtk' 'rnnoise' 'pipewire' 'libxtst' 'libxrandr' )
+makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl'
+ 'libtg_owt' 'extra-cmake-modules')
optdepends=('ttf-opensans: default Open Sans font family')
provides=("64gram-desktop")
conflicts=("telegram-desktop" "tdesktop-x64")
replaces=("tdesktop-x64")
source=("https://github.com/TDesktop-x64/tdesktop/releases/download/v${pkgver}/${_pkgname}-${pkgver}-full.tar.gz"
- "fix-tgcalls-gcc10.patch")
-sha512sums=('b9f4e540d2d5e6b80a2934dbd2857743a28ca12135ca1a5d5acc9e365f35b2debff0f13e18d261eeda866082a7843776da31c874961909a5399ed66d23b30012'
- '05e3dcc3d090087525287bb9254a4440b44faa7443fa0f9f942e94c5e5ea3bad41b1df2e6f10594e173a1d41188a75e918118228f5715e537f3c3ac65346cb80')
+ "fix-gcc11-assert.patch")
+sha512sums=('8b51aa32ff31e61fc8ef8afaef2c961f4a60df3ea8dba72a12ca173ce4e5dcfdba0f5b0beae5f27c66262e19cd114212acc6440e525219687fe033cd620b1a71'
+ '29f4ddf6eba62e14dac1a00aa3ba96f9f6767b82f2c85c98931d9be967fb4398a1337b9716e2d423ecfe56e672bfa15d81898e87ce8b85cd8a3be976336fd682')
prepare() {
cd $_pkgname-$pkgver-full/cmake
- # force webrtc link to libjpeg
+ # force webrtc link to libjpeg and X11 libs
echo "target_link_libraries(external_webrtc INTERFACE jpeg)" | tee -a external/webrtc/CMakeLists.txt
-
- cd ../Telegram/ThirdParty/tgcalls
- patch -Np1 -i "$srcdir"/fix-tgcalls-gcc10.patch
+ echo "find_package(X11 REQUIRED COMPONENTS Xcomposite Xdamage Xext Xfixes Xrender Xrandr Xtst)" | tee -a external/webrtc/CMakeLists.txt
+ echo "target_link_libraries(external_webrtc INTERFACE Xcomposite Xdamage Xext Xfixes Xrandr Xrender Xtst)" | tee -a external/webrtc/CMakeLists.txt
+
+ cd ..
+ patch -b -d Telegram/lib_webview/ -Np1 -i ${srcdir}/fix-gcc11-assert.patch
}
build() {
diff --git a/fix-gcc11-assert.patch b/fix-gcc11-assert.patch
new file mode 100644
index 000000000000..fe42469f1a96
--- /dev/null
+++ b/fix-gcc11-assert.patch
@@ -0,0 +1,24 @@
+diff --unified --recursive --text lib_webview/webview/webview_embed.cpp lib_webview.new/webview/webview_embed.cpp
+--- lib_webview/webview/webview_embed.cpp 2021-04-26 23:56:15.503592000 +0800
++++ lib_webview.new/webview/webview_embed.cpp 2021-07-09 10:53:33.174391865 +0800
+@@ -125,7 +125,7 @@
+ _messageHandler = std::move(handler);
+ }
+
+-void Window::setMessageHandler(Fn<void(QJsonDocument)> handler) {
++void Window::setMessageHandler(Fn<void(const QJsonDocument&)> handler) {
+ if (!handler) {
+ setMessageHandler(Fn<void(std::string)>());
+ return;
+diff --unified --recursive --text lib_webview/webview/webview_embed.h lib_webview.new/webview/webview_embed.h
+--- lib_webview/webview/webview_embed.h 2021-04-26 23:56:15.503592000 +0800
++++ lib_webview.new/webview/webview_embed.h 2021-07-09 10:54:05.049390350 +0800
+@@ -36,7 +36,7 @@
+
+ void navigate(const QString &url);
+ void setMessageHandler(Fn<void(std::string)> handler);
+- void setMessageHandler(Fn<void(QJsonDocument)> handler);
++ void setMessageHandler(Fn<void(const QJsonDocument&)> handler);
+ void setNavigationStartHandler(Fn<bool(QString)> handler);
+ void setNavigationDoneHandler(Fn<void(bool)> handler);
+ void init(const QByteArray &js);
diff --git a/fix-tgcalls-gcc10.patch b/fix-tgcalls-gcc10.patch
deleted file mode 100644
index eeaa6f12a78a..000000000000
--- a/fix-tgcalls-gcc10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --unified --recursive --text tgcalls/tgcalls/group/StreamingPart.cpp tgcalls.patched/tgcalls/group/StreamingPart.cpp
---- tgcalls/tgcalls/group/StreamingPart.cpp 2021-03-18 02:01:52.440061600 +0800
-+++ tgcalls.patched/tgcalls/group/StreamingPart.cpp 2021-03-29 14:47:27.879951836 +0800
-@@ -12,7 +12,6 @@
- #include <string>
- #include <set>
- #include <map>
--#include <stdint.h>
-
- namespace tgcalls {
-
-diff --unified --recursive --text tgcalls/tgcalls/group/StreamingPart.h tgcalls.patched/tgcalls/group/StreamingPart.h
---- tgcalls/tgcalls/group/StreamingPart.h 2021-03-13 21:44:07.165794600 +0800
-+++ tgcalls.patched/tgcalls/group/StreamingPart.h 2021-03-29 14:47:43.456952571 +0800
-@@ -3,6 +3,7 @@
-
- #include "absl/types/optional.h"
- #include <vector>
-+#include <stdint.h>
-
- namespace tgcalls {
-