rpm/telegram-desktop
SHA256
1
0
Fork 0
forked from pool/telegram-desktop
Code Pull Requests Activity

Accepting request 984925 from home:manfred-h

Browse Source 
- Update tg_owt; this does not include pipewire anymore, therefore:
  * Add BuildRequires: pkgconfig(libpipewire-0.3)
- Remove patches no longer needed:
  * 0002-tg_owt-fix-name-confliction.patch
  * 0005-add-wayland-include-path.patch
  * fix-unused-variable-error.patch
- Add suport for Qt version 6
- Update to version 4.0.0
  * Premium: Send media and files each up to 4 GB in size.
  * Premium: Download media and files at the fastest possible speed,
    with no limits.
  * Premium: Double most of the limits in the app.
  * Premium: Get a new button next to any voice message to generate
    a transcript of its audio.
  * Premium: React with even more emoji, including :clown: and 😍.
  * Premium: Send unique stickers with additional effects, updated
    monthly.
  * Premium: Set a default chat folder or enable tools to
    auto-archive and hide new chats.
  * Premium: Subscribers have a badge next to their name, showing
    they help support Telegram.
  * Premium: Show off your profile video that will be animated for
    everyone in chats and the chat list.
  * Premium: Sponsored Messages that are sometimes shown in public
    channels will no longer appear.
  * Enable join requests for your public groups – no invite links
    required.
  * Users who open the group will see an Apply to Join Group button.
  * Once approved by an admin, users will be able to participate in
    the chat.
  * Bots that are integrated into the attachment menu can be programmed
    to work in groups and channels.
- Update to version 3.7.6
  * Settings > Advanced > Experimental adds an option to open chats
    in separate windows.
  * Fix possible crash in video chat reconnection.
  * Fix possible crash after account switch.
- Update to version 3.7.5
  * Improve cloud password management design.
  * Fix a crash in shared media search.
  * Fix audio recording on macOS.
- Update to version 3.7.4
  * More icons for chat folders.
  * Improve some more sections design.
  * Update the OpenAL library to 1.22.0.

OBS-URL: https://build.opensuse.org/request/show/984925
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=226
This commit is contained in:
Xu Zhao 2022-06-24 18:02:14 +00:00 committed by Git OBS Bridge
parent a71148f935
commit f06fc4c971
9 changed files with 132 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

357
0002-tg_owt-fix-name-confliction.patch
View File

