sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

notmuch: Update from 0.24.2 to 0.25

This commit is contained in:
Fredrik Fornwall 2017-07-26 15:13:26 +02:00
parent 100d289715
commit c5b6c4acab
5 changed files with 13 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/notmuch/build.sh
View File

@ -1,9 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://notmuchmail.org
TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system"
TERMUX_PKG_VERSION=0.24.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=0.25
TERMUX_PKG_SHA256=65d28d1f783d02629039f7d15d9a2bada147a7d3809f86fe8d13861b0f6ae60b
TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=aa76a96684d5c5918d940182b6fe40f7d6745f144476fdda57388479d586cc51
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="glib, libgmime, libtalloc, libxapian"

24
packages/notmuch/configure.patch
View File

@ -1,27 +1,25 @@
diff -u -r ../notmuch-0.24.1/configure ./configure
--- ../notmuch-0.24.1/configure 2017-04-01 14:29:38.000000000 +0200
+++ ./configure 2017-04-07 00:53:36.743033402 +0200
@@ -352,7 +352,7 @@
diff -u -r ../notmuch-0.25/configure ./configure
--- ../notmuch-0.25/configure 2017-07-25 13:30:24.000000000 +0200
+++ ./configure 2017-07-26 14:35:27.777600722 +0200
@@ -370,7 +370,7 @@
return 0;
}
EOF
-if ${CC} ${CFLAGS} _libversion.c -o _libversion > /dev/null 2>&1 && \
+if ${CC_FOR_BUILD} _libversion.c -o _libversion > /dev/null 2>&1 && \
./_libversion > _libversion.sh && . ./_libversion.sh
-if ${CC} ${CFLAGS} -I"$srcdir" _libversion.c -o _libversion > /dev/null 2>&1 \
+if ${CC_FOR_BUILD} -I"$srcdir" _libversion.c -o _libversion > /dev/null 2>&1 \
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
@@ -554,14 +554,6 @@
valgrind_cflags=
@@ -579,12 +579,7 @@
fi
-printf "Checking for bash-completion (>= 1.90)... "
printf "Checking for bash-completion (>= 1.90)... "
-if pkg-config --atleast-version=1.90 bash-completion; then
- printf "Yes.\n"
printf "Yes.\n"
-else
- printf "No (will not install bash completion).\n"
- WITH_BASH=0
-fi
-
if [ -z "${EMACSLISPDIR-}" ]; then
EMACSLISPDIR="\$(prefix)/share/emacs/site-lisp"
fi

12
packages/notmuch/lib-message-property.cc.patch
View File

@ -1,12 +0,0 @@
diff -u -r ../notmuch-0.24.1/lib/message-property.cc ./lib/message-property.cc
--- ../notmuch-0.24.1/lib/message-property.cc 2017-04-01 14:29:38.000000000 +0200
+++ ./lib/message-property.cc 2017-04-07 00:48:00.914918764 +0200
@@ -51,7 +51,7 @@
if (key == NULL || value == NULL)
return NOTMUCH_STATUS_NULL_POINTER;
- if (index (key, '='))
+ if (strchr (key, '='))
return NOTMUCH_STATUS_ILLEGAL_ARGUMENT;
term = talloc_asprintf (message, "%s=%s", key, value);

12
packages/notmuch/lib-message.cc.patch
View File

@ -1,12 +0,0 @@
diff -u -r ../notmuch-0.24.1/lib/message.cc ./lib/message.cc
--- ../notmuch-0.24.1/lib/message.cc 2017-04-01 14:29:38.000000000 +0200
+++ ./lib/message.cc 2017-04-07 00:45:52.192408149 +0200
@@ -1837,7 +1837,7 @@
const char *key;
char *value;
- value = index(node->string, '=');
+ value = strchr(node->string, '=');
if (!value)
INTERNAL_ERROR ("malformed property term");

105
packages/notmuch/rename-libutil.patch
View File

@ -1,105 +0,0 @@
Apply patch where build fails if the system has a libutil:
https://notmuchmail.org/pipermail/notmuch/2017/024295.html
Already applied upstream so we'll remove this at the next update.
Apparently some systems (MacOS?) have a system library called libutil
and the name conflict causes problems. Since this library is quite
notmuch specific, rename it to something less generic.
---
Makefile.global | 2 +-
Makefile.local | 2 +-
lib/Makefile.local | 4 ++--
test/Makefile.local | 6 +++---
util/Makefile.local | 10 +++++-----
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile.global b/Makefile.global
index 7a78e9b5..cae4c7d1 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -52,7 +52,7 @@ PV_FILE=bindings/python/notmuch/version.py
STD_CFLAGS := -std=gnu99
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(STD_CFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch
+FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lnotmuch_util -Llib -lnotmuch
ifeq ($(LIBDIR_IN_LDCONFIG),0)
FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
endif
diff --git a/Makefile.local b/Makefile.local
index e75b6eae..03eafaaa 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -241,7 +241,7 @@ notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
notmuch.o: version.stamp
-notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a
+notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libnotmuch_util.a parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
diff --git a/lib/Makefile.local b/lib/Makefile.local
index cd92fc79..d36fd5a0 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -60,8 +60,8 @@ libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o)
$(dir)/libnotmuch.a: $(libnotmuch_modules)
$(call quiet,AR) rcs $@ $^
-$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym util/libutil.a parse-time-string/libparse-time-string.a
- $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libutil.a parse-time-string/libparse-time-string.a
+$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym util/libnotmuch_util.a parse-time-string/libparse-time-string.a
+ $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a parse-time-string/libparse-time-string.a
notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules)
sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@
diff --git a/test/Makefile.local b/test/Makefile.local
index 46805972..0df72c92 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -12,15 +12,15 @@ smtp_dummy_srcs = \
smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
-$(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a
+$(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libnotmuch_util.a
$(call quiet,CC) $^ -o $@ $(LDFLAGS)
-$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
+$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libnotmuch_util.a
$(call quiet,CC) $^ -o $@ $(LDFLAGS) $(TALLOC_LDFLAGS)
random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \
notmuch-config.o status.o command-line-arguments.o \
- lib/libnotmuch.a util/libutil.a \
+ lib/libnotmuch.a util/libnotmuch_util.a \
parse-time-string/libparse-time-string.a
$(dir)/random-corpus: $(random_corpus_deps)
diff --git a/util/Makefile.local b/util/Makefile.local
index 905f2376..a6962d49 100644
--- a/util/Makefile.local
+++ b/util/Makefile.local
@@ -3,14 +3,14 @@
dir := util
extra_cflags += -I$(srcdir)/$(dir)
-libutil_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c \
+libnotmuch_util_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c \
$(dir)/string-util.c $(dir)/talloc-extra.c $(dir)/zlib-extra.c \
$(dir)/util.c
-libutil_modules := $(libutil_c_srcs:.c=.o)
+libnotmuch_util_modules := $(libnotmuch_util_c_srcs:.c=.o)
-$(dir)/libutil.a: $(libutil_modules)
+$(dir)/libnotmuch_util.a: $(libnotmuch_util_modules)
$(call quiet,AR) rcs $@ $^
-SRCS := $(SRCS) $(libutil_c_srcs)
-CLEAN := $(CLEAN) $(libutil_modules) $(dir)/libutil.a
+SRCS := $(SRCS) $(libnotmuch_util_c_srcs)
+CLEAN := $(CLEAN) $(libnotmuch_util_modules) $(dir)/libnotmuch_util.a
--
2.11.0