Browse Source

libandroid-support: finally drop iconv implementation

It is replaced by GNU iconv.
emacs-27
Leonid Plyushch 6 years ago
parent
commit
a4db5efc22
  1. 5
      packages/libandroid-support/build.sh
  2. 20
      packages/libandroid-support/iconv-decls.patch

5
packages/libandroid-support/build.sh

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://github.com/termux/libandroid-support
TERMUX_PKG_DESCRIPTION="Library extending the Android C library (Bionic) for additional multibyte, locale and math support"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_VERSION=24
TERMUX_PKG_REVISION=7
TERMUX_PKG_VERSION=25
TERMUX_PKG_SRCURL=https://github.com/termux/libandroid-support/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=e14e262429a60bea733d5bed69d2f3a1cada53fcadaf76787fca5c8b0d4dae2f
TERMUX_PKG_SHA256=42e7b55c2e5fc91cc0447fa8bea432e7a75ec78b03469330668af17aea56f660
TERMUX_PKG_PRE_DEPENDS="dpkg (>= 1.19.4-3)"
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_ESSENTIAL=yes

20
packages/libandroid-support/iconv-decls.patch

@ -1,20 +0,0 @@
diff -uNr libandroid-support-24/src/musl-locale/iconv.c libandroid-support-24.mod/src/musl-locale/iconv.c
--- libandroid-support-24/src/musl-locale/iconv.c 2019-01-25 03:17:10.000000000 +0200
+++ libandroid-support-24.mod/src/musl-locale/iconv.c 2019-05-23 02:25:07.770702362 +0300
@@ -1,4 +1,3 @@
-#include <iconv.h>
#include <errno.h>
#include <wchar.h>
#include <string.h>
@@ -6,6 +5,11 @@
#include <limits.h>
#include <stdint.h>
+typedef void* iconv_t;
+iconv_t iconv_open(const char*, const char*);
+size_t iconv(iconv_t, char**, size_t*, char**, size_t*);
+int iconv_close(iconv_t);
+
#define UTF_32BE 0300
#define UTF_16LE 0301
#define UTF_16BE 0302
Loading…
Cancel
Save