public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matthew Smith" <matthew@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/
Date: Mon, 26 Feb 2024 14:41:18 +0000 (UTC)	[thread overview]
Message-ID: <1708958389.6595e07cab120ebc8bc8804b8f090a6698d02315.matthew@gentoo> (raw)

commit:     6595e07cab120ebc8bc8804b8f090a6698d02315
Author:     Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 14:39:49 2024 +0000
Commit:     Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 14:39:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6595e07c

net-mail/mu: fix build without python3

Avoid dependency on Python.

Closes: https://bugs.gentoo.org/925503
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>

 net-mail/mu/files/mu-1.12.0-no-python.patch | 30 +++++++++++++++++++++++++++++
 net-mail/mu/mu-1.12.0.ebuild                |  4 ++++
 2 files changed, 34 insertions(+)

diff --git a/net-mail/mu/files/mu-1.12.0-no-python.patch b/net-mail/mu/files/mu-1.12.0-no-python.patch
new file mode 100644
index 000000000000..9840da22ca33
--- /dev/null
+++ b/net-mail/mu/files/mu-1.12.0-no-python.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/925503
+
+Call coreutils date instead of a Python script.
+--- a/meson.build
++++ b/meson.build
+@@ -104,17 +104,16 @@ cxx.check_header('charconv', required:true)
+ build_aux = join_paths(meson.current_source_dir(), 'build-aux')
+ ################################################################################
+ # derived date values (based on 'mu-date'); used in docs
+-# we can't use the 'date' because MacOS 'date' is incompatible with GNU's.
+-pdate=find_program(join_paths(build_aux, 'date.py'))
++date=find_program('date', required:true)
+ env = environment()
+ env.set('LANG', 'C')
+-mu_day_month_year = run_command(pdate, mu_date, '%d %B %Y',
++mu_day_month_year = run_command(date, '-u', '+%d %B %Y', '--date', mu_date,
+                                 check:true, capture:true,
+                                 env: env).stdout().strip()
+-mu_month_year = run_command(pdate, mu_date, '%B %Y',
++mu_month_year = run_command(date, '-u', '+%B %Y', '--date', mu_date,
+                             check:true, capture:true,
+                             env: env).stdout().strip()
+-mu_year = run_command(pdate, mu_date, '%Y',
++mu_year = run_command(date, '-u', '+%Y', '--date', mu_date,
+                       check:true, capture:true, env: env).stdout().strip()
+ 
+ ################################################################################
+-- 
+2.44.0
+

diff --git a/net-mail/mu/mu-1.12.0.ebuild b/net-mail/mu/mu-1.12.0.ebuild
index 4df4e56cb6e2..8152dc0b9a0e 100644
--- a/net-mail/mu/mu-1.12.0.ebuild
+++ b/net-mail/mu/mu-1.12.0.ebuild
@@ -27,7 +27,11 @@ BDEPEND="
 "
 
 PATCHES=(
+	# https://github.com/djcb/mu/pull/2632
 	"${FILESDIR}"/${PN}-1.12.0-cld2-opt.patch
+
+	# https://bugs.gentoo.org/925503
+	"${FILESDIR}"/${PN}-1.12.0-no-python.patch
 )
 
 SITEFILE="70mu-gentoo-autoload.el"


             reply	other threads:[~2024-02-26 14:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-26 14:41 Matthew Smith [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-25 10:49 [gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/ Matthew Smith
2023-01-21 19:53 Arsen Arsenović
2022-07-09 10:16 Matthew Smith
2021-07-16  1:34 Sam James
2020-07-07  6:55 Joonas Niilola
2020-02-20 13:27 Joonas Niilola

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1708958389.6595e07cab120ebc8bc8804b8f090a6698d02315.matthew@gentoo \
    --to=matthew@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox