From 71bf459596c72cf72b89c6ae2f47b1f5cf7548db Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 10 Jun 2019 21:06:57 -0300 Subject: [PATCH 1/5] doc: don't build notmuch-emacs.info for configure --without-emacs Since the docstrings are not built in the case of --without-emacs, even if emacs is detected, don't let sphinx build the emacs docs. This avoids a large number of error messages due to missing includes. It's actually a bit surprising sphinx doesn't generate an error for the missing include files. --- doc/Makefile.local | 2 +- doc/conf.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.local b/doc/Makefile.local index 719172fe..a88beb46 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -4,7 +4,7 @@ dir := doc # You can set these variables from the command line. SPHINXOPTS := -q -SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} sphinx-build +SPHINXBUILD = HAVE_EMACS=${HAVE_EMACS} WITH_EMACS=${WITH_EMACS} sphinx-build DOCBUILDDIR := $(dir)/_build # Internal variables. diff --git a/doc/conf.py b/doc/conf.py index 5f8c9f1c..8afff929 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -29,9 +29,10 @@ release = version # directories to ignore when looking for source files. exclude_patterns = ['_build'] -# If we don't have emacs, don't build the notmuch-emacs docs, as they need -# emacs to generate the docstring include files -if os.environ.get('HAVE_EMACS') != '1': +# If we don't have emacs (or the user configured --without-emacs), +# don't build the notmuch-emacs docs, as they need emacs to generate +# the docstring include files +if os.environ.get('HAVE_EMACS') != '1' or os.environ.get('WITH_EMACS') != '1': exclude_patterns.append('notmuch-emacs.rst') # The name of the Pygments (syntax highlighting) style to use. From 3ec47e1165064d4937044c02e882612a3e3a7671 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 10 Jun 2019 07:11:50 -0300 Subject: [PATCH 2/5] doc: Don't install emacs docs when they are not built In 40b025 we stopped building the notmuch-emacs documentation if HAVE_EMACS=0 (i.e. no emacs was detected by configure). Unfortunately we continued to try to install the (non-existent) documentation, which causes build/install failures. As a bonus, we also avoid installing the documentation if the user configures --without-emacs. Thanks to Ralph Seichter for reporting the problem, and testing previous versions of this fix. --- doc/Makefile.local | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/Makefile.local b/doc/Makefile.local index a88beb46..d733b51e 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -28,7 +28,11 @@ MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES}) MAN1_TEXI := $(patsubst $(srcdir)/doc/man1/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN1_RST)) MAN5_TEXI := $(patsubst $(srcdir)/doc/man5/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN5_RST)) MAN7_TEXI := $(patsubst $(srcdir)/doc/man7/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN7_RST)) -INFO_TEXI_FILES := $(MAN1_TEXI) $(MAN5_TEXI) $(MAN7_TEXI) $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi +INFO_TEXI_FILES := $(MAN1_TEXI) $(MAN5_TEXI) $(MAN7_TEXI) +ifeq ($(HAVE_EMACS)$(WITH_EMACS),11) + INFO_TEXI_FILES := $(INFO_TEXI_FILES) $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi +endif + INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) .PHONY: sphinx-html sphinx-texinfo sphinx-info From f325bd599c2490bf74bf28dd36b8de6823e624d4 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 11 Jun 2019 20:11:45 -0300 Subject: [PATCH 3/5] version: bump to 0.29.1 --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 94e9cc16..ca9e6a8c 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.29' +__VERSION__ = '0.29.1' SOVERSION = '5' diff --git a/version b/version index eec15f90..25939d35 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.29 +0.29.1 From 6600f8b32852d6b3a273d9a92ed8ba39d6e779d5 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 11 Jun 2019 20:15:04 -0300 Subject: [PATCH 4/5] NEWS: news for 0.29.1 --- NEWS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS b/NEWS index 292d94e9..e0271e70 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +Notmuch 0.29.1 (2019-06-11) +=========================== + +Build +----- + +Fix for installation failure with `configure --without-emacs`. + Notmuch 0.29 (2019-06-07) ========================= From 20842dfb6d64f4469c554525ab4c27c6571fbdfe Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 11 Jun 2019 20:16:48 -0300 Subject: [PATCH 5/5] debian: changelog for 0.29.1-1 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2a24b025..d34d5259 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +notmuch (0.29.1-1) experimental; urgency=medium + + * New upstream bug fix release + - fix for building and installing without emacs, does not occur + in Debian builds. + + -- David Bremner Tue, 11 Jun 2019 20:16:03 -0300 + notmuch (0.29-2) experimental; urgency=medium * New upstream feature release. See /usr/share/doc/notmuch/NEWS.gz for