mutt: bump to version 1.11.2
PATCH v2 1/1 mutt: bump to version 1.11.2
Remove patch (rejected upstream:
https://gitlab.com/muttmua/mutt/merge_requests/25), an other solution has been preferred:
https://gitlab.com/muttmua/mutt/commit/78db40f25c6479b14da5a73adf7207bfbec5ccc5)
---
Changes v1 -> v2 (after review of Ryan Barnett):
- Remove host-pkgconf dependency
...tatic-build-with-libidn2-and-libunistring.patch | 36 ---------------------- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 6 ++-- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch
package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 1baceb95bd8e6f35c25bc7afdc6a88c8f6264f3f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Mon, 20 Aug 2018 19:06:08 +0200 -Subject: [PATCH] Fix static build with libidn2 and libunistring - -When libidn2 is statically build with libunistring support, mutt needs -to add -lunistring to LIBS. -To do that, add a call to PKG_CHECK_MODULES to retrieve this information -from libidn2.pc - -Fixes: - - http://autobuild.buildroot.net/results/177da8f4798f69298db5385957184f1c53cca923 - -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 29252173..2e69ac19 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1341,6 +1341,10 @@ AC_ARG_WITH(idn2, AS_HELP_STRING([--with-idn2=@<:@PFX@:>@],[Use GNU libidn2 for - if test "$with_idn2" != "yes" ; then - CPPFLAGS="$CPPFLAGS -I$with_idn2/include" - LDFLAGS="$LDFLAGS -L$with_idn2/lib" -+ else -+ PKG_CHECK_MODULES([LIBIDN2], libidn2, -+ [CPPFLAGS="$CPPFLAGS $LIBIDN2_CFLAGS" -+ LIBS="$LIBIDN2_LIBS"]) - fi - fi - ], --- -2.14.1 -
package/mutt/mutt.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 734a3883158ec3d180cf6538d8bd7f685ce641d2cdef657aa0038f76e79a54a0 mutt-1.10.1.tar.gz +sha256 da5cd4c39f228914d3933d8cf3a017c8271fdd9b9d81c6e4fc42ad22e1a28723 mutt-1.11.2.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL
package/mutt/mutt.mk +2 -4
@@ -4,14 +4,12 @@ # ################################################################################ -MUTT_VERSION = 1.10.1 +MUTT_VERSION = 1.11.2 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL -MUTT_DEPENDENCIES = host-pkgconf ncurses +MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp -# We're patching configure.ac -MUTT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv
Signature · 1 line
2.14.1
PATCH v2 1/1 mutt: bump to version 1.11.2
Quoted 10 lines · Fabrice Fontaine
Remove patch (rejected upstream:
https://gitlab.com/muttmua/mutt/merge_requests/25), an other solution has been preferred:
https://gitlab.com/muttmua/mutt/commit/78db40f25c6479b14da5a73adf7207bfbec5ccc5)Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Ryan Barnett):
- Remove host-pkgconf dependency
Quoted 85 lines
...tatic-build-with-libidn2-and-libunistring.patch | 36 ---------------------- package/mutt/mutt.hash | 2 +- package/mutt/mutt.mk | 6 ++-- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patchpackage/mutt/0001-Fix-static-build-with-libidn2-and-libunistring.patch deleted +0
-36@@ -1,36 +0,0 @@ -From 1baceb95bd8e6f35c25bc7afdc6a88c8f6264f3f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Mon, 20 Aug 2018 19:06:08 +0200 -Subject: [PATCH] Fix static build with libidn2 and libunistring - -When libidn2 is statically build with libunistring support, mutt needs -to add -lunistring to LIBS. -To do that, add a call to PKG_CHECK_MODULES to retrieve this information -from libidn2.pc - -Fixes: - - http://autobuild.buildroot.net/results/177da8f4798f69298db5385957184f1c53cca923 - -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 29252173..2e69ac19 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1341,6 +1341,10 @@ AC_ARG_WITH(idn2, AS_HELP_STRING([--with-idn2=@<:@PFX@:>@],[Use GNU libidn2 for - if test "$with_idn2" != "yes" ; then - CPPFLAGS="$CPPFLAGS -I$with_idn2/include" - LDFLAGS="$LDFLAGS -L$with_idn2/lib" -+ else -+ PKG_CHECK_MODULES([LIBIDN2], libidn2, -+ [CPPFLAGS="$CPPFLAGS $LIBIDN2_CFLAGS" -+ LIBS="$LIBIDN2_LIBS"]) - fi - fi - ], --- -2.14.1 -package/mutt/mutt.hash +1
-1@@ -1,3 +1,3 @@ # Locally calculated -sha256 734a3883158ec3d180cf6538d8bd7f685ce641d2cdef657aa0038f76e79a54a0 mutt-1.10.1.tar.gz +sha256 da5cd4c39f228914d3933d8cf3a017c8271fdd9b9d81c6e4fc42ad22e1a28723 mutt-1.11.2.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPLpackage/mutt/mutt.mk +2
-5@@ -4,14 +4,12 @@ # ################################################################################ -MUTT_VERSION = 1.10.1 +MUTT_VERSION = 1.11.2 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL -MUTT_DEPENDENCIES = host-pkgconf ncurses +MUTT_DEPENDENCIES = ncurses MUTT_CONF_OPTS = --disable-doc --disable-smtp -# We're patching configure.ac -MUTT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBICONV),y) MUTT_DEPENDENCIES += libiconv --2.14.1
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni
AppliedPATCH v2 1/1 mutt: bump to version 1.11.2
In reply to Fabrice FontaineHello,
Quoted 9 lines · Fabrice Fontaine
Remove patch (rejected upstream:
https://gitlab.com/muttmua/mutt/merge_requests/25), an other solution has been preferred:
https://gitlab.com/muttmua/mutt/commit/78db40f25c6479b14da5a73adf7207bfbec5ccc5)Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2 (after review of Ryan Barnett):
- Remove host-pkgconf dependency
Applied to master after adjusting the commit log to explain why the host-pkgconf dependency is dropped.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com