From da44770b6cf770b8cc5fe709870db053adfc4242 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Feb 2021 23:58:47 +0000 Subject: Revert "msmtp: Fix to work with autoconf 2.70" This reverts commit e8c0012ea036cb962db25a5941619c22e7218985. No longer needed with autoconf 2.71 --- meta/recipes-extended/msmtp/msmtp/autoconf270.patch | 17 ----------------- meta/recipes-extended/msmtp/msmtp_1.8.14.bb | 3 +-- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-extended/msmtp/msmtp/autoconf270.patch diff --git a/meta/recipes-extended/msmtp/msmtp/autoconf270.patch b/meta/recipes-extended/msmtp/msmtp/autoconf270.patch deleted file mode 100644 index 6efd3d6d7c..0000000000 --- a/meta/recipes-extended/msmtp/msmtp/autoconf270.patch +++ /dev/null @@ -1,17 +0,0 @@ -Update to add the required gettext version to work with autoconf 2.70 - -Upstream-Status: Pending -RP - 2021/1/28 - -Index: msmtp-1.8.14/configure.ac -=================================================================== ---- msmtp-1.8.14.orig/configure.ac -+++ msmtp-1.8.14/configure.ac -@@ -44,6 +44,7 @@ case "${target}" in *-*-mingw*) LIBS="$L - - dnl Gettext - AM_GNU_GETTEXT([external]) -+AM_GNU_GETTEXT_VERSION([0.21]) - - dnl Headers, functions, and types - AC_CHECK_HEADERS([sysexits.h netdb.h arpa/inet.h sys/select.h sys/socket.h sys/wait.h netinet/in.h]) diff --git a/meta/recipes-extended/msmtp/msmtp_1.8.14.bb b/meta/recipes-extended/msmtp/msmtp_1.8.14.bb index c35c8e7ecc..3bd5f9edeb 100644 --- a/meta/recipes-extended/msmtp/msmtp_1.8.14.bb +++ b/meta/recipes-extended/msmtp/msmtp_1.8.14.bb @@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" -SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz \ - file://autoconf270.patch" +SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" SRC_URI[sha256sum] = "d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4" inherit gettext autotools update-alternatives pkgconfig -- cgit 1.2.3-korg