From 215933796743594b3d6ccfdce665f55f468422c5 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 17 Sep 2023 10:22:52 +0200 Subject: [PATCH 1/3] tg_owt: update to 0.0.0.20230921. --- srcpkgs/tg_owt/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template index 1dd0f25e84c94a..50bc8310b8859a 100644 --- a/srcpkgs/tg_owt/template +++ b/srcpkgs/tg_owt/template @@ -1,9 +1,9 @@ # Template file for 'tg_owt' pkgname=tg_owt -version=0.0.0.20230610 -revision=3 -_commit=dcb5069ff76bd293e86928804208737e6cee2ccc -_libyuv_commit=77c2121f7e6b8e694d6e908bbbe9be24214097da +version=0.0.0.20230921 +revision=1 +_commit=3bb3d757681e6cc5135aec6529a753dc3dcdcfb9 +_libyuv_commit=04821d1e7d60845525e8db55c7bcd41ef5be9406 _abseil_commit=8c0b94e793a66495e0b1f34a5eb26bd7dc672db0 _crc32c_commit=21fc8ef30415a635e7351ffa0e5d5367943d4a94 _libsrtp_commit=a566a9cfcd619e8327784aa7cff4a1276dc1e895 @@ -25,8 +25,8 @@ distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz https://github.com/google/crc32c/archive/${_crc32c_commit}.tar.gz https://github.com/abseil/abseil-cpp/archive/${_abseil_commit}.tar.gz https://github.com/cisco/libsrtp/archive/${_libsrtp_commit}.tar.gz" -checksum="@6cdfbf64a3e5f4876cc936162fbe57400dd342d4e30c21209d3870853b5a29da - @4ed69a9a02126185bb50ec5dabc4e9bb53886deb7a1fd878c6bad248ab73db4e +checksum="@b86ac0a42c71736f57ad56d046edcb53d2ba4060924a655b943ab95af20f205e + @81bd2ae522e634cd0e9e25fd7eb4a889f1b0b4aeeb76746df0f0bf3f88dec95c @b359ed4f5fd0321d807fd7301e66399c311c1fe6ab4c6a0f5538587d97ba4a8d @05b5d2f4b540602e8b247116be0559b8a26addac53f026f751a93163946936fb @012d2e3055921e4a33b839e35acbb0a28b5bdc7146d04d9f217ab3d29b103606" From ff1d34ec1c7a70d806352edc28a24f6e8f89cdae Mon Sep 17 00:00:00 2001 From: John Date: Sat, 23 Sep 2023 21:19:25 +0200 Subject: [PATCH 2/3] range-v3: update to 0.12.0. --- srcpkgs/range-v3/patches/1715.patch | 31 ++++++ srcpkgs/range-v3/patches/1716.patch | 156 ++++++++++++++++++++++++++++ srcpkgs/range-v3/template | 4 +- 3 files changed, 189 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/range-v3/patches/1715.patch create mode 100644 srcpkgs/range-v3/patches/1716.patch diff --git a/srcpkgs/range-v3/patches/1715.patch b/srcpkgs/range-v3/patches/1715.patch new file mode 100644 index 00000000000000..00eb457b5dcbcb --- /dev/null +++ b/srcpkgs/range-v3/patches/1715.patch @@ -0,0 +1,31 @@ +From 64fe7d738bb2c2aa8e9ba24d170a8548519156a7 Mon Sep 17 00:00:00 2001 +From: Eric Niebler +Date: Wed, 22 Jun 2022 17:06:16 -0700 +Subject: [PATCH] avoid constraint recursion with ranges::any ctor/assign + +--- + include/range/v3/utility/any.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/range/v3/utility/any.hpp b/include/range/v3/utility/any.hpp +index 0d2889264..5feb2f8cd 100644 +--- a/include/range/v3/utility/any.hpp ++++ b/include/range/v3/utility/any.hpp +@@ -123,7 +123,7 @@ namespace ranges + public: + any() noexcept = default; + template(typename TRef, typename T = detail::decay_t)( +- requires copyable AND (!same_as)) // ++ requires (!same_as) AND copyable) // + any(TRef && t) + : ptr_(new impl(static_cast(t))) + {} +@@ -138,7 +138,7 @@ namespace ranges + return *this; + } + template(typename TRef, typename T = detail::decay_t)( +- requires copyable AND (!same_as)) // ++ requires (!same_as) AND copyable) // + any & operator=(TRef && t) + { + any{static_cast(t)}.swap(*this); diff --git a/srcpkgs/range-v3/patches/1716.patch b/srcpkgs/range-v3/patches/1716.patch new file mode 100644 index 00000000000000..94898cc21a529f --- /dev/null +++ b/srcpkgs/range-v3/patches/1716.patch @@ -0,0 +1,156 @@ +From 390a35e5815d1cb4e40e87d332df711de379a852 Mon Sep 17 00:00:00 2001 +From: Eric Niebler +Date: Wed, 22 Jun 2022 22:56:28 -0700 +Subject: [PATCH] work around strange gcc bug causing constraint recursion in + ranges::any + +--- + include/range/v3/detail/config.hpp | 8 ++--- + include/range/v3/utility/any.hpp | 58 +++++++++++++++++------------- + 2 files changed, 36 insertions(+), 30 deletions(-) + +diff --git a/include/range/v3/detail/config.hpp b/include/range/v3/detail/config.hpp +index f8015f436..d29dada10 100644 +--- a/include/range/v3/detail/config.hpp ++++ b/include/range/v3/detail/config.hpp +@@ -351,9 +351,6 @@ namespace ranges + #define RANGES_WORKAROUND_CLANG_43400 // template friend is redefinition of itself + #endif + #else // __GNUC__ +-#if __GNUC__ < 6 +-#define RANGES_WORKAROUND_GCC_UNFILED0 /* Workaround old GCC name lookup bug */ +-#endif + #if __GNUC__ == 7 || __GNUC__ == 8 + #define RANGES_WORKAROUND_GCC_91525 /* Workaround strange GCC ICE */ + #endif +@@ -724,8 +721,9 @@ namespace ranges + #endif + #endif // RANGES_CONSTEXPR_IF + +-#if !defined(RANGES_BROKEN_CPO_LOOKUP) && !defined(RANGES_DOXYGEN_INVOKED) && \ +- (defined(RANGES_WORKAROUND_GCC_UNFILED0) || defined(RANGES_WORKAROUND_MSVC_895622)) ++#if !defined(RANGES_BROKEN_CPO_LOOKUP) && \ ++ !defined(RANGES_DOXYGEN_INVOKED) && \ ++ defined(RANGES_WORKAROUND_MSVC_895622) + #define RANGES_BROKEN_CPO_LOOKUP 1 + #endif + #ifndef RANGES_BROKEN_CPO_LOOKUP +diff --git a/include/range/v3/utility/any.hpp b/include/range/v3/utility/any.hpp +index 5feb2f8cd..7a3807499 100644 +--- a/include/range/v3/utility/any.hpp ++++ b/include/range/v3/utility/any.hpp +@@ -61,25 +61,9 @@ namespace ranges + template + T const * any_cast(any const *) noexcept; + +- struct any ++ namespace _any_ + { +- private: +- template +- friend meta::if_c() || (bool)copyable, T> any_cast(any &); +- +- template +- friend meta::if_c() || (bool)copyable, T> any_cast( +- any const &); +- +- template +- friend meta::if_c() || (bool)copyable, T> any_cast( +- any &&); +- +- template +- friend T * any_cast(any *) noexcept; +- +- template +- friend T const * any_cast(any const *) noexcept; ++ struct _base {}; + + struct interface + { +@@ -117,15 +101,39 @@ namespace ranges + return typeid(T); + } + }; ++ } // namespace _any_ ++ ++ struct any ++ #if RANGES_BROKEN_CPO_LOOKUP ++ : private _any_::_base ++ #endif ++ { ++ private: ++ template ++ friend meta::if_c() || (bool)copyable, T> any_cast(any &); ++ ++ template ++ friend meta::if_c() || (bool)copyable, T> any_cast( ++ any const &); ++ ++ template ++ friend meta::if_c() || (bool)copyable, T> any_cast( ++ any &&); ++ ++ template ++ friend T * any_cast(any *) noexcept; ++ ++ template ++ friend T const * any_cast(any const *) noexcept; + +- std::unique_ptr ptr_; ++ std::unique_ptr<_any_::interface> ptr_; + + public: + any() noexcept = default; + template(typename TRef, typename T = detail::decay_t)( + requires (!same_as) AND copyable) // + any(TRef && t) +- : ptr_(new impl(static_cast(t))) ++ : ptr_(new _any_::impl(static_cast(t))) + {} + any(any &&) noexcept = default; + any(any const & that) +@@ -185,7 +193,7 @@ namespace ranges + { + if(x.type() != typeid(detail::decay_t)) + throw bad_any_cast{}; +- return static_cast> *>(x.ptr_.get())->get(); ++ return static_cast<_any_::impl> *>(x.ptr_.get())->get(); + } + + /// \overload +@@ -194,7 +202,7 @@ namespace ranges + { + if(x.type() != typeid(detail::decay_t)) + throw bad_any_cast{}; +- return static_cast> const *>(x.ptr_.get())->get(); ++ return static_cast<_any_::impl> const *>(x.ptr_.get())->get(); + } + + /// \overload +@@ -203,7 +211,7 @@ namespace ranges + { + if(x.type() != typeid(detail::decay_t)) + throw bad_any_cast{}; +- return static_cast> *>(x.ptr_.get())->get(); ++ return static_cast<_any_::impl> *>(x.ptr_.get())->get(); + } + + /// \overload +@@ -211,7 +219,7 @@ namespace ranges + T * any_cast(any * p) noexcept + { + if(p && p->ptr_) +- if(any::impl * q = dynamic_cast *>(p->ptr_.get())) ++ if(_any_::impl * q = dynamic_cast<_any_::impl *>(p->ptr_.get())) + return &q->get(); + return nullptr; + } +@@ -221,7 +229,7 @@ namespace ranges + T const * any_cast(any const * p) noexcept + { + if(p && p->ptr_) +- if(any::impl const * q = dynamic_cast const *>(p->ptr_.get())) ++ if(_any_::impl const * q = dynamic_cast<_any_::impl const *>(p->ptr_.get())) + return &q->get(); + return nullptr; + } diff --git a/srcpkgs/range-v3/template b/srcpkgs/range-v3/template index b845742ae25b6c..ff97a1cbd6a7a5 100644 --- a/srcpkgs/range-v3/template +++ b/srcpkgs/range-v3/template @@ -1,6 +1,6 @@ # Template file for 'range-v3' pkgname=range-v3 -version=0.11.0 +version=0.12.0 revision=1 build_style=cmake configure_args="-DRANGE_V3_EXAMPLES=OFF -DRANGES_BUILD_CALENDAR_EXAMPLE=OFF @@ -10,7 +10,7 @@ maintainer="John " license="BSL-1.0" homepage="https://github.com/ericniebler/range-v3" distfiles="https://github.com/ericniebler/range-v3/archive/${version}.tar.gz" -checksum=376376615dbba43d3bef75aa590931431ecb49eb36d07bb726a19f680c75e20c +checksum=015adb2300a98edfceaf0725beec3337f542af4915cec4d0b89fa0886f4ba9cb if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DRANGE_V3_HEADER_CHECKS=ON -DRANGE_V3_TESTS=ON" From e13eb8638aec1821337310be8ae3ae5c4313d950 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 17 Sep 2023 10:22:54 +0200 Subject: [PATCH 3/3] telegram-desktop: update to 4.10.1. --- srcpkgs/telegram-desktop/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 621630887e8785..1679ea8b2711cb 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=4.8.4 -revision=4 +version=4.10.1 +revision=1 build_style=cmake build_helper="qemu gir" configure_args="-DTDESKTOP_API_ID=209235 @@ -10,7 +10,7 @@ configure_args="-DTDESKTOP_API_ID=209235 -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true') -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner -DQT_HOST_PATH=/usr" -hostmakedepends="pkg-config qt6-base python3 clang extra-cmake-modules +hostmakedepends="pkg-config qt6-base python3 extra-cmake-modules qt6-wayland-tools wayland-devel protobuf" makedepends="alsa-lib-devel boost-devel fmt-devel ffmpeg-devel gobject-introspection libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel pulseaudio-devel range-v3 @@ -25,7 +25,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="4328296df07557786e1b9cf22f6675200dbdf29c75d2efeb635c6b7f3f951e8d" +checksum=4716a0fc0612c1e773bb4a6755eeee2fd1eba5a4a34c78db07ada749976267d4 build_options="spellcheck" build_options_default="spellcheck"