jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'misc-cleanups' into 'master' 

build: Cleanups and use g_memdup2 when building with newer glib

See merge request GNOME/libnotify!22
This commit is contained in:
Marco Trevisan 2022-04-21 23:50:08 +00:00
parent 2accd4ceab d348a36a05
commit 8a8c86cdc6
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnotify/meson.build
View File

@ -69,8 +69,9 @@ pkgconfig.generate(libnotify_lib,
) )
introspection = get_option('introspection') introspection = get_option('introspection')
if not introspection.disabled() g_ir_scanner = find_program('g-ir-scanner', required: introspection.enabled())
find_program('g-ir-scanner', required: introspection.enabled())
if g_ir_scanner.found() and not introspection.disabled()
gnome.generate_gir(libnotify_lib, gnome.generate_gir(libnotify_lib,
sources: headers + sources + enum_types, sources: headers + sources + enum_types,
namespace: 'Notify', namespace: 'Notify',

4
libnotify/notification.c
View File

@ -1056,7 +1056,11 @@ notify_notification_set_hint_byte_array (NotifyNotification *notification,
g_return_if_fail (value != NULL || len == 0); g_return_if_fail (value != NULL || len == 0);
#ifdef GLIB_VERSION_2_68
value_dup = g_memdup2 (value, len);
#else
value_dup = g_memdup (value, len); value_dup = g_memdup (value, len);
#endif
notify_notification_set_hint (notification, key, notify_notification_set_hint (notification, key,
g_variant_new_from_data (G_VARIANT_TYPE ("ay"), g_variant_new_from_data (G_VARIANT_TYPE ("ay"),
value_dup, value_dup,

2
meson.build
View File

@ -66,7 +66,7 @@ if get_option('man')
'@INPUT@', '@INPUT@',
] ]
testrun = run_command(xsltproc, '--nonet', stylesheet) testrun = run_command(xsltproc, '--nonet', stylesheet, check: false)
if testrun.returncode() != 0 if testrun.returncode() != 0
error('DocBook stylesheet for generating man pages not found, you need to install docbook-xsl-ns or similar package.') error('DocBook stylesheet for generating man pages not found, you need to install docbook-xsl-ns or similar package.')