Diff below updates notmuch to 0.31.2. Changes:
https://git.notmuchmail.org/git?p=notmuch;a=blob;f=NEWS;h=677c507dc6d90a84d5c7392dbd5b8537224a8dd7;hb=02a7b026d938f53d9fd9b183ca2b3c44c92489f2
Changes to the port:
- Drop several patches as the underlying issues has been addressed
upstream
- Sync WANTLIB-main
'make test' fails two test (Yen-test), which were already failing.
OK?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/mail/notmuch/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- Makefile.inc 1 Nov 2020 09:48:48 -0000 1.3
+++ Makefile.inc 8 Nov 2020 19:00:12 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.3 2020/11/01 09:48:48 bket Exp $
-V = 0.31
+V = 0.31.2
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz
Index: notmuch/Makefile
===================================================================
RCS file: /cvs/ports/mail/notmuch/notmuch/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- notmuch/Makefile 1 Nov 2020 09:48:48 -0000 1.6
+++ notmuch/Makefile 8 Nov 2020 19:00:12 -0000
@@ -13,8 +13,8 @@ DEBUG_PACKAGES = -main
COMPILER= base-clang ports-gcc
-WANTLIB-main += ${COMPILER_LIBCXX} c glib-2.0 gmime-3.0
-WANTLIB-main += gobject-2.0 intl m pthread talloc xapian z
+WANTLIB-main += ${COMPILER_LIBCXX} c glib-2.0 gmime-3.0 gobject-2.0
+WANTLIB-main += talloc xapian z
LIB_DEPENDS = databases/xapian-core \
devel/libtalloc \
@@ -67,10 +67,8 @@ post-extract:
cd ${WRKSRC}/test; [ -r test-lib-OPENBSD.sh ] || \
cp test-lib-FREEBSD.sh test-lib-OPENBSD.sh
-# Avoid conflict with C++20 <version>, also see patches
pre-configure:
- cd ${WRKSRC}; mv version version.txt; \
- ${SUBST_CMD} lib/Makefile.local
+ cd ${WRKSRC}; ${SUBST_CMD} lib/Makefile.local
ln -s ${PREFIX}/bin/sphinx-build${MODPY_BIN_SUFFIX} ${WRKDIR}/bin/sphinx-build
post-install:
Index: notmuch/distinfo
===================================================================
RCS file: /cvs/ports/mail/notmuch/notmuch/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- notmuch/distinfo 1 Nov 2020 09:48:48 -0000 1.3
+++ notmuch/distinfo 8 Nov 2020 19:00:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.31.tar.xz) = Vx+g4VOchmErHyssgKOY4I7P71LifvfkjPjjuE+hg5Q=
-SIZE (notmuch-0.31.tar.xz) = 713144
+SHA256 (notmuch-0.31.2.tar.xz) = FFa2PgRjcJTu/n5vmkWBLtQZOSoDIv6LD0Ut0GpM++8=
+SIZE (notmuch-0.31.2.tar.xz) = 713388
Index: notmuch/patches/patch-Makefile_global
===================================================================
RCS file: notmuch/patches/patch-Makefile_global
diff -N notmuch/patches/patch-Makefile_global
--- notmuch/patches/patch-Makefile_global 1 Nov 2020 09:48:48 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile_global,v 1.2 2020/11/01 09:48:48 bket Exp $
-
-Index: Makefile.global
---- Makefile.global.orig
-+++ Makefile.global
-@@ -17,7 +17,7 @@ else
- DATE:=$(shell date +%F)
- endif
-
--VERSION:=$(shell cat ${srcdir}/version)
-+VERSION:=$(shell cat ${srcdir}/version.txt)
- ELPA_VERSION:=$(subst ~,_,$(VERSION))
- ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
- ifeq ($(IS_GIT),yes)
Index: notmuch/patches/patch-Makefile_local
===================================================================
RCS file: notmuch/patches/patch-Makefile_local
diff -N notmuch/patches/patch-Makefile_local
--- notmuch/patches/patch-Makefile_local 15 May 2020 08:58:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile_local,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
-
-Index: Makefile.local
---- Makefile.local.orig
-+++ Makefile.local
-@@ -19,7 +19,7 @@ endif
-
- # Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes)
- # this file may already have been updated.
--version.stamp: $(srcdir)/version
-+version.stamp: $(srcdir)/version.txt
- echo $(VERSION) > $@
-
- $(TAR_FILE):
Index: notmuch/patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/notmuch/notmuch/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure
--- notmuch/patches/patch-configure 1 Nov 2020 09:48:48 -0000 1.5
+++ notmuch/patches/patch-configure 8 Nov 2020 19:00:12 -0000
@@ -1,9 +1,5 @@
$OpenBSD: patch-configure,v 1.5 2020/11/01 09:48:48 bket Exp $
-The realpath command (e.g. from GNU coreutils) is not so common outside Linux
-systems. Taken from
-https://git.notmuchmail.org/git?p=notmuch;a=commit;h=b042a59cdf8be7ad215268eee32d4cc114d312bb
-
Index: configure
--- configure.orig
+++ configure
@@ -19,12 +15,3 @@ Index: configure
printf "Yes.\n"
have_zlib=1
zlib_cflags=$(pkg-config --cflags zlib)
-@@ -1536,7 +1536,7 @@ EOF
- if [ $WITH_PYTHON_DOCS = "1" ]; then
- echo "tags.add('WITH_PYTHON')"
- fi
-- printf "rsti_dir = '%s'\n" $(realpath emacs)
-+ printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)"
- } > sphinx.config
-
- # Finally, after everything configured, inform the user how to continue.
Index: notmuch/patches/patch-devel_RELEASING
===================================================================
RCS file: notmuch/patches/patch-devel_RELEASING
diff -N notmuch/patches/patch-devel_RELEASING
--- notmuch/patches/patch-devel_RELEASING 15 May 2020 08:58:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-devel_RELEASING,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
-
-Index: devel/RELEASING
---- devel/RELEASING.orig
-+++ devel/RELEASING
-@@ -62,7 +62,7 @@ repository. From here, there are just a few steps to r
- be "1.0.1" and a subsequent bug-fix release would be "1.0.2"
- etc.
-
-- When you are happy with the file 'version', run
-+ When you are happy with the file 'version.txt', run
-
- make update-versions
-
Index: notmuch/patches/patch-devel_nmbug_doc_conf_py
===================================================================
RCS file: notmuch/patches/patch-devel_nmbug_doc_conf_py
diff -N notmuch/patches/patch-devel_nmbug_doc_conf_py
--- notmuch/patches/patch-devel_nmbug_doc_conf_py 15 May 2020 08:58:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-devel_nmbug_doc_conf_py,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
-
-Index: devel/nmbug/doc/conf.py
---- devel/nmbug/doc/conf.py.orig
-+++ devel/nmbug/doc/conf.py
-@@ -17,7 +17,7 @@ location = os.path.dirname(__file__)
-
- dirname = location
- while True:
-- version_file = os.path.join(dirname, 'version')
-+ version_file = os.path.join(dirname, 'version.txt')
- if os.path.exists(version_file):
- with open(version_file,'r') as f:
- version = f.read().strip()
Index: notmuch/patches/patch-doc_conf_py
===================================================================
RCS file: notmuch/patches/patch-doc_conf_py
diff -N notmuch/patches/patch-doc_conf_py
--- notmuch/patches/patch-doc_conf_py 1 Nov 2020 09:48:48 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-doc_conf_py,v 1.3 2020/11/01 09:48:48 bket Exp $
-
-Index: doc/conf.py
---- doc/conf.py.orig
-+++ doc/conf.py
-@@ -19,7 +19,7 @@ copyright = u'2009-2020, Carl Worth and many others'
- location = os.path.dirname(__file__)
-
- for pathdir in ['.', '..']:
-- version_file = os.path.join(location,pathdir,'version')
-+ version_file = os.path.join(location,pathdir,'version.txt')
- if os.path.exists(version_file):
- with open(version_file,'r') as infile:
- version=infile.read().replace('\n','')
Index: notmuch/patches/patch-lib_config_cc
===================================================================
RCS file: notmuch/patches/patch-lib_config_cc
diff -N notmuch/patches/patch-lib_config_cc
--- notmuch/patches/patch-lib_config_cc 1 Nov 2020 09:48:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-lib_config_cc,v 1.1 2020/11/01 09:48:48 bket Exp $
-
-Don't set destructor until iterator is initialized. Taken from
-https://git.notmuchmail.org/git?p=notmuch;a=commit;h=582e919e2769bd99064b997b05e1601ffcfe9a98
-
-Index: lib/config.cc
---- lib/config.cc.orig
-+++ lib/config.cc
-@@ -113,7 +113,6 @@ notmuch_database_get_config_list (notmuch_database_t *
- goto DONE;
- }
-
-- talloc_set_destructor (list, _notmuch_config_list_destroy);
- list->notmuch = notmuch;
- list->current_key = NULL;
- list->current_val = NULL;
-@@ -122,6 +121,7 @@ notmuch_database_get_config_list (notmuch_database_t *
-
- new(&(list->iterator)) Xapian::TermIterator (notmuch->xapian_db->metadata_keys_begin
- (CONFIG_PREFIX + (prefix ? prefix : "")));
-+ talloc_set_destructor (list, _notmuch_config_list_destroy);
-
- } catch (const Xapian::Error &error) {
- _notmuch_database_log (notmuch, "A Xapian exception occurred getting metadata iterator: %s.\n",
Index: py-notmuch/distinfo
===================================================================
RCS file: /cvs/ports/mail/notmuch/py-notmuch/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- py-notmuch/distinfo 1 Nov 2020 09:48:48 -0000 1.3
+++ py-notmuch/distinfo 8 Nov 2020 19:00:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.31.tar.xz) = Vx+g4VOchmErHyssgKOY4I7P71LifvfkjPjjuE+hg5Q=
-SIZE (notmuch-0.31.tar.xz) = 713144
+SHA256 (notmuch-0.31.2.tar.xz) = FFa2PgRjcJTu/n5vmkWBLtQZOSoDIv6LD0Ut0GpM++8=
+SIZE (notmuch-0.31.2.tar.xz) = 713388
No comments:
Post a Comment