Re: UPDATE mail/notmuch-0.36
On Wed 03/08/2022 18:58, Bjorn Ketelaars wrote:
> Diff below updates notmuch to 0.36. Changes:
> https://notmuchmail.org/news/release-0.36/
>
> 'make test' passes all but 2 tests. These test are known to fail. Run
> tested on amd64.
>
> OK?
Ping
Diff enclosed again.
Index: Makefile.inc
===
RCS file: /cvs/ports/mail/notmuch/Makefile.inc,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.inc
--- Makefile.inc11 Mar 2022 19:34:43 - 1.10
+++ Makefile.inc3 Aug 2022 16:51:47 -
@@ -1,4 +1,4 @@
-V =0.35
+V =0.36
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz
Index: notmuch/Makefile
===
RCS file: /cvs/ports/mail/notmuch/notmuch/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- notmuch/Makefile17 Jun 2022 13:05:00 - 1.18
+++ notmuch/Makefile3 Aug 2022 16:51:47 -
@@ -4,8 +4,6 @@ COMMENT-emacs = Emacs bindings for notm
PKGNAME-main = notmuch-${V}
PKGNAME-emacs =notmuch-emacs-${V}
-REVISION-main =0
-
SHARED_LIBS += notmuch 1.2
MULTI_PACKAGES = -main -emacs
Index: notmuch/distinfo
===
RCS file: /cvs/ports/mail/notmuch/notmuch/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- notmuch/distinfo24 Feb 2022 17:53:12 - 1.9
+++ notmuch/distinfo3 Aug 2022 16:51:47 -
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.35.tar.xz) = qDHEFMTyCmyuOlgHk8hVEC0ylQgPAA6zgyt3ImpArDk=
-SIZE (notmuch-0.35.tar.xz) = 755112
+SHA256 (notmuch-0.36.tar.xz) = EwIxuDD9mA770qqxIhQ5K4hB9dKlo2GqjHmnmmA1zkA=
+SIZE (notmuch-0.36.tar.xz) = 761260
Index: notmuch/patches/patch-lib_Makefile_local
===
RCS file: /cvs/ports/mail/notmuch/notmuch/patches/patch-lib_Makefile_local,v
retrieving revision 1.5
diff -u -p -r1.5 patch-lib_Makefile_local
--- notmuch/patches/patch-lib_Makefile_local11 Mar 2022 19:34:43 -
1.5
+++ notmuch/patches/patch-lib_Makefile_local3 Aug 2022 16:51:47 -
@@ -24,7 +24,7 @@ Index: lib/Makefile.local
endif
ifeq ($(LIBDIR_IN_LDCONFIG),1)
ifeq ($(DESTDIR),)
-@@ -74,19 +78,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
+@@ -75,19 +79,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
$(dir)/$(LIBNAME): $(libnotmuch_modules) util/libnotmuch_util.a
parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules)
$(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a
parse-time-string/libparse-time-string.a
Index: notmuch/patches/patch-test_test-lib_sh
===
RCS file: /cvs/ports/mail/notmuch/notmuch/patches/patch-test_test-lib_sh,v
retrieving revision 1.6
diff -u -p -r1.6 patch-test_test-lib_sh
--- notmuch/patches/patch-test_test-lib_sh 11 Mar 2022 19:34:43 -
1.6
+++ notmuch/patches/patch-test_test-lib_sh 3 Aug 2022 16:51:47 -
@@ -1,20 +1,10 @@
-we don't have libdl
-
-our ld code does not ignore empty elements in the list, which results in
errors.
+Our ld code does not ignore empty elements in the list, which results in
errors.
Removing the append logic fixes this
Index: test/test-lib.sh
--- test/test-lib.sh.orig
+++ test/test-lib.sh
-@@ -96,7 +96,6 @@ TEST_GDB=${TEST_GDB:-gdb}
- TEST_CC=${TEST_CC:-cc}
- TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"}
- TEST_SHIM_CFLAGS=${TEST_SHIM_CFLAGS:-"-fpic -shared"}
--TEST_SHIM_LDFLAGS=${TEST_SHIM_LDFLAGS:-"-ldl"}
-
- # Protect ourselves from common misconfiguration to export
- # CDPATH into the environment
-@@ -953,7 +952,7 @@ notmuch_with_shim () {
+@@ -886,7 +886,7 @@ notmuch_with_shim () {
base_name="$1"
shift
shim_file="${base_name}.so"
Index: notmuch/patches/patch-test_test-vars_sh
===
RCS file: notmuch/patches/patch-test_test-vars_sh
diff -N notmuch/patches/patch-test_test-vars_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ notmuch/patches/patch-test_test-vars_sh 3 Aug 2022 16:51:47 -
@@ -0,0 +1,13 @@
+We don't have libdl.
+
+Index: test/test-vars.sh
+--- test/test-vars.sh.orig
test/test-vars.sh
+@@ -33,7 +33,6 @@ TEST_GDB=${TEST_GDB:-gdb}
+ TEST_CC=${TEST_CC:-cc}
+ TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"}
+ TEST_SHIM_CFLAGS=${TEST_SHIM_CFLAGS:-"-fpic -shared"}
+-TEST_SHIM_LDFLAGS=${TEST_SHIM_LDFLAGS:-"-ldl"}
+
+ # Protect ourselves from common misconfiguration to export
+ # CDPATH into the environment
Index: py-notmuch/distinfo
===
RCS file: /cvs/ports/mail/notmuch/py-notmuch/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- py-notmuch/distinfo 24 Feb 2022 17:53:12 -
UPDATE mail/notmuch-0.36
Diff below updates notmuch to 0.36. Changes:
https://notmuchmail.org/news/release-0.36/
'make test' passes all but 2 tests. These test are known to fail. Run
tested on amd64.
OK?
Index: Makefile.inc
===
RCS file: /cvs/ports/mail/notmuch/Makefile.inc,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.inc
--- Makefile.inc11 Mar 2022 19:34:43 - 1.10
+++ Makefile.inc3 Aug 2022 16:51:47 -
@@ -1,4 +1,4 @@
-V =0.35
+V =0.36
DISTNAME = notmuch-$V
EXTRACT_SUFX = .tar.xz
Index: notmuch/Makefile
===
RCS file: /cvs/ports/mail/notmuch/notmuch/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- notmuch/Makefile17 Jun 2022 13:05:00 - 1.18
+++ notmuch/Makefile3 Aug 2022 16:51:47 -
@@ -4,8 +4,6 @@ COMMENT-emacs = Emacs bindings for notm
PKGNAME-main = notmuch-${V}
PKGNAME-emacs =notmuch-emacs-${V}
-REVISION-main =0
-
SHARED_LIBS += notmuch 1.2
MULTI_PACKAGES = -main -emacs
Index: notmuch/distinfo
===
RCS file: /cvs/ports/mail/notmuch/notmuch/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- notmuch/distinfo24 Feb 2022 17:53:12 - 1.9
+++ notmuch/distinfo3 Aug 2022 16:51:47 -
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.35.tar.xz) = qDHEFMTyCmyuOlgHk8hVEC0ylQgPAA6zgyt3ImpArDk=
-SIZE (notmuch-0.35.tar.xz) = 755112
+SHA256 (notmuch-0.36.tar.xz) = EwIxuDD9mA770qqxIhQ5K4hB9dKlo2GqjHmnmmA1zkA=
+SIZE (notmuch-0.36.tar.xz) = 761260
Index: notmuch/patches/patch-lib_Makefile_local
===
RCS file: /cvs/ports/mail/notmuch/notmuch/patches/patch-lib_Makefile_local,v
retrieving revision 1.5
diff -u -p -r1.5 patch-lib_Makefile_local
--- notmuch/patches/patch-lib_Makefile_local11 Mar 2022 19:34:43 -
1.5
+++ notmuch/patches/patch-lib_Makefile_local3 Aug 2022 16:51:47 -
@@ -24,7 +24,7 @@ Index: lib/Makefile.local
endif
ifeq ($(LIBDIR_IN_LDCONFIG),1)
ifeq ($(DESTDIR),)
-@@ -74,19 +78,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
+@@ -75,19 +79,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
$(dir)/$(LIBNAME): $(libnotmuch_modules) util/libnotmuch_util.a
parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules)
$(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a
parse-time-string/libparse-time-string.a
Index: notmuch/patches/patch-test_test-lib_sh
===
RCS file: /cvs/ports/mail/notmuch/notmuch/patches/patch-test_test-lib_sh,v
retrieving revision 1.6
diff -u -p -r1.6 patch-test_test-lib_sh
--- notmuch/patches/patch-test_test-lib_sh 11 Mar 2022 19:34:43 -
1.6
+++ notmuch/patches/patch-test_test-lib_sh 3 Aug 2022 16:51:47 -
@@ -1,20 +1,10 @@
-we don't have libdl
-
-our ld code does not ignore empty elements in the list, which results in
errors.
+Our ld code does not ignore empty elements in the list, which results in
errors.
Removing the append logic fixes this
Index: test/test-lib.sh
--- test/test-lib.sh.orig
+++ test/test-lib.sh
-@@ -96,7 +96,6 @@ TEST_GDB=${TEST_GDB:-gdb}
- TEST_CC=${TEST_CC:-cc}
- TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"}
- TEST_SHIM_CFLAGS=${TEST_SHIM_CFLAGS:-"-fpic -shared"}
--TEST_SHIM_LDFLAGS=${TEST_SHIM_LDFLAGS:-"-ldl"}
-
- # Protect ourselves from common misconfiguration to export
- # CDPATH into the environment
-@@ -953,7 +952,7 @@ notmuch_with_shim () {
+@@ -886,7 +886,7 @@ notmuch_with_shim () {
base_name="$1"
shift
shim_file="${base_name}.so"
Index: notmuch/patches/patch-test_test-vars_sh
===
RCS file: notmuch/patches/patch-test_test-vars_sh
diff -N notmuch/patches/patch-test_test-vars_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ notmuch/patches/patch-test_test-vars_sh 3 Aug 2022 16:51:47 -
@@ -0,0 +1,13 @@
+We don't have libdl.
+
+Index: test/test-vars.sh
+--- test/test-vars.sh.orig
test/test-vars.sh
+@@ -33,7 +33,6 @@ TEST_GDB=${TEST_GDB:-gdb}
+ TEST_CC=${TEST_CC:-cc}
+ TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"}
+ TEST_SHIM_CFLAGS=${TEST_SHIM_CFLAGS:-"-fpic -shared"}
+-TEST_SHIM_LDFLAGS=${TEST_SHIM_LDFLAGS:-"-ldl"}
+
+ # Protect ourselves from common misconfiguration to export
+ # CDPATH into the environment
Index: py-notmuch/distinfo
===
RCS file: /cvs/ports/mail/notmuch/py-notmuch/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- py-notmuch/distinfo 24 Feb 2022 17:53:12 - 1.9
+++ py-notmuch/distinfo 3 Aug 2022 16:51:47 -
@@ -1,2 +1,2 @@
-SHA256
