Merge branch 'stable' into branch 'main'

NEWS

@@ -1,6 +1,12 @@
-= Version 1.2 on 20XX-XX-XX =
+= Version 1.2 on 2023-03-29 =
+
+Changes since 1.1:
 
  * Apply downstream patches from FreeBSD
+ * meson: Fix project license field (MIT->GPL-2.0-only)
+ * meson: Fix version.h when building from tarball
+ * meson: disable siginfo build
+ * meson: Fix after README->README.adoc rename in 1.1
 
 = Version 1.1 on 2023-11-26 =
 

daemon/meson.build

@@ -46,6 +46,9 @@ daemon_sources = [
   '../string_constants.c',
 ]
 
+# define SIGINFO_ENABLED and build
+#  'siginfo.c',
+
 ladishd = executable('ladishd', daemon_sources,
                      dependencies : deps,
                      include_directories : inc,

meson.build

@@ -1,19 +1,31 @@
 project('ladish', 'c', 'cpp',
-  version : '0.3',
-  license : 'MIT')
+  version : '1.2',
+  license : 'GPL-2.0-only')
 
 data_dir = get_option('prefix') / 'share' / 'ladish'
 locale_dir = get_option('prefix') / 'share' / 'locale'
 dbus_name_base = 'org.ladish'
 dbus_base_path = '/org/ladish'
 
-git_version = run_command(['git', 'rev-parse', '--short', 'HEAD']).stdout().strip()
+fs = import('fs')
+if fs.is_dir('.git')
+  # This block handles building from git source tree
+  # version.h is generated during build
+  git_version = run_command(['git', 'rev-parse', '--short', 'HEAD']).stdout().strip()
 
-configure_file(output : 'version.h',
-    configuration : {
-        'GIT_VERSION' : '"@0@"'.format(git_version)
-    }
-)
+  configure_file(output : 'version.h',
+                 configuration : {
+                                   'GIT_VERSION' : '"@0@"'.format(git_version)
+                 }
+  )
+else
+  # Tarballs already have version.h,
+  # Just copy the file in this case
+  configure_file(output : 'version.h',
+                 input : 'version.h',
+                 copy: true
+  )
+endif
 
 configure_file(output : 'config.h',
   configuration : {