Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package telegram-desktop for
openSUSE:Factory checked in at 2022-06-25 10:24:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telegram-desktop (Old)
and /work/SRC/openSUSE:Factory/.telegram-desktop.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telegram-desktop"
Sat Jun 25 10:24:37 2022 rev:77 rq:984930 version:4.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/telegram-desktop/telegram-desktop.changes
2022-06-10 15:58:08.632864918 +0200
+++
/work/SRC/openSUSE:Factory/.telegram-desktop.new.1548/telegram-desktop.changes
2022-06-25 10:24:57.502733389 +0200
@@ -1,0 +2,50 @@
+Fri Jun 24 09:16:23 UTC 2022 - Manfred Hollstein <manfre...@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.
+
+-------------------------------------------------------------------
Old:
----
0002-tg_owt-fix-name-confliction.patch
0005-add-wayland-include-path.patch
fix-unused-variable-error.patch
tdesktop-3.7.3-full.tar.gz
New:
----
tdesktop-4.0.0-full.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telegram-desktop.spec ++++++
--- /var/tmp/diff_new_pack.tjXmAb/_old 2022-06-25 10:24:59.098735667 +0200
+++ /var/tmp/diff_new_pack.tjXmAb/_new 2022-06-25 10:24:59.102735673 +0200
@@ -33,8 +33,10 @@
%define _dwz_low_mem_die_limit 40000000
%define _dwz_max_die_limit 200000000
+%define qt_major_version 6
+
Name: telegram-desktop
-Version: 3.7.3
+Version: 4.0.0
Release: 0
Summary: Messaging application with a focus on speed and security
License: GPL-3.0-only
@@ -48,15 +50,9 @@
# PATCH-FIX-OPENSUSE
Patch1: 0001-use-bundled-ranged-exptected-gsl.patch
# PATCH-FIX-OPENSUSE
-Patch2: 0002-tg_owt-fix-name-confliction.patch
-# PATCH-FIX-OPENSUSE
Patch3: 0003-revert-webrtc-cmake-target-file.patch
# PATCH-FIX-OPENSUSE
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:
# https://github.com/desktop-app/lib_base.git
3582bca53a1e195a31760978dc41f67ce44fc7e4
# but tdesktop itself still falls short, and it looks to be something
@@ -81,8 +77,6 @@
BuildRequires: libwebrtc_audio_processing-devel
BuildRequires: ninja
BuildRequires: pkgconfig
-BuildRequires: qt6-gui-private-devel
-BuildRequires: qt6-waylandclient-private-devel
BuildRequires: unzip
BuildRequires: wayland-devel
BuildRequires: webkit2gtk3-devel
@@ -91,17 +85,25 @@
BuildRequires: xz
BuildRequires: yasm
BuildRequires: cmake(KF5Wayland)
-BuildRequires: cmake(Qt6Concurrent)
-BuildRequires: cmake(Qt6Core5Compat)
-BuildRequires: cmake(Qt6DBus)
-BuildRequires: cmake(Qt6Network)
-BuildRequires: cmake(Qt6OpenGL)
-BuildRequires: cmake(Qt6OpenGLWidgets)
-BuildRequires: cmake(Qt6Svg)
-BuildRequires: cmake(Qt6WaylandClient)
-BuildRequires: cmake(Qt6Widgets)
+BuildRequires: cmake(Qt%{qt_major_version}Concurrent)
+BuildRequires: cmake(Qt%{qt_major_version}Core)
+BuildRequires: cmake(Qt%{qt_major_version}DBus)
+BuildRequires: cmake(Qt%{qt_major_version}Network)
+BuildRequires: cmake(Qt%{qt_major_version}OpenGL)
+BuildRequires: cmake(Qt%{qt_major_version}Svg)
+BuildRequires: cmake(Qt%{qt_major_version}WaylandClient)
+BuildRequires: cmake(Qt%{qt_major_version}Widgets)
+%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(dbusmenu-qt5)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
@@ -125,6 +127,7 @@
BuildRequires: pkgconfig(libpcre16)
BuildRequires: pkgconfig(libpcrecpp)
BuildRequires: pkgconfig(libpcreposix)
+BuildRequires: pkgconfig(libpipewire-0.3)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libproxy-1.0)
BuildRequires: pkgconfig(libpulse)
@@ -161,11 +164,16 @@
# Runtime requirements
Requires: hicolor-icon-theme
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
Recommends: xdg-desktop-portal
Recommends: google-opensans-fonts
-Recommends: qt6-wayland
%description
Telegram is a non-profit cloud-based instant messaging service.
@@ -179,14 +187,11 @@
%patch1 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
cd ../
unzip -q %{SOURCE2}
mkdir Libraries
mv tg_owt-master Libraries/tg_owt
-%patch2 -p2 -d Libraries/tg_owt
%build
%if %{with compiler_upgrade}
@@ -219,7 +224,13 @@
%cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_BUILD_TYPE=Release \
+%if %{qt_major_version} == 6
-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_HASH=d524b414d21f4d37f08684c1df41ac9c \
-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
++++++ tdesktop-3.7.3-full.tar.gz -> tdesktop-4.0.0-full.tar.gz ++++++
/work/SRC/openSUSE:Factory/telegram-desktop/tdesktop-3.7.3-full.tar.gz
/work/SRC/openSUSE:Factory/.telegram-desktop.new.1548/tdesktop-4.0.0-full.tar.gz
differ: char 5, line 1
++++++ tg_owt-master.zip ++++++
Binary files /var/tmp/diff_new_pack.tjXmAb/_old and
/var/tmp/diff_new_pack.tjXmAb/_new differ
++++++ tg_owt-packager.py ++++++
--- /var/tmp/diff_new_pack.tjXmAb/_old 2022-06-25 10:24:59.350736027 +0200
+++ /var/tmp/diff_new_pack.tjXmAb/_new 2022-06-25 10:24:59.358736039 +0200
@@ -22,44 +22,44 @@
for sms in repo.submodules:
sms.update(init=True)
-def find_pipewire_path(repo):
- "Return the relative path of pipewire (relative to repo path)"
- sms = map(lambda x: x.name, repo.submodules)
- sms = filter(lambda x: "pipewire" in x, sms)
- sms = list(sms)
- assert len(sms) == 1, f"find more than 1 pipewire submodule: {sms}"
- return sms[0]
-
-def find_pipewire_ver(pipeware_path):
- pw_build_file = os.path.join(pipeware_path, "meson.build")
- with open(pw_build_file, "r") as pf:
- pw_build = list(map(lambda x: x.strip(), pf.read().splitlines()))
- version_re = "^version : '([0-9]+)\.([0-9]+)\.([0-9]+)',"
- apiver_re = "^apiversion = '([0-9.]+)'"
- 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))
- 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}"
- ver = re.match(version_re, ver_line[0]).groups()
- api_ver = re.match(apiver_re, apiver_line[0]).groups()[0]
- return ver, api_ver
-
-def gen_pipewire_version_header(pipewire_path, pw_ver, pw_apiver):
- pw_ver_major, pw_ver_minor, pw_ver_micro = pw_ver
- replace_map = {
- '@PIPEWIRE_API_VERSION@': pw_apiver,
- '@PIPEWIRE_VERSION_MAJOR@': pw_ver_major,
- '@PIPEWIRE_VERSION_MINOR@': pw_ver_minor,
- '@PIPEWIRE_VERSION_MICRO@': pw_ver_micro,
- }
- part_header_file = os.path.join(pipewire_path, "src", "pipewire",
"version.h.in")
- with open(part_header_file, "r") as phf:
- part_header = phf.read()
- for k, v in replace_map.items():
- part_header = part_header.replace(k, v)
- header_file = os.path.join(pipewire_path, "src", "pipewire", "version.h")
- with open(header_file, "w") as hf:
- hf.write(part_header)
+#def find_pipewire_path(repo):
+# "Return the relative path of pipewire (relative to repo path)"
+# sms = map(lambda x: x.name, repo.submodules)
+# sms = filter(lambda x: "pipewire" in x, sms)
+# sms = list(sms)
+# assert len(sms) == 1, f"find more than 1 pipewire submodule: {sms}"
+# return sms[0]
+#
+#def find_pipewire_ver(pipeware_path):
+# pw_build_file = os.path.join(pipeware_path, "meson.build")
+# with open(pw_build_file, "r") as pf:
+# pw_build = list(map(lambda x: x.strip(), pf.read().splitlines()))
+# version_re = "^version : '([0-9]+)\.([0-9]+)\.([0-9]+)',"
+# apiver_re = "^apiversion = '([0-9.]+)'"
+# 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))
+# 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}"
+# ver = re.match(version_re, ver_line[0]).groups()
+# api_ver = re.match(apiver_re, apiver_line[0]).groups()[0]
+# return ver, api_ver
+#
+#def gen_pipewire_version_header(pipewire_path, pw_ver, pw_apiver):
+# pw_ver_major, pw_ver_minor, pw_ver_micro = pw_ver
+# replace_map = {
+# '@PIPEWIRE_API_VERSION@': pw_apiver,
+# '@PIPEWIRE_VERSION_MAJOR@': pw_ver_major,
+# '@PIPEWIRE_VERSION_MINOR@': pw_ver_minor,
+# '@PIPEWIRE_VERSION_MICRO@': pw_ver_micro,
+# }
+# part_header_file = os.path.join(pipewire_path, "src", "pipewire",
"version.h.in")
+# with open(part_header_file, "r") as phf:
+# part_header = phf.read()
+# for k, v in replace_map.items():
+# part_header = part_header.replace(k, v)
+# header_file = os.path.join(pipewire_path, "src", "pipewire", "version.h")
+# with open(header_file, "w") as hf:
+# hf.write(part_header)
def compress_package(repo_dir):
basename = os.path.basename(repo_dir)
@@ -76,9 +76,9 @@
repo_dir = args.repo_dir
repo = clone_repo(tg_owt_url, repo_dir)
load_submodules(repo)
- pipewire_path = find_pipewire_path(repo)
- pipewire_path = os.path.join(repo_dir, pipewire_path)
- pw_ver, pw_apiver = find_pipewire_ver(pipewire_path)
- gen_pipewire_version_header(pipewire_path, pw_ver, pw_apiver)
+# pipewire_path = find_pipewire_path(repo)
+# pipewire_path = os.path.join(repo_dir, pipewire_path)
+# pw_ver, pw_apiver = find_pipewire_ver(pipewire_path)
+# gen_pipewire_version_header(pipewire_path, pw_ver, pw_apiver)
compress_package(repo_dir)
