[arch-commits] Commit in telegram-desktop/repos/community-x86_64 (5 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Mon Apr 26 15:36:13 UTC 2021
Date: Monday, April 26, 2021 @ 15:36:13
Author: svenstaro
Revision: 924533
archrelease: copy trunk to community-x86_64
Added:
telegram-desktop/repos/community-x86_64/PKGBUILD
(from rev 924532, telegram-desktop/trunk/PKGBUILD)
telegram-desktop/repos/community-x86_64/fix-tgcalls-gcc10.patch
(from rev 924532, telegram-desktop/trunk/fix-tgcalls-gcc10.patch)
telegram-desktop/repos/community-x86_64/fix-webview-includes.patch
(from rev 924532, telegram-desktop/trunk/fix-webview-includes.patch)
Deleted:
telegram-desktop/repos/community-x86_64/PKGBUILD
telegram-desktop/repos/community-x86_64/fix-tgcalls-gcc10.patch
----------------------------+
PKGBUILD | 95 +++++++++++++++++++++----------------------
fix-tgcalls-gcc10.patch | 68 +++++++++++++++---------------
fix-webview-includes.patch | 12 +++++
3 files changed, 93 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-26 15:36:04 UTC (rev 924532)
+++ PKGBUILD 2021-04-26 15:36:13 UTC (rev 924533)
@@ -1,48 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: hexchain <i at hexchain.org>
-pkgname=telegram-desktop
-pkgver=2.7.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')
-makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libtg_owt')
-source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
- "fix-tgcalls-gcc10.patch")
-sha512sums=('dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b'
- 'dbc61a8520f3698fdeec6c9849cfd8241b8b778589f89277f82d6c748d8ed7a81db90daa0a69dedc3ab2b81bba848ee68e1df79a9cb3fb055f99bd7d19f46e5d')
-
-prepare() {
- cd tdesktop-$pkgver-full/cmake
- # force webrtc link to libjpeg
- 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
-}
-
-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 924532, telegram-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-26 15:36:13 UTC (rev 924533)
@@ -0,0 +1,47 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: hexchain <i at hexchain.org>
+pkgname=telegram-desktop
+pkgver=2.7.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')
+makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libtg_owt')
+source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
+ "fix-webview-includes.patch")
+sha512sums=('4c4e41d0af6e2ee004002abf1fd41d8d400d75c3d95ae2952e6354692928dee32062cc066e15c63b84ab512cf3cba7dbc90104920618523d72c71cfea5449d98'
+ '5492c73f0b984da1e2d1f21c3a36c11c4b9ad511522dccd4d6440681f68d6ebc9e672806a534b1e551f736f080d3ef307c8ddd012e4646bd84d09c5e8fa85a40')
+
+prepare() {
+ cd tdesktop-$pkgver-full/cmake
+ # force webrtc link to libjpeg
+ echo "target_link_libraries(external_webrtc INTERFACE jpeg)" | tee -a external/webrtc/CMakeLists.txt
+ cd ../Telegram/lib_webview
+ patch -Np1 -i "$srcdir"/fix-webview-includes.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-tgcalls-gcc10.patch
===================================================================
--- fix-tgcalls-gcc10.patch 2021-04-26 15:36:04 UTC (rev 924532)
+++ fix-tgcalls-gcc10.patch 2021-04-26 15:36:13 UTC (rev 924533)
@@ -1,34 +0,0 @@
-From eded7cc540123eaf26361958b9a61c65cb2f7cfc Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail at gmail.com>
-Date: Mon, 22 Mar 2021 19:24:10 +0400
-Subject: [PATCH] Fix build on GCC 10, second attempt.
-
----
- tgcalls/group/StreamingPart.cpp | 1 -
- tgcalls/group/StreamingPart.h | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tgcalls/group/StreamingPart.cpp b/tgcalls/group/StreamingPart.cpp
-index a7f2e00..6b0206f 100644
---- a/tgcalls/group/StreamingPart.cpp
-+++ b/tgcalls/group/StreamingPart.cpp
-@@ -12,7 +12,6 @@ extern "C" {
- #include <string>
- #include <set>
- #include <map>
--#include <stdint.h>
-
- namespace tgcalls {
-
-diff --git a/tgcalls/group/StreamingPart.h b/tgcalls/group/StreamingPart.h
-index 08859d6..6e0812c 100644
---- a/tgcalls/group/StreamingPart.h
-+++ b/tgcalls/group/StreamingPart.h
-@@ -3,6 +3,7 @@
-
- #include "absl/types/optional.h"
- #include <vector>
-+#include <stdint.h>
-
- namespace tgcalls {
-
Copied: telegram-desktop/repos/community-x86_64/fix-tgcalls-gcc10.patch (from rev 924532, telegram-desktop/trunk/fix-tgcalls-gcc10.patch)
===================================================================
--- fix-tgcalls-gcc10.patch (rev 0)
+++ fix-tgcalls-gcc10.patch 2021-04-26 15:36:13 UTC (rev 924533)
@@ -0,0 +1,34 @@
+From eded7cc540123eaf26361958b9a61c65cb2f7cfc Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail at gmail.com>
+Date: Mon, 22 Mar 2021 19:24:10 +0400
+Subject: [PATCH] Fix build on GCC 10, second attempt.
+
+---
+ tgcalls/group/StreamingPart.cpp | 1 -
+ tgcalls/group/StreamingPart.h | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tgcalls/group/StreamingPart.cpp b/tgcalls/group/StreamingPart.cpp
+index a7f2e00..6b0206f 100644
+--- a/tgcalls/group/StreamingPart.cpp
++++ b/tgcalls/group/StreamingPart.cpp
+@@ -12,7 +12,6 @@ extern "C" {
+ #include <string>
+ #include <set>
+ #include <map>
+-#include <stdint.h>
+
+ namespace tgcalls {
+
+diff --git a/tgcalls/group/StreamingPart.h b/tgcalls/group/StreamingPart.h
+index 08859d6..6e0812c 100644
+--- a/tgcalls/group/StreamingPart.h
++++ b/tgcalls/group/StreamingPart.h
+@@ -3,6 +3,7 @@
+
+ #include "absl/types/optional.h"
+ #include <vector>
++#include <stdint.h>
+
+ namespace tgcalls {
+
Copied: telegram-desktop/repos/community-x86_64/fix-webview-includes.patch (from rev 924532, telegram-desktop/trunk/fix-webview-includes.patch)
===================================================================
--- fix-webview-includes.patch (rev 0)
+++ fix-webview-includes.patch 2021-04-26 15:36:13 UTC (rev 924533)
@@ -0,0 +1,12 @@
+diff --git a/webview/platform/linux/webview_linux_webkit_gtk.h b/webview/platform/linux/webview_linux_webkit_gtk.h
+index a7f0f97..c2b21c7 100644
+--- a/webview/platform/linux/webview_linux_webkit_gtk.h
++++ b/webview/platform/linux/webview_linux_webkit_gtk.h
+@@ -14,6 +14,7 @@ extern "C" {
+ #include <gtk/gtk.h>
+ #include <webkit2/webkit2.h>
+ #include <X11/Xlib.h>
++#include <gdk/gdkx.h>
+ #define signals public
+ } // extern "C"
+
More information about the arch-commits
mailing list