mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 21:56:31 +00:00
package/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:
78db40f25c
). This
other solution doesn't require pkg-config, so we can drop the
host-pkgconf dependency.
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Ryan Barnett <ryan.barnett@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
b1056f16f4
commit
7dc547c9a8
@ -1,36 +0,0 @@
|
|||||||
From 1baceb95bd8e6f35c25bc7afdc6a88c8f6264f3f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
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 <fontaine.fabrice@gmail.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 734a3883158ec3d180cf6538d8bd7f685ce641d2cdef657aa0038f76e79a54a0 mutt-1.10.1.tar.gz
|
sha256 da5cd4c39f228914d3933d8cf3a017c8271fdd9b9d81c6e4fc42ad22e1a28723 mutt-1.11.2.tar.gz
|
||||||
sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL
|
sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL
|
||||||
|
@ -4,14 +4,12 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
MUTT_VERSION = 1.10.1
|
MUTT_VERSION = 1.11.2
|
||||||
MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads
|
MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads
|
||||||
MUTT_LICENSE = GPL-2.0+
|
MUTT_LICENSE = GPL-2.0+
|
||||||
MUTT_LICENSE_FILES = GPL
|
MUTT_LICENSE_FILES = GPL
|
||||||
MUTT_DEPENDENCIES = host-pkgconf ncurses
|
MUTT_DEPENDENCIES = ncurses
|
||||||
MUTT_CONF_OPTS = --disable-doc --disable-smtp
|
MUTT_CONF_OPTS = --disable-doc --disable-smtp
|
||||||
# We're patching configure.ac
|
|
||||||
MUTT_AUTORECONF = YES
|
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||||
MUTT_DEPENDENCIES += libiconv
|
MUTT_DEPENDENCIES += libiconv
|
||||||
|
Loading…
x
Reference in New Issue
Block a user