From da40a47e0939cc7fc8d9b7db4be6737dd47709ce Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Mon, 27 Nov 2023 12:01:52 +0000 Subject: [PATCH] upgpkg(main/libgsf): 1.14.51 --- packages/libgsf/build.sh | 12 ++++++------ packages/libgsf/configure.patch | 14 ++------------ packages/libgsf/gir/{1.14.50 => }/Gsf-1.xml | 0 packages/libgsf/libxml2.patch | 10 ++++++++++ 4 files changed, 18 insertions(+), 18 deletions(-) rename packages/libgsf/gir/{1.14.50 => }/Gsf-1.xml (100%) create mode 100644 packages/libgsf/libxml2.patch diff --git a/packages/libgsf/build.sh b/packages/libgsf/build.sh index 5b65a53d67..39eaa3cde6 100644 --- a/packages/libgsf/build.sh +++ b/packages/libgsf/build.sh @@ -2,11 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.gnome.org/GNOME/libgsf TERMUX_PKG_DESCRIPTION="The G Structured File Library" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -_MAJOR_VERSION=1.14 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.50 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libgsf/${_MAJOR_VERSION}/libgsf-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=6e6c20d0778339069d583c0d63759d297e817ea10d0d897ebbe965f16e2e8e52 +TERMUX_PKG_VERSION="1.14.51" +TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libgsf/${TERMUX_PKG_VERSION%.*}/libgsf-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=f0b83251f98b0fd5592b11895910cc0e19f798110b389aba7da1cb7c474017f5 +TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="glib, libbz2, libxml2, zlib" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_DISABLE_GIR=false @@ -17,7 +16,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" " termux_step_pre_configure() { - termux_setup_gir + TERMUX_PKG_VERSION=. termux_setup_gir + CFLAGS+=" -I${TERMUX_PREFIX}/include/libxml2 -includelibxml/xmlerror.h" } termux_step_post_configure() { diff --git a/packages/libgsf/configure.patch b/packages/libgsf/configure.patch index 4c687b714d..20c5353e88 100644 --- a/packages/libgsf/configure.patch +++ b/packages/libgsf/configure.patch @@ -1,6 +1,5 @@ ---- a/configure -+++ b/configure -@@ -15473,7 +15473,7 @@ ++++ a/configure +@@ -16733,7 +16733,7 @@ -Werror=missing-prototypes -Werror=nested-externs \ -Werror=implicit-function-declaration \ -Wmissing-declarations -Wno-pointer-sign \ @@ -9,12 +8,3 @@ -Wdefault-bitfield-sign -Wdo-while -Wparen-string \ -Wptr-subtraction-blows -Wreturn-void -Wtypesign \ -Wstrict-prototypes -Wno-error=format-nonliteral " -@@ -16658,7 +16658,7 @@ - #undef VERSION - #undef HAVE_STDLIB_H - #include -- main () -+ int main () - { - return BZ2_bzDecompressInit (NULL, 0, 0); - } diff --git a/packages/libgsf/gir/1.14.50/Gsf-1.xml b/packages/libgsf/gir/Gsf-1.xml similarity index 100% rename from packages/libgsf/gir/1.14.50/Gsf-1.xml rename to packages/libgsf/gir/Gsf-1.xml diff --git a/packages/libgsf/libxml2.patch b/packages/libgsf/libxml2.patch new file mode 100644 index 0000000000..e457004a14 --- /dev/null +++ b/packages/libgsf/libxml2.patch @@ -0,0 +1,10 @@ ++++ a/gsf/gsf-libxml.c +@@ -27,6 +27,8 @@ + + #include + #include ++#include ++#include + + #undef DEBUG_PUSH_POP +