sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glib: Fix bug in glib-gtimezone.patch (#8243)

Browse Source 
```
 ../src/glib/gtimezone.c:1909:56: warning: incompatible pointer types passing 'gchar *' (aka 'char *') to parameter of type 'gchar **' (aka 'char **'); take the address with & [-Wincompatible-pointer-types]
       GBytes *zoneinfo = zone_info_android(identifier, resolved_identifier);
                                                        ^~~~~~~~~~~~~~~~~~~
                                                        &
 ../src/glib/gtimezone.c:527:34: note: passing argument to parameter 'out_identifier' here
                    gchar       **out_identifier)
                                  ^
```
This commit is contained in:
xtkoba 2021-12-15 10:21:28 +09:00 committed by GitHub
parent 630b01094d
commit 3684cb850d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/glib/build.sh
View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and
TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.70.2 TERMUX_PKG_VERSION=2.70.2
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION:0:4}/glib-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION:0:4}/glib-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f TERMUX_PKG_SHA256=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
TERMUX_PKG_DEPENDS="libffi, libiconv, pcre, libandroid-support, zlib" TERMUX_PKG_DEPENDS="libffi, libiconv, pcre, libandroid-support, zlib"

2
packages/glib/glib-gtimezone.patch
View File

@ -152,7 +152,7 @@
{ {
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
- GBytes *zoneinfo = zone_info_unix (identifier, resolved_identifier); - GBytes *zoneinfo = zone_info_unix (identifier, resolved_identifier);
+ GBytes *zoneinfo = zone_info_android(identifier, resolved_identifier); + GBytes *zoneinfo = zone_info_android(identifier, &resolved_identifier);
if (zoneinfo != NULL) if (zoneinfo != NULL)
{ {
init_zone_from_iana_info (tz, zoneinfo, g_steal_pointer (&resolved_identifier)); init_zone_from_iana_info (tz, zoneinfo, g_steal_pointer (&resolved_identifier));