Date: Tuesday, July 6, 2021 @ 13:49:13
Author: farseerfc
Revision: 973265
archrelease: copy trunk to community-x86_64
Added:
telegram-desktop/repos/community-x86_64/PKGBUILD
(from rev 973264, telegram-desktop/trunk/PKGBUILD)
telegram-desktop/repos/community-x86_64/fix-gcc11-assert.patch
(from rev 973264, telegram-desktop/trunk/fix-gcc11-assert.patch)
Deleted:
telegram-desktop/repos/community-x86_64/PKGBUILD
telegram-desktop/repos/community-x86_64/fix-gcc11-assert.patch
------------------------+
PKGBUILD | 115 ++++++++++++++++++++++++-----------------------
fix-gcc11-assert.patch | 52 ++++++++++-----------
2 files changed, 85 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-06 13:48:53 UTC (rev 973264)
+++ PKGBUILD 2021-07-06 13:49:13 UTC (rev 973265)
@@ -1,56 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com>
-# Contributor: hexchain <i...@hexchain.org>
-pkgname=telegram-desktop
-pkgver=2.8.4
-pkgrel=2
-pkgdesc='Official Telegram Desktop client'
-arch=('x86_64')
-url="https://desktop.telegram.org/";
-license=('GPL3')
-depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
'ttf-opensans'
- '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')
-source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz";
- "fix-gcc11-assert.patch"
-
"fix-freeze-after-file-dialog.patch::https://github.com/telegramdesktop/tdesktop/commit/1261c775d4ca6fb78277ec213794da7c15e304e2.patch";)
-sha512sums=('b0e78aa9bffa1707425f058737b0d0a0db26e8fba14e1413e465eefcbbc95dc0eaee642d1ebc4a82c8239188a3eed677c5c3eb748203348a14ba2ace61afd779'
-
'd94c21f45a14eea009f4dc099a0be7774aa9c64d6bdb2745eb866a505ad4d95e4e75e53e110bcdc2db553809d8aea485e3fa321feccc7660120c0f418f4d5e3f'
-
'2a5c8f5ca5a3a34872567ac98032717c40689baab2926d9fa8960404c6630925732f028dc7fdcf28bef11dd247a78779c3f5ca631f8b75abf23e23dab8d0f24c')
-
-prepare() {
- cd tdesktop-$pkgver-full/cmake
- # force webrtc link to libjpeg and X11 libs
- echo "target_link_libraries(external_webrtc INTERFACE jpeg)" | tee -a
external/webrtc/CMakeLists.txt
- 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
- # backport file dialog patch
- patch -Np1 -i ${srcdir}/fix-freeze-after-file-dialog.patch
-}
-
-build() {
- cd tdesktop-$pkgver-full
-
- # Turns out we're allowed to use the official API key that telegram uses
for their snap builds:
- #
https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88
- # Thanks @primeos!
- cmake . \
- -B build \
- -G Ninja \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -DCMAKE_BUILD_TYPE=Release \
- -DTDESKTOP_API_ID=611335 \
- -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
- -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
- -DDESKTOP_APP_SPECIAL_TARGET=""
- ninja -C build
-}
-
-package() {
- cd tdesktop-$pkgver-full
- DESTDIR=$pkgdir ninja -C build install
-}
Copied: telegram-desktop/repos/community-x86_64/PKGBUILD (from rev 973264,
telegram-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-07-06 13:49:13 UTC (rev 973265)
@@ -0,0 +1,59 @@
+# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com>
+# Contributor: hexchain <i...@hexchain.org>
+pkgname=telegram-desktop
+pkgver=2.8.4
+pkgrel=3
+pkgdesc='Official Telegram Desktop client'
+arch=('x86_64')
+url="https://desktop.telegram.org/";
+license=('GPL3')
+depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal'
'ttf-opensans'
+ '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')
+source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz";
+ "fix-gcc11-assert.patch"
+
"fix-freeze-after-file-dialog.patch::https://github.com/telegramdesktop/tdesktop/commit/1261c775d4ca6fb78277ec213794da7c15e304e2.patch";
+
"revert-qmenubar-fix-global-menu.patch::https://github.com/telegramdesktop/tdesktop/commit/6f031a715e5f9db1f75ec230cf06538d77d5b4ec.patch";)
+sha512sums=('b0e78aa9bffa1707425f058737b0d0a0db26e8fba14e1413e465eefcbbc95dc0eaee642d1ebc4a82c8239188a3eed677c5c3eb748203348a14ba2ace61afd779'
+
'd94c21f45a14eea009f4dc099a0be7774aa9c64d6bdb2745eb866a505ad4d95e4e75e53e110bcdc2db553809d8aea485e3fa321feccc7660120c0f418f4d5e3f'
+
'2a5c8f5ca5a3a34872567ac98032717c40689baab2926d9fa8960404c6630925732f028dc7fdcf28bef11dd247a78779c3f5ca631f8b75abf23e23dab8d0f24c'
+
'9a49f7e074f8e5c2ecad0092146af2647f7afd5e7b7904d3634013fcba7fb81eaff7ccca35c955ee55010431172b2c1bcdbe7f01d3d5a391d950b278b491fb54')
+
+prepare() {
+ cd tdesktop-$pkgver-full/cmake
+ # force webrtc link to libjpeg and X11 libs
+ echo "target_link_libraries(external_webrtc INTERFACE jpeg)" | tee -a
external/webrtc/CMakeLists.txt
+ 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
+ # backport file dialog patch
+ patch -Np1 -i ${srcdir}/fix-freeze-after-file-dialog.patch
+ patch -Np1 -i ${srcdir}/revert-qmenubar-fix-global-menu.patch
+}
+
+build() {
+ cd tdesktop-$pkgver-full
+
+ # Turns out we're allowed to use the official API key that telegram uses
for their snap builds:
+ #
https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88
+ # Thanks @primeos!
+ cmake . \
+ -B build \
+ -G Ninja \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DTDESKTOP_API_ID=611335 \
+ -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
+ -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
+ -DDESKTOP_APP_SPECIAL_TARGET=""
+ ninja -C build
+}
+
+package() {
+ cd tdesktop-$pkgver-full
+ DESTDIR=$pkgdir ninja -C build install
+}
Deleted: fix-gcc11-assert.patch
===================================================================
--- fix-gcc11-assert.patch 2021-07-06 13:48:53 UTC (rev 973264)
+++ fix-gcc11-assert.patch 2021-07-06 13:49:13 UTC (rev 973265)
@@ -1,26 +0,0 @@
-diff --git a/webview/webview_embed.cpp b/webview/webview_embed.cpp
-index 7d4050a..bc55f7e 100644
---- a/webview/webview_embed.cpp
-+++ b/webview/webview_embed.cpp
-@@ -125,7 +125,7 @@ void Window::setMessageHandler(Fn<void(std::string)>
handler) {
- _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 --git a/webview/webview_embed.h b/webview/webview_embed.h
-index 930cb8e..1281a71 100644
---- a/webview/webview_embed.h
-+++ b/webview/webview_embed.h
-@@ -36,7 +36,7 @@ class Window final {
-
- 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);
Copied: telegram-desktop/repos/community-x86_64/fix-gcc11-assert.patch (from
rev 973264, telegram-desktop/trunk/fix-gcc11-assert.patch)
===================================================================
--- fix-gcc11-assert.patch (rev 0)
+++ fix-gcc11-assert.patch 2021-07-06 13:49:13 UTC (rev 973265)
@@ -0,0 +1,26 @@
+diff --git a/webview/webview_embed.cpp b/webview/webview_embed.cpp
+index 7d4050a..bc55f7e 100644
+--- a/webview/webview_embed.cpp
++++ b/webview/webview_embed.cpp
+@@ -125,7 +125,7 @@ void Window::setMessageHandler(Fn<void(std::string)>
handler) {
+ _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 --git a/webview/webview_embed.h b/webview/webview_embed.h
+index 930cb8e..1281a71 100644
+--- a/webview/webview_embed.h
++++ b/webview/webview_embed.h
+@@ -36,7 +36,7 @@ class Window final {
+
+ 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);
