grim/purple-spasm

Add a separate glib dependency and always install the icons regardless of whether or not pidgin is installed.
--- a/icons/meson.build Thu May 14 03:51:48 2020 -0500
+++ b/icons/meson.build Thu May 14 03:54:05 2020 -0500
@@ -1,11 +1,8 @@
-# install the icons if pidgin is installed
-PIDGIN = dependency('pidgin', version: '>=2.0.0', required: false)
-if PIDGIN.found()
- pidginpixmapdir = '@0@/pixmaps/pidgin/protocols'.format(PIDGIN.get_pkgconfig_variable('datadir'))
- foreach dir : ['16', '22', '48', 'scaled']
- install_subdir(
- dir,
- install_dir: pidginpixmapdir,
- )
- endforeach
-endif
+# install the icons regardless of whether or not pidgin is installed
+pixmapdir = '@0@/pixmaps/pidgin/protocols'.format(get_option('datadir'))
+foreach dir : ['16', '22', '48', 'scaled']
+ install_subdir(
+ dir,
+ install_dir: pixmapdir,
+ )
+endforeach
--- a/meson.build Thu May 14 03:51:48 2020 -0500
+++ b/meson.build Thu May 14 03:54:05 2020 -0500
@@ -5,6 +5,7 @@
)
add_project_arguments(
+ '-DDATADIR="@0@"'.format(get_option('datadir')),
'-DGETTEXT_PACKAGE="spasm"',
'-DLIBDIR="@0@"'.format(get_option('libdir')),
'-DPREFIX="@0@"'.format(get_option('prefix')),
@@ -12,6 +13,8 @@
language : 'c'
)
+GLIB = dependency('glib-2.0', version: '>=2.40.0')
+
JSON_GLIB = dependency('json-glib-1.0')
SOUP = dependency('libsoup-2.4')
--- a/src/meson.build Thu May 14 03:51:48 2020 -0500
+++ b/src/meson.build Thu May 14 03:54:05 2020 -0500
@@ -16,7 +16,7 @@
meson.project_name(),
SOURCES,
name_prefix: '',
- dependencies: [PURPLE, JSON_GLIB, SOUP],
+ dependencies: [PURPLE, GLIB, JSON_GLIB, SOUP],
install: true,
install_dir: join_paths(get_option('libdir'), 'purple'),
)