libwnck3: 3.30.0 → 3.32.0

https://gitlab.gnome.org/GNOME/libwnck/blob/3.32.0/NEWS#L1-33
This commit is contained in:
Jan Tojnar
2019-08-13 23:11:25 +02:00
parent 8746c77a38
commit 3e47ef9790
2 changed files with 87 additions and 16 deletions
@@ -0,0 +1,24 @@
diff --git a/meson.build b/meson.build
index 28799d8..047e523 100644
--- a/meson.build
+++ b/meson.build
@@ -72,11 +72,15 @@
pc_conf = configuration_data()
pc_conf.set('prefix', get_option('prefix'))
pc_conf.set('exec_prefix', '${prefix}')
-pc_conf.set('libdir', '${exec_prefix}/' + get_option('libdir'))
-pc_conf.set('includedir', '${prefix}/' + get_option('includedir'))
-pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE)
+pc_conf.set('libdir', '${exec_prefix}' / get_option('libdir'))
+pc_conf.set('includedir', '${prefix}' / get_option('includedir'))
+if conf.has('HAVE_' + STARTUP_NOTIFICATION_PACKAGE.to_upper().underscorify())
+ pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE)
+endif
pc_conf.set('X11_PACKAGE', X11_PACKAGE)
-pc_conf.set('XRES_PACKAGE', XRES_PACKAGE)
+if conf.has('HAVE_' + XRES_PACKAGE.to_upper().underscorify())
+ pc_conf.set('XRES_PACKAGE', XRES_PACKAGE)
+endif
pc_conf.set('VERSION', meson.project_version())
foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled']