* [PR PATCH] notmuch: update to 0.29.
@ 2019-06-10 14:16 voidlinux-github
2019-06-10 14:19 ` [PR PATCH] [Updated] " voidlinux-github
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
There is a new pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9084 bytes --]
From e3b33e59fc6293164bca0c1a4db8bab690fd56c6 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:13:14 +0700
Subject: [PATCH] notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..c75879f3a3d 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs-mua.info.*
+ vmove usr/share/man/man1/notmuch-emacs-mua.1
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
@ 2019-06-10 14:19 ` voidlinux-github
2019-06-10 14:19 ` voidlinux-github
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9962 bytes --]
From 43599c3fb45887aeb0269988ffbad6a6f3b3255b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/2] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 63a7911b2f836032c21c811b15da11734e5395e7 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:13:14 +0700
Subject: [PATCH 2/2] notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..c75879f3a3d 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs-mua.info.*
+ vmove usr/share/man/man1/notmuch-emacs-mua.1
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
2019-06-10 14:19 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-10 14:19 ` voidlinux-github
2019-06-10 14:22 ` voidlinux-github
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9962 bytes --]
From 43599c3fb45887aeb0269988ffbad6a6f3b3255b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/2] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 63a7911b2f836032c21c811b15da11734e5395e7 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:13:14 +0700
Subject: [PATCH 2/2] notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..c75879f3a3d 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs-mua.info.*
+ vmove usr/share/man/man1/notmuch-emacs-mua.1
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (2 preceding siblings ...)
2019-06-10 14:22 ` voidlinux-github
@ 2019-06-10 14:22 ` voidlinux-github
2019-06-10 14:31 ` voidlinux-github
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9962 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/2] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 781ab69896c41884d8b16d6c6be77374d8e1b5f6 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/2] notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..c75879f3a3d 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs-mua.info.*
+ vmove usr/share/man/man1/notmuch-emacs-mua.1
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
2019-06-10 14:19 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-10 14:19 ` voidlinux-github
@ 2019-06-10 14:22 ` voidlinux-github
2019-06-10 14:22 ` voidlinux-github
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9962 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/2] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 781ab69896c41884d8b16d6c6be77374d8e1b5f6 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/2] notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..c75879f3a3d 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs-mua.info.*
+ vmove usr/share/man/man1/notmuch-emacs-mua.1
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (3 preceding siblings ...)
2019-06-10 14:22 ` voidlinux-github
@ 2019-06-10 14:31 ` voidlinux-github
2019-06-10 14:32 ` voidlinux-github
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
New comment by congdanhqx on void-packages repository
https://github.com/void-linux/void-packages/pull/12367#issuecomment-500438274
Comment:
I'm not sure if it's ok to introduce `BUILD_CXX`.
`CXX_FOR_BUILD` sounds awkward to me,
and AFAICT, `BUILD_{CXX,CPP,LD,F}FLAGS` is newer than `{CXX,CPP,LD,F}FLAGS_FOR_BUILD`,
but `BUILD_{CC,CFLAGS}` is newer than `{CC,CFLAGS}_FOR_BUILD}`
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (4 preceding siblings ...)
2019-06-10 14:31 ` voidlinux-github
@ 2019-06-10 14:32 ` voidlinux-github
2019-06-10 14:45 ` [PR PATCH] [Updated] " voidlinux-github
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
New comment by congdanhqx on void-packages repository
https://github.com/void-linux/void-packages/pull/12367#issuecomment-500438274
Comment:
I'm not sure if it's ok to introduce `BUILD_CXX`.
`CXX_FOR_BUILD` sounds awkward to me,
and AFAICT, `BUILD_{CXX,CPP,LD,F}FLAGS` is newer than `{CXX,CPP,LD,F}FLAGS_FOR_BUILD`,
but `BUILD_{CC,CFLAGS}` is newer than `{CC,CFLAGS}_FOR_BUILD}`.
Feel free to drop the first patch and amend the second one if it's desired.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (5 preceding siblings ...)
2019-06-10 14:32 ` voidlinux-github
@ 2019-06-10 14:45 ` voidlinux-github
2019-06-10 14:45 ` voidlinux-github
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9947 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/2] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 00dc88190f156bda99f4f3a0690c7fa7ec6a7867 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/2] notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..d4bfb905942 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (6 preceding siblings ...)
2019-06-10 14:45 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-06-10 14:45 ` voidlinux-github
2019-06-10 15:48 ` voidlinux-github
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9947 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/2] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 00dc88190f156bda99f4f3a0690c7fa7ec6a7867 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/2] notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..d4bfb905942 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (8 preceding siblings ...)
2019-06-10 15:48 ` voidlinux-github
@ 2019-06-10 15:48 ` voidlinux-github
2019-06-11 14:51 ` voidlinux-github
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9946 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/2] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 3473c792f982c3f71fe1ea8f1af400740fa7750b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/2] notmuch: update to 0.29
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..d4bfb905942 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (7 preceding siblings ...)
2019-06-10 14:45 ` voidlinux-github
@ 2019-06-10 15:48 ` voidlinux-github
2019-06-10 15:48 ` voidlinux-github
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-10 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 9946 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/2] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 3473c792f982c3f71fe1ea8f1af400740fa7750b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/2] notmuch: update to 0.29
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..d4bfb905942 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (9 preceding siblings ...)
2019-06-10 15:48 ` voidlinux-github
@ 2019-06-11 14:51 ` voidlinux-github
2019-06-11 14:51 ` voidlinux-github
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-11 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 11964 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/3] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 3473c792f982c3f71fe1ea8f1af400740fa7750b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/3] notmuch: update to 0.29
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..d4bfb905942 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
From 86fb8d173c71ad14ae543152019b153b02bfd165 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 11 Jun 2019 21:28:20 +0700
Subject: [PATCH 3/3] notmuch: add binding for ruby
cross-compiling ruby binding is failed for now.
---
srcpkgs/notmuch-ruby | 1 +
srcpkgs/notmuch/template | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/notmuch-ruby
diff --git a/srcpkgs/notmuch-ruby b/srcpkgs/notmuch-ruby
new file mode 120000
index 00000000000..67778b7eb37
--- /dev/null
+++ b/srcpkgs/notmuch-ruby
@@ -0,0 +1 @@
+notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index d4bfb905942..911c6faa25d 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
*) _args="--without-emacs";;
esac
+if [ ! "$CROSS_BUILD" ]; then
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
+fi
+
do_configure() {
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
@@ -35,7 +40,6 @@ do_configure() {
do_build() {
make ${makejobs} V=1
make -C contrib/notmuch-mutt
- make -C bindings
cd bindings/python
python2 setup.py build --build-base=build-2
python3 setup.py build --build-base=build-3
@@ -43,11 +47,15 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
- cd bindings/python
+ pushd bindings/python
python2 setup.py build --build-base=build-2 \
install --prefix=/usr --root=${DESTDIR}
python3 setup.py build --build-base=build-3 \
install --prefix=/usr --root=${DESTDIR}
+ popd
+ if [ ! "$CROSS_BUILD" ]; then
+ make DESTDIR=${DESTDIR} -C bindings/ruby install
+ fi
}
libnotmuch_package() {
@@ -109,3 +117,11 @@ notmuch-python3_package() {
vmove ${py3_sitelib}
}
}
+
+notmuch-ruby_package () {
+ depends="libnotmuch>=${version}_${revision} ruby"
+ short_desc+=" - Ruby bindings"
+ pkg_install() {
+ vmove usr/lib/ruby
+ }
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (10 preceding siblings ...)
2019-06-11 14:51 ` voidlinux-github
@ 2019-06-11 14:51 ` voidlinux-github
2019-06-11 15:19 ` voidlinux-github
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-11 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 11964 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/3] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 3473c792f982c3f71fe1ea8f1af400740fa7750b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/3] notmuch: update to 0.29
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..d4bfb905942 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
From 86fb8d173c71ad14ae543152019b153b02bfd165 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 11 Jun 2019 21:28:20 +0700
Subject: [PATCH 3/3] notmuch: add binding for ruby
cross-compiling ruby binding is failed for now.
---
srcpkgs/notmuch-ruby | 1 +
srcpkgs/notmuch/template | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/notmuch-ruby
diff --git a/srcpkgs/notmuch-ruby b/srcpkgs/notmuch-ruby
new file mode 120000
index 00000000000..67778b7eb37
--- /dev/null
+++ b/srcpkgs/notmuch-ruby
@@ -0,0 +1 @@
+notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index d4bfb905942..911c6faa25d 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
*) _args="--without-emacs";;
esac
+if [ ! "$CROSS_BUILD" ]; then
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
+fi
+
do_configure() {
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
@@ -35,7 +40,6 @@ do_configure() {
do_build() {
make ${makejobs} V=1
make -C contrib/notmuch-mutt
- make -C bindings
cd bindings/python
python2 setup.py build --build-base=build-2
python3 setup.py build --build-base=build-3
@@ -43,11 +47,15 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
- cd bindings/python
+ pushd bindings/python
python2 setup.py build --build-base=build-2 \
install --prefix=/usr --root=${DESTDIR}
python3 setup.py build --build-base=build-3 \
install --prefix=/usr --root=${DESTDIR}
+ popd
+ if [ ! "$CROSS_BUILD" ]; then
+ make DESTDIR=${DESTDIR} -C bindings/ruby install
+ fi
}
libnotmuch_package() {
@@ -109,3 +117,11 @@ notmuch-python3_package() {
vmove ${py3_sitelib}
}
}
+
+notmuch-ruby_package () {
+ depends="libnotmuch>=${version}_${revision} ruby"
+ short_desc+=" - Ruby bindings"
+ pkg_install() {
+ vmove usr/lib/ruby
+ }
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (11 preceding siblings ...)
2019-06-11 14:51 ` voidlinux-github
@ 2019-06-11 15:19 ` voidlinux-github
2019-06-11 15:19 ` voidlinux-github
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-11 15:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 11963 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/3] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 3473c792f982c3f71fe1ea8f1af400740fa7750b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/3] notmuch: update to 0.29
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..d4bfb905942 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
From 10c2e56295da5f8500eda855d3f2033f439879f9 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 11 Jun 2019 21:28:20 +0700
Subject: [PATCH 3/3] notmuch: add binding for ruby
cross-compiling ruby binding is failed for now.
---
srcpkgs/notmuch-ruby | 1 +
srcpkgs/notmuch/template | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/notmuch-ruby
diff --git a/srcpkgs/notmuch-ruby b/srcpkgs/notmuch-ruby
new file mode 120000
index 00000000000..67778b7eb37
--- /dev/null
+++ b/srcpkgs/notmuch-ruby
@@ -0,0 +1 @@
+notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index d4bfb905942..e4ff6a8d431 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
*) _args="--without-emacs";;
esac
+if [ ! "$CROSS_BUILD" ]; then
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
+fi
+
do_configure() {
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
@@ -35,7 +40,6 @@ do_configure() {
do_build() {
make ${makejobs} V=1
make -C contrib/notmuch-mutt
- make -C bindings
cd bindings/python
python2 setup.py build --build-base=build-2
python3 setup.py build --build-base=build-3
@@ -43,11 +47,15 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
- cd bindings/python
+ pushd bindings/python
python2 setup.py build --build-base=build-2 \
install --prefix=/usr --root=${DESTDIR}
python3 setup.py build --build-base=build-3 \
install --prefix=/usr --root=${DESTDIR}
+ popd
+ if [ ! "$CROSS_BUILD" ]; then
+ make DESTDIR=${DESTDIR} -C bindings/ruby install
+ fi
}
libnotmuch_package() {
@@ -109,3 +117,11 @@ notmuch-python3_package() {
vmove ${py3_sitelib}
}
}
+
+notmuch-ruby_package() {
+ depends="libnotmuch>=${version}_${revision} ruby"
+ short_desc+=" - Ruby bindings"
+ pkg_install() {
+ vmove usr/lib/ruby
+ }
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (12 preceding siblings ...)
2019-06-11 15:19 ` voidlinux-github
@ 2019-06-11 15:19 ` voidlinux-github
2019-06-12 1:25 ` voidlinux-github
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-11 15:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 11963 bytes --]
From d8b5e768c93680feafa6df4da201f36d4e3d3fff Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/3] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From 3473c792f982c3f71fe1ea8f1af400740fa7750b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/3] notmuch: update to 0.29
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
---
srcpkgs/notmuch/patches/cross.patch | 115 ++++++++++++++++++++++-
srcpkgs/notmuch/patches/emacs-info.patch | 19 ++++
srcpkgs/notmuch/template | 16 +++-
3 files changed, 142 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/notmuch/patches/emacs-info.patch
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/patches/emacs-info.patch b/srcpkgs/notmuch/patches/emacs-info.patch
new file mode 100644
index 00000000000..12b47941bdf
--- /dev/null
+++ b/srcpkgs/notmuch/patches/emacs-info.patch
@@ -0,0 +1,19 @@
+ doc/Makefile.local | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.local b/doc/Makefile.local
+index 719172fe..732d92f5 100644
+--- a/doc/Makefile.local
++++ b/doc/Makefile.local
+@@ -28,7 +28,10 @@ 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 ($(WITH_EMACS),1)
++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
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..d4bfb905942 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=08e926aba53c4b0337fe7907d4f44e76ecc5eaa5d5a59ecda90a6acac195e465
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
From 10c2e56295da5f8500eda855d3f2033f439879f9 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 11 Jun 2019 21:28:20 +0700
Subject: [PATCH 3/3] notmuch: add binding for ruby
cross-compiling ruby binding is failed for now.
---
srcpkgs/notmuch-ruby | 1 +
srcpkgs/notmuch/template | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/notmuch-ruby
diff --git a/srcpkgs/notmuch-ruby b/srcpkgs/notmuch-ruby
new file mode 120000
index 00000000000..67778b7eb37
--- /dev/null
+++ b/srcpkgs/notmuch-ruby
@@ -0,0 +1 @@
+notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index d4bfb905942..e4ff6a8d431 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
*) _args="--without-emacs";;
esac
+if [ ! "$CROSS_BUILD" ]; then
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
+fi
+
do_configure() {
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
@@ -35,7 +40,6 @@ do_configure() {
do_build() {
make ${makejobs} V=1
make -C contrib/notmuch-mutt
- make -C bindings
cd bindings/python
python2 setup.py build --build-base=build-2
python3 setup.py build --build-base=build-3
@@ -43,11 +47,15 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
- cd bindings/python
+ pushd bindings/python
python2 setup.py build --build-base=build-2 \
install --prefix=/usr --root=${DESTDIR}
python3 setup.py build --build-base=build-3 \
install --prefix=/usr --root=${DESTDIR}
+ popd
+ if [ ! "$CROSS_BUILD" ]; then
+ make DESTDIR=${DESTDIR} -C bindings/ruby install
+ fi
}
libnotmuch_package() {
@@ -109,3 +117,11 @@ notmuch-python3_package() {
vmove ${py3_sitelib}
}
}
+
+notmuch-ruby_package() {
+ depends="libnotmuch>=${version}_${revision} ruby"
+ short_desc+=" - Ruby bindings"
+ pkg_install() {
+ vmove usr/lib/ruby
+ }
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (13 preceding siblings ...)
2019-06-11 15:19 ` voidlinux-github
@ 2019-06-12 1:25 ` voidlinux-github
2019-06-12 1:25 ` voidlinux-github
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-12 1:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 10723 bytes --]
From cc6f4dc79a2e02efc3177be89b440dba3c4fe775 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/3] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From ca8e3b04817d63aa34213e7cbbbb1414c78391b9 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/3] notmuch: update to 0.29.1
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
---
srcpkgs/notmuch/patches/cross.patch | 115 +++++++++++++++++++++++++++-
srcpkgs/notmuch/template | 16 ++--
2 files changed, 123 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..33405821bd6 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29.1
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=9846fc8e32d415cee41f6644581a4de7b0d2e6bc98e1ba86db918f061fcfe365
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
From 0c49a07bd967bd7e1b41151ed610204fce36e1f6 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 11 Jun 2019 21:28:20 +0700
Subject: [PATCH 3/3] notmuch: add binding for ruby
cross-compiling ruby binding is failed for now.
---
srcpkgs/notmuch-ruby | 1 +
srcpkgs/notmuch/template | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/notmuch-ruby
diff --git a/srcpkgs/notmuch-ruby b/srcpkgs/notmuch-ruby
new file mode 120000
index 00000000000..67778b7eb37
--- /dev/null
+++ b/srcpkgs/notmuch-ruby
@@ -0,0 +1 @@
+notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 33405821bd6..ced670a59d4 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
*) _args="--without-emacs";;
esac
+if [ ! "$CROSS_BUILD" ]; then
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
+fi
+
do_configure() {
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
@@ -35,7 +40,6 @@ do_configure() {
do_build() {
make ${makejobs} V=1
make -C contrib/notmuch-mutt
- make -C bindings
cd bindings/python
python2 setup.py build --build-base=build-2
python3 setup.py build --build-base=build-3
@@ -43,11 +47,15 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
- cd bindings/python
+ pushd bindings/python
python2 setup.py build --build-base=build-2 \
install --prefix=/usr --root=${DESTDIR}
python3 setup.py build --build-base=build-3 \
install --prefix=/usr --root=${DESTDIR}
+ popd
+ if [ ! "$CROSS_BUILD" ]; then
+ make DESTDIR=${DESTDIR} -C bindings/ruby install
+ fi
}
libnotmuch_package() {
@@ -109,3 +117,11 @@ notmuch-python3_package() {
vmove ${py3_sitelib}
}
}
+
+notmuch-ruby_package() {
+ depends="libnotmuch>=${version}_${revision} ruby"
+ short_desc+=" - Ruby bindings"
+ pkg_install() {
+ vmove usr/lib/ruby
+ }
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] notmuch: update to 0.29.
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (14 preceding siblings ...)
2019-06-12 1:25 ` voidlinux-github
@ 2019-06-12 1:25 ` voidlinux-github
2019-06-15 14:23 ` notmuch: update to 0.29.1 voidlinux-github
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-12 1:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages notmuch
https://github.com/void-linux/void-packages/pull/12367
notmuch: update to 0.29.
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
A patch file from https://github.com/void-linux/void-packages/pull/12367.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-notmuch-12367.patch --]
[-- Type: application/text/x-diff, Size: 10723 bytes --]
From cc6f4dc79a2e02efc3177be89b440dba3c4fe775 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:18:23 +0700
Subject: [PATCH 1/3] common: add BUILD_{CXX,CPP,FC,LD} flags
---
common/xbps-src/shutils/common.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index cdf1803a4d5..5cc68599056 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -453,6 +453,10 @@ setup_pkg() {
export LDFLAGS="$XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
export BUILD_CC="cc"
+ export BUILD_CXX="c++"
+ export BUILD_CPP="cpp"
+ export BUILD_FC="gfortran"
+ export BUILD_LD="ld"
export BUILD_CFLAGS="$XBPS_CFLAGS"
export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
From ca8e3b04817d63aa34213e7cbbbb1414c78391b9 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 10 Jun 2019 21:20:59 +0700
Subject: [PATCH 2/3] notmuch: update to 0.29.1
While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
---
srcpkgs/notmuch/patches/cross.patch | 115 +++++++++++++++++++++++++++-
srcpkgs/notmuch/template | 16 ++--
2 files changed, 123 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/notmuch/patches/cross.patch b/srcpkgs/notmuch/patches/cross.patch
index a1f3f6e157c..682e7b2a209 100644
--- a/srcpkgs/notmuch/patches/cross.patch
+++ b/srcpkgs/notmuch/patches/cross.patch
@@ -1,6 +1,20 @@
---- configure.orig
-+++ configure
-@@ -370,7 +370,7 @@
+From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
+From: Doan Tran Cong Danh <congdanhqx@gmail.com>
+Date: Mon, 10 Jun 2019 20:30:11 +0700
+Subject: [PATCH] configure: cross compile on Void Linux
+
+- Void Linux ships gmime linked against latest gpgme.
+- default Xapian backend is glass from version 1.4
+- cheat some test by running them on host environment
+---
+ configure | 73 +++----------------------------------------------------
+ 1 file changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/configure b/configure
+index 8b80f0e0..8e5fd4ce 100755
+--- a/configure
++++ b/configure
+@@ -380,7 +380,7 @@ int main(void) {
return 0;
}
EOF
@@ -9,3 +23,98 @@
&& ./_libversion > _libversion.sh && . ./_libversion.sh
then
printf "OK.\n"
+@@ -478,13 +478,7 @@ int main(int argc, char** argv) {
+ Xapian::WritableDatabase db("test.db",Xapian::DB_CREATE_OR_OPEN);
+ }
+ EOF
+- ${CXX} ${CXXFLAGS_for_sh} ${xapian_cxxflags} _default_backend.cc -o _default_backend ${xapian_ldflags}
+- ./_default_backend
+- if [ -f test.db/iamglass ]; then
+- default_xapian_backend=glass
+- else
+- default_xapian_backend=chert
+- fi
++ default_xapian_backend=glass
+ printf "%s\n" "${default_xapian_backend}";
+ rm -rf test.db _default_backend _default_backend.cc
+ fi
+@@ -499,66 +493,7 @@ if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+ gmime_ldflags=$(pkg-config --libs gmime-3.0)
+
+ printf "Checking for GMime session key extraction support... "
+-
+- cat > _check_session_keys.c <<EOF
+-#include <gmime/gmime.h>
+-#include <stdio.h>
+-
+-int main () {
+- GError *error = NULL;
+- GMimeParser *parser = NULL;
+- GMimeMultipartEncrypted *body = NULL;
+- GMimeDecryptResult *decrypt_result = NULL;
+- GMimeObject *output = NULL;
+-
+- g_mime_init ();
+- parser = g_mime_parser_new ();
+- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("test/corpora/crypto/basic-encrypted.eml", "r", &error));
+- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n");
+-
+- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL)));
+- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n");
+-
+- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error);
+- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n");
+-
+- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n");
+- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n");
+-
+- printf ("%s\n", decrypt_result->session_key);
+- return 0;
+-}
+-EOF
+- if ! TEMP_GPG=$(mktemp -d); then
+- printf 'No.\nCould not make tempdir for testing session-key support.\n'
+- errors=$((errors + 1))
+- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
+- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
+- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+- then
+- printf "OK.\n"
+- else
+- cat <<EOF
+-No.
+-*** Error: Could not extract session keys from encrypted message.
+-
+-This is likely due to your GMime having been built against a old
+-version of GPGME.
+-
+-Please try to rebuild your version of GMime against a more recent
+-version of GPGME (at least GPGME 1.8.0).
+-EOF
+- if command -v gpgme-config >/dev/null; then
+- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+- else
+- printf 'You do not have the GPGME development libraries installed.\n'
+- fi
+- errors=$((errors + 1))
+- fi
+- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
+- rm -rf "$TEMP_GPG"
+- fi
++ printf "OK.\n"
+ else
+ have_gmime=0
+ printf "No.\n"
+@@ -581,7 +516,7 @@ else
+ fi
+
+ if ! pkg-config --exists zlib; then
+- ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
++ ${BUILD_CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 &&
+ compat/gen_zlib_pc > compat/zlib.pc &&
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat &&
+ export PKG_CONFIG_PATH
+--
+2.22.0.rc1.479.gd8fdbe21b5
+
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index fc6fb70fa61..33405821bd6 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
# Template file for 'notmuch'
pkgname=notmuch
-version=0.28.4
+version=0.29.1
revision=1
hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
@@ -8,13 +8,15 @@ short_desc="Thread-based email index, search, and tagging"
maintainer="Jan S. <jan.schreib@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://notmuchmail.org"
-distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.gz"
-checksum=bab1cabb0542ce2bd4b41a15b84a8d81c8dc3332162705ded6f311dd898656ca
+distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
+checksum=9846fc8e32d415cee41f6644581a4de7b0d2e6bc98e1ba86db918f061fcfe365
subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*|ppc64*)
+ hostmakedepends+=" desktop-file-utils"
makedepends+=" emacs"
subpackages+=" notmuch-emacs"
_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -25,8 +27,6 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_configure() {
- # fool the endianess test
- sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
@@ -71,7 +71,11 @@ notmuch-emacs_package() {
short_desc+=" - Emacs interface"
depends="${sourcepkg}-${version}_${revision} virtual?emacs"
pkg_install() {
+ vmove usr/bin/notmuch-emacs-mua
+ vmove usr/share/applications
vmove usr/share/emacs/site-lisp
+ vmove usr/share/info/notmuch-emacs*
+ vmove usr/share/man/man1/notmuch-emacs*
}
}
@@ -87,6 +91,7 @@ notmuch-mutt_package() {
}
notmuch-python_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python2 bindings"
pycompile_module="notmuch"
@@ -96,6 +101,7 @@ notmuch-python_package() {
}
notmuch-python3_package() {
+ archs=noarch
depends="libnotmuch>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pycompile_module="notmuch"
From 0c49a07bd967bd7e1b41151ed610204fce36e1f6 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 11 Jun 2019 21:28:20 +0700
Subject: [PATCH 3/3] notmuch: add binding for ruby
cross-compiling ruby binding is failed for now.
---
srcpkgs/notmuch-ruby | 1 +
srcpkgs/notmuch/template | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/notmuch-ruby
diff --git a/srcpkgs/notmuch-ruby b/srcpkgs/notmuch-ruby
new file mode 120000
index 00000000000..67778b7eb37
--- /dev/null
+++ b/srcpkgs/notmuch-ruby
@@ -0,0 +1 @@
+notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 33405821bd6..ced670a59d4 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
*) _args="--without-emacs";;
esac
+if [ ! "$CROSS_BUILD" ]; then
+ makedepends+=" ruby-devel"
+ subpackages+=" notmuch-ruby"
+fi
+
do_configure() {
./configure --prefix=/usr \
--bashcompletiondir=/usr/share/bash-completion/completions \
@@ -35,7 +40,6 @@ do_configure() {
do_build() {
make ${makejobs} V=1
make -C contrib/notmuch-mutt
- make -C bindings
cd bindings/python
python2 setup.py build --build-base=build-2
python3 setup.py build --build-base=build-3
@@ -43,11 +47,15 @@ do_build() {
do_install() {
make DESTDIR=${DESTDIR} install
- cd bindings/python
+ pushd bindings/python
python2 setup.py build --build-base=build-2 \
install --prefix=/usr --root=${DESTDIR}
python3 setup.py build --build-base=build-3 \
install --prefix=/usr --root=${DESTDIR}
+ popd
+ if [ ! "$CROSS_BUILD" ]; then
+ make DESTDIR=${DESTDIR} -C bindings/ruby install
+ fi
}
libnotmuch_package() {
@@ -109,3 +117,11 @@ notmuch-python3_package() {
vmove ${py3_sitelib}
}
}
+
+notmuch-ruby_package() {
+ depends="libnotmuch>=${version}_${revision} ruby"
+ short_desc+=" - Ruby bindings"
+ pkg_install() {
+ vmove usr/lib/ruby
+ }
+}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: notmuch: update to 0.29.1
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (15 preceding siblings ...)
2019-06-12 1:25 ` voidlinux-github
@ 2019-06-15 14:23 ` voidlinux-github
2019-06-15 14:30 ` voidlinux-github
2019-06-15 14:31 ` [PR PATCH] [Merged]: " voidlinux-github
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-15 14:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
New comment by congdanhqx on void-packages repository
https://github.com/void-linux/void-packages/pull/12367#issuecomment-502371032
Comment:
On 2019-06-15 06:05:41 -0700, Juan RP wrote:
> xtraeme commented on this pull request.
>
>
>
> > @@ -1,6 +1,20 @@
> ---- configure.orig
> -+++ configure
> -@@ -370,7 +370,7 @@
> +From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
> +From: Doan Tran Cong Danh <congdanhqx@gmail.com>
> +Date: Mon, 10 Jun 2019 20:30:11 +0700
>
> I suppose that you've created a patch against configure.in and then
> configure was regenerated, isn't it? otherwise the patch needs to be
> made each time a new version is released.
No, notmuch doesn't have configure.in
It only have this configure script to generate Makefile.local
--
Danh
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: notmuch: update to 0.29.1
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (16 preceding siblings ...)
2019-06-15 14:23 ` notmuch: update to 0.29.1 voidlinux-github
@ 2019-06-15 14:30 ` voidlinux-github
2019-06-15 14:31 ` [PR PATCH] [Merged]: " voidlinux-github
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-15 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
New comment by congdanhqx on void-packages repository
https://github.com/void-linux/void-packages/pull/12367#issuecomment-502371032
Comment:
On 2019-06-15 06:05:41 -0700, Juan RP wrote:
> xtraeme commented on this pull request.
>
>
>
> > @@ -1,6 +1,20 @@
> ---- configure.orig
> -+++ configure
> -@@ -370,7 +370,7 @@
> +From 7bb539777d688acd5ca6081919047b60d47566d3 Mon Sep 17 00:00:00 2001
> +From: Doan Tran Cong Danh <congdanhqx@gmail.com>
> +Date: Mon, 10 Jun 2019 20:30:11 +0700
>
> I suppose that you've created a patch against configure.in and then
> configure was regenerated, isn't it? otherwise the patch needs to be
> made each time a new version is released.
No, notmuch doesn't have configure.in
It only have this configure script to generate Makefile.local
--
Danh
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: notmuch: update to 0.29.1
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
` (17 preceding siblings ...)
2019-06-15 14:30 ` voidlinux-github
@ 2019-06-15 14:31 ` voidlinux-github
18 siblings, 0 replies; 20+ messages in thread
From: voidlinux-github @ 2019-06-15 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 336 bytes --]
There's a merged pull request on the void-packages repository
notmuch: update to 0.29.1
https://github.com/void-linux/void-packages/pull/12367
Description: While we're at it, also:
- remove old sed for fooling endianess since it's not necessary anymore
- move emacs related file to notmuch-emacs
- mark notmuch-python{,3} as noarch
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2019-06-15 14:31 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-10 14:16 [PR PATCH] notmuch: update to 0.29 voidlinux-github
2019-06-10 14:19 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-10 14:19 ` voidlinux-github
2019-06-10 14:22 ` voidlinux-github
2019-06-10 14:22 ` voidlinux-github
2019-06-10 14:31 ` voidlinux-github
2019-06-10 14:32 ` voidlinux-github
2019-06-10 14:45 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-10 14:45 ` voidlinux-github
2019-06-10 15:48 ` voidlinux-github
2019-06-10 15:48 ` voidlinux-github
2019-06-11 14:51 ` voidlinux-github
2019-06-11 14:51 ` voidlinux-github
2019-06-11 15:19 ` voidlinux-github
2019-06-11 15:19 ` voidlinux-github
2019-06-12 1:25 ` voidlinux-github
2019-06-12 1:25 ` voidlinux-github
2019-06-15 14:23 ` notmuch: update to 0.29.1 voidlinux-github
2019-06-15 14:30 ` voidlinux-github
2019-06-15 14:31 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).