wget: Fix implementation of `struct __sFILE`

packages/wget/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Commandline tool for retrieving files using HTTP, HTTPS
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.21.3
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/wget/wget-${TERMUX_PKG_VERSION}.tar.lz
 TERMUX_PKG_SHA256=dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5
 TERMUX_PKG_DEPENDS="libiconv, pcre2, openssl, libuuid, libandroid-support, libandroid-spawn, zlib"

packages/wget/gnulib.patch

@@ -1,26 +0,0 @@
-diff -uNr wget-1.21.2/lib/freading.c wget-1.21.2.b/lib/freading.c
---- wget-1.21.2/lib/freading.c	2021-09-07 21:59:08.000000000 +0300
-+++ wget-1.21.2.b/lib/freading.c	2021-12-13 14:33:29.421006123 +0300
-@@ -14,6 +14,9 @@
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
- 
-+#include <sys/types.h>
-+#include <bits/struct_file.h>
-+
- #include <config.h>
- 
- /* Specification.  */
-
-diff -uNr wget-1.21.2/lib/stdio-impl.h wget-1.21.2.b/lib/stdio-impl.h
---- wget-1.21.2/lib/stdio-impl.h	2021-09-07 21:59:09.000000000 +0300
-+++ wget-1.21.2.b/lib/stdio-impl.h	2021-12-13 14:59:23.341455180 +0300
-@@ -38,6 +38,8 @@
- #endif
- 
- #include <errno.h>                             /* For detecting Plan9.  */
-+#include <sys/types.h>
-+#include <bits/struct_file.h>
- 
- #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
-   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */

packages/wget/lib-stdio-impl.h.patch

@@ -1,12 +1,22 @@
-diff -u -r ../wget-1.20.2/lib/stdio-impl.h ./lib/stdio-impl.h
---- ../wget-1.20.2/lib/stdio-impl.h	2019-04-01 18:26:23.000000000 +0000
-+++ ./lib/stdio-impl.h	2019-04-03 21:54:29.141765465 +0000
-@@ -60,7 +60,7 @@
- #  define _flags pub._flags
- #  define _r pub._r
- #  define _w pub._w
--# elif defined __ANDROID__ /* Android */
-+# elif defined __ANDROID_BUT_THIS_IS_BROKEN__ /* Android */
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -68,8 +68,10 @@
+ # elif defined __ANDROID__ /* Android */
  #  ifdef __LP64__
  #   define _gl_flags_file_t int
++#   define _gl_struct_file_off_t int64_t
  #  else
+ #   define _gl_flags_file_t short
++#   define _gl_struct_file_off_t __kernel_off_t
+ #  endif
+   /* Up to this commit from 2015-10-12
+      <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
+@@ -96,7 +98,7 @@
+                          unsigned char _nbuf[1]; \
+                          struct { unsigned char *_base; size_t _size; } _lb; \
+                          int _blksize; \
+-                         fpos_t _offset; \
++                         _gl_struct_file_off_t _offset; \
+                          /* More fields, not relevant here.  */ \
+                        } *) fp)
+ # else