Skip to content

Updated dependencies (3.21.x) #1931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larsewi merged 5 commits into from
Sep 29, 2025
Merged

Updated dependencies (3.21.x) #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
403b186
Updated dependency 'libxml2' from version 2.14.6 to 2.15.0
github-actions[bot] Sep 25, 2025
a00c6b1
Updated dependency 'php' from version 8.3.25 to 8.3.26
github-actions[bot] Sep 25, 2025
06b2206
Fixed duplicate case value when compiling libxml2 on AIX
larsewi Sep 25, 2025
9ac22d8
Fixed wrong number of arguments specified for 'deprecated' attribute
larsewi Sep 25, 2025
1752520
Use patch tool found by detect-environment script
larsewi Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deps-packaging/libxml2/cfbuild-libxml2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define libxml_version 2.14.6
%define libxml_version 2.15.0

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

%build

patch -p1 < %{_topdir}/SOURCES/no-arg-in-deprecated.patch
make

%install
Expand Down Expand Up @@ -83,5 +85,3 @@ CFEngine Build Automation -- libxml2 -- development files
%prefix/lib/pkgconfig

%changelog


2 changes: 1 addition & 1 deletion deps-packaging/libxml2/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a libxml2-2.14.6.tar.xz
5abc766497c5b1d6d99231f662e30c99402a90d03b06c67b62d6c1179dedd561 libxml2-2.15.0.tar.xz
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/hpux/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ CPPFLAGS="-I${PREFIX}/include"
mv configure configure.bak
sed 's/ *-Wno-array-bounds//' configure.bak >configure
chmod a+x configure
$PATCH -p1 < no-arg-in-deprecated.patch
./configure CPPFLAGS="$CPPFLAGS" --prefix=${PREFIX} --without-python --without-iconv --without-lzma --without-zlib --with-iso8859x

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

mkdir -p ${LX}/lib
mv ${LXD}/lib/*.so* ${LX}/lib

17 changes: 17 additions & 0 deletions deps-packaging/libxml2/no-arg-in-deprecated.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff -ruN libxml2-2.15.0/include/libxml/xmlexports.h libxml2-2.15.0-modified/include/libxml/xmlexports.h
--- libxml2-2.15.0/include/libxml/xmlexports.h 2025-09-15 13:55:59.000000000 +0200
+++ libxml2-2.15.0-modified/include/libxml/xmlexports.h 2025-09-25 10:52:38.346569829 +0200
@@ -55,8 +55,12 @@
#ifndef XML_DEPRECATED
#if defined(IN_LIBXML)
#define XML_DEPRECATED
- #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301
+ #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 405
+ /* GCC 4.5+ supports deprecated with message */
#define XML_DEPRECATED __attribute__((deprecated("See https://gnome.pages.gitlab.gnome.org/libxml2/html/deprecated.html")))
+ #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301
+ /* GCC 3.1+ supports deprecated without message */
+ #define XML_DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER) && _MSC_VER >= 1400
/* Available since Visual Studio 2005 */
#define XML_DEPRECATED __declspec(deprecated("See https://gnome.pages.gitlab.gnome.org/libxml2/html/deprecated.html"))
2 changes: 1 addition & 1 deletion deps-packaging/libxml2/source
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://download.gnome.org/sources/libxml2/2.14/
https://download.gnome.org/sources/libxml2/2.15/
2 changes: 1 addition & 1 deletion deps-packaging/php/cfbuild-php.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define php_version 8.3.25
%define php_version 8.3.26

Summary: CFEngine Build Automation -- php
Name: cfbuild-php
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/php/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
86711e98eccffb637dc319f0cdcde9188c1710633910beb1a3cbb3ae5ecc2e05 php-8.3.25.tar.gz
c96dac9745db9216a299007d144b593f4e4e7d95b4618b2a9591e5e5585200d5 php-8.3.26.tar.gz
Loading