[arch-commits] Commit in telegram-desktop/repos/community-x86_64 (4 files)
Jiachen Yang
farseerfc at archlinux.org
Fri Nov 6 02:28:55 UTC 2020
Date: Friday, November 6, 2020 @ 02:28:54
Author: farseerfc
Revision: 743877
archrelease: copy trunk to community-x86_64
Added:
telegram-desktop/repos/community-x86_64/PKGBUILD
(from rev 743876, telegram-desktop/trunk/PKGBUILD)
telegram-desktop/repos/community-x86_64/Use-tg_owt-webrtc-fork.patch
(from rev 743876, telegram-desktop/trunk/Use-tg_owt-webrtc-fork.patch)
Deleted:
telegram-desktop/repos/community-x86_64/PKGBUILD
telegram-desktop/repos/community-x86_64/Use-tg_owt-webrtc-fork.patch
------------------------------+
PKGBUILD | 110 ++++++++++++++++++------------------
Use-tg_owt-webrtc-fork.patch | 122 ++++++++++++++++++++---------------------
2 files changed, 116 insertions(+), 116 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-06 02:28:10 UTC (rev 743876)
+++ PKGBUILD 2020-11-06 02:28:54 UTC (rev 743877)
@@ -1,55 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: hexchain <i at hexchain.org>
-pkgname=telegram-desktop
-pkgver=2.4.6
-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'
- 'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'qt5-wayland' 'gtk3')
-makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libwebrtc')
-optdepends=('ttf-opensans: default Open Sans font family')
-source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
-"Use-tg_owt-webrtc-fork.patch"
-"Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch"
-"Add_external_jpeg.patch::https://github.com/desktop-app/cmake_helpers/commit/ed9fa2e798a1f175840479417d760c51181959b8.patch"
-)
-sha512sums=('922b9d00a90866899c2817aaa24273b2ac8525bb18543598c8f203846d2e2e3849485cfcbce081d4dfbd45ebafe40dd57434f08849781a4f1d011b3518d03a6b'
- '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43'
- 'b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6'
- '3891f191f720e77d463365d1415ff8c20866d0d898909dcbe757d334c582c38975d47c33e82ae54e3cfbce7f46c257e9f2eb76b673a76c37446ecf1e9a9c681b')
-
-prepare() {
- cd tdesktop-$pkgver-full/cmake
- patch -R -Np1 -i ${srcdir}/Add_external_jpeg.patch
- patch -R -Np1 -i ${srcdir}/Update-webrtc-packaged-build-for-tg_owt.patch
- patch -R -Np1 -i ${srcdir}/Use-tg_owt-webrtc-fork.patch
- sed 's|set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)|set(webrtc_build_loc /usr/lib)|' -i external/webrtc/CMakeLists.txt
-}
-
-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_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
- -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
- -DDESKTOP_APP_SPECIAL_TARGET="" \
- -DDESKTOP_APP_WEBRTC_LOCATION=/usr/include/libwebrtc
- ninja -C build
-}
-
-package() {
- cd tdesktop-$pkgver-full
- DESTDIR=$pkgdir ninja -C build install
-}
Copied: telegram-desktop/repos/community-x86_64/PKGBUILD (from rev 743876, telegram-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-06 02:28:54 UTC (rev 743877)
@@ -0,0 +1,55 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: hexchain <i at hexchain.org>
+pkgname=telegram-desktop
+pkgver=2.4.7
+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'
+ 'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'qt5-wayland' 'gtk3')
+makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libwebrtc')
+optdepends=('ttf-opensans: default Open Sans font family')
+source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
+"Use-tg_owt-webrtc-fork.patch"
+"Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch"
+"Add_external_jpeg.patch::https://github.com/desktop-app/cmake_helpers/commit/ed9fa2e798a1f175840479417d760c51181959b8.patch"
+)
+sha512sums=('712ab6896f89f7df0c7ac297039ee3b3532c159e17f66e4539b701a35d04d4709b558755d592d3cd91df541a2d2ca9f0485cf073c32f0b69a18848ab2ccd1993'
+ '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43'
+ 'b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6'
+ '3891f191f720e77d463365d1415ff8c20866d0d898909dcbe757d334c582c38975d47c33e82ae54e3cfbce7f46c257e9f2eb76b673a76c37446ecf1e9a9c681b')
+
+prepare() {
+ cd tdesktop-$pkgver-full/cmake
+ patch -R -Np1 -i ${srcdir}/Add_external_jpeg.patch
+ patch -R -Np1 -i ${srcdir}/Update-webrtc-packaged-build-for-tg_owt.patch
+ patch -R -Np1 -i ${srcdir}/Use-tg_owt-webrtc-fork.patch
+ sed 's|set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)|set(webrtc_build_loc /usr/lib)|' -i external/webrtc/CMakeLists.txt
+}
+
+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_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
+ -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
+ -DDESKTOP_APP_SPECIAL_TARGET="" \
+ -DDESKTOP_APP_WEBRTC_LOCATION=/usr/include/libwebrtc
+ ninja -C build
+}
+
+package() {
+ cd tdesktop-$pkgver-full
+ DESTDIR=$pkgdir ninja -C build install
+}
Deleted: Use-tg_owt-webrtc-fork.patch
===================================================================
--- Use-tg_owt-webrtc-fork.patch 2020-11-06 02:28:10 UTC (rev 743876)
+++ Use-tg_owt-webrtc-fork.patch 2020-11-06 02:28:54 UTC (rev 743877)
@@ -1,61 +0,0 @@
-From 4c8956027de8e8e8b984c5daa643aacb14a89123 Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail at gmail.com>
-Date: Thu, 20 Aug 2020 16:06:55 +0400
-Subject: [PATCH] Use tg_owt webrtc fork.
-
----
- external/webrtc/CMakeLists.txt | 8 ++++----
- init_target.cmake | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt
-index 2a09508..1273291 100644
---- a/external/webrtc/CMakeLists.txt
-+++ b/external/webrtc/CMakeLists.txt
-@@ -10,10 +10,10 @@ add_library(desktop-app::external_webrtc ALIAS external_webrtc)
- if (DESKTOP_APP_WEBRTC_LOCATION)
- set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION})
- else()
-- set(webrtc_loc ${libs_loc}/webrtc/src)
-+ set(webrtc_loc ${libs_loc}/tg_owt/src)
- endif()
-
--set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)
-+set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
-
- target_compile_definitions(external_webrtc
- INTERFACE
-@@ -64,7 +64,7 @@ INTERFACE
- )
-
- set(webrtc_libs
-- ${webrtc_lib_prefix}webrtc
-+ ${webrtc_lib_prefix}tg_owt
- )
- if (APPLE)
- target_include_directories(external_webrtc
-@@ -87,7 +87,7 @@ if (WIN32)
- wmcodecdspuuid.lib
- amstrmid.lib
- msdmo.lib
-- )
-+ )
- elseif (APPLE)
- target_link_libraries(external_webrtc
- INTERFACE
-diff --git a/init_target.cmake b/init_target.cmake
-index 936a364..3a4806b 100644
---- a/init_target.cmake
-+++ b/init_target.cmake
-@@ -17,7 +17,7 @@ endfunction()
-
- function(init_target target_name) # init_target(my_target folder_name)
- if (ARGC GREATER 1)
-- if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11)
-+ if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11 OR ${ARGV1} STREQUAL cxx_std_17)
- target_compile_features(${target_name} PUBLIC ${ARGV1})
- else()
- target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD})
---
-2.28.0
-
Copied: telegram-desktop/repos/community-x86_64/Use-tg_owt-webrtc-fork.patch (from rev 743876, telegram-desktop/trunk/Use-tg_owt-webrtc-fork.patch)
===================================================================
--- Use-tg_owt-webrtc-fork.patch (rev 0)
+++ Use-tg_owt-webrtc-fork.patch 2020-11-06 02:28:54 UTC (rev 743877)
@@ -0,0 +1,61 @@
+From 4c8956027de8e8e8b984c5daa643aacb14a89123 Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail at gmail.com>
+Date: Thu, 20 Aug 2020 16:06:55 +0400
+Subject: [PATCH] Use tg_owt webrtc fork.
+
+---
+ external/webrtc/CMakeLists.txt | 8 ++++----
+ init_target.cmake | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt
+index 2a09508..1273291 100644
+--- a/external/webrtc/CMakeLists.txt
++++ b/external/webrtc/CMakeLists.txt
+@@ -10,10 +10,10 @@ add_library(desktop-app::external_webrtc ALIAS external_webrtc)
+ if (DESKTOP_APP_WEBRTC_LOCATION)
+ set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION})
+ else()
+- set(webrtc_loc ${libs_loc}/webrtc/src)
++ set(webrtc_loc ${libs_loc}/tg_owt/src)
+ endif()
+
+-set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)
++set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
+
+ target_compile_definitions(external_webrtc
+ INTERFACE
+@@ -64,7 +64,7 @@ INTERFACE
+ )
+
+ set(webrtc_libs
+- ${webrtc_lib_prefix}webrtc
++ ${webrtc_lib_prefix}tg_owt
+ )
+ if (APPLE)
+ target_include_directories(external_webrtc
+@@ -87,7 +87,7 @@ if (WIN32)
+ wmcodecdspuuid.lib
+ amstrmid.lib
+ msdmo.lib
+- )
++ )
+ elseif (APPLE)
+ target_link_libraries(external_webrtc
+ INTERFACE
+diff --git a/init_target.cmake b/init_target.cmake
+index 936a364..3a4806b 100644
+--- a/init_target.cmake
++++ b/init_target.cmake
+@@ -17,7 +17,7 @@ endfunction()
+
+ function(init_target target_name) # init_target(my_target folder_name)
+ if (ARGC GREATER 1)
+- if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11)
++ if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11 OR ${ARGV1} STREQUAL cxx_std_17)
+ target_compile_features(${target_name} PUBLIC ${ARGV1})
+ else()
+ target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD})
+--
+2.28.0
+
More information about the arch-commits
mailing list