Modernize

CODING_STYLE

@@ -14,14 +14,3 @@
 - error codes are returned as negative Exxx. i.e. return -EINVAL. There
   are some exceptions: for constructors its is OK to return NULL on
   OOM. For lookup functions NULL is fine too for "not found".
-
-- Do not issue NSS requests (that includes user name and host name
-  lookups) from the main daemon as this might trigger deadlocks when
-  we those lookups involve synchronously talking to services that we
-  would need to start up.
-
-- Do not access any directories outside of /etc/, /dev, /lib from the
-  init daemon to avoid deadlocks with the automounter.
-
-- Don't synchronously talk to any other service, due to risk of
-  deadlocks.

README

@@ -1,30 +1,30 @@
 systemd System and Service Manager UI
 
 DETAILS:
-        http://0pointer.de/blog/projects/systemd.html
+        https://0pointer.de/blog/projects/systemd.html
 
 WEB SITE:
-        http://www.freedesktop.org/wiki/Software/systemd
+        https://systemd.io
 
 GIT:
-        git://anongit.freedesktop.org/systemd/systemd-ui
-        ssh://git.freedesktop.org/git/systemd/systemd-ui
+        https://github.com/systemd/systemd-ui.git
+        ssh://git@github.com/systemd/systemd-ui.git
 
 GITWEB:
-        http://cgit.freedesktop.org/systemd/systemd-ui
+        https://github.com/systemd/systemd-ui
 
 MAILING LIST:
-        http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-        http://lists.freedesktop.org/mailman/listinfo/systemd-commits
+        https://lists.freedesktop.org/mailman/listinfo/systemd-devel
 
 IRC:
-        #systemd on irc.freenode.org
+        #systemd on libera.chat
 
 BUG REPORTS:
-        https://bugs.freedesktop.org/enter_bug.cgi?product=systemd
+        https://github.com/systemd/systemd-ui/issues
 
 AUTHOR:
         Lennart Poettering with major support from Kay Sievers
 
 LICENSE:
-        GPLv2+ for all code.
+        GPLv2+ for all code,
+        CC-BY-3.0-US for the desktop icon (from the GNOME Project).

man/meson.build

@@ -4,7 +4,7 @@ xsltproc_flags = ['--nonet',
 
 xsl_file = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
 xsltproc_cmdline = [xsltproc,
-                    '-o', '@OUTPUT',
+                    '-o', '@OUTPUT@',
                     xsltproc_flags,
                     xsl_file,
                     '@INPUT@']

meson.build

@@ -18,20 +18,11 @@ else
         project_minor_version = '0'
 endif
 
-# Meson ignores the preceding arguments when joining paths if an absolute
-# component is encountered, so this should canonicalize various paths when they
-# are absolute or relative.
 prefixdir = get_option('prefix')
-if not prefixdir.startswith('/')
-        error('Prefix is not absolute: "@0@"'.format(prefixdir))
-endif
-
-prefixdir_noslash = '/' + prefixdir.strip('/')
-bindir = prefixdir / get_option('bindir')
-libdir = prefixdir / get_option('libdir')
-datadir = prefixdir / get_option('datadir')
+datadir = get_option('datadir')
 applicationsdir = datadir / 'applications'
-appdatadir = datadir / 'appdata'
+iconsdir = datadir / 'icons/hicolor/scalable/apps'
+metainfodir = datadir / 'metainfo'
 userunitdir = prefixdir / 'lib/systemd/user'
 
 polkitrulesdir = datadir / 'polkit-1/rules.d'
@@ -92,8 +83,6 @@ possible_common_link_flags = [
         '-fstack-protector',
 ]
 
-c_args = get_option('c_args')
-
 # --as-needed and --no-undefined are provided by meson by default,
 # run 'meson configure' to see what is enabled
 possible_link_flags = [
@@ -136,8 +125,6 @@ add_project_link_arguments(
 userspace_c_args += cc.get_supported_arguments(possible_cc_flags)
 userspace_c_ld_args += cc.get_supported_link_arguments(possible_link_flags)
 
-cpp = ' '.join(cc.cmd_array() + get_option('c_args')) + ' -E'
-
 #####################################################################
 # compilation result tests
 
@@ -148,7 +135,7 @@ endif
 
 #####################################################################
 
-xsltproc = find_program('xsltproc', required: get_option('man').allowed())
+xsltproc = find_program('xsltproc', required: get_option('man'))
 
 #####################################################################
 
@@ -157,50 +144,23 @@ glib = dependency('glib-2.0', version: '> 2.26')
 gio_unix = dependency('gio-unix-2.0')
 gee = dependency('gee-0.8')
 gtk3 = dependency('gtk+-3.0')
-libnotify = dependency('libnotify')
-linux = meson.get_compiler('vala').find_library('linux')
 posix = meson.get_compiler('vala').find_library('posix')
 
 #####################################################################
 
-# meson_render_jinja2 = find_program('tools/meson-render-jinja2.py')
-
-#####################################################################
-
-# jinja2_cmdline = [meson_render_jinja2]
-
-userspace = declare_dependency(
+common_flags = declare_dependency(
         compile_args : userspace_c_args,
         link_args : userspace_c_ld_args,
 )
 
 #####################################################################
 
-executable_template = {
-        'install' : true,
-}
-
-executable_additional_kwargs = {
-        'dependencies' : userspace,
-}
-
-#####################################################################
-
 subdir('src')
 
 #####################################################################
 
-if xsltproc.found()
-        subdir('man')
-endif
+subdir('man', if_found: xsltproc)
 
 install_data('LICENSE',
              'CODING_STYLE',
              install_dir : docdir)
-
-#####################################################################
-
-summary({
-        'prefix directory' :                prefixdir,
-        'lib directory' :                   libdir,
-        })

meson_options.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 option('man', type : 'feature',
-       value : 'disabled',
+       value : 'auto',
        description : 'build and install man pages')
 
 option('docdir', type : 'string',