From c597028e947f10a3a812e8973cc5e36b65030fbd Mon Sep 17 00:00:00 2001 From: Pascal Huber Date: Sun, 17 Mar 2024 09:56:19 +0100 Subject: [PATCH] mu4e: update to 1.12.2 --- srcpkgs/mu4e/patches/fix-root-test.patch | 11 ++++------- srcpkgs/mu4e/patches/mu-utils-stdout.patch | 12 ++++++++++++ srcpkgs/mu4e/template | 4 ++-- 3 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/mu4e/patches/mu-utils-stdout.patch diff --git a/srcpkgs/mu4e/patches/fix-root-test.patch b/srcpkgs/mu4e/patches/fix-root-test.patch index 009a30b4b1e49f..4e006c41729f99 100644 --- a/srcpkgs/mu4e/patches/fix-root-test.patch +++ b/srcpkgs/mu4e/patches/fix-root-test.patch @@ -1,20 +1,17 @@ -Remove a test which fails when run as root. - diff --git a/lib/tests/test-mu-store.cc b/lib/tests/test-mu-store.cc -index 872c56e3..c4e7eeb2 100644 +index da7f1202..7ff47b81 100644 --- a/lib/tests/test-mu-store.cc +++ b/lib/tests/test-mu-store.cc -@@ -470,13 +470,6 @@ test_store_fail() +@@ -555,12 +555,6 @@ test_store_fail() const auto store = Store::make("/root/non-existent-path/12345"); g_assert_false(!!store); } - - { - const auto store = Store::make_new("/../../root/non-existent-path/12345", -- "/../../root/non-existent-path/54321", -- {}, {}); +- "/../../root/non-existent-path/54321"); - g_assert_false(!!store); - } } - int + diff --git a/srcpkgs/mu4e/patches/mu-utils-stdout.patch b/srcpkgs/mu4e/patches/mu-utils-stdout.patch new file mode 100644 index 00000000000000..7348912e209d82 --- /dev/null +++ b/srcpkgs/mu4e/patches/mu-utils-stdout.patch @@ -0,0 +1,12 @@ +# source: https://git.alpinelinux.org/aports/plain/community/mu/mu-utils-stdout.patch +--- a/lib/utils/mu-utils.hh ++++ b/lib/utils/mu-utils.hh +@@ -265,7 +265,7 @@ + template + static inline bool mu_print_encoded(fmt::format_string frm, T&&... args) noexcept { + return fputs_encoded(fmt::format(frm, std::forward(args)...), +- ::stdout); ++ stdout); + } + + /** diff --git a/srcpkgs/mu4e/template b/srcpkgs/mu4e/template index 97836555b40ab1..9ef0286594c8fa 100644 --- a/srcpkgs/mu4e/template +++ b/srcpkgs/mu4e/template @@ -1,6 +1,6 @@ # Template file for 'mu4e' pkgname=mu4e -version=1.10.8 +version=1.12.2 revision=1 build_style=meson hostmakedepends="emacs libtool pkg-config texinfo glib-devel" @@ -11,6 +11,6 @@ license="GPL-3.0-or-later" homepage="https://www.djcbsoftware.nl/code/mu/" changelog="https://github.com/djcb/mu/raw/master/NEWS.org" distfiles="https://github.com/djcb/mu/releases/download/v${version}/mu-${version}.tar.xz" -checksum=6b11d8add2a7eeb0ebc4a5c7a6b9a9b3e1be8c5175c0c1c019a7ad8d7e363589 +checksum=7b1a1d840f120a1e777b366e6d52bda5a203dd31d831a5a285fbaef275c6b618 replaces="mu<${version}" provides="mu-${version}_${revision}"