From 90cfcb9dc09aebf18eecc3620830fbddadeaad85 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Tue, 5 Jul 2022 04:37:46 +0000 Subject: [PATCH] packages/mu --- packages/mu/build.sh | 1 + packages/mu/mu4e-dont-bytecompile-meson.patch | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 packages/mu/mu4e-dont-bytecompile-meson.patch diff --git a/packages/mu/build.sh b/packages/mu/build.sh index cb427b2875..9c88ccccb3 100644 --- a/packages/mu/build.sh +++ b/packages/mu/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Maildir indexer/searcher and Emacs client (mu4e)" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="1.8.3" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/djcb/mu/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=ac6110beb0f2119b0ffc5c258e20f29de91dbb890d77c36bef934ba1c02b91a6 TERMUX_PKG_AUTO_UPDATE=true diff --git a/packages/mu/mu4e-dont-bytecompile-meson.patch b/packages/mu/mu4e-dont-bytecompile-meson.patch new file mode 100644 index 0000000000..ded5e659ba --- /dev/null +++ b/packages/mu/mu4e-dont-bytecompile-meson.patch @@ -0,0 +1,59 @@ +--- ./meson.build.orig 2022-07-05 08:58:24.604395395 +0530 ++++ ./meson.build 2022-07-05 09:00:57.594395336 +0530 +@@ -124,13 +124,6 @@ + guile_dep = dependency('guile-3.0', required: get_option('guile')) + # soft dependencies + +-# emacs -- needed for mu4e compilation +-emacs_name=get_option('emacs') +-emacs=find_program([emacs_name], version: '>=25.3', required:false) +-if not emacs.found() +- message('emacs not found; not pre-compiling mu4e sources') +-endif +- + makeinfo=find_program(['makeinfo'], required:false) + if not makeinfo.found() + message('makeinfo (texinfo) not found; not building info documentation') +@@ -181,9 +174,8 @@ + subdir('mu') + subdir('man') + +-if emacs.found() +- subdir('mu4e') +-endif ++# This will not compile, but still copy files. ++subdir('mu4e') + + if not get_option('guile').disabled() and guile_dep.found() + config_h_data.set('BUILD_GUILE', 1) + +# Do not compile .el files to .elc. We will do it during installation, on device. +--- ./mu4e/meson.build.orig 2022-07-05 09:03:00.844395289 +0530 ++++ ./mu4e/meson.build 2022-07-05 09:04:51.624395247 +0530 +@@ -70,27 +70,6 @@ + configure_file(input: src, output:'@BASENAME@.el', copy:true) + endforeach + +-foreach src : mu4e_srcs +- target_name= '@BASENAME@.elc' +- target_path = join_paths(meson.current_build_dir(), target_name) +- target_func = '(setq byte-compile-dest-file-function(lambda(_) "' + target_path + '"))' +- +- custom_target(src.underscorify() + '_el', +- build_by_default: true, +- input: src, +- output: target_name, +- install_dir: lispdir, +- install: true, +- command: [emacs, +- '--no-init-file', +- '--batch', +- '--eval', '(setq load-prefer-newer t)', +- '--eval', target_func, +- '--directory', meson.current_build_dir(), +- '--directory', meson.current_source_dir(), +- '--funcall', 'batch-byte-compile', '@INPUT@']) +-endforeach +- + # also install the sources and the config + install_data(mu4e_srcs, install_dir: lispdir)