Mercurial > mxe-octave
changeset 6093:ce8cf8007f40
libxml2: update to v2.9.13
* src/libxml2.mk: update version/checksum, use gitlab sources
* src/libxml2-1-fixes.patch: update patch
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Wed, 23 Feb 2022 13:44:44 -0500 |
| parents | bd60b1ff34da |
| children | 1bf47a1e03c1 |
| files | src/libxml2-1-fixes.patch src/libxml2.mk |
| diffstat | 2 files changed, 12 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libxml2-1-fixes.patch Wed Feb 23 13:18:29 2022 -0500 +++ b/src/libxml2-1-fixes.patch Wed Feb 23 13:44:44 2022 -0500 @@ -1,24 +1,11 @@ -This file is part of MXE. -See index.html for further information. - -From 91a883b212d0ea5f1d36618362baeca2f35abb29 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sat, 16 Jun 2012 19:44:21 +0200 -Subject: [PATCH] .pc requires.private liblzma - - -diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index f5f5f03..21b14d1 100644 ---- a/libxml-2.0.pc.in -+++ b/libxml-2.0.pc.in -@@ -8,6 +8,7 @@ Name: libXML +diff -ur libxml2-v2.9.13.orig/libxml-2.0.pc.in libxml2-v2.9.13/libxml-2.0.pc.in +--- libxml2-v2.9.13.orig/libxml-2.0.pc.in 2022-02-23 13:29:48.119724801 -0500 ++++ libxml2-v2.9.13/libxml-2.0.pc.in 2022-02-23 13:42:19.580206424 -0500 +@@ -8,6 +8,7 @@ Version: @VERSION@ Description: libXML library version2. Requires: +Requires.private: liblzma Libs: -L${libdir} -lxml2 - Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ + Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ --- -1.7.10.4 -
--- a/src/libxml2.mk Wed Feb 23 13:18:29 2022 -0500 +++ b/src/libxml2.mk Wed Feb 23 13:44:44 2022 -0500 @@ -3,11 +3,11 @@ PKG := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.12 -$(PKG)_CHECKSUM := 339fe5bb2a7d0c13f068c26d8f7cd194c13f9a2a -$(PKG)_SUBDIR := libxml2-$($(PKG)_VERSION) -$(PKG)_FILE := libxml2-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := ftp://xmlsoft.org/libxml2/$($(PKG)_FILE) +$(PKG)_VERSION := 2.9.13 +$(PKG)_CHECKSUM := 156b8938fe54b024bbd8a3db319a6b8a58f9c209 +$(PKG)_SUBDIR := libxml2-v$($(PKG)_VERSION) +$(PKG)_FILE := libxml2-v$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://gitlab.gnome.org/GNOME/$(PKG)/-/archive/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := zlib libiconv ifneq ($(MXE_SYSTEM),msvc) @@ -21,8 +21,8 @@ endef define $(PKG)_BUILD - $(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in' - cd '$(1)' && ./configure \ + #$(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in' + cd '$(1)' && ./autogen.sh \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \