[arch-commits] Commit in telegram-desktop/repos/community-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Mon Jun 28 08:25:00 UTC 2021
Date: Monday, June 28, 2021 @ 08:24:59
Author: svenstaro
Revision: 967663
archrelease: copy trunk to community-x86_64
Added:
telegram-desktop/repos/community-x86_64/PKGBUILD
(from rev 967662, telegram-desktop/trunk/PKGBUILD)
telegram-desktop/repos/community-x86_64/fix-gcc11-assert.patch
(from rev 967662, 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 | 104 +++++++++++++++++++++++------------------------
fix-gcc11-assert.patch | 52 +++++++++++------------
2 files changed, 78 insertions(+), 78 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-28 08:24:49 UTC (rev 967662)
+++ PKGBUILD 2021-06-28 08:24:59 UTC (rev 967663)
@@ -1,52 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: hexchain <i at hexchain.org>
-pkgname=telegram-desktop
-pkgver=2.8.1
-pkgrel=1
-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")
-sha512sums=('df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69'
- 'd94c21f45a14eea009f4dc099a0be7774aa9c64d6bdb2745eb866a505ad4d95e4e75e53e110bcdc2db553809d8aea485e3fa321feccc7660120c0f418f4d5e3f')
-
-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
-}
-
-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 967662, telegram-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-28 08:24:59 UTC (rev 967663)
@@ -0,0 +1,52 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: hexchain <i at hexchain.org>
+pkgname=telegram-desktop
+pkgver=2.8.2
+pkgrel=1
+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")
+sha512sums=('7e77fe7ddbaf5590e5e9846e76d987e35fadb4ed7a90ae4c4b3c54ddb331d71be0b046b28217287cb19636514197fc4a3632b09433ab5922f5b22bdfd6e22f75'
+ 'd94c21f45a14eea009f4dc099a0be7774aa9c64d6bdb2745eb866a505ad4d95e4e75e53e110bcdc2db553809d8aea485e3fa321feccc7660120c0f418f4d5e3f')
+
+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
+}
+
+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-06-28 08:24:49 UTC (rev 967662)
+++ fix-gcc11-assert.patch 2021-06-28 08:24:59 UTC (rev 967663)
@@ -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 967662, telegram-desktop/trunk/fix-gcc11-assert.patch)
===================================================================
--- fix-gcc11-assert.patch (rev 0)
+++ fix-gcc11-assert.patch 2021-06-28 08:24:59 UTC (rev 967663)
@@ -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);
More information about the arch-commits
mailing list