[rpmfusion-free-appstream-data] Update for rawhide
by Leigh Scott
commit 6329627ff992c4f907a49fc1745164613229e68e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Sep 17 09:28:58 2020 +0100
Update for rawhide
.gitignore | 2 ++
rpmfusion-free-appstream-data.spec | 7 +++++--
sources | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5580df..c90b998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ tags
/rpmfusion-free-32.xml.gz
/rpmfusion-free-33-icons.tar.gz
/rpmfusion-free-33.xml.gz
+/rpmfusion-free-34-icons.tar.gz
+/rpmfusion-free-34.xml.gz
diff --git a/rpmfusion-free-appstream-data.spec b/rpmfusion-free-appstream-data.spec
index bfb39ff..3518458 100644
--- a/rpmfusion-free-appstream-data.spec
+++ b/rpmfusion-free-appstream-data.spec
@@ -2,8 +2,8 @@
%global repoversion free
Name: %{reponame}-%{repoversion}-appstream-data
-Version: 33
-Release: 2%{?dist}
+Version: 34
+Release: 1%{?dist}
Summary: Appstream metadata for the RPM Fusion free repository
BuildArch: noarch
@@ -40,6 +40,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Thu Sep 17 2020 Leigh Scott <leigh123linux(a)gmail.com> - 34-1
+- Update for rawhide
+
* Thu Sep 10 2020 Leigh Scott <leigh123linux(a)gmail.com> - 33-2
- Regenerate for audacity-freeworld and openmw
diff --git a/sources b/sources
index f27e4af..a655712 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rpmfusion-free-33-icons.tar.gz) = 0b73ec1dec26858a1a0d1a62c31f6bb4b92605d749445044336c638da134f3328a4380d461e9899bd38a1581eb37f9ae85876a4d9e73c4688bd011db28a04882
-SHA512 (rpmfusion-free-33.xml.gz) = b57a6219c118b8ae46f4c357a952d304751a47598fb9d2327f70811471d78f766548302b486388cf588683bcf2e064fba5080675ce4fc6e6daf884179b1817d8
+SHA512 (rpmfusion-free-34-icons.tar.gz) = 3169795ec218ed52cc2fb39db01301ac066df43f0dd316902bd9ea28ff1092d37ad53a9f50948df6bece56a5da9524733d990bfe82ea9833652c0c4a68dfd7cd
+SHA512 (rpmfusion-free-34.xml.gz) = 996af727313e7c06ff84d5372edb0a8389b151edc0aed13c39f717ba647062965b83e644a4fd2b7af23163eaaff24cfc6005eafa5c70df269a98384036295acb
3 years, 8 months
[discord/f31] * Updated to 0.0.12
by seancallaway
commit e216c7e15bd69674bb544a603f304d58d26ca36f
Author: Sean Callaway <seancallaway(a)gmail.com>
Date: Wed Sep 16 19:30:08 2020 -0700
* Updated to 0.0.12
.gitignore | 1 +
discord.spec | 8 +++++++-
sources | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dfb37ef..50bc1ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/discord-0.0.9.tar.gz
/discord-0.0.10.tar.gz
/discord-0.0.11.tar.gz
+/discord-0.0.12.tar.gz
diff --git a/discord.spec b/discord.spec
index ac8371f..2663813 100644
--- a/discord.spec
+++ b/discord.spec
@@ -3,7 +3,7 @@
%global __requires_exclude libffmpeg.so
Name: discord
-Version: 0.0.11
+Version: 0.0.12
Release: 1%{?dist}
Summary: All-in-one voice and text chat for gamers
@@ -63,6 +63,12 @@ discord.desktop
%changelog
+* Fri Sep 11 2020 Sean Callaway <seancallaway(a)fedoraproject.org> - 0.0.12-1
+* Updated to 0.0.12
+
+* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Fri Aug 07 2020 Sean Callaway <seancallaway(a)fedoraproject.org> - 0.0.11-1
- Updated to 0.0.11
diff --git a/sources b/sources
index 1d59abd..cdd93d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discord-0.0.11.tar.gz) = aac728bd514b2d3467bf21291fc96192cc3024b41471cd220e6fd74792a4131a1448cd2e0f5092e476b472be8d12c4deebcc46d2b0908e21b1626215ec7c4d5f
+SHA512 (discord-0.0.12.tar.gz) = c5009e022cac0b76d39cc125a98b9dd3d7a5827dd7d733c5578237b99b746aeccc1cd253aafa99e2a237bd82ef71ee42011f864059aa5ee62812488dbd82f511
3 years, 8 months
[rfpkg] Fix (#5756) and python3 -m nose
by Sérgio M. Basto
commit 75e685c181748d0532e4528a181e4d8aed94d1bd
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Sep 16 23:41:33 2020 +0100
Fix (#5756) and python3 -m nose
d0ec0eb608024ecd6df60b1c567fd552d7e7e41d.patch | 68 +++++++++++++
rfpkg-test.patch | 128 +++++++++++++++++++++++++
rfpkg.spec | 22 +++--
3 files changed, 210 insertions(+), 8 deletions(-)
---
diff --git a/d0ec0eb608024ecd6df60b1c567fd552d7e7e41d.patch b/d0ec0eb608024ecd6df60b1c567fd552d7e7e41d.patch
new file mode 100644
index 0000000..63edf53
--- /dev/null
+++ b/d0ec0eb608024ecd6df60b1c567fd552d7e7e41d.patch
@@ -0,0 +1,68 @@
+From d0ec0eb608024ecd6df60b1c567fd552d7e7e41d Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)gmail.com>
+Date: Wed, 16 Sep 2020 01:33:57 +0100
+Subject: [PATCH] Try to address 'Commands' object has no attribute
+ 'read_koji_config'
+
+---
+ rfpkg/__init__.py | 46 +++++++---------------------------------------
+ 1 file changed, 7 insertions(+), 39 deletions(-)
+
+diff --git a/rfpkg/__init__.py b/rfpkg/__init__.py
+index 8517f72..2191d13 100644
+--- a/rfpkg/__init__.py
++++ b/rfpkg/__init__.py
+@@ -333,46 +333,14 @@ def update(self, template='bodhi.template', bugs=[]):
+ self._run_command(cmd, shell=True)
+
+ def load_kojisession(self, anon=False):
+- """Initiate a koji session.
+-
+- The koji session can be logged in or anonymous
+- """
+- koji_config = self.read_koji_config()
+-
+- # Expand out the directory options
+- for name in ('cert', 'ca', 'serverca'):
+- path = koji_config[name]
+- if path:
+- koji_config[name] = os.path.expanduser(path)
+-
+- # save the weburl and topurl for later use as well
+- self._kojiweburl = koji_config['weburl']
+- self._topurl = koji_config['topurl']
+-
+- self.log.debug('Initiating a %s session to %s',
+- os.path.basename(self.build_client), koji_config['server'])
+-
+- # Build session options used to create instance of ClientSession
+- session_opts = koji.grab_session_options(koji_config)
+-
+ try:
+- session = koji.ClientSession(koji_config['server'], session_opts)
+- except Exception:
+- raise rpkgError('Could not initiate %s session' % os.path.basename(self.build_client))
+- else:
+- if anon:
+- self._anon_kojisession = session
+- else:
+- self._kojisession = session
+-
+- if not anon:
+- try:
+- self.login_koji_session(koji_config, self._kojisession)
+- except pyrpkg.rpkgAuthError:
+- self.log.info("You might want to run rpmfusion-packager-setup or rpmfusion-cert -n to "
+- "regenerate SSL certificate. For more info see "
+- "https://rpmfusion.org/Contributors#If_SSL_certificate_expired")
+- raise
++ return super(Commands, self).load_kojisession(anon)
++ except pyrpkg.rpkgAuthError:
++ self.log.info("You might want to run rpmfusion-packager-setup "
++ "or rpmfusion-cert -n to regenerate SSL certificate. "
++ "For more info see https://rpmfusion.org/Contributors"
++ "#If_SSL_certificate_expired")
++ raise
+
+
+ def _get_bodhi_version():
diff --git a/rfpkg-test.patch b/rfpkg-test.patch
new file mode 100644
index 0000000..5601f4d
--- /dev/null
+++ b/rfpkg-test.patch
@@ -0,0 +1,128 @@
+diff --git a/setup.cfg b/setup.cfg
+index d246701..a38d7e6 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,8 +1,17 @@
++[aliases]
++test = pytest
++
+ [sdist]
+-formats=bztar
++formats = bztar
++
++[tool:pytest]
++cover-package = rfpkg
++addopts = --cov=rfpkg
++testpaths = test
++
++[flake8]
++max-line-length = 100
+
+-[nosetests]
+-verbosity=2
+-detailed-errors=1
+-with-coverage=1
+-cover-package=rfpkg
++[egg_info]
++tag_build =
++tag_date = 0
+diff --git a/setup.py b/setup.py
+index c100f67..2fb1726 100755
+--- a/setup.py
++++ b/setup.py
+@@ -3,7 +3,7 @@
+ import os
+ import sys
+
+-from setuptools import setup, find_packages
++from setuptools import find_packages, setup
+
+ try:
+ from subprocess import getstatusoutput
+@@ -55,7 +55,6 @@ setup(
+
+ install_requires=install_requires,
+ tests_require=tests_require,
+- test_suite='nose.collector',
+
+ entry_points={
+ 'console_scripts': [
+@@ -75,5 +74,7 @@ setup(
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
++ 'Programming Language :: Python :: 3.7',
++ 'Programming Language :: Python :: 3.8',
+ ],
+ )
+diff --git a/test/test_retire.py b/test/test_retire.py
+index 9de9f13..5296c1d 100644
+--- a/test/test_retire.py
++++ b/test/test_retire.py
+@@ -4,13 +4,13 @@ import os
+ import shutil
+ import unittest
+ import mock
+-import ConfigParser
++from six.moves import configparser
+ import tempfile
+ import subprocess
++import rfpkgdb2client
+
+ from rfpkg.cli import rfpkgClient
+
+-
+ TEST_CONFIG = os.path.join(os.path.dirname(__file__), 'rfpkg-test.conf')
+
+
+@@ -47,12 +47,13 @@ class RetireTestCase(unittest.TestCase):
+
+ def _get_latest_commit(self):
+ proc = subprocess.Popen(['git', 'log', '-n', '1', '--pretty=%s'],
+- cwd=self.tmpdir, stdout=subprocess.PIPE)
++ cwd=self.tmpdir, stdout=subprocess.PIPE,
++ universal_newlines=True)
+ out, err = proc.communicate()
+ return out.strip()
+
+ def _fake_client(self, args):
+- config = ConfigParser.SafeConfigParser()
++ config = configparser.SafeConfigParser()
+ config.read(TEST_CONFIG)
+ with mock.patch('sys.argv', new=args):
+ client = rfpkgClient(config)
+@@ -71,7 +72,7 @@ class RetireTestCase(unittest.TestCase):
+ 'rfpkg.spec')))
+ self.assertEqual(self._get_latest_commit(), reason)
+
+- @mock.patch('pkgdb2client.PkgDB')
++ @mock.patch('rfpkgdb2client.PkgDB')
+ def test_retire_with_namespace(self, PkgDB):
+ self._setup_repo('ssh://git@pkgs.example.com/rpms/rfpkg')
+ args = ['rfpkg', '--release=master', 'retire', 'my reason']
+@@ -85,7 +86,7 @@ class RetireTestCase(unittest.TestCase):
+ [mock.call('rfpkg', 'master', namespace='rpms')])
+
+ @mock.patch('rpmfusion_cert.read_user_cert')
+- @mock.patch('pkgdb2client.PkgDB')
++ @mock.patch('rfpkgdb2client.PkgDB')
+ def test_retire_without_namespace(self, PkgDB, read_user_cert):
+ self._setup_repo('ssh://git@pkgs.example.com/rfpkg')
+ args = ['rfpkg', '--release=master', 'retire', 'my reason']
+diff --git a/tests-requirements.txt b/tests-requirements.txt
+index 1cc4eb4..cca4322 100644
+--- a/tests-requirements.txt
++++ b/tests-requirements.txt
+@@ -1,5 +1,8 @@
+-mock == 1.0.1
+-nose == 1.3.7
+-nose-cov
++mock >= 1.0.1
++coverage<5.0.0
++cccolutils
++gitpython
+ freezegun
+-PyYAML
++rpm
++pytest
++pytest-cov
diff --git a/rfpkg.spec b/rfpkg.spec
index a6fd754..41a393f 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -5,13 +5,15 @@
Name: rfpkg
Version: 1.26.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: RPM Fusion utility for working with dist-git
License: GPLv2+
Group: Applications/System
URL: https://github.com/rpmfusion-infra/rfpkg
Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: %url/commit/be33cce92923328b613e4245bfb28f2c10c93f35.patch
+Patch1: %url/commit/d0ec0eb608024ecd6df60b1c567fd552d7e7e41d.patch
+Patch2: rfpkg-test.patch
BuildArch: noarch
@@ -31,7 +33,6 @@ Requires: koji
Requires: redhat-rpm-config
%if %{with python2}
-
BuildRequires: python2
BuildRequires: python2-rpm-macros
BuildRequires: python2-setuptools
@@ -51,19 +52,21 @@ Requires: rpmfusion-packager >= 0.6.1
Requires: packagedb-cli > 2.2
%else
-
-BuildRequires: python3
-BuildRequires: python3-rpm-macros
-BuildRequires: python3-setuptools
+BuildRequires: python3-devel
+BuildRequires: python3-rpkg
+BuildRequires: python3-distro
# We br these things for man page generation due to imports
BuildRequires: python3-rpmfusion-cert
BuildRequires: rfpkgdb-cli
-BuildRequires: python3-rpkg
# For testing
BuildRequires: python3-mock
BuildRequires: python3-nose
+BuildRequires: python3-setuptools
+#BuildRequires: python3-bugzilla
+#BuildRequires: python3-freezegun
+#BuildRequires: python3-bodhi-client
Requires: python3-rpkg
Requires: redhat-rpm-config
@@ -114,7 +117,7 @@ nosetests
%if %{with python2}
#{__python2} -m nose
%else
-#{__python3} -m nose
+%{__python3} -m nose
%endif
%endif
@@ -138,6 +141,9 @@ nosetests
%changelog
+* Wed Sep 16 2020 Sérgio Basto <sergio(a)serjux.com> - 1.26.3-4
+- Fix (#5756) and python3 -m nose
+
* Sat May 30 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.26.3-3
- Rebuild for python-3.9
3 years, 8 months
[telegram-desktop/f32: 2/2] Updated to version 2.3.2.
by Vitaly Zaitsev
commit e076945e44a8510f12981e4f3947982c4f97fbf0
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Sep 15 16:11:22 2020 +0200
Updated to version 2.3.2.
.gitignore | 2 +
sources | 3 +-
telegram-desktop-fix-night-theme.patch | 33 ------
telegram-desktop-libatomic-linkage.patch | 61 ----------
telegram-desktop-webrtc-packaged.patch | 191 +++++++++++++++++++++++++++++++
telegram-desktop.spec | 127 +++++++++++++++-----
tg_owt-dlopen-linkage.patch | 38 ++++++
7 files changed, 334 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0905619..55694d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,3 +146,5 @@
/tdesktop-2.1.12-full.tar.gz
/tdesktop-2.1.13-full.tar.gz
/tdesktop-2.2.0-full.tar.gz
+/owt-a803835.tar.gz
+/tdesktop-2.3.2-full.tar.gz
diff --git a/sources b/sources
index 557d958..8f19fd2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (tdesktop-2.2.0-full.tar.gz) = 2aeca83be7bc385bd7537d56ecf66996facedd0af588e743fedbb08c3158fc76436d6cf3b1fb5dd7c8d37b4471f739872ca54ba300aa1d0e0202e87c005703fd
+SHA512 (owt-a803835.tar.gz) = 709b7a179f890267c5c1a125bb18f65a77c83f901f4458f8a739d9e74e3ce44e52d43bdced760aaeb0c26f989ea9361771517717815bc87d9c13d384e2ec6e4c
+SHA512 (tdesktop-2.3.2-full.tar.gz) = 757e57389ce24656c1d6676d6f0808e3d444785394e916b9f5fb47511662f01b6742c88c2a27274c4d9bb58263ae281218579c78cce7db119e2c863c1eaacc90
diff --git a/telegram-desktop-webrtc-packaged.patch b/telegram-desktop-webrtc-packaged.patch
new file mode 100644
index 0000000..fb37918
--- /dev/null
+++ b/telegram-desktop-webrtc-packaged.patch
@@ -0,0 +1,191 @@
+From d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010(a)ya.ru>
+Date: Sat, 29 Aug 2020 20:48:37 +0400
+Subject: [PATCH] Update webrtc packaged build for tg_owt
+
+---
+ external/webrtc/CMakeLists.txt | 136 ++++++++++++++++-----------------
+ variables.cmake | 1 -
+ 2 files changed, 68 insertions(+), 69 deletions(-)
+
+diff --git a/cmake/external/webrtc/CMakeLists.txt b/cmake/external/webrtc/CMakeLists.txt
+index 1273291..a354057 100644
+--- a/cmake/external/webrtc/CMakeLists.txt
++++ b/cmake/external/webrtc/CMakeLists.txt
+@@ -7,96 +7,96 @@
+ add_library(external_webrtc INTERFACE IMPORTED GLOBAL)
+ add_library(desktop-app::external_webrtc ALIAS external_webrtc)
+
+-if (DESKTOP_APP_WEBRTC_LOCATION)
+- set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION})
++if (DESKTOP_APP_USE_PACKAGED)
++ find_package(tg_owt REQUIRED)
++ target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
+ else()
+ set(webrtc_loc ${libs_loc}/tg_owt/src)
+-endif()
+-
+-set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
+-
+-target_compile_definitions(external_webrtc
+-INTERFACE
+- WEBRTC_ENABLE_PROTOBUF=0
+- WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE
+- RTC_ENABLE_VP9
+- HAVE_SCTP
+- WEBRTC_USE_H264
+- WEBRTC_LIBRARY_IMPL
+- WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1
+- ABSL_ALLOCATOR_NOTHROW=1
+-)
+-
+-if (WIN32)
+- set(webrtc_lib_prefix "")
+- set(webrtc_lib_suffix .lib)
++ set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
+
+ target_compile_definitions(external_webrtc
+ INTERFACE
+- WEBRTC_WIN
++ WEBRTC_ENABLE_PROTOBUF=0
++ WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE
++ RTC_ENABLE_VP9
++ HAVE_SCTP
++ WEBRTC_USE_H264
++ WEBRTC_LIBRARY_IMPL
++ WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1
++ ABSL_ALLOCATOR_NOTHROW=1
+ )
+-else()
+- set(webrtc_lib_prefix lib)
+- set(webrtc_lib_suffix .a)
+
+- if (APPLE)
++ if (WIN32)
++ set(webrtc_lib_prefix "")
++ set(webrtc_lib_suffix .lib)
++
+ target_compile_definitions(external_webrtc
+ INTERFACE
+- WEBRTC_MAC
++ WEBRTC_WIN
+ )
+ else()
++ set(webrtc_lib_prefix lib)
++ set(webrtc_lib_suffix .a)
++
++ if (APPLE)
++ target_compile_definitions(external_webrtc
++ INTERFACE
++ WEBRTC_MAC
++ )
++ else()
++ target_compile_definitions(external_webrtc
++ INTERFACE
++ WEBRTC_LINUX
++ )
++ endif()
++
+ target_compile_definitions(external_webrtc
+ INTERFACE
+- WEBRTC_LINUX
++ WEBRTC_POSIX
+ )
+ endif()
+
+- target_compile_definitions(external_webrtc
+- INTERFACE
+- WEBRTC_POSIX
+- )
+-endif()
+-
+-target_include_directories(external_webrtc
+-INTERFACE
+- ${webrtc_loc}
+- ${webrtc_loc}/third_party/abseil-cpp
+-)
+-
+-set(webrtc_libs
+- ${webrtc_lib_prefix}tg_owt
+-)
+-if (APPLE)
+ target_include_directories(external_webrtc
+ INTERFACE
+- ${webrtc_loc}/sdk/objc
+- ${webrtc_loc}/sdk/objc/base
+- ${webrtc_loc}/sdk/objc/components/video_codec
+- ${webrtc_loc}/third_party/libyuv/include
++ ${webrtc_loc}
++ ${webrtc_loc}/third_party/abseil-cpp
+ )
+-endif()
+-foreach (lib ${webrtc_libs})
+- list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}")
+-endforeach()
+
+-if (WIN32)
+- target_link_libraries(external_webrtc
+- INTERFACE
+- Secur32.lib # Required for rtc_base/http_common.cc
+- dmoguids.lib # Required for the built-in WASAPI AEC, see modules/audio_device/BUILD.gn
+- wmcodecdspuuid.lib
+- amstrmid.lib
+- msdmo.lib
++ set(webrtc_libs
++ ${webrtc_lib_prefix}tg_owt
+ )
+-elseif (APPLE)
++ if (APPLE)
++ target_include_directories(external_webrtc
++ INTERFACE
++ ${webrtc_loc}/sdk/objc
++ ${webrtc_loc}/sdk/objc/base
++ ${webrtc_loc}/sdk/objc/components/video_codec
++ ${webrtc_loc}/third_party/libyuv/include
++ )
++ endif()
++ foreach (lib ${webrtc_libs})
++ list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}")
++ endforeach()
++
++ if (WIN32)
++ target_link_libraries(external_webrtc
++ INTERFACE
++ Secur32.lib # Required for rtc_base/http_common.cc
++ dmoguids.lib # Required for the built-in WASAPI AEC, see modules/audio_device/BUILD.gn
++ wmcodecdspuuid.lib
++ amstrmid.lib
++ msdmo.lib
++ )
++ elseif (APPLE)
++ target_link_libraries(external_webrtc
++ INTERFACE
++ -ObjC
++ )
++ endif()
++
+ target_link_libraries(external_webrtc
+ INTERFACE
+- -ObjC
++ ${webrtc_libs_list}
++ desktop-app::external_openssl
+ )
+ endif()
+-
+-target_link_libraries(external_webrtc
+-INTERFACE
+- ${webrtc_libs_list}
+- desktop-app::external_openssl
+-)
+diff --git a/variables.cmake b/variables.cmake
+index 04a18bd..9e7f41f 100644
+--- a/cmake/variables.cmake
++++ b/cmake/variables.cmake
+@@ -40,7 +40,6 @@ option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate
+ option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
+ option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell. (Linux only)" OFF)
+ set(DESKTOP_APP_QTWAYLANDCLIENT_PRIVATE_HEADERS "" CACHE STRING "QtWaylandClient headers location.")
+-set(DESKTOP_APP_WEBRTC_LOCATION "" CACHE STRING "WebRTC source root location.")
+
+ set(dont_bundle_fonts 0)
+ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index d1c26fa..516521a 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -2,15 +2,26 @@
%define _lto_cflags %{nil}
# Build conditionals (with - OFF, without - ON)...
-%bcond_without rlottie
+%bcond_with rlottie
%bcond_without ipo
+%bcond_without webrtc
%bcond_with gtk3
%bcond_with clang
+%if 0%{?fedora} && 0%{?fedora} >= 33
+%bcond_with mapbox
+%else
+%bcond_without mapbox
+%endif
+
# Telegram Desktop's constants...
%global appname tdesktop
%global launcher telegramdesktop
+# Git revision of WebRTC...
+%global commit1 a80383535367dd8961f55f960938d943d6975808
+%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+
# Applying workaround to RHBZ#1559007...
%if %{with clang}
%if 0%{?fedora} && 0%{?fedora} >= 33
@@ -28,22 +39,29 @@
%endif
Name: telegram-desktop
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
+# * tg_owt - BSD -- static dependency;
# * rlottie - LGPLv2+ -- static dependency;
# * qt_functions.cpp - LGPLv3 -- build-time dependency.
License: GPLv3+ and LGPLv2+ and LGPLv3
URL: https://github.com/telegramdesktop/%{appname}
Summary: Telegram Desktop official messaging app
+
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
-ExclusiveArch: x86_64
+Source1: https://github.com/desktop-app/tg_owt/archive/%{commit1}/owt-%{shortcommi...
+
+# https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b...
+Patch100: %{name}-webrtc-packaged.patch
+# https://github.com/desktop-app/tg_owt/pull/25
+Patch101: tg_owt-dlopen-linkage.patch
-# Upstream patches...
-Patch100: %{name}-fix-night-theme.patch
-Patch101: %{name}-libatomic-linkage.patch
+# Telegram Desktop require more than 8 GB of RAM on linking stage.
+# Disabling all low-memory architectures.
+ExclusiveArch: x86_64
# Telegram Desktop require exact version of Qt due to Qt private API usage.
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
@@ -63,6 +81,13 @@ BuildRequires: rlottie-devel
Provides: bundled(rlottie) = 0~git
%endif
+# Breaking API changes in version 1.2.0.
+%if %{with mapbox}
+BuildRequires: mapbox-variant-devel < 1.2.0
+%else
+Provides: bundled(mapbox-variant) = 1.1.6
+%endif
+
# Telegram Desktop require patched version of lxqt-qtplugin.
# Pull Request pending: https://github.com/lxqt/lxqt-qtplugin/pull/52
Provides: bundled(lxqt-qtplugin) = 0.14.0~git
@@ -76,7 +101,6 @@ BuildRequires: gcc
# Development packages for Telegram Desktop...
BuildRequires: guidelines-support-library-devel >= 3.0.1
-BuildRequires: mapbox-variant-devel >= 0.3.6
BuildRequires: qt5-qtbase-private-devel
BuildRequires: libtgvoip-devel >= 2.4.4
BuildRequires: range-v3-devel >= 0.10.0
@@ -103,6 +127,23 @@ BuildRequires: lz4-devel
BuildRequires: xz-devel
BuildRequires: python3
+%if %{with webrtc}
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: yasm
+
+Provides: bundled(tg_owt) = 0~git
+Provides: bundled(openh264) = 0~git
+Provides: bundled(abseil-cpp) = 0~git
+Provides: bundled(libsrtp) = 0~git
+Provides: bundled(libvpx) = 0~git
+Provides: bundled(libyuv) = 0~git
+Provides: bundled(pffft) = 0~git
+Provides: bundled(rnnoise) = 0~git
+Provides: bundled(usrsctp) = 0~git
+%endif
+
%if %{with clang}
BuildRequires: compiler-rt
BuildRequires: clang
@@ -129,30 +170,74 @@ business messaging needs.
%prep
# Unpacking Telegram Desktop source archive...
-%autosetup -n %{appname}-%{version}-full -p1
+%setup -q -n %{appname}-%{version}-full
+%patch100 -p1
+
+# Unpacking WebRTC...
+%if %{with webrtc}
+tar -xf %{SOURCE1}
+mv tg_owt-%{commit1} tg_owt
+%patch101 -p1
+%endif
# Unbundling libraries...
-rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,hime,hunspell,libdbusmenu-qt,libqtxdg,libtgvoip,lxqt-qtplugin,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,variant,xxHash}
+rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,hime,hunspell,libdbusmenu-qt,libqtxdg,libtgvoip,lxqt-qtplugin,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash}
# Unbundling rlottie if build against packaged version...
%if %{with rlottie}
rm -rf Telegram/ThirdParty/rlottie
%endif
+# Unbundling mapbox-variant if build against packaged version...
+%if %{with mapbox}
+rm -rf Telegram/ThirdParty/variant
+%endif
+
%build
+# Building WebRTC using cmake...
+%if %{with webrtc}
+pushd tg_owt
+%cmake -G Ninja \
+ -DCMAKE_BUILD_TYPE=Release \
+%ifarch x86_64
+%if %{with ipo} && %{without clang}
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=ON \
+%endif
+%endif
+%if %{with clang}
+ -DCMAKE_C_COMPILER=%{_bindir}/clang \
+ -DCMAKE_CXX_COMPILER=%{_bindir}/clang++ \
+ -DCMAKE_AR=%{_bindir}/llvm-ar \
+ -DCMAKE_RANLIB=%{_bindir}/llvm-ranlib \
+ -DCMAKE_LINKER=%{_bindir}/llvm-ld \
+ -DCMAKE_OBJDUMP=%{_bindir}/llvm-objdump \
+ -DCMAKE_NM=%{_bindir}/llvm-nm \
+%else
+ -DCMAKE_AR=%{_bindir}/gcc-ar \
+ -DCMAKE_RANLIB=%{_bindir}/gcc-ranlib \
+ -DCMAKE_NM=%{_bindir}/gcc-nm \
+%endif
+ -DTG_OWT_PACKAGED_BUILD:BOOL=ON
+%cmake_build
+popd
+%endif
+
# Building Telegram Desktop using cmake...
%cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
%ifarch x86_64
%if %{with ipo} && %{without clang}
- -DDESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS:BOOL=ON \
+ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=ON \
%endif
%endif
%if %{with rlottie}
- -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=ON \
-DDESKTOP_APP_LOTTIE_USE_CACHE:BOOL=OFF \
+%endif
+%if %{with webrtc}
+ -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION:BOOL=OFF \
+ -Dtg_owt_DIR:PATH=%{_builddir}/%{appname}-%{version}-full/tg_owt/%_vpath_builddir \
%else
- -DDESKTOP_APP_USE_PACKAGED_RLOTTIE:BOOL=OFF \
+ -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION:BOOL=ON \
%endif
%if %{with clang}
-DCMAKE_C_COMPILER=%{_bindir}/clang \
@@ -170,22 +255,15 @@ rm -rf Telegram/ThirdParty/rlottie
-DTDESKTOP_API_ID=611335 \
-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
-DDESKTOP_APP_USE_PACKAGED:BOOL=ON \
- -DDESKTOP_APP_USE_PACKAGED_GSL:BOOL=ON \
- -DDESKTOP_APP_USE_PACKAGED_EXPECTED:BOOL=ON \
- -DDESKTOP_APP_USE_PACKAGED_VARIANT:BOOL=ON \
- -DDESKTOP_APP_USE_PACKAGED_QRCODE:BOOL=ON \
-DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=ON \
-DDESKTOP_APP_USE_GLIBC_WRAPS:BOOL=OFF \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON \
- -DTDESKTOP_USE_PACKAGED_TGVOIP:BOOL=ON \
%if %{with gtk3}
-DTDESKTOP_DISABLE_GTK_INTEGRATION:BOOL=OFF \
%else
-DTDESKTOP_DISABLE_GTK_INTEGRATION:BOOL=ON \
%endif
-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME:BOOL=ON \
- -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION:BOOL=ON \
- -DTDESKTOP_USE_FONTCONFIG_FALLBACK:BOOL=OFF \
-DTDESKTOP_LAUNCHER_BASENAME=%{launcher}
%cmake_build
@@ -205,14 +283,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Sun Aug 30 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.3.2-1
+- Updated to version 2.3.2.
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun Jul 26 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.2.0-1
- Updated to version 2.2.0.
-
-* Wed Jun 24 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.13-1
-- Updated to version 2.1.13.
-
-* Thu Jun 18 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.12-1
-- Updated to version 2.1.12.
diff --git a/tg_owt-dlopen-linkage.patch b/tg_owt-dlopen-linkage.patch
new file mode 100644
index 0000000..8718ed2
--- /dev/null
+++ b/tg_owt-dlopen-linkage.patch
@@ -0,0 +1,38 @@
+From 5fc2e9c95291c5864d3c41676942d28ab56acb0f Mon Sep 17 00:00:00 2001
+From: Vitaly Zaitsev <vitaly(a)easycoding.org>
+Date: Tue, 15 Sep 2020 13:40:41 +0200
+Subject: [PATCH] Fixed linkage against dl library.
+
+Signed-off-by: Vitaly Zaitsev <vitaly(a)easycoding.org>
+---
+ tg_owt/CMakeLists.txt | 1 +
+ tg_owt/cmake/external.cmake | 7 +++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c238bd7..68e142af 100644
+--- a/tg_owt/CMakeLists.txt
++++ b/tg_owt/CMakeLists.txt
+@@ -108,6 +108,7 @@ link_opus(tg_owt)
+ if (UNIX AND NOT APPLE)
+ link_libalsa(tg_owt)
+ link_libpulse(tg_owt)
++ link_dl(tg_owt)
+ endif()
+
+ nice_target_sources(tg_owt ${webrtc_loc}
+diff --git a/cmake/external.cmake b/cmake/external.cmake
+index 60683340..c0dff620 100644
+--- a/tg_owt/cmake/external.cmake
++++ b/tg_owt/cmake/external.cmake
+@@ -121,3 +121,10 @@ function(link_libpulse target_name)
+ target_include_directories(${target_name} PRIVATE ${PULSEAUDIO_INCLUDE_DIRS})
+ endif()
+ endfunction()
++
++# dl
++function(link_dl target_name)
++ if (TG_OWT_PACKAGED_BUILD)
++ target_link_libraries(${target_name} PRIVATE ${CMAKE_DL_LIBS})
++ endif()
++endfunction()
3 years, 8 months
[chromium-browser-privacy/f33] (12 commits) ...Update ungoogled-chromium to 85.0.4183.102-1
by qvint
Summary of changes:
9dec70d... Update to 85.0.4183.83 (*)
59b831a... Drop Fedora 30 support (*)
f726697... Fix manpage and desktop metadata files (*)
38e10ae... Sync spec and sources with free/chromium-freeworld (*)
5637229... Update ungoogled-chromium to 76c9694 (*)
92ba179... Add domain_substitution switch (*)
bdb0bea... Fix manpage and desktop metadata files (*)
e0395a6... Ship ANGLE libEGL.so and libGLESv2.so (*)
c2339bf... Update to 85.0.4183.102 (*)
7f7c325... Remove bundlepylibs and clang toggles (*)
356e7c7... Sync spec and sources with free/chromium-freeworld (*)
ec6df29... Update ungoogled-chromium to 85.0.4183.102-1 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 8 months
