78 lines
3.3 KiB
Diff
78 lines
3.3 KiB
Diff
--- a/configure
|
|
+++ b/configure
|
|
@@ -14311,19 +14311,19 @@
|
|
fi
|
|
|
|
pkg_failed=no
|
|
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.40" >&5
|
|
-printf %s "checking for glib-2.0 >= 2.40... " >&6; }
|
|
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.38" >&5
|
|
+printf %s "checking for glib-2.0 >= 2.38... " >&6; }
|
|
|
|
if test -n "$GLIB_CFLAGS"; then
|
|
pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
|
|
elif test -n "$PKG_CONFIG"; then
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.40\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.40") 2>&5
|
|
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.38\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.38") 2>&5
|
|
ac_status=$?
|
|
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.40" 2>/dev/null`
|
|
+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.38" 2>/dev/null`
|
|
test "x$?" != "x0" && pkg_failed=yes
|
|
else
|
|
pkg_failed=yes
|
|
@@ -14335,12 +14335,12 @@
|
|
pkg_cv_GLIB_LIBS="$GLIB_LIBS"
|
|
elif test -n "$PKG_CONFIG"; then
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.40\""; } >&5
|
|
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.40") 2>&5
|
|
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.38\""; } >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.38") 2>&5
|
|
ac_status=$?
|
|
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
test $ac_status = 0; }; then
|
|
- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.40" 2>/dev/null`
|
|
+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.38" 2>/dev/null`
|
|
test "x$?" != "x0" && pkg_failed=yes
|
|
else
|
|
pkg_failed=yes
|
|
@@ -14361,14 +14361,14 @@
|
|
_pkg_short_errors_supported=no
|
|
fi
|
|
if test $_pkg_short_errors_supported = yes; then
|
|
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.40" 2>&1`
|
|
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.38" 2>&1`
|
|
else
|
|
- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.40" 2>&1`
|
|
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.38" 2>&1`
|
|
fi
|
|
# Put the nasty error message in config.log where it belongs
|
|
echo "$GLIB_PKG_ERRORS" >&5
|
|
|
|
- as_fn_error $? "Package requirements (glib-2.0 >= 2.40) were not met:
|
|
+ as_fn_error $? "Package requirements (glib-2.0 >= 2.38) were not met:
|
|
|
|
$GLIB_PKG_ERRORS
|
|
|
|
diff -urN a/subprojects/dbus-gmain/meson.build b/subprojects/dbus-gmain/meson.build
|
|
--- a/subprojects/dbus-gmain/meson.build 2022-09-06 15:52:12.000000000 +0200
|
|
+++ b/subprojects/dbus-gmain/meson.build 2024-12-09 12:44:28.792515255 +0100
|
|
@@ -105,10 +105,10 @@
|
|
endif
|
|
|
|
dbus_dep = dependency('dbus-1', version: '>=1.8')
|
|
-glib_dep = dependency('glib-2.0', version: '>=2.40')
|
|
+glib_dep = dependency('glib-2.0', version: '>=2.38')
|
|
gthread_dep = dependency(
|
|
'gthread-2.0',
|
|
- version: '>=2.40',
|
|
+ version: '>=2.38',
|
|
required: get_option('tests'),
|
|
)
|
|
|