Skip to content

Commit 774274a

Browse files
authored
Merge pull request #1931 from cfengine/update-dependencies-action-3.21.x-1758803094
Updated dependencies (3.21.x)
2 parents 57b3f36 + 1752520 commit 774274a

File tree

7 files changed

+26
-9
lines changed

7 files changed

+26
-9
lines changed

deps-packaging/libxml2/cfbuild-libxml2.spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define libxml_version 2.14.6
1+
%define libxml_version 2.15.0
22

33
Summary: CFEngine Build Automation -- libxml2
44
Name: cfbuild-libxml2
@@ -30,10 +30,12 @@ then
3030
chmod a+x configure
3131
fi
3232
./configure --prefix=%{prefix} --without-python --enable-shared --disable-static --with-zlib=%{prefix} \
33-
CPPFLAGS="-I%{prefix}/include" \
33+
CPPFLAGS="-I%{prefix}/include -D_LINUX_SOURCE_COMPAT" \
3434
LD_LIBRARY_PATH="%{prefix}/lib" LD_RUN_PATH="%{prefix}/lib"
3535

3636
%build
37+
38+
patch -p1 < %{_topdir}/SOURCES/no-arg-in-deprecated.patch
3739
make
3840

3941
%install
@@ -83,5 +85,3 @@ CFEngine Build Automation -- libxml2 -- development files
8385
%prefix/lib/pkgconfig
8486

8587
%changelog
86-
87-

deps-packaging/libxml2/distfiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a libxml2-2.14.6.tar.xz
1+
5abc766497c5b1d6d99231f662e30c99402a90d03b06c67b62d6c1179dedd561 libxml2-2.15.0.tar.xz

deps-packaging/libxml2/hpux/build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CPPFLAGS="-I${PREFIX}/include"
1515
mv configure configure.bak
1616
sed 's/ *-Wno-array-bounds//' configure.bak >configure
1717
chmod a+x configure
18+
$PATCH -p1 < no-arg-in-deprecated.patch
1819
./configure CPPFLAGS="$CPPFLAGS" --prefix=${PREFIX} --without-python --without-iconv --without-lzma --without-zlib --with-iso8859x
1920

2021
# Build
@@ -38,4 +39,3 @@ rm -rf ${LXD}/share
3839

3940
mkdir -p ${LX}/lib
4041
mv ${LXD}/lib/*.so* ${LX}/lib
41-
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff -ruN libxml2-2.15.0/include/libxml/xmlexports.h libxml2-2.15.0-modified/include/libxml/xmlexports.h
2+
--- libxml2-2.15.0/include/libxml/xmlexports.h 2025-09-15 13:55:59.000000000 +0200
3+
+++ libxml2-2.15.0-modified/include/libxml/xmlexports.h 2025-09-25 10:52:38.346569829 +0200
4+
@@ -55,8 +55,12 @@
5+
#ifndef XML_DEPRECATED
6+
#if defined(IN_LIBXML)
7+
#define XML_DEPRECATED
8+
- #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301
9+
+ #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 405
10+
+ /* GCC 4.5+ supports deprecated with message */
11+
#define XML_DEPRECATED __attribute__((deprecated("See https://gnome.pages.gitlab.gnome.org/libxml2/html/deprecated.html")))
12+
+ #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301
13+
+ /* GCC 3.1+ supports deprecated without message */
14+
+ #define XML_DEPRECATED __attribute__((deprecated))
15+
#elif defined(_MSC_VER) && _MSC_VER >= 1400
16+
/* Available since Visual Studio 2005 */
17+
#define XML_DEPRECATED __declspec(deprecated("See https://gnome.pages.gitlab.gnome.org/libxml2/html/deprecated.html"))

deps-packaging/libxml2/source

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://download.gnome.org/sources/libxml2/2.14/
1+
https://download.gnome.org/sources/libxml2/2.15/

deps-packaging/php/cfbuild-php.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define php_version 8.3.25
1+
%define php_version 8.3.26
22

33
Summary: CFEngine Build Automation -- php
44
Name: cfbuild-php

deps-packaging/php/distfiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
86711e98eccffb637dc319f0cdcde9188c1710633910beb1a3cbb3ae5ecc2e05 php-8.3.25.tar.gz
1+
c96dac9745db9216a299007d144b593f4e4e7d95b4618b2a9591e5e5585200d5 php-8.3.26.tar.gz

0 commit comments

Comments
 (0)