net-mail/notmuch: sync ::gentooHEADmaster

3 files changed, 78 insertions, 24 deletions

diff --git a/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch
deleted file mode 100644
index 42c1083..0000000
--- a/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/879739
-https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu
-
-Probe for strcasestr using the C++ compiler
-
-The C++ compiler may define _GNU_SOURCE, causing <string.h> to
-declare strcasestr, while the C compiler does not.  As a result,
-the probe may fail, resulting in an incompatible declaration
-of strcasestr in compat/compat.h.
-
-Upstream discussion:
-
-  [PATCH] compat/strcasestr: Include correct header file
-  <https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu>
-
---- a/compat/have_strcasestr.c
-+++ b/compat/have_strcasestr.c
-@@ -1,4 +1,5 @@
- #define _GNU_SOURCE
-+#include <string.h>
- #include <strings.h>
- 
- int
-
diff --git a/net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch b/net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch
new file mode 100644
index 0000000..2959545
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.39-no-compress-man-pages.patch
@@ -0,0 +1,67 @@
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -25,8 +25,6 @@ MAN5_ROFF := $(patsubst $(srcdir)/doc/%,$(DOCBUILDDIR)/man/%,$(MAN5_RST:.rst=.5)
+ MAN7_ROFF := $(patsubst $(srcdir)/doc/%,$(DOCBUILDDIR)/man/%,$(MAN7_RST:.rst=.7))
+ MAN_ROFF_FILES := $(MAN1_ROFF) $(MAN5_ROFF) $(MAN7_ROFF)
+ 
+-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))
+@@ -42,9 +40,6 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) $(COPY_INFO1)
+ 
+ .PHONY: install-man build-man apidocs install-apidocs
+ 
+-%.gz: %
+-	rm -f $@ && gzip --no-name --stdout $^ > $@
+-
+ ifeq ($(WITH_EMACS),1)
+ $(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.texi.stamp : docstring.stamp
+ endif
+@@ -97,11 +92,11 @@ endif
+ install-man: install-apidocs
+ 
+ ifeq ($(HAVE_DOXYGEN),1)
+-MAN_GZIP_FILES += ${APIMAN}.gz
++MAN_ROFF_FILES += ${APIMAN}
+ apidocs: $(APIMAN)
+-install-apidocs: ${APIMAN}.gz
++install-apidocs: ${APIMAN}
+ 	mkdir -p "$(DESTDIR)$(mandir)/man3"
+-	install -m0644 $(filter %.3.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man3
++	install -m0644 $(filter %.3,$(MAN_ROFF_FILES)) $(DESTDIR)/$(mandir)/man3
+ 
+ $(APIMAN): $(dir)/config.dox $(srcdir)/$(dir)/doxygen.cfg $(srcdir)/lib/notmuch.h
+ 	mkdir -p $(DOCBUILDDIR)/man/man3
+@@ -123,16 +118,16 @@ else
+ 
+ # it should be safe to depend on the stamp file, because it is created
+ # after all roff files are moved into place.
+-${MAN_GZIP_FILES}: ${DOCBUILDDIR}/.roff.stamp
++${MAN_ROFF_FILES}: ${DOCBUILDDIR}/.roff.stamp
+ 
+-build-man: ${MAN_GZIP_FILES}
+-install-man: ${MAN_GZIP_FILES}
++build-man: ${MAN_ROFF_FILES}
++install-man: ${MAN_ROFF_FILES}
+ 	mkdir -m0755 -p "$(DESTDIR)$(mandir)/man1"
+ 	mkdir -m0755 -p "$(DESTDIR)$(mandir)/man5"
+ 	mkdir -m0755 -p "$(DESTDIR)$(mandir)/man7"
+-	install -m0644 $(filter %.1.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man1
+-	install -m0644 $(filter %.5.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man5
+-	install -m0644 $(filter %.7.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man7
++	install -m0644 $(filter %.1,$(MAN_ROFF_FILES)) $(DESTDIR)/$(mandir)/man1
++	install -m0644 $(filter %.5,$(MAN_ROFF_FILES)) $(DESTDIR)/$(mandir)/man5
++	install -m0644 $(filter %.7,$(MAN_ROFF_FILES)) $(DESTDIR)/$(mandir)/man7
+ endif
+ 
+ ifneq ($(HAVE_SPHINX)$(HAVE_MAKEINFO),11)
+@@ -158,6 +153,6 @@ $(dir)/config.dox: version.stamp
+ 
+ CLEAN := $(CLEAN) $(DOCBUILDDIR) $(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.texi.stamp
+ CLEAN := $(CLEAN) $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.info.stamp
+-CLEAN := $(CLEAN) $(MAN_GZIP_FILES) $(MAN_ROFF_FILES) $(dir)/conf.pyc $(dir)/config.dox
++CLEAN := $(CLEAN) $(MAN_ROFF_FILES) $(MAN_ROFF_FILES) $(dir)/conf.pyc $(dir)/config.dox
+ 
+ CLEAN := $(CLEAN) $(dir)/__pycache__
diff --git a/net-mail/notmuch/files/notmuch-0.39-test-skip-debug-symbols.patch b/net-mail/notmuch/files/notmuch-0.39-test-skip-debug-symbols.patch
new file mode 100644
index 0000000..f5a052e
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.39-test-skip-debug-symbols.patch
@@ -0,0 +1,11 @@
+--- a/test/T000-basic.sh
++++ b/test/T000-basic.sh
+@@ -71,8 +71,4 @@ test_expect_equal \
+     "$(dirname ${TEST_DIRECTORY})" \
+     "$(echo $PATH|cut -f1 -d: | sed -e 's,/test/valgrind/bin$,,')"
+ 
+-test_begin_subtest 'notmuch is compiled with debugging symbols'
+-readelf --sections $(command -v notmuch) | grep \.debug
+-test_expect_equal 0 $?
+-
+ test_done