From fe9f34bc772f74b5f1b787f651d96a4f21bc03f6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 13:33:55 -0800 Subject: [PATCH 01/10] libxml2: update to 2.12.5. --- ...952bdb7a4364100f009043e94e1bf44c6197.patch | 85 +++++++++++++++++++ srcpkgs/libxml2/template | 8 +- 2 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/libxml2/patches/387a952bdb7a4364100f009043e94e1bf44c6197.patch diff --git a/srcpkgs/libxml2/patches/387a952bdb7a4364100f009043e94e1bf44c6197.patch b/srcpkgs/libxml2/patches/387a952bdb7a4364100f009043e94e1bf44c6197.patch new file mode 100644 index 00000000000000..50a6da45513f82 --- /dev/null +++ b/srcpkgs/libxml2/patches/387a952bdb7a4364100f009043e94e1bf44c6197.patch @@ -0,0 +1,85 @@ +From 387a952bdb7a4364100f009043e94e1bf44c6197 Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Mon, 12 Feb 2024 16:45:16 +0100 +Subject: [PATCH] xmllint: Return error code if XPath returns empty nodeset + +Return an error code as before but make it possible to distinguish from +real errors. + +Fixes #690. +--- + doc/xmllint.xml | 11 ++++++++++- + xmllint.c | 24 +++++++++++++----------- + 2 files changed, 23 insertions(+), 12 deletions(-) + +diff --git a/doc/xmllint.xml b/doc/xmllint.xml +index b81da3aa7..8bc665216 100644 +--- a/doc/xmllint.xml ++++ b/doc/xmllint.xml +@@ -575,7 +575,9 @@ + result. In case of a nodeset result, each node in the + node set is serialized in full in the output. In case + of an empty node set the "XPath set is empty" result +- will be shown and an error exit code will be returned. ++ will be shown and exit code 11 will be returned.. ++ This feature is EXPERIMENTAL. Implementation details can ++ change without futher notice. + + + +@@ -945,6 +947,13 @@ + + + ++ ++ 11 ++ ++ XPath result is empty ++ ++ ++ + + + +diff --git a/xmllint.c b/xmllint.c +index 21dbe7d24..5c26c3fe8 100644 +--- a/xmllint.c ++++ b/xmllint.c +@@ -86,17 +86,18 @@ + #endif + + typedef enum { +- XMLLINT_RETURN_OK = 0, /* No error */ +- XMLLINT_ERR_UNCLASS = 1, /* Unclassified */ +- XMLLINT_ERR_DTD = 2, /* Error in DTD */ +- XMLLINT_ERR_VALID = 3, /* Validation error */ +- XMLLINT_ERR_RDFILE = 4, /* CtxtReadFile error */ +- XMLLINT_ERR_SCHEMACOMP = 5, /* Schema compilation */ +- XMLLINT_ERR_OUT = 6, /* Error writing output */ +- XMLLINT_ERR_SCHEMAPAT = 7, /* Error in schema pattern */ +- XMLLINT_ERR_RDREGIS = 8, /* Error in Reader registration */ +- XMLLINT_ERR_MEM = 9, /* Out of memory error */ +- XMLLINT_ERR_XPATH = 10 /* XPath evaluation error */ ++ XMLLINT_RETURN_OK = 0, /* No error */ ++ XMLLINT_ERR_UNCLASS = 1, /* Unclassified */ ++ XMLLINT_ERR_DTD = 2, /* Error in DTD */ ++ XMLLINT_ERR_VALID = 3, /* Validation error */ ++ XMLLINT_ERR_RDFILE = 4, /* CtxtReadFile error */ ++ XMLLINT_ERR_SCHEMACOMP = 5, /* Schema compilation */ ++ XMLLINT_ERR_OUT = 6, /* Error writing output */ ++ XMLLINT_ERR_SCHEMAPAT = 7, /* Error in schema pattern */ ++ XMLLINT_ERR_RDREGIS = 8, /* Error in Reader registration */ ++ XMLLINT_ERR_MEM = 9, /* Out of memory error */ ++ XMLLINT_ERR_XPATH = 10, /* XPath evaluation error */ ++ XMLLINT_ERR_XPATH_EMPTY = 11 /* XPath result is empty */ + } xmllintReturnCode; + #ifdef LIBXML_DEBUG_ENABLED + static int shell = 0; +@@ -2019,6 +2020,7 @@ static void doXPathDump(xmlXPathObjectPtr cur) { + xmlOutputBufferPtr buf; + + if ((cur->nodesetval == NULL) || (cur->nodesetval->nodeNr <= 0)) { ++ progresult = XMLLINT_ERR_XPATH_EMPTY; + if (!quiet) { + fprintf(stderr, "XPath set is empty\n"); + } diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 7e05639eaaa1e2..270753e103cee1 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,8 +1,7 @@ # Template file for 'libxml2' pkgname=libxml2 -reverts="2.12.1_1" -version=2.11.4 -revision=6 +version=2.12.5 +revision=1 build_style=gnu-configure configure_args="--with-threads --with-history --with-icu --with-legacy --with-ftp --with-xptr-locs --enable-static" @@ -13,8 +12,9 @@ short_desc="Library providing XML and HTML support" maintainer="Enno Boland " license="MIT" homepage="https://gitlab.gnome.org/GNOME/libxml2" +changelog="https://gitlab.gnome.org/GNOME/libxml2/-/raw/master/NEWS" distfiles="${GNOME_SITE}/libxml2/${version%.*}/libxml2-${version}.tar.xz" -checksum=737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7 +checksum=a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21 python_version=3 CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver" From 16163aa0eb109586bb625c46925b79e7af67026a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 13:34:20 -0800 Subject: [PATCH 02/10] collectd: update tarballs location --- srcpkgs/collectd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 0cbb7c457fb9ec..1b0b1d192ce8cd 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -20,7 +20,7 @@ short_desc="Daemon which collects system performance statistics periodically" maintainer="Orphaned " license="GPL-2.0-only, MIT" homepage="https://collectd.org" -distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2" +distfiles="https://storage.googleapis.com/collectd-tarballs/${pkgname}-${version}.tar.bz2" checksum=5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 LDFLAGS="-lgcrypt" From 4baf80f8e2e2cc6f5fe83cfbbdfad78055ab88d7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 17:50:25 -0800 Subject: [PATCH 03/10] zabbix: update distfiles url --- srcpkgs/zabbix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template index aa2615c12dc4bb..707b48567e87ec 100644 --- a/srcpkgs/zabbix/template +++ b/srcpkgs/zabbix/template @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.zabbix.com" changelog="https://www.zabbix.com/rn/rn${version}" -distfiles="https://cdn.zabbix.com/zabbix/sources/stable/${version%.*}/zabbix-${version}.tar.gz" +distfiles="https://cdn.zabbix.com/zabbix/sources/oldstable/${version%.*}/zabbix-${version}.tar.gz" checksum=f0e7a9abb0f65d700f531253b91c31165077a9c94769cc8d238a423ada852773 conf_files="/etc/zabbix_server.conf" system_accounts="_zabbix_server" From 63cd00f39109e021f5b1fa54c44815c201f3d7d4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 20:57:54 -0800 Subject: [PATCH 04/10] inkscape: fix build for libxml2 2.12 --- .../inkscape/patches/fix-libxml2-2.12.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 srcpkgs/inkscape/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..dc5b0f53460c9a --- /dev/null +++ b/srcpkgs/inkscape/patches/fix-libxml2-2.12.patch @@ -0,0 +1,33 @@ +From 694d8ae43d06efff21adebf377ce614d660b24cd Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Fri, 17 Nov 2023 22:30:42 +0100 +Subject: [PATCH] include missing header file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes build error: +``` +/build/inkscape/src/inkscape/src/object/uri.cpp: In constructor ‘Inkscape::URI::URI(const gchar*, const char*)’: +/build/inkscape/src/inkscape/src/object/uri.cpp:86:9: error: ‘xmlFree’ was not declared in this scope; did you mean ‘xmlFreeURI’? + 86 | xmlFree(full); +``` +--- + src/object/uri.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/object/uri.h b/src/object/uri.h +index 381adec58cf..d5b211fe2b2 100644 +--- a/src/object/uri.h ++++ b/src/object/uri.h +@@ -13,6 +13,7 @@ + #define INKSCAPE_URI_H + + #include ++#include + #include + #include + +-- +GitLab + From 0323f4f070853f99406d0cd106063364006b2274 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 20:58:21 -0800 Subject: [PATCH 05/10] rdrview: fix build for libxml2 2.12 --- .../rdrview/patches/fix-libxml2-2.12.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/rdrview/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch b/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..eb8c8eb7709a87 --- /dev/null +++ b/srcpkgs/rdrview/patches/fix-libxml2-2.12.patch @@ -0,0 +1,26 @@ +From b5fdd379577e13d26784ffdeca3ecb02ff1d336e Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 13:49:49 -0800 +Subject: [PATCH] Add missing include with libxml2 2.12+ + +libxml2 2.12 removed extra includes, which causes stdlib.h to not get implicitly +included anymore. + +The missing include results in a warning on gcc13 and below with the resulting +binary truncating the pointer to an integer, gcc14+ makes this a hard error. +--- + src/rdrview.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/rdrview.h b/src/rdrview.h +index 9365e7a..2eda156 100644 +--- a/src/rdrview.h ++++ b/src/rdrview.h +@@ -26,6 +26,7 @@ + #define RDRVIEW_H + + #include ++#include + #include + #include + #include From 1a312009eb9f79ae0514544de4459fe8d29b4702 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 15:13:02 -0800 Subject: [PATCH 06/10] libgdal: update to 3.8.4. --- common/shlibs | 2 +- srcpkgs/libgdal/patches/10-atoll.patch | 34 -------------------------- srcpkgs/libgdal/template | 6 ++--- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/libgdal/patches/10-atoll.patch diff --git a/common/shlibs b/common/shlibs index 3cf507d8ada879..f5b32693cae681 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2459,7 +2459,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5 libu2f-server.so.0 libu2f-server-1.1.0_9 libsqlcipher.so.0 sqlcipher-4.3.0_3 libgta.so.1 libgta-1.2.0_1 -libgdal.so.31 libgdal-3.5.3_1 +libgdal.so.34 libgdal-3.8.4_1 libosgViewer.so.161 osg-3.6.5_1 libosgShadow.so.161 osg-3.6.5_1 libosgParticle.so.161 osg-3.6.5_1 diff --git a/srcpkgs/libgdal/patches/10-atoll.patch b/srcpkgs/libgdal/patches/10-atoll.patch deleted file mode 100644 index a114098612c522..00000000000000 --- a/srcpkgs/libgdal/patches/10-atoll.patch +++ /dev/null @@ -1,34 +0,0 @@ -Author: Holger Jaekel -Summary: musl atoll() doesn't return ERANGE in case of overflow ----- - ---- a/port/cpl_conv.cpp -+++ b/port/cpl_conv.cpp -@@ -1011,8 +1011,6 @@ - #endif - } - --#if defined(__MINGW32__) || defined(__sun__) -- - // mingw atoll() doesn't return ERANGE in case of overflow - static int CPLAtoGIntBigExHasOverflow(const char* pszString, GIntBig nVal) - { -@@ -1035,8 +1033,6 @@ - return strcmp(szBuffer, pszString) != 0; - } - --#endif -- - /************************************************************************/ - /* CPLAtoGIntBigEx() */ - /************************************************************************/ -@@ -1065,9 +1061,7 @@ - GIntBig nVal = atol(pszString); - #endif - if( errno == ERANGE --#if defined(__MINGW32__) || defined(__sun__) - || CPLAtoGIntBigExHasOverflow(pszString, nVal) --#endif - ) - { - if( pbOverflow ) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index d5850fb768f669..93d916099045c0 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal -version=3.5.3 -revision=12 +version=3.8.4 +revision=1 build_style=cmake build_helper=python3 configure_args="-DGDAL_USE_OPENCL=ON @@ -21,7 +21,7 @@ license="MIT" homepage="https://www.gdal.org" changelog="https://raw.githubusercontent.com/OSGeo/gdal/master/NEWS.md" distfiles="https://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" -checksum=d32223ddf145aafbbaec5ccfa5dbc164147fb3348a3413057f9b1600bb5b3890 +checksum=0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce python_version=3 if [ -z "$CROSS_BUILD" ]; then From 208a4d06fe55943a5536ed757cc98e5786fa1214 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 20:58:50 -0800 Subject: [PATCH 07/10] cegui: fix build for libxml2 2.12 --- srcpkgs/cegui/patches/fix-libxml2-2.12.patch | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 srcpkgs/cegui/patches/fix-libxml2-2.12.patch diff --git a/srcpkgs/cegui/patches/fix-libxml2-2.12.patch b/srcpkgs/cegui/patches/fix-libxml2-2.12.patch new file mode 100644 index 00000000000000..f288ce9a66b098 --- /dev/null +++ b/srcpkgs/cegui/patches/fix-libxml2-2.12.patch @@ -0,0 +1,26 @@ +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 14:16:21 -0800 +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 +--- + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +index 74a3dbddd..a408f9305 100644 +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, + + if (!doc) + { ++#if LIBXML_VERSION >= 21200 ++ const xmlError* err = xmlGetLastError(); ++#else + xmlError* err = xmlGetLastError(); ++#endif + + throw GenericException( + String("xmlParseMemory failed in file: '") + From 0f056abc27e7f28666bc78c004abd3a5281ca43e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 20:59:44 -0800 Subject: [PATCH 08/10] 0ad: fix build for gcc 13 --- srcpkgs/0ad/patches/fix-gcc13.patch | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 srcpkgs/0ad/patches/fix-gcc13.patch diff --git a/srcpkgs/0ad/patches/fix-gcc13.patch b/srcpkgs/0ad/patches/fix-gcc13.patch new file mode 100644 index 00000000000000..ad40bceffc7cbc --- /dev/null +++ b/srcpkgs/0ad/patches/fix-gcc13.patch @@ -0,0 +1,48 @@ +From 093e1eb23519ab4a4633a999a555a58e4fd5343e Mon Sep 17 00:00:00 2001 +From: Stan +Date: Sat, 13 May 2023 12:08:23 +0000 +Subject: [PATCH] Fix compilation with GCC 13. + +gcc-13 less often includes cstdint so one might need to include it manually if needed. + +The headers already included in Message.h are included within namespace AtlasMessage which didn't break by chance, move them out and add cstdint. + +Patch by: @sera +Reviewed by: @phosit +Fixes: #6800 +Differential Revision: https://code.wildfiregames.com/D4997 + +git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27644 3db68df2-c116-0410-a063-a993310a9797 +--- + source/tools/atlas/GameInterface/Messages.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/source/tools/atlas/GameInterface/Messages.h b/source/tools/atlas/GameInterface/Messages.h +index 2fa47809213..a486d93a687 100644 +--- a/source/tools/atlas/GameInterface/Messages.h ++++ b/source/tools/atlas/GameInterface/Messages.h +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2022 Wildfire Games. ++/* Copyright (C) 2023 Wildfire Games. + * This file is part of 0 A.D. + * + * 0 A.D. is free software: you can redistribute it and/or modify +@@ -18,13 +18,15 @@ + #ifndef INCLUDED_MESSAGES + #define INCLUDED_MESSAGES + ++#include ++#include ++#include ++ ++// Opens namespace AtlasMessage, closes it on second inclusion! + #ifndef MESSAGES_SKIP_SETUP + #include "MessagesSetup.h" + #endif + +-#include +-#include +- + // TODO: organisation, documentation, etc + + #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by Atlas too) From 37922b3645a6f460481b7ba7e58ec10b9f679061 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 21:00:02 -0800 Subject: [PATCH 09/10] openmsx: fix build for gcc 13 --- srcpkgs/openmsx/patches/gcc13.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/openmsx/patches/gcc13.patch diff --git a/srcpkgs/openmsx/patches/gcc13.patch b/srcpkgs/openmsx/patches/gcc13.patch new file mode 100644 index 00000000000000..8ab7880d127f98 --- /dev/null +++ b/srcpkgs/openmsx/patches/gcc13.patch @@ -0,0 +1,23 @@ +From b50d02069c09f11c687637c64ca1b459a5def28c Mon Sep 17 00:00:00 2001 +From: m9710797 +Date: Sat, 4 Feb 2023 16:37:39 +0100 +Subject: [PATCH] Added missing #include + +Thanks to 'musuruan' for reporting. +https://github.com/openMSX/openMSX/issues/1487 +--- + src/utils/hash_set.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/utils/hash_set.hh b/src/utils/hash_set.hh +index fb4bb93933..c89883121e 100644 +--- a/src/utils/hash_set.hh ++++ b/src/utils/hash_set.hh +@@ -11,6 +11,7 @@ + #include "unreachable.hh" + #include "xrange.hh" + #include ++#include + #include + #include + #include From d60a07667dcdd0df3652f25bed89b83592f45d97 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 18 Feb 2024 21:00:31 -0800 Subject: [PATCH 10/10] liblangtag: update to 0.6.7. fixes build with gcc 13 --- srcpkgs/liblangtag/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/liblangtag/template b/srcpkgs/liblangtag/template index 63eb8794148d2d..c833c656b73586 100644 --- a/srcpkgs/liblangtag/template +++ b/srcpkgs/liblangtag/template @@ -1,6 +1,6 @@ # Template file for 'liblangtag' pkgname=liblangtag -version=0.6.4 +version=0.6.7 revision=1 build_style=gnu-configure build_helper=gir @@ -13,7 +13,7 @@ license="LGPL-3.0-or-later, MPL-2.0" homepage="https://bitbucket.org/tagoh/liblangtag/src" changelog="https://bitbucket.org/tagoh/liblangtag/raw/main/NEWS" distfiles="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-${version}.tar.bz2" -checksum=5701062c17d3e73ddaa49956cbfa5d47d2f8221988dec561c0af2118c1c8a564 +checksum=5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e build_options="gir" build_options_default="gir"