Changeset View
Changeset View
Standalone View
Standalone View
sysutils/polkit/files/patch-meson.build
| --- meson.build.orig 2021-09-29 19:16:29 UTC | --- meson.build.orig 2022-10-26 12:12:24 UTC | ||||
| +++ meson.build | +++ meson.build | ||||
| @@ -133,10 +133,10 @@ assert(cc.has_function('XML_ParserCreate', dependencie | @@ -154,10 +154,11 @@ if js_engine == 'duktape' | ||||
| assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.') | config_h.set('HAVE_' + func.to_upper(), cc.has_function(func, prefix : '#include <pthread.h>')) | ||||
| assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.') | elif js_engine == 'mozjs' | ||||
| js_dep = dependency('mozjs-102') | |||||
| + config_h.set('__BSD_VISIBLE', 1) | |||||
| endif | |||||
| -mozjs_dep = dependency('mozjs-78') | |||||
| +mozjs_dep = dependency('mozjs-91') | |||||
| dbus_dep = dependency('dbus-1', required: false) | dbus_dep = dependency('dbus-1', required: false) | ||||
| -dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' | -dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' | ||||
| +dbus_policydir = pk_prefix / pk_sysconfdir / 'dbus-1/system.d' | +dbus_policydir = pk_prefix / pk_sysconfdir / 'dbus-1/system.d' | ||||
| if dbus_dep.found() | if dbus_dep.found() | ||||
| dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) | dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) | ||||
| else | else | ||||
| @@ -329,15 +329,6 @@ configure_file( | @@ -358,15 +359,6 @@ endif | ||||
| configure_file( | configure_file( | ||||
| output: 'config.h', | output: 'config.h', | ||||
| configuration: config_h, | configuration: config_h, | ||||
| -) | -) | ||||
| - | - | ||||
| -meson.add_install_script( | -meson.add_install_script( | ||||
| - 'meson_post_install.py', | - 'meson_post_install.py', | ||||
| - get_option('bindir'), | - get_option('bindir'), | ||||
| - pk_pkgdatadir, | - pk_pkgdatadir, | ||||
| - pk_libprivdir, | - pk_libprivdir, | ||||
| - pk_pkgsysconfdir, | - pk_pkgsysconfdir, | ||||
| - polkitd_user, | - polkitd_user, | ||||
| ) | ) | ||||
| output = '\n ' + meson.project_name() + ' ' + meson.project_version() + '\n' | output = '\n ' + meson.project_name() + ' ' + meson.project_version() + '\n' | ||||