@ -1,357 +0,0 @@
diff --git a/tg_owt-master/src/pc/external_hmac.cc b/tg_owt/src/pc/external_hmac.cc
index 99021f8..19b87cb 100644
--- a/tg_owt-master/src/pc/external_hmac.cc
+++ b/tg_owt/src/pc/external_hmac.cc
@@ -15,7 +15,7 @@
#include "rtc_base/logging.h"
#include "rtc_base/zero_memory.h"
-#include "third_party/libsrtp/include/srtp.h"
+#include "third_party/libsrtp/include/private_srtp.h"
// Begin test case 0 */
static const uint8_t kExternalHmacTestCase0Key[20] = {
diff --git a/tg_owt-master/src/pc/external_hmac.h b/tg_owt/src/pc/external_hmac.h
index 3319bea..3c1cffc 100644
--- a/tg_owt-master/src/pc/external_hmac.h
+++ b/tg_owt/src/pc/external_hmac.h
@@ -32,7 +32,7 @@
#include "third_party/libsrtp/crypto/include/auth.h"
#include "third_party/libsrtp/crypto/include/crypto_types.h"
-#include "third_party/libsrtp/include/srtp.h"
+#include "third_party/libsrtp/include/private_srtp.h"
#define EXTERNAL_HMAC_SHA1 SRTP_HMAC_SHA1 + 1
#define HMAC_KEY_LENGTH 20
diff --git a/tg_owt-master/src/pc/srtp_session.cc b/tg_owt/src/pc/srtp_session.cc
index 5ded455..90643f8 100644
--- a/tg_owt-master/src/pc/srtp_session.cc
+++ b/tg_owt/src/pc/srtp_session.cc
@@ -21,7 +21,7 @@
#include "rtc_base/time_utils.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h"
-#include "third_party/libsrtp/include/srtp.h"
+#include "third_party/libsrtp/include/private_srtp.h"
#include "third_party/libsrtp/include/srtp_priv.h"
namespace cricket {
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c
index b3a449b..ab4c529 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c
+++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_gcm_ossl.c
@@ -50,7 +50,7 @@
#include "aes_icm_ossl.h"
#include "aes_gcm_ossl.h"
#include "alloc.h"
-#include "err.h" /* for srtp_debug */
+#include "private_err.h" /* for srtp_debug */
#include "crypto_types.h"
#include "cipher_types.h"
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c
index fcd75e8..8ecdd9f 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c
+++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/aes_icm_ossl.c
@@ -53,7 +53,7 @@
#include <openssl/evp.h>
#include "aes_icm_ossl.h"
#include "crypto_types.h"
-#include "err.h" /* for srtp_debug */
+#include "private_err.h" /* for srtp_debug */
#include "alloc.h"
#include "cipher_types.h"
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/cipher.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/cipher.c
index 822cff0..2593183 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/cipher.c
+++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/cipher.c
@@ -48,7 +48,7 @@
#include "cipher.h"
#include "crypto_types.h"
-#include "err.h" /* for srtp_debug */
+#include "private_err.h" /* for srtp_debug */
#include "alloc.h" /* for crypto_alloc(), crypto_free() */
srtp_debug_module_t srtp_mod_cipher = {
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/null_cipher.c b/tg_owt/src/third_party/libsrtp/crypto/cipher/null_cipher.c
index f5e4469..1576150 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/cipher/null_cipher.c
+++ b/tg_owt/src/third_party/libsrtp/crypto/cipher/null_cipher.c
@@ -48,7 +48,7 @@
#include "datatypes.h"
#include "null_cipher.h"
-#include "err.h" /* for srtp_debug */
+#include "private_err.h" /* for srtp_debug */
#include "alloc.h"
#include "cipher_types.h"
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/auth.c b/tg_owt/src/third_party/libsrtp/crypto/hash/auth.c
index 9ffbfb2..0ef283d 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/auth.c
+++ b/tg_owt/src/third_party/libsrtp/crypto/hash/auth.c
@@ -46,7 +46,7 @@
#include "config.h"
#include "auth.h"
-#include "err.h" /* for srtp_debug */
+#include "private_err.h" /* for srtp_debug */
#include "datatypes.h" /* for octet_string */
/* the debug module for authentiation */
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/hmac_ossl.c b/tg_owt/src/third_party/libsrtp/crypto/hash/hmac_ossl.c
index 36cfb71..8cb52b9 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/hmac_ossl.c
+++ b/tg_owt/src/third_party/libsrtp/crypto/hash/hmac_ossl.c
@@ -46,7 +46,7 @@
#include "auth.h"
#include "alloc.h"
-#include "err.h" /* for srtp_debug */
+#include "private_err.h" /* for srtp_debug */
#include <openssl/evp.h>
#include <openssl/hmac.h>
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/hash/null_auth.c b/tg_owt/src/third_party/libsrtp/crypto/hash/null_auth.c
index 01d7722..219d47d 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/hash/null_auth.c
+++ b/tg_owt/src/third_party/libsrtp/crypto/hash/null_auth.c
@@ -47,7 +47,7 @@
#include "config.h"
#include "null_auth.h"
-#include "err.h" /* for srtp_debug */
+#include "private_err.h" /* for srtp_debug */
#include "alloc.h"
#include "cipher_types.h"
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h b/tg_owt/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h
index d5b83ee..c1862e1 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/aes_gcm_ossl.h
@@ -47,7 +47,7 @@
#define AES_GCM_OSSL_H
#include "cipher.h"
-#include "srtp.h"
+#include "private_srtp.h"
#include "datatypes.h"
#include <openssl/evp.h>
#include <openssl/aes.h>
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/auth.h b/tg_owt/src/third_party/libsrtp/crypto/include/auth.h
index 774ea16..11f3b93 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/auth.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/auth.h
@@ -46,7 +46,7 @@
#ifndef SRTP_AUTH_H
#define SRTP_AUTH_H
-#include "srtp.h"
+#include "private_srtp.h"
#include "crypto_types.h" /* for values of auth_type_id_t */
#ifdef __cplusplus
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher.h b/tg_owt/src/third_party/libsrtp/crypto/include/cipher.h
index 4f14e35..2221cda 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/cipher.h
@@ -45,7 +45,7 @@
#ifndef SRTP_CIPHER_H
#define SRTP_CIPHER_H
-#include "srtp.h"
+#include "private_srtp.h"
#include "crypto_types.h" /* for values of cipher_type_id_t */
#ifdef __cplusplus
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher_types.h b/tg_owt/src/third_party/libsrtp/crypto/include/cipher_types.h
index a543b54..88228df 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/cipher_types.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/cipher_types.h
@@ -39,6 +39,7 @@
#include "cipher.h"
#include "auth.h"
+#include "private_err.h"
/*
* cipher types that can be included in the kernel
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/crypto_kernel.h b/tg_owt/src/third_party/libsrtp/crypto/include/crypto_kernel.h
index 1f8dfa7..0005b7d 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/crypto_kernel.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/crypto_kernel.h
@@ -47,7 +47,7 @@
#include "cipher.h"
#include "auth.h"
-#include "err.h"
+#include "private_err.h"
#include "crypto_types.h"
#include "key.h"
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/key.h b/tg_owt/src/third_party/libsrtp/crypto/include/key.h
index 3498114..fe0c220 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/key.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/key.h
@@ -46,7 +46,7 @@
#define KEY_H
#include "rdbx.h" /* for srtp_xtd_seq_num_t */
-#include "err.h"
+#include "private_err.h"
#ifdef __cplusplus
extern "C" {
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h b/tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h
similarity index 98%
rename from tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h
rename to tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h
index 779c3ac..e257fb2 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/aes.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/private_aes.h
@@ -47,7 +47,7 @@
#define AES_H
#include "datatypes.h"
-#include "err.h"
+#include "private_err.h"
#ifdef __cplusplus
extern "C" {
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/err.h b/tg_owt/src/third_party/libsrtp/crypto/include/private_err.h
similarity index 99%
rename from tg_owt-master/src/third_party/libsrtp/crypto/include/err.h
rename to tg_owt/src/third_party/libsrtp/crypto/include/private_err.h
index 66a1023..d82191a 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/err.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/private_err.h
@@ -47,7 +47,7 @@
#include <stdio.h>
#include <stdarg.h>
-#include "srtp.h"
+#include "private_srtp.h"
#ifdef __cplusplus
extern "C" {
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdb.h b/tg_owt/src/third_party/libsrtp/crypto/include/rdb.h
index 98314c1..97387c0 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdb.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/rdb.h
@@ -48,7 +48,7 @@
#include "integers.h" /* for uint32_t */
#include "datatypes.h" /* for v128_t */
-#include "err.h" /* for srtp_err_status_t */
+#include "private_err.h" /* for srtp_err_status_t */
#ifdef __cplusplus
extern "C" {
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdbx.h b/tg_owt/src/third_party/libsrtp/crypto/include/rdbx.h
index 2194178..8740996 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/rdbx.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/rdbx.h
@@ -48,7 +48,7 @@
#define RDBX_H
#include "datatypes.h"
-#include "err.h"
+#include "private_err.h"
#ifdef __cplusplus
extern "C" {
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/include/stat.h b/tg_owt/src/third_party/libsrtp/crypto/include/stat.h
index 1894e04..8001645 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/include/stat.h
+++ b/tg_owt/src/third_party/libsrtp/crypto/include/stat.h
@@ -47,7 +47,7 @@
#define STAT_H
#include "datatypes.h" /* for uint8_t */
-#include "err.h" /* for srtp_err_status_t */
+#include "private_err.h" /* for srtp_err_status_t */
#ifdef __cplusplus
extern "C" {
diff --git a/tg_owt-master/src/third_party/libsrtp/crypto/kernel/err.c b/tg_owt/src/third_party/libsrtp/crypto/kernel/err.c
index e9bb64b..ff4123f 100644
--- a/tg_owt-master/src/third_party/libsrtp/crypto/kernel/err.c
+++ b/tg_owt/src/third_party/libsrtp/crypto/kernel/err.c
@@ -44,7 +44,7 @@
#include "config.h"
-#include "err.h"
+#include "private_err.h"
#include "datatypes.h"
#include <string.h>
diff --git a/tg_owt-master/src/third_party/libsrtp/include/ekt.h b/tg_owt/src/third_party/libsrtp/include/ekt.h
index a289a53..d87d60d 100644
--- a/tg_owt-master/src/third_party/libsrtp/include/ekt.h
+++ b/tg_owt/src/third_party/libsrtp/include/ekt.h
@@ -62,6 +62,7 @@
// left in commented out as reminder to not include private headers
//#include "srtp_priv.h"
+#include "private_aes.h"
#ifdef __cplusplus
extern "C" {
diff --git a/tg_owt-master/src/third_party/libsrtp/include/srtp.h b/tg_owt/src/third_party/libsrtp/include/private_srtp.h
similarity index 100%
rename from tg_owt-master/src/third_party/libsrtp/include/srtp.h
rename to tg_owt/src/third_party/libsrtp/include/private_srtp.h
diff --git a/tg_owt-master/src/third_party/libsrtp/include/srtp_priv.h b/tg_owt/src/third_party/libsrtp/include/srtp_priv.h
index 1e86df7..6fd4997 100644
--- a/tg_owt-master/src/third_party/libsrtp/include/srtp_priv.h
+++ b/tg_owt/src/third_party/libsrtp/include/srtp_priv.h
@@ -48,13 +48,13 @@
// Leave this as the top level import. Ensures the existence of defines
#include "config.h"
-#include "srtp.h"
+#include "private_srtp.h"
#include "rdbx.h"
#include "rdb.h"
#include "integers.h"
#include "cipher.h"
#include "auth.h"
-#include "aes.h"
+#include "private_aes.h"
#include "key.h"
#include "crypto_kernel.h"
diff --git a/tg_owt-master/src/third_party/libsrtp/srtp/ekt.c b/tg_owt/src/third_party/libsrtp/srtp/ekt.c
index b54ecf6..96b0a1d 100644
--- a/tg_owt-master/src/third_party/libsrtp/srtp/ekt.c
+++ b/tg_owt/src/third_party/libsrtp/srtp/ekt.c
@@ -43,7 +43,7 @@
*/
#include "srtp_priv.h"
-#include "err.h"
+#include "private_err.h"
#include "ekt.h"
extern srtp_debug_module_t mod_srtp;
diff --git a/tg_owt-master/src/third_party/libsrtp/srtp/srtp.c b/tg_owt/src/third_party/libsrtp/srtp/srtp.c
index 4462501..6de2495 100644
--- a/tg_owt-master/src/third_party/libsrtp/srtp/srtp.c
+++ b/tg_owt/src/third_party/libsrtp/srtp/srtp.c
@@ -47,10 +47,11 @@
#include "srtp_priv.h"
#include "crypto_types.h"
-#include "err.h"
+#include "private_err.h"
#include "ekt.h" /* for SRTP Encrypted Key Transport */
#include "alloc.h" /* for srtp_crypto_alloc() */
+
#ifdef OPENSSL
#include "aes_gcm_ossl.h" /* for AES GCM mode */
#ifdef OPENSSL_KDF

10
0005-add-wayland-include-path.patch
View File

@ -1,10 +0,0 @@
--- a/Telegram/lib_waylandshells/waylandshells/xdg-shell/CMakeLists.txt
+++ b/Telegram/lib_waylandshells/waylandshells/xdg-shell/CMakeLists.txt
@@ -45,6 +45,7 @@
target_include_directories(lib_waylandshells_xdg_shell
PRIVATE
${src_loc}
+ /usr/include/wayland
${CMAKE_CURRENT_BINARY_DIR}
)

21
fix-unused-variable-error.patch
View File

@ -1,21 +0,0 @@
diff -Nur tdesktop-3.7.3-full/Telegram/ThirdParty/dispatch/src/BlocksRuntime/runtime.c new/Telegram/ThirdParty/dispatch/src/BlocksRuntime/runtime.c
--- tdesktop-3.7.3-full/Telegram/ThirdParty/dispatch/src/BlocksRuntime/runtime.c 2021-09-17 06:54:52.000000000 +0200
+++ new/Telegram/ThirdParty/dispatch/src/BlocksRuntime/runtime.c 2022-05-02 19:30:46.128231255 +0200
@@ -468,7 +468,6 @@
// Old compiler SPI
static void _Block_byref_release(const void *arg) {
struct Block_byref *byref = (struct Block_byref *)arg;
- int32_t refcount;
// dereference the forwarding pointer since the compiler isn't doing this anymore (ever?)
byref = byref->forwarding;
@@ -478,8 +477,7 @@
if ((byref->flags & BLOCK_BYREF_NEEDS_FREE) == 0) {
return; // stack or GC or global
}
- refcount = byref->flags & BLOCK_REFCOUNT_MASK;
- os_assert(refcount);
+ os_assert(byref->flags & BLOCK_REFCOUNT_MASK);
if (latching_decr_int_should_deallocate(&byref->flags)) {
if (byref->flags & BLOCK_BYREF_HAS_COPY_DISPOSE) {
struct Block_byref_2 *byref2 = (struct Block_byref_2 *)(byref+1);

3
tdesktop-3.7.3-full.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9735f30610ff62b01cbdb0b945d32c494cec245961023c9860d9dd5268b9fe1e
size 41365751

3
tdesktop-4.0.0-full.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f4ff20e1ac8ffdd4066d708f835fb1168c83bf4b74a20a52c9a31a0305e5a0c7
size 41056249

50
telegram-desktop.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Fri Jun 24 09:16:23 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
- Update tg_owt; this does not include pipewire anymore, therefore:
* Add BuildRequires: pkgconfig(libpipewire-0.3)
- Remove patches no longer needed:
* 0002-tg_owt-fix-name-confliction.patch
* 0005-add-wayland-include-path.patch
* fix-unused-variable-error.patch
- Add suport for Qt version 6
- Update to version 4.0.0
* Premium: Send media and files each up to 4 GB in size.
* Premium: Download media and files at the fastest possible speed,
with no limits.
* Premium: Double most of the limits in the app.
* Premium: Get a new button next to any voice message to generate
a transcript of its audio.
* Premium: React with even more emoji, including :clown: and 😍.
* Premium: Send unique stickers with additional effects, updated
monthly.
* Premium: Set a default chat folder or enable tools to
auto-archive and hide new chats.
* Premium: Subscribers have a badge next to their name, showing
they help support Telegram.
* Premium: Show off your profile video that will be animated for
everyone in chats and the chat list.
* Premium: Sponsored Messages that are sometimes shown in public
channels will no longer appear.
* Enable join requests for your public groups – no invite links
required.
* Users who open the group will see an Apply to Join Group button.
* Once approved by an admin, users will be able to participate in
the chat.
* Bots that are integrated into the attachment menu can be programmed
to work in groups and channels.
- Update to version 3.7.6
* Settings > Advanced > Experimental adds an option to open chats
in separate windows.
* Fix possible crash in video chat reconnection.
* Fix possible crash after account switch.
- Update to version 3.7.5
* Improve cloud password management design.
* Fix a crash in shared media search.
* Fix audio recording on macOS.
- Update to version 3.7.4
* More icons for chat folders.
* Improve some more sections design.
* Update the OpenAL library to 1.22.0.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 3 08:08:46 UTC 2022 - marec <marec@detebe.org> Fri Jun 3 08:08:46 UTC 2022 - marec <marec@detebe.org>

59
telegram-desktop.spec
View File

@ -33,8 +33,10 @@
%define _dwz_low_mem_die_limit 40000000 %define _dwz_low_mem_die_limit 40000000
%define _dwz_max_die_limit 200000000 %define _dwz_max_die_limit 200000000
%define qt_major_version 6
Name: telegram-desktop Name: telegram-desktop
Version: 3.7.3 Version: 4.0.0
Release: 0 Release: 0
Summary: Messaging application with a focus on speed and security Summary: Messaging application with a focus on speed and security
License: GPL-3.0-only License: GPL-3.0-only
@ -48,15 +50,9 @@ Source2: tg_owt-master.zip
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch1: 0001-use-bundled-ranged-exptected-gsl.patch Patch1: 0001-use-bundled-ranged-exptected-gsl.patch
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch2: 0002-tg_owt-fix-name-confliction.patch
# PATCH-FIX-OPENSUSE
Patch3: 0003-revert-webrtc-cmake-target-file.patch Patch3: 0003-revert-webrtc-cmake-target-file.patch
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch4: 0004-use-dynamic-x-libraries.patch Patch4: 0004-use-dynamic-x-libraries.patch
# PATCH-FIX-OPENSUSE
Patch5: 0005-add-wayland-include-path.patch
# PATCH-FIX-OPENSUSE
Patch6: fix-unused-variable-error.patch
# There is an (incomplete) patch available for part of the source: # There is an (incomplete) patch available for part of the source:
# https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4 # https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4
# but tdesktop itself still falls short, and it looks to be something # but tdesktop itself still falls short, and it looks to be something
@ -81,8 +77,6 @@ BuildRequires: liblz4-devel
BuildRequires: libwebrtc_audio_processing-devel BuildRequires: libwebrtc_audio_processing-devel
BuildRequires: ninja BuildRequires: ninja
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: qt6-gui-private-devel
BuildRequires: qt6-waylandclient-private-devel
BuildRequires: unzip BuildRequires: unzip
BuildRequires: wayland-devel BuildRequires: wayland-devel
BuildRequires: webkit2gtk3-devel BuildRequires: webkit2gtk3-devel
@ -91,17 +85,25 @@ BuildRequires: xxhash-devel
BuildRequires: xz BuildRequires: xz
BuildRequires: yasm BuildRequires: yasm
BuildRequires: cmake(KF5Wayland) BuildRequires: cmake(KF5Wayland)
BuildRequires: cmake(Qt6Concurrent) BuildRequires: cmake(Qt%{qt_major_version}Concurrent)
BuildRequires: cmake(Qt6Core5Compat) BuildRequires: cmake(Qt%{qt_major_version}Core)
BuildRequires: cmake(Qt6DBus) BuildRequires: cmake(Qt%{qt_major_version}DBus)
BuildRequires: cmake(Qt6Network) BuildRequires: cmake(Qt%{qt_major_version}Network)
BuildRequires: cmake(Qt6OpenGL) BuildRequires: cmake(Qt%{qt_major_version}OpenGL)
BuildRequires: cmake(Qt6OpenGLWidgets) BuildRequires: cmake(Qt%{qt_major_version}Svg)
BuildRequires: cmake(Qt6Svg) BuildRequires: cmake(Qt%{qt_major_version}WaylandClient)
BuildRequires: cmake(Qt6WaylandClient) BuildRequires: cmake(Qt%{qt_major_version}Widgets)
BuildRequires: cmake(Qt6Widgets) %if %{qt_major_version} >= 6
BuildRequires: qt%{qt_major_version}-gui-private-devel
BuildRequires: qt%{qt_major_version}-waylandclient-private-devel
BuildRequires: cmake(Qt%{qt_major_version}Core5Compat)
BuildRequires: cmake(Qt%{qt_major_version}OpenGLWidgets)
%else
BuildRequires: libQt5Gui-private-headers-devel
BuildRequires: libqt5-qtwayland-private-headers-devel
BuildRequires: pkgconfig(dbusmenu-qt%{qt_major_version})
%endif
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(dbusmenu-qt5)
BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(freetype2)
@ -125,6 +127,7 @@ BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libpcre16) BuildRequires: pkgconfig(libpcre16)
BuildRequires: pkgconfig(libpcrecpp) BuildRequires: pkgconfig(libpcrecpp)
BuildRequires: pkgconfig(libpcreposix) BuildRequires: pkgconfig(libpcreposix)
BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(libproxy-1.0)
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse)
@ -161,11 +164,16 @@ BuildRequires: pkgconfig(zlib)
# Runtime requirements # Runtime requirements
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
Requires: icu Requires: icu
Requires: qt6-imageformats %if %{qt_major_version} >= 6
Requires: qt%{qt_major_version}-imageformats
Recommends: qt%{qt_major_version}-wayland
%else
Requires: libqt%{qt_major_version}-qtimageformats
Recommends: libqt%{qt_major_version}-qtwayland
%endif
# TDesktop can fall back to a simple GTK file picker but prefers the portal # TDesktop can fall back to a simple GTK file picker but prefers the portal
Recommends: xdg-desktop-portal Recommends: xdg-desktop-portal
Recommends: google-opensans-fonts Recommends: google-opensans-fonts
Recommends: qt6-wayland
%description %description
Telegram is a non-profit cloud-based instant messaging service. Telegram is a non-profit cloud-based instant messaging service.
@ -179,14 +187,11 @@ The service also provides APIs to independent developers.
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch6 -p1
cd ../ cd ../
unzip -q %{SOURCE2} unzip -q %{SOURCE2}
mkdir Libraries mkdir Libraries
mv tg_owt-master Libraries/tg_owt mv tg_owt-master Libraries/tg_owt
%patch2 -p2 -d Libraries/tg_owt
%build %build
%if %{with compiler_upgrade} %if %{with compiler_upgrade}
@ -219,7 +224,13 @@ cd %{_builddir}/tdesktop-%{version}-full
%cmake \ %cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
%if %{qt_major_version} == 6
-DDESKTOP_APP_QT6=ON \ -DDESKTOP_APP_QT6=ON \
%else
-DDESKTOP_APP_QT6=OFF \
-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON \
-DDESKTOP_APP_USE_ENCHANT=ON \
%endif
-DTDESKTOP_API_ID=611335 \ -DTDESKTOP_API_ID=611335 \
-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \ -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \ -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \

4
tg_owt-master.zip
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ef173882422e65e1388db5659f507b6d9884290d90f200e608d0d288356c2475 oid sha256:0f3ee1c93d421ff43d951ca0d72e844dcb912f53f129451520e21fdaa4c56363
size 25390157 size 23694606

84
tg_owt-packager.py
View File

@ -22,44 +22,44 @@ def load_submodules(repo):
for sms in repo.submodules: for sms in repo.submodules:
sms.update(init=True) sms.update(init=True)
def find_pipewire_path(repo): #def find_pipewire_path(repo):
"Return the relative path of pipewire (relative to repo path)" # "Return the relative path of pipewire (relative to repo path)"
sms = map(lambda x: x.name, repo.submodules) # sms = map(lambda x: x.name, repo.submodules)
sms = filter(lambda x: "pipewire" in x, sms) # sms = filter(lambda x: "pipewire" in x, sms)
sms = list(sms) # sms = list(sms)
assert len(sms) == 1, f"find more than 1 pipewire submodule: {sms}" # assert len(sms) == 1, f"find more than 1 pipewire submodule: {sms}"
return sms[0] # return sms[0]
#
def find_pipewire_ver(pipeware_path): #def find_pipewire_ver(pipeware_path):
pw_build_file = os.path.join(pipeware_path, "meson.build") # pw_build_file = os.path.join(pipeware_path, "meson.build")
with open(pw_build_file, "r") as pf: # with open(pw_build_file, "r") as pf:
pw_build = list(map(lambda x: x.strip(), pf.read().splitlines())) # pw_build = list(map(lambda x: x.strip(), pf.read().splitlines()))
version_re = "^version : '([0-9]+)\.([0-9]+)\.([0-9]+)'," # version_re = "^version : '([0-9]+)\.([0-9]+)\.([0-9]+)',"
apiver_re = "^apiversion = '([0-9.]+)'" # apiver_re = "^apiversion = '([0-9.]+)'"
ver_line = list(filter(lambda x: re.match(version_re, x), pw_build)) # ver_line = list(filter(lambda x: re.match(version_re, x), pw_build))
apiver_line = list(filter(lambda x: re.match(apiver_re, x), pw_build)) # apiver_line = list(filter(lambda x: re.match(apiver_re, x), pw_build))
assert len(ver_line) == 1, f"Found more than one version line: {ver_line}" # assert len(ver_line) == 1, f"Found more than one version line: {ver_line}"
assert len(apiver_line) == 1, f"Found more than one apiversion line: {apiver_line}" # assert len(apiver_line) == 1, f"Found more than one apiversion line: {apiver_line}"
ver = re.match(version_re, ver_line[0]).groups() # ver = re.match(version_re, ver_line[0]).groups()
api_ver = re.match(apiver_re, apiver_line[0]).groups()[0] # api_ver = re.match(apiver_re, apiver_line[0]).groups()[0]
return ver, api_ver # return ver, api_ver
#
def gen_pipewire_version_header(pipewire_path, pw_ver, pw_apiver): #def gen_pipewire_version_header(pipewire_path, pw_ver, pw_apiver):
pw_ver_major, pw_ver_minor, pw_ver_micro = pw_ver # pw_ver_major, pw_ver_minor, pw_ver_micro = pw_ver
replace_map = { # replace_map = {
'@PIPEWIRE_API_VERSION@': pw_apiver, # '@PIPEWIRE_API_VERSION@': pw_apiver,
'@PIPEWIRE_VERSION_MAJOR@': pw_ver_major, # '@PIPEWIRE_VERSION_MAJOR@': pw_ver_major,
'@PIPEWIRE_VERSION_MINOR@': pw_ver_minor, # '@PIPEWIRE_VERSION_MINOR@': pw_ver_minor,
'@PIPEWIRE_VERSION_MICRO@': pw_ver_micro, # '@PIPEWIRE_VERSION_MICRO@': pw_ver_micro,
} # }
part_header_file = os.path.join(pipewire_path, "src", "pipewire", "version.h.in") # part_header_file = os.path.join(pipewire_path, "src", "pipewire", "version.h.in")
with open(part_header_file, "r") as phf: # with open(part_header_file, "r") as phf:
part_header = phf.read() # part_header = phf.read()
for k, v in replace_map.items(): # for k, v in replace_map.items():
part_header = part_header.replace(k, v) # part_header = part_header.replace(k, v)
header_file = os.path.join(pipewire_path, "src", "pipewire", "version.h") # header_file = os.path.join(pipewire_path, "src", "pipewire", "version.h")
with open(header_file, "w") as hf: # with open(header_file, "w") as hf:
hf.write(part_header) # hf.write(part_header)
def compress_package(repo_dir): def compress_package(repo_dir):
basename = os.path.basename(repo_dir) basename = os.path.basename(repo_dir)
@ -76,8 +76,8 @@ if __name__ == '__main__':
repo_dir = args.repo_dir repo_dir = args.repo_dir
repo = clone_repo(tg_owt_url, repo_dir) repo = clone_repo(tg_owt_url, repo_dir)
load_submodules(repo) load_submodules(repo)
pipewire_path = find_pipewire_path(repo) # pipewire_path = find_pipewire_path(repo)
pipewire_path = os.path.join(repo_dir, pipewire_path) # pipewire_path = os.path.join(repo_dir, pipewire_path)
pw_ver, pw_apiver = find_pipewire_ver(pipewire_path) # pw_ver, pw_apiver = find_pipewire_ver(pipewire_path)
gen_pipewire_version_header(pipewire_path, pw_ver, pw_apiver) # gen_pipewire_version_header(pipewire_path, pw_ver, pw_apiver)
compress_package(repo_dir) compress_package(repo_dir)