Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WiP] telegram-desktop: update to 2.6.1.
@ 2021-03-08 19:03 Johnnynator
  2021-03-21 20:31 ` [PR PATCH] [Updated] " Johnnynator
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Johnnynator @ 2021-03-08 19:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1808 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages telegram-desktop
https://github.com/void-linux/void-packages/pull/29329

[WiP] telegram-desktop: update to 2.6.1.
- libvpx6: update to 1.10.0rc1.
- telegram-desktop: update to 2.6.1.
- tg_owt: update to 0.0.0.20210203.

Newer tg_owt does not compile with libvpx 1.9.0, but 1.10.0 should be right around the corner, so just wait

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29329.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-telegram-desktop-29329.patch --]
[-- Type: text/x-diff, Size: 6834 bytes --]

From 42c4b2f761f97b7d2061affa8e92b1a5266e8cd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 8 Mar 2021 19:59:09 +0100
Subject: [PATCH 1/3] libvpx6: update to 1.10.0rc1.

---
 srcpkgs/libvpx6/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libvpx6/template b/srcpkgs/libvpx6/template
index a929b3ebcc2..4014b7c31c6 100644
--- a/srcpkgs/libvpx6/template
+++ b/srcpkgs/libvpx6/template
@@ -1,15 +1,15 @@
 # Template file for 'libvpx6'
 pkgname=libvpx6
-version=1.9.0
+version=1.10.0rc1
 revision=1
-wrksrc=libvpx-${version}
+wrksrc=libvpx-${version/rc/-rc}
 hostmakedepends="perl yasm"
 short_desc="VP8 and VP9 video codec"
 maintainer="q66 <daniel@octaforge.org>"
 license="BSD-3-Clause-Clear"
 homepage="http://www.webmproject.org"
-distfiles="https://github.com/webmproject/libvpx/archive/v${version}.tar.gz"
-checksum=d279c10e4b9316bf11a570ba16c3d55791e1ad6faa4404c67422eb631782c80a
+distfiles="https://github.com/webmproject/libvpx/archive/v${version/rc/-rc}.tar.gz"
+checksum=8e55e04cdefeb1596968e70c5167e13d26132ca214d276292d5cda737a430af5
 replaces="libvpx<1.8.0"
 
 do_configure() {

From e613f42cedc22a06b75064d65d1d74f8e483f9e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:06:52 +0100
Subject: [PATCH 2/3] telegram-desktop: update to 2.6.1.

---
 srcpkgs/telegram-desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 5778f4c2d76..7cd6ff77158 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.5.1
-revision=2
+version=2.6.1
+revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"
@@ -26,7 +26,7 @@ license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=f1cc5e876deaa4fa4eaafbba95f127d5a3114c166802902b8584099852b9eae2
+checksum=c7878c4d7c621a175b3b27895b3fb8c20a56319214d5030d734b2768390a8b73
 
 build_options="spellcheck webrtc"
 build_options_default="spellcheck webrtc"

From c9c8c84372811f9d81b699c89bbcd49118ac41d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Mar 2021 11:17:37 +0100
Subject: [PATCH 3/3] tg_owt: update to 0.0.0.20210203.

---
 srcpkgs/tg_owt/patches/libressl.patch      | 70 ----------------------
 srcpkgs/tg_owt/patches/libressl.patch.args |  1 -
 srcpkgs/tg_owt/template                    |  9 ++-
 3 files changed, 4 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/tg_owt/patches/libressl.patch
 delete mode 100644 srcpkgs/tg_owt/patches/libressl.patch.args

diff --git a/srcpkgs/tg_owt/patches/libressl.patch b/srcpkgs/tg_owt/patches/libressl.patch
deleted file mode 100644
index fc352a2a64c..00000000000
--- a/srcpkgs/tg_owt/patches/libressl.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 3f2d8238846d4795f1292c05923b9f212dc4d022 Mon Sep 17 00:00:00 2001
-From: Charlie Li <git@vishwin.info>
-Date: Sat, 21 Nov 2020 14:24:04 -0500
-Subject: [PATCH] Fix build with LibreSSL
-
-LibreSSL's dtls1.h uses some definitions from ssl.h and ssl3.h, but
-expects consumers to include them. Reorder and include them before
-dtls1.h.
-
-LibreSSL does not define DTLS1_2_VERSION. Remove them from view.
----
- src/rtc_base/openssl_stream_adapter.cc | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/rtc_base/openssl_stream_adapter.cc b/src/rtc_base/openssl_stream_adapter.cc
-index 7f4b79a5..037002bc 100644
---- a/src/rtc_base/openssl_stream_adapter.cc
-+++ b/src/rtc_base/openssl_stream_adapter.cc
-@@ -17,8 +17,11 @@
- #include <openssl/tls1.h>
- #include <openssl/x509v3.h>
- #ifndef OPENSSL_IS_BORINGSSL
--#include <openssl/dtls1.h>
- #include <openssl/ssl.h>
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#include <openssl/ssl3.h>
-+#endif
-+#include <openssl/dtls1.h>
- #endif
- 
- #include <memory>
-@@ -392,8 +395,10 @@ SSLProtocolVersion OpenSSLStreamAdapter::GetSslVersion() const {
-   if (ssl_mode_ == SSL_MODE_DTLS) {
-     if (ssl_version == DTLS1_VERSION) {
-       return SSL_PROTOCOL_DTLS_10;
-+#ifndef LIBRESSL_VERSION_NUMBER
-     } else if (ssl_version == DTLS1_2_VERSION) {
-       return SSL_PROTOCOL_DTLS_12;
-+#endif
-     }
-   } else {
-     if (ssl_version == TLS1_VERSION) {
-@@ -985,15 +990,27 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() {
-       case SSL_PROTOCOL_TLS_12:
-       default:
-         SSL_CTX_set_max_proto_version(
-+#ifdef LIBRESSL_VERSION_NUMBER
-+            ctx, TLS1_2_VERSION);
-+#else
-             ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
-+#endif
-         break;
-     }
-   } else {
-     // TODO(https://bugs.webrtc.org/10261): Make this the default in M84.
-     SSL_CTX_set_min_proto_version(
-+#ifdef LIBRESSL_VERSION_NUMBER
-+        ctx, TLS1_2_VERSION);
-+#else
-         ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
-+#endif
-     SSL_CTX_set_max_proto_version(
-+#ifdef LIBRESSL_VERSION_NUMBER
-+        ctx, TLS1_2_VERSION);
-+#else
-         ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION);
-+#endif
-   }
- 
- #ifdef OPENSSL_IS_BORINGSSL
diff --git a/srcpkgs/tg_owt/patches/libressl.patch.args b/srcpkgs/tg_owt/patches/libressl.patch.args
deleted file mode 100644
index 2eba1cb3c5c..00000000000
--- a/srcpkgs/tg_owt/patches/libressl.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index fa0d55fc4ae..d6c4eade142 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,9 +1,8 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
-version=0.0.0.1
-revision=2
-_commit=756fd0fb5f40ffb4244c675208e84de781f766f3
-_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
+version=0.0.0.20210203
+revision=1
+_commit=a19877363082da634a3c851a4698376504d2eaee
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 wrksrc="tg_owt-$_commit"
 build_style=cmake
@@ -18,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/desktop-app/tg_owt"
 distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
  https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz"
-checksum="@43d09b00a43f9206b1f04c6d6697f4b0cb3be0285100bf5df91144b1d689c89a
+checksum="@f8e90e2435d8fd17974e9e1b8325c74dbfc9ca1dd3b216939812aa06999cd9ff
  @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
 skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"
 

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-27  9:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-08 19:03 [PR PATCH] [WiP] telegram-desktop: update to 2.6.1 Johnnynator
2021-03-21 20:31 ` [PR PATCH] [Updated] " Johnnynator
2021-03-21 20:31 ` Johnnynator
2021-03-26 23:09 ` Johnnynator
2021-03-26 23:19 ` Johnnynator
2021-03-27  9:03 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).