From 5ec1c04964bdaac8d10bfd22c2c783b175a49019 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:43 +0400 Subject: [PATCH 01/10] fmt: update to 8.0.1. --- common/shlibs | 2 +- srcpkgs/fmt/template | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5affb5dc09fd..46c8bad90f9e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3523,7 +3523,7 @@ libcotp.so.12 libcotp-1.2.1_1 libunarr.so.1 libunarr-1.0.1_1 libretro-gtk-1.so.0 retro-gtk-1.0.0_1 libmanette-0.2.so.0 libmanette-0.2.1_1 -libfmt.so.7 fmt-7.0.3_1 +libfmt.so.8 fmt-8.0.1_1 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1 libolm.so.3 olm-3.0.0_1 libtls.so.20 libtls-3.2.4_1 diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template index ba9ae5c4ee49..41a50a0f8e0e 100644 --- a/srcpkgs/fmt/template +++ b/srcpkgs/fmt/template @@ -1,15 +1,16 @@ # Template file for 'fmt' pkgname=fmt -version=7.1.3 +version=8.0.1 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF" short_desc="Modern formatting library" -maintainer="Orphaned " +maintainer="skmpz " license="BSD-2-Clause" homepage="https://github.com/fmtlib/fmt" +changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst" distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz" -checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc +checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01 post_install() { vlicense LICENSE.rst LICENSE From 7b0e0f47d598aedc70ddd10f7055d5dd734411fb Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:12 +0400 Subject: [PATCH 02/10] spdlog: update to 1.9.1. --- srcpkgs/spdlog/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template index 184a4d891698..4e34e8a58322 100644 --- a/srcpkgs/spdlog/template +++ b/srcpkgs/spdlog/template @@ -1,7 +1,7 @@ # Template file for 'spdlog' pkgname=spdlog -version=1.8.2 -revision=2 +version=1.9.1 +revision=1 build_style=cmake configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_BUILD_SHARED=ON" @@ -9,11 +9,11 @@ hostmakedepends="pkg-config" makedepends="fmt-devel" depends="libspdlog>=${version}_${revision} fmt-devel" short_desc="Fast C++ logging library" -maintainer="Orphaned " +maintainer="skmpz " license="MIT" homepage="https://github.com/gabime/spdlog" distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz" -checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5 +checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON" From 0ef733b360e41b3b2cdeab96972036e16d79f125 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:11 +0400 Subject: [PATCH 03/10] cherrytree: rebuild against libfmt.so.8 --- srcpkgs/cherrytree/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template index 8789cd37dba7..55512e3b5ef7 100644 --- a/srcpkgs/cherrytree/template +++ b/srcpkgs/cherrytree/template @@ -1,7 +1,7 @@ # Template file for 'cherrytree' pkgname=cherrytree version=0.99.39 -revision=1 +revision=2 wrksrc="${pkgname}_${version}" build_style=cmake hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel" From 646cac09c877118dbdff7b6268d4077777a09bf0 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:11 +0400 Subject: [PATCH 04/10] 0ad: patch spidermonkey 78.6 for rust>=1.50. Necessary in order to rebuild 0ad for libfmt.so.8. --- .../patches/spidermonkey-78.6-rust-1.50.patch | 107 ++++++++++++++++++ srcpkgs/0ad/template | 2 +- 2 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch diff --git a/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch new file mode 100644 index 000000000000..95007b32f25e --- /dev/null +++ b/srcpkgs/0ad/patches/spidermonkey-78.6-rust-1.50.patch @@ -0,0 +1,107 @@ +From 087a277e66c0456c2d6fdb7403d032ad09cbd18b Mon Sep 17 00:00:00 2001 +From: wraitii +Date: Sat, 27 Feb 2021 09:31:17 +0000 +Subject: [PATCH] Patch SM78.6 for Rust 1.50 + +Upstreamed from https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb +(this fix is integrated in SM78.8) + +Reviewed By: s0600204 + +Differential Revision: https://code.wildfiregames.com/D3590 + + + +git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24941 3db68df2-c116-0410-a063-a993310a9797 +--- + libraries/source/spidermonkey/FixRust150.diff | 65 +++++++++++++++++++ + libraries/source/spidermonkey/patch.sh | 4 ++ + 2 files changed, 69 insertions(+) + create mode 100644 libraries/source/spidermonkey/FixRust150.diff + +diff --git a/libraries/source/spidermonkey/FixRust150.diff b/libraries/source/spidermonkey/FixRust150.diff +new file mode 100644 +index 00000000000..cfb0d58b4a0 +--- /dev/null ++++ b/libraries/source/spidermonkey/FixRust150.diff +@@ -0,0 +1,65 @@ ++ ++# HG changeset patch ++# User Emilio Cobos Álvarez ++# Date 1609006565 0 ++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582 ++# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0 ++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM ++ ++Fixes errors like: ++ ++ dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed. ++ ++I've left the most specific dependency, but for wgpu the rev is not ++right, so I've kept the branch which effectively preserves behavior. ++ ++Differential Revision: https://phabricator.services.mozilla.com/D100485 ++ ++diff --git a/.cargo/config.in b/.cargo/config.in ++--- a/.cargo/config.in +++++ b/.cargo/config.in ++@@ -1,16 +1,16 @@ ++ # This file contains vendoring instructions for cargo. ++ # It was generated by `mach vendor rust`. ++ # Please do not edit. ++ ++ [source."https://github.com/shravanrn/nix/"] ++-branch = "r0.13.1" ++ git = "https://github.com/shravanrn/nix/" ++ replace-with = "vendored-sources" +++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" ++ ++ [source."https://github.com/mozilla/rkv"] ++ git = "https://github.com/mozilla/rkv" ++ replace-with = "vendored-sources" ++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731" ++ ++ [source."https://github.com/mozilla/neqo"] ++ git = "https://github.com/mozilla/neqo" ++diff --git a/Cargo.lock b/Cargo.lock ++--- a/Cargo.lock +++++ b/Cargo.lock ++@@ -3200,7 +3200,7 @@ ++ [[package]] ++ name = "nix" ++ version = "0.13.1" ++-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" +++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" ++ dependencies = [ ++ "bitflags", ++ "cc", ++diff --git a/Cargo.toml b/Cargo.toml ++--- a/Cargo.toml +++++ b/Cargo.toml ++@@ -60,8 +60,8 @@ ++ [patch.crates-io] ++ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } ++ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } ++-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } ++-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } +++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } +++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" } ++ # failure's backtrace feature might break our builds, see bug 1608157. ++ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } ++ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } ++ +diff --git a/libraries/source/spidermonkey/patch.sh b/libraries/source/spidermonkey/patch.sh +index 58be1fbdef0..879964b0f2e 100644 +--- a/libraries/source/spidermonkey/patch.sh ++++ b/libraries/source/spidermonkey/patch.sh +@@ -39,6 +39,10 @@ patch -p1 < ../FixMacBuild.diff + # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491 + patch -p1 < ../FixRpiUnalignedFpAccess.diff + ++# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb ++# Note that this isn't quite the upstream patch to match our version. ++patch -p1 < ../FixRust150.diff ++ + # Patch those separately, as they might interfere with normal behaviour. + if [ "$(uname -s)" = "FreeBSD" ]; + then diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index d6bbdb483101..f6e6b41899de 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.24b -revision=2 +revision=3 archs="x86_64* i686* aarch64* armv7l* ppc64le*" wrksrc="${pkgname}-${version}-alpha" hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" From 3c2cc2c61f7deb3ea3fd73e0771d5907e7ba4b35 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:11 +0400 Subject: [PATCH 05/10] Waybar: rebuild for libfmt.so.8. --- .../patches/libfmt8-compatibility.patch | 40 +++++++++++++++++++ srcpkgs/Waybar/template | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch new file mode 100644 index 000000000000..4ae9ee619e3a --- /dev/null +++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch @@ -0,0 +1,40 @@ +From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001 +From: John Helmert III +Date: Tue, 29 Jun 2021 21:29:12 -0500 +Subject: [PATCH] libfmt >=8.0.0 compatibility + +--- + include/util/format.hpp | 4 ++++ + src/modules/clock.cpp | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/include/util/format.hpp b/include/util/format.hpp +index 288d8f0cd..543a100fb 100644 +--- a/Waybar-0.9.7/include/util/format.hpp ++++ b/Waybar-0.9.7/include/util/format.hpp +@@ -35,7 +35,11 @@ namespace fmt { + // The rationale for ignoring it is that the only reason to specify + // an alignment and a with is to get a fixed width bar, and ">" is + // sufficient in this implementation. ++#if FMT_VERSION < 80000 + width = parse_nonnegative_int(it, end, ctx); ++#else ++ width = detail::parse_nonnegative_int(it, end, -1); ++#endif + } + return it; + } +diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp +index 22bedc783..82c570102 100644 +--- a/Waybar-0.9.7/src/modules/clock.cpp ++++ b/Waybar-0.9.7/src/modules/clock.cpp +@@ -196,6 +196,9 @@ template <> + struct fmt::formatter : fmt::formatter { + template + auto format(const waybar_time& t, FormatContext& ctx) { ++#if FMT_VERSION >= 80000 ++ auto& tm_format = specs; ++#endif + return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime)); + } + }; diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 5d6538e66982..699c4baddb59 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,7 +1,7 @@ # Template file for 'Waybar' pkgname=Waybar version=0.9.7 -revision=1 +revision=2 _date_version=3.0.0 create_wrksrc=yes build_wrksrc=${pkgname}-${version} From d1ad191d9ff4b3dae2e5467b9ee158631766a383 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:11 +0400 Subject: [PATCH 06/10] gerbera: rebuild against libfmt.so.8 --- srcpkgs/gerbera/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index 13ff8252378d..7ae7950c72fb 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.6.4 -revision=3 +revision=4 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" hostmakedepends="pkg-config" From 87b5da9312499a2bc28d13ebc1a67be3c2fd8f06 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:11 +0400 Subject: [PATCH 07/10] kodi: rebuild for libfmt.so.8 --- srcpkgs/kodi/patches/fmt8-support.patch | 7 +++++++ srcpkgs/kodi/template | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch new file mode 100644 index 000000000000..0c6fc3eafdb9 --- /dev/null +++ b/srcpkgs/kodi/patches/fmt8-support.patch @@ -0,0 +1,7 @@ +--- a/xbmc/utils/StringUtils.h 2021-02-19 02:17:59.000000000 +0400 ++++ b/xbmc/utils/StringUtils.h 2021-07-29 01:23:03.569130175 +0400 +@@ -39,0 +40,4 @@ ++#if FMT_VERSION >= 80000 ++#include ++#endif ++ diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 8f10f4f04887..4a66b15f46ce 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=19.0 -revision=2 +revision=3 _codename="Matrix" wrksrc="xbmc-${version}-${_codename}" build_style=cmake From aec21fc5e73da5c6bca79d504a05724e14580f35 Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:11 +0400 Subject: [PATCH 08/10] mkvtoolnix: rebuild against libfmt.so.8 --- srcpkgs/mkvtoolnix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 0875991a872f..0ebfc4daa9a9 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=60.0.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=qmake configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt From 056a39fbe022bf0347fbd61244d2152c8abc504b Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 24 Jul 2021 22:51:12 +0400 Subject: [PATCH 09/10] nheko: rebuild against libfmt.so.8 --- srcpkgs/nheko/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index a32ac2a6117e..7b7c6bfbf6e1 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,7 +1,7 @@ # Template file for 'nheko' pkgname=nheko version=0.8.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative" makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel From 569e16d0500aaa12681809e848fd6316ffdb7aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Sun, 8 Aug 2021 18:38:31 -0300 Subject: [PATCH 10/10] cryfs: rebuild against libfmt.so.8 --- srcpkgs/cryfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index 6d8f855a80af..ef585572fbec 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -1,7 +1,7 @@ # Template file for 'cryfs' pkgname=cryfs version=0.10.2 -revision=3 +revision=4 create_wrksrc=yes build_style=cmake configure_args="-DCRYFS_UPDATE_CHECKS=off