Skip to contentSkip to conversation

package/mutt: bump to version 1.12.1

PATCH New Fabrice Fontaine 2 participants 2 messages Aug 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/mutt: bump to version 1.12.1

Remove both patches (already in version) and drop AUTORECONF

---
 ...-static-build-with-idn2-and-unistrin.patch | 37 --------------
 ...Fix-unistring-library-configure-test.patch | 49 -------------------
 package/mutt/mutt.hash                        |  2 +-
 package/mutt/mutt.mk                          |  4 +-
 4 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch
 delete mode 100644 package/mutt/0002-Fix-unistring-library-configure-test.patch
package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch deleted +0 -37
deleted file mode 100644
index c802cbb365..0000000000
@@ -1,37 +0,0 @@
-From c53b36698fe4721fb562908ac6119aa9280383af Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Sun, 14 Apr 2019 10:22:12 +0200
-Subject: [PATCH] configure.ac: fix static build with idn2 and unistring
-
-Commit 78db40f25c6479b14da5a73adf7207bfbec5ccc5 did not fix static build
-failure
-
-AC_SEARCH_LIBS prepends the library to LIBS as a result -lunistring is
-added before -lidn2. To fix static build, we must set -lunistring after
--lidn2
-
-Fixes:
- - http://autobuild.buildroot.org/results/c9544b4f1a0252e260a2ed19218fa950f4dc2d2d
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://gitlab.com/muttmua/mutt/merge_requests/42]
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index bd8beb91..75943eee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1402,7 +1402,7 @@ if test "x$with_idn2" != "xno"; then
-     AC_SEARCH_LIBS([idn2_check_version], [idn2], [
-       AC_DEFINE([HAVE_LIBIDN2], 1, [Define to 1 if you have the GNU idn2 library])
-       dnl -lunistring is needed for static linking
--      AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring])
-+      AC_SEARCH_LIBS([u8_strconv_from_locale], [unistring], [LIBS="$LIBS -lunistring"])
-       MUTTLIBS="$MUTTLIBS $LIBS"
- 
-       dnl libidn2 >= 2.0.0 declares compatibility macros in idn2.h
--- 
-2.20.1
-
package/mutt/0002-Fix-unistring-library-configure-test.patch deleted +0 -49

49 lines not on this page · raw message

package/mutt/mutt.hash +1 -1
index d0e2d2dd83..376fd8215c 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 b651357ea6c8762178080493991c77ecb111d916d171d422500257ab48be2801  mutt-1.11.4.tar.gz
+sha256 01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c  mutt-1.12.1.tar.gz
 sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee  GPL
package/mutt/mutt.mk +1 -3
index 613358abdd..6a52106abc 100644
@@ -4,14 +4,12 @@
 #
 ################################################################################
 
-MUTT_VERSION = 1.11.4
+MUTT_VERSION = 1.12.1
 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads
 MUTT_LICENSE = GPL-2.0+
 MUTT_LICENSE_FILES = GPL
 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.20.1
#1 lore raw

PATCH 1/1 package/mutt: bump to version 1.12.1

Quoted 11 lines · On Thu, 15 Aug 2019 13:32:14 +0200 Fabrice Fontaine…

Remove both patches (already in version) and drop AUTORECONF

---
 ...-static-build-with-idn2-and-unistrin.patch | 37 --------------
 ...Fix-unistring-library-configure-test.patch | 49 -------------------
 package/mutt/mutt.hash                        |  2 +-
 package/mutt/mutt.mk                          |  4 +-
 4 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 package/mutt/0001-configure.ac-fix-static-build-with-idn2-and-unistrin.patch
 delete mode 100644 package/mutt/0002-Fix-unistring-library-configure-test.patch

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com