From 22ccd3797c0a437e6201ea38ae8932a68ba237e2 Mon Sep 17 00:00:00 2001 From: Simeon Huang Date: Tue, 18 May 2021 19:30:26 +0100 Subject: [PATCH] Add package script for mimetic --- packages/mimetic/build.sh | 7 ++++ packages/mimetic/debian_patches_g++-11.patch | 30 +++++++++++++++++ .../mimetic/debian_patches_signed-char.patch | 32 +++++++++++++++++++ packages/mimetic/disable_test_build.patch | 11 +++++++ 4 files changed, 80 insertions(+) create mode 100644 packages/mimetic/build.sh create mode 100644 packages/mimetic/debian_patches_g++-11.patch create mode 100644 packages/mimetic/debian_patches_signed-char.patch create mode 100644 packages/mimetic/disable_test_build.patch diff --git a/packages/mimetic/build.sh b/packages/mimetic/build.sh new file mode 100644 index 0000000000..2fb2114b46 --- /dev/null +++ b/packages/mimetic/build.sh @@ -0,0 +1,7 @@ +TERMUX_PKG_HOMEPAGE=http://www.codesink.org/mimetic_mime_library.html +TERMUX_PKG_DESCRIPTION="A C++ Email library (MIME)" +TERMUX_PKG_LICENSE="MIT" +TERMUX_PKG_MAINTAINER="Simeon Huang " +TERMUX_PKG_VERSION=0.9.8 +TERMUX_PKG_SRCURL=http://www.codesink.org/download/mimetic-${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=3a07d68d125f5e132949b078c7275d5eb0078dd649079bd510dd12b969096700 diff --git a/packages/mimetic/debian_patches_g++-11.patch b/packages/mimetic/debian_patches_g++-11.patch new file mode 100644 index 0000000000..d4835cf64a --- /dev/null +++ b/packages/mimetic/debian_patches_g++-11.patch @@ -0,0 +1,30 @@ +Description: Fix build failure with GCC-11 + The failure: + . + mmfile.cxx: In member function ‘bool mimetic::MMFile::map()’: + mmfile.cxx:60:14: error: ordered comparison of pointer with integer zero (‘char*’ and ‘int’) + 60 | if(m_beg > 0) + | ~~~~~~^~~ + . + https://gcc.gnu.org/gcc-11/porting_to.html says: + . + GCC 11 now issues a diagnostic for ordered comparisons of pointers against + constant integers. Commonly this is an ordered comparison against NULL or + 0. These should be equality comparisons, not ordered comparisons. +Origin: upstream +Bug-Debian: https://bugs.debian.org/984235 +Applied: bf84940f9021950c80846e6b1a5f8b0b55991b00 +Reviewed-by: gregor herrmann +Last-Update: 2021-04-13 + +--- a/mimetic/os/mmfile.cxx ++++ b/mimetic/os/mmfile.cxx +@@ -57,7 +57,7 @@ + bool MMFile::map() + { + m_beg = (char*) mmap(0, m_st.st_size, PROT_READ, MAP_SHARED,m_fd,0); +- if(m_beg > 0) ++ if(m_beg != MAP_FAILED) + { + m_end = m_beg + m_st.st_size; + #if HAVE_MADVISE diff --git a/packages/mimetic/debian_patches_signed-char.patch b/packages/mimetic/debian_patches_signed-char.patch new file mode 100644 index 0000000000..6911544c2a --- /dev/null +++ b/packages/mimetic/debian_patches_signed-char.patch @@ -0,0 +1,32 @@ +Description: fix FTBFS on architectures where char is unsigned + Fix error + base64.cxx:30:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing] + by making Base64::sDecTable a signed char. +Bug-Debian: https://bugs.debian.org/859963 +Forwarded: via email +Author: gregor herrmann +Last-Update: 2021-04-13 +Applied: d83e0363e316836d1b8d587f4b89e8e09229abe4 and 2f1bb2b93ecec3167a0aa3410ea4423d5b26320a + +--- a/mimetic/codec/base64.cxx ++++ b/mimetic/codec/base64.cxx +@@ -13,7 +13,7 @@ + "abcdefghijklmnopqrstuvwxyz" + "0123456789+/="; + +-const char Base64::sDecTable[] = { ++const signed char Base64::sDecTable[] = { + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, + -1,-1,-1,-1,-1,-1,-1,-1,-1,-1, +--- a/mimetic/codec/base64.h ++++ b/mimetic/codec/base64.h +@@ -20,7 +20,7 @@ + enum { default_maxlen = 76 }; + enum { eq_sign = 100 }; + static const char sEncTable[]; +- static const char sDecTable[]; ++ static const signed char sDecTable[]; + static const int sDecTableSz; + public: + class Encoder; class Decoder; diff --git a/packages/mimetic/disable_test_build.patch b/packages/mimetic/disable_test_build.patch new file mode 100644 index 0000000000..335b41c6bb --- /dev/null +++ b/packages/mimetic/disable_test_build.patch @@ -0,0 +1,11 @@ +--- src/Makefile.in 2021-05-18 18:26:27.774977928 +0000 ++++ src.mod/Makefile.in 2021-05-18 18:28:31.341028561 +0000 +@@ -225,7 +225,7 @@ + top_srcdir = @top_srcdir@ + MAINTAINERCLEANFILES = Makefile Makefile.in config.cache + EXTRA_DIST = LICENSE m4 +-SUBDIRS = mimetic doc examples test win32 ++SUBDIRS = mimetic doc + INCLUDES = -I$(top_srcdir) + ACLOCAL_AMFLAGS = -I m4 + all: all-recursive