[libsystemd] Update to 256.2 (#39741)

This commit is contained in:
Kai Pastor 2024-07-08 16:23:22 +02:00 committed by GitHub
parent 2ae35d09d9
commit 39ed9f9955
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 20 additions and 16 deletions

View File

@ -1,8 +1,8 @@
diff --git a/meson.build b/meson.build
index 7419e2b..687450e 100644
index b1a110c..6a7d930 100644
--- a/meson.build
+++ b/meson.build
@@ -1909,12 +1909,11 @@ libsystemd_includes = [basic_includes, include_directories(
@@ -2074,12 +2074,11 @@ libsystemd_includes = [basic_includes, include_directories(
includes = [libsystemd_includes, include_directories('src/shared')]
subdir('po')
@ -17,7 +17,7 @@ index 7419e2b..687450e 100644
libsystemd = shared_library(
'systemd',
@@ -1930,7 +1929,8 @@ libsystemd = shared_library(
@@ -2095,7 +2094,8 @@ libsystemd = shared_library(
threads,
userspace],
link_depends : libsystemd_sym,
@ -27,16 +27,16 @@ index 7419e2b..687450e 100644
install_tag: 'libsystemd',
install_dir : libdir)
@@ -1963,6 +1963,8 @@ install_libsystemd_static = static_library(
userspace],
c_args : libsystemd_c_args + (static_libsystemd_pic ? [] : ['-fno-PIC']))
@@ -2130,6 +2130,8 @@ else
alias_target('libsystemd', libsystemd)
endif
+if false
+
libudev = shared_library(
'udev',
version : libudev_version,
@@ -1974,7 +1976,8 @@ libudev = shared_library(
@@ -2141,7 +2143,8 @@ libudev = shared_library(
dependencies : [threads,
userspace],
link_depends : libudev_sym,
@ -46,9 +46,9 @@ index 7419e2b..687450e 100644
install_tag: 'libudev',
install_dir : libdir)
@@ -2661,6 +2664,13 @@ if not meson.is_cross_build()
command : [export_dbus_interfaces_py, '@OUTPUT@', dbus_programs])
endif
@@ -2905,6 +2908,13 @@ custom_target('installed-unit-files.txt',
install_dir : testdata_dir,
command : [meson_extract_unit_files, project_build_root])
+endif # false
+static_libudev='unused'
@ -57,6 +57,6 @@ index 7419e2b..687450e 100644
+want_html=false
+want_man=false
+
############################################################
#####################################################################
alt_time_epoch = run_command('date', '-Is', '-u', '-d', '@@0@'.format(time_epoch),

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO systemd/systemd
REF "v${VERSION}"
SHA512 51728de604c2169d8643718ac72acb8f70f613cfcca9e9abb7dac519f291fa26a16d48f24cae6897356319096cfe8f4d9377743e7870127374f98d432e0c557c
SHA512 10da82ee58d3608c41cb0204fdf0227af965b13b8f3716e4f5dea994c236c08a5e31f09ba0d3774cea20a365e1d959c8c865fdeacc82400da55e94ad800e75ba
PATCHES
disable-warning-nonnull.patch
only-libsystemd.patch

View File

@ -1,7 +1,6 @@
{
"name": "libsystemd",
"version": "255",
"port-version": 2,
"version": "256.2",
"description": "Libsystemd",
"homepage": "https://github.com/systemd/systemd",
"license": null,

View File

@ -5069,8 +5069,8 @@
"port-version": 0
},
"libsystemd": {
"baseline": "255",
"port-version": 2
"baseline": "256.2",
"port-version": 0
},
"libtar": {
"baseline": "1.2.20",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9b6ef432aa434e0b1f188e23e6d1309a9050ab0b",
"version": "256.2",
"port-version": 0
},
{
"git-tree": "4c173e2a6eaa6e20dae0122c0aee9ab9cfab82df",
"version": "255",