haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

expat: bump version

Browse Source
This commit is contained in:
Jérôme Duval
2025-09-20 20:27:08 +02:00
parent 7e86ffed97
commit fdf71fafdd
2 changed files with 74 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-libs/expat/expat-2.7.1.recipe → dev-libs/expat/expat-2.7.2.recipe
View File

@@ -9,14 +9,14 @@ LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://downloads.sourceforge.net/expat/expat-$portVersion.tar.bz2"
#SOURCE_URI="git+https://github.com/libexpat/libexpat?signed#tag=R_${portVersion//./_}"
CHECKSUM_SHA256="45c98ae1e9b5127325d25186cf8c511fa814078e9efeae7987a574b482b79b3d"
CHECKSUM_SHA256="976f6c2d358953c22398d64cd93790ba5abc62e02a1bbc204a3a264adea149b8"
PATCHES="expat-$portVersion.patchset"
#PGPKEYS="3176EF7DB2367F1FCA4F306B1F9B0E909AF37285"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion=1.10.2
libVersion=1.11.0
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
portVersionCompat="$portVersion compat >= 2.2"

138
dev-libs/expat/patches/expat-2.7.1.patchset → dev-libs/expat/patches/expat-2.7.2.patchset
View File

@@ -1,4 +1,4 @@
From 7f2fdf2f03142a0b39136b711e99c8bb070dcd35 Mon Sep 17 00:00:00 2001
From 4a60f5d1409daa83b91742eb7b06cdd109680650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 2 Dec 2023 02:02:15 +0100
Subject: Fix INTERFACE_INCLUDE_DIRECTORIES on Haiku
@@ -6,13 +6,13 @@ Subject: Fix INTERFACE_INCLUDE_DIRECTORIES on Haiku
Not sure if the IMPORTED_LOCATION shouldn't be develop/lib
diff --git a/Makefile.am b/Makefile.am
index 7d8e17c..435f7a8 100644
index d612d43..8b0268b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,6 +70,7 @@ cmakedir = $(libdir)/cmake/expat-@PACKAGE_VERSION@
_EXTRA_DIST_CMAKE = \
@@ -71,6 +71,7 @@ _EXTRA_DIST_CMAKE = \
cmake/autotools/expat__linux.cmake.in \
cmake/autotools/expat__macos.cmake.in \
cmake/autotools/expat__windows.cmake.in \
+ cmake/autotools/expat-noconfig__haiku.cmake.in \
cmake/autotools/expat-noconfig__linux.cmake.in \
cmake/autotools/expat-noconfig__macos.cmake.in \
@@ -50,44 +50,47 @@ index 0000000..c1aad9d
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/configure.ac b/configure.ac
index fffcd12..479ff5f 100644
index b9966ea..eb53b68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,6 +442,7 @@ AC_SUBST([CMAKE_SHARED_LIBRARY_PREFIX])
AS_CASE("${host_os}",
[darwin*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__macos.cmake.in],
[mingw*|cygwin*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__windows.cmake.in],
+ [haiku*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__haiku.cmake.in],
[CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__linux.cmake.in])
AC_CONFIG_FILES([Makefile]
[expat.pc]
@@ -448,6 +448,10 @@ AS_CASE("${host_os}",
CMAKE_SOURCE=cmake/autotools/expat__windows.cmake.in
CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__windows.cmake.in
],
+ [haiku*], [
+ CMAKE_SOURCE=cmake/autotools/expat__linux.cmake.in
+ CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__haiku.cmake.in
+ ],
[
CMAKE_SOURCE=cmake/autotools/expat__linux.cmake.in
CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__linux.cmake.in
--
2.45.2
2.48.1
From c3b1d8d9641983d9d47bcc438d16fddc494a5791 Mon Sep 17 00:00:00 2001
From 3729fea144ac6255d64db68e7f81e72b70aa0769 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 7 Feb 2024 18:47:27 +0100
Subject: can't allocate so much on Haiku
diff --git a/Makefile.in b/Makefile.in
index c0fcb5d..56de6c3 100644
index b799591..43bbfd4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -468,6 +468,7 @@ nodist_cmake_DATA = \
cmakedir = $(libdir)/cmake/expat-@PACKAGE_VERSION@
_EXTRA_DIST_CMAKE = \
@@ -474,6 +474,7 @@ _EXTRA_DIST_CMAKE = \
cmake/autotools/expat__linux.cmake.in \
cmake/autotools/expat__macos.cmake.in \
cmake/autotools/expat__windows.cmake.in \
+ cmake/autotools/expat-noconfig__haiku.cmake.in \
cmake/autotools/expat-noconfig__linux.cmake.in \
cmake/autotools/expat-noconfig__macos.cmake.in \
cmake/autotools/expat-noconfig__windows.cmake.in \
diff --git a/configure b/configure
index c2f7bb7..870ad18 100755
index 3c6d4ad..e7d77ec 100755
--- a/configure
+++ b/configure
@@ -1786,7 +1786,7 @@ else $as_nop
@@ -1785,7 +1785,7 @@ else case e in #(
#define $2 innocuous_$2
/* System header to define __stub macros and hopefully few prototypes,
@@ -96,7 +99,7 @@ index c2f7bb7..870ad18 100755
#include <limits.h>
#undef $2
@@ -1797,7 +1797,7 @@ else $as_nop
@@ -1796,7 +1796,7 @@ else case e in #(
#ifdef __cplusplus
extern "C"
#endif
@@ -105,7 +108,7 @@ index c2f7bb7..870ad18 100755
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
@@ -2551,7 +2551,9 @@ struct stat;
@@ -2564,7 +2564,9 @@ struct stat;
/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
struct buf { int x; };
struct buf * (*rcsopen) (struct buf *, struct stat *, int);
@@ -116,7 +119,7 @@ index c2f7bb7..870ad18 100755
{
return p[i];
}
@@ -2602,7 +2604,6 @@ extern int puts (const char *);
@@ -2632,7 +2634,6 @@ extern int puts (const char *);
extern int printf (const char *, ...);
extern int dprintf (int, const char *, ...);
extern void *malloc (size_t);
@@ -124,7 +127,7 @@ index c2f7bb7..870ad18 100755
// Check varargs macros. These examples are taken from C99 6.10.3.5.
// dprintf is used instead of fprintf to avoid needing to declare
@@ -13298,14 +13299,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14306,14 +14307,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -141,7 +144,7 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -13366,14 +13361,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14377,14 +14372,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -158,7 +161,7 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -13416,14 +13405,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14429,14 +14418,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -175,7 +178,7 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -13461,14 +13444,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14476,14 +14459,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -192,7 +195,7 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -13506,14 +13483,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14523,14 +14500,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -209,7 +212,7 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -14687,11 +14658,11 @@ if test x$ac_prog_cxx_stdcxx = xno
@@ -15744,11 +15715,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
@@ -217,13 +220,13 @@ index c2f7bb7..870ad18 100755
+if test ${ac_cv_prog_cxx_11+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx11=no
+ ac_cv_prog_cxx_11=no
else case e in #(
- e) ac_cv_prog_cxx_cxx11=no
+ e) ac_cv_prog_cxx_11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -14733,11 +14704,11 @@ if test x$ac_prog_cxx_stdcxx = xno
@@ -15793,11 +15764,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
@@ -231,13 +234,23 @@ index c2f7bb7..870ad18 100755
+if test ${ac_cv_prog_cxx_98+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx98=no
+ ac_cv_prog_cxx_98=no
else case e in #(
- e) ac_cv_prog_cxx_cxx98=no
+ e) ac_cv_prog_cxx_98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -18866,23 +18837,22 @@ unsigned short int ascii_mm[] =
@@ -16575,8 +16546,7 @@ then :
lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
@@ -20491,23 +20461,22 @@ unsigned short int ascii_mm[] =
int use_ebcdic (int i) {
return ebcdic_mm[i] + ebcdic_ii[i];
}
@@ -273,17 +286,7 @@ index c2f7bb7..870ad18 100755
if test "$ac_cv_c_bigendian" = unknown; then
ac_cv_c_bigendian=no
else
@@ -18891,8 +18861,7 @@ then :
fi
fi
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -19534,14 +19503,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21169,14 +21138,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -300,7 +303,7 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -19580,14 +19543,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21217,14 +21180,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -317,7 +320,7 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -19628,14 +19585,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21267,14 +21224,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -334,7 +337,7 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -19690,14 +19641,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21332,14 +21283,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -351,17 +354,20 @@ index c2f7bb7..870ad18 100755
int
main (void)
{
@@ -20407,6 +20352,8 @@ case "${host_os}" in #(
CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__macos.cmake.in ;; #(
mingw*|cygwin*) :
CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__windows.cmake.in ;; #(
@@ -22080,6 +22025,11 @@ case "${host_os}" in #(
CMAKE_SOURCE=cmake/autotools/expat__windows.cmake.in
CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__windows.cmake.in
;; #(
+ haiku*) :
+ CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__haiku.cmake.in ;; #(
+
+ CMAKE_SOURCE=cmake/autotools/expat__linux.cmake.in
+ CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__haiku.cmake.in
+ ;; #(
*) :
CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__linux.cmake.in ;;
esac
CMAKE_SOURCE=cmake/autotools/expat__linux.cmake.in
diff --git a/expat_config.h b/expat_config.h
index 5c3e007..48d7b06 100644
index ac1ee7f..1750d16 100644
--- a/expat_config.h
+++ b/expat_config.h
@@ -14,7 +14,7 @@
@@ -392,10 +398,10 @@ index 5c3e007..48d7b06 100644
/* Define to 1 if you have the <sys/param.h> header file. */
#define HAVE_SYS_PARAM_H 1
diff --git a/tests/basic_tests.c b/tests/basic_tests.c
index d38b8fd..5589c89 100644
index 0231e09..97c8042 100644
--- a/tests/basic_tests.c
+++ b/tests/basic_tests.c
@@ -2987,13 +2987,18 @@ START_TEST(test_buffer_can_grow_to_max) {
@@ -3109,13 +3109,18 @@ START_TEST(test_buffer_can_grow_to_max) {
"withreadabilityprettygreatithinkanywaysthisisprobablylongenoughbye><x a='"};
const int num_prefixes = sizeof(prefixes) / sizeof(prefixes[0]);
int maxbuf = INT_MAX / 2 + (INT_MAX & 1); // round up without overflow
@@ -416,5 +422,5 @@ index d38b8fd..5589c89 100644
free(big);
#endif
--
2.45.2
2.48.1