cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to notmuch-0.31.2

Browse Source 
Changes:
- https://notmuchmail.org/news/release-0.31.1/
- https://notmuchmail.org/news/release-0.31.2/

Drop several local patches as these are not needed any more. While here
sync WANTLIB.

OK bentley@
This commit is contained in:
bket 2020-11-16 15:53:10 +00:00
parent d16d838e52
commit 7a0d3ab893
11 changed files with 11 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/notmuch/Makefile.inc
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.3 2020/11/01 09:48:48 bket Exp $
# $OpenBSD: Makefile.inc,v 1.4 2020/11/16 15:53:10 bket Exp $
V = 0.31
V = 0.31.2
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz

10
mail/notmuch/notmuch/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2020/11/01 09:48:48 bket Exp $
# $OpenBSD: Makefile,v 1.7 2020/11/16 15:53:10 bket Exp $
COMMENT-main = mail indexer, tagger and threader
COMMENT-emacs = Emacs bindings for notmuch
@ -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:

4
mail/notmuch/notmuch/distinfo
View File

@ -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

14
mail/notmuch/notmuch/patches/patch-Makefile_global
View File

@ -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)

14
mail/notmuch/notmuch/patches/patch-Makefile_local
View File

@ -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):

15
mail/notmuch/notmuch/patches/patch-configure
View File

@ -1,8 +1,4 @@
$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
$OpenBSD: patch-configure,v 1.6 2020/11/16 15:53:10 bket Exp $
Index: configure
--- configure.orig
@ -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.

14
mail/notmuch/notmuch/patches/patch-devel_RELEASING
View File

@ -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

14
mail/notmuch/notmuch/patches/patch-devel_nmbug_doc_conf_py
View File

@ -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()

14
mail/notmuch/notmuch/patches/patch-doc_conf_py
View File

@ -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','')

24
mail/notmuch/notmuch/patches/patch-lib_config_cc
View File

@ -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",

4
mail/notmuch/py-notmuch/distinfo
View File

@ -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