summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2022-08-11 03:06:20 -0500
committerGary Kramlich <grim@reaperworld.com>2022-08-11 03:06:20 -0500
commit49bff88e408a010d681fcc97102fda00162257e1 (patch)
tree63d263800144918552dcd65625bb4655a2091db2
parentd7d841d5b3170c8ee23cf2e3a6c45e1555b028d9 (diff)
downloadpidgin-49bff88e408a010d681fcc97102fda00162257e1.tar.gz
Remove some no longer necessary meson options
nettle was only used for the internal keyring which we dropped awhile ago. The nls and pixmaps options were originally created to decrease the iteration time for developers, but with meson dev environments this is no longer necessary as we don't need to install at all to test things. Testing Done: Ran `meson --wipe` with no issue and compiled. Reviewed at https://reviews.imfreedom.org/r/1577/
-rw-r--r--libpurple/meson.build33
-rw-r--r--meson.build31
-rw-r--r--meson_options.txt9
-rw-r--r--pidgin/data/meson.build4
-rw-r--r--pidgin/meson.build52
-rw-r--r--pidgin/pixmaps/emotes/default/24/meson.build19
-rw-r--r--pidgin/pixmaps/emotes/small/16/meson.build18
-rw-r--r--po/meson.build2
8 files changed, 51 insertions, 117 deletions
diff --git a/libpurple/meson.build b/libpurple/meson.build
index c697121107..b277e0c922 100644
--- a/libpurple/meson.build
+++ b/libpurple/meson.build
@@ -363,27 +363,18 @@ libpurple_dep = declare_dependency(
meson.override_dependency(purple_filebase, libpurple_dep)
PURPLE3_URL_HANDLER_DESKTOP = 'purple3-url-handler.desktop'
-if get_option('nls')
- i18n = import('i18n')
- desktop_file_in = configure_file(
- input : 'data' / (PURPLE3_URL_HANDLER_DESKTOP + '.in.in'),
- output : PURPLE3_URL_HANDLER_DESKTOP + '.in',
- configuration : conf)
- i18n.merge_file(
- input : desktop_file_in,
- output : PURPLE3_URL_HANDLER_DESKTOP,
- po_dir : meson.project_source_root() / 'po',
- type : 'desktop',
- install : true,
- install_dir : get_option('datadir') / 'applications')
-else
- configure_file(
- input : 'data' / (PURPLE3_URL_HANDLER_DESKTOP + '.in.in'),
- output : PURPLE3_URL_HANDLER_DESKTOP,
- configuration : conf,
- install : true,
- install_dir : get_option('datadir') / 'applications')
-endif
+i18n = import('i18n')
+desktop_file_in = configure_file(
+ input : 'data' / (PURPLE3_URL_HANDLER_DESKTOP + '.in.in'),
+ output : PURPLE3_URL_HANDLER_DESKTOP + '.in',
+ configuration : conf)
+i18n.merge_file(
+ input : desktop_file_in,
+ output : PURPLE3_URL_HANDLER_DESKTOP,
+ po_dir : meson.project_source_root() / 'po',
+ type : 'desktop',
+ install : true,
+ install_dir : get_option('datadir') / 'applications')
subdir('tests')
subdir('example')
diff --git a/meson.build b/meson.build
index be10f47b3c..e63147d972 100644
--- a/meson.build
+++ b/meson.build
@@ -38,9 +38,8 @@ purple_minor_version = parts[1]
purple_micro_version = parts[2]
GETTEXT_PACKAGE=meson.project_name()
-if get_option('nls')
- find_program('gettext')
-endif
+find_program('gettext')
+find_program('xgettext')
add_project_arguments([
'-DHAVE_CONFIG_H=1',
@@ -95,11 +94,6 @@ compiler = meson.get_compiler('c')
# Check for Sun compiler
SUNCC = compiler.compiles('void main() {__SUNPRO_C;};')
-# Make sure we have xgettext
-if get_option('nls')
- find_program('xgettext')
-endif
-
# Check for Win32
if host_machine.system() == 'windows'
windows = import('windows')
@@ -657,11 +651,6 @@ endif
#AC_VAR_TIMEZONE_EXTERNALS
#######################################################################
-# Disable pixmap installation
-#######################################################################
-INSTALL_PIXMAPS = get_option('pixmaps-install')
-
-#######################################################################
# Documentation
#######################################################################
@@ -740,8 +729,6 @@ summary({
'Enable Introspection': enable_introspection,
'Generate documentation': get_option('doc'),
'Has you': true,
- 'Install pixmaps': INSTALL_PIXMAPS,
- 'Install translations': get_option('nls'),
'Print debugging messages': enable_debug,
}, section: 'Miscellaneous', bool_yn: true)
@@ -749,17 +736,3 @@ if pidgin3path.found()
summary('You have an old copy of pidgin3 at', pidgin3path.full_path(),
section: 'Warnings')
endif
-if not INSTALL_PIXMAPS
- summary('Pixmaps disabled',
- 'You have disabled the installation of pixmap data, ' +
- 'but Pidgin still requires installed pixmaps. ' +
- 'Be sure you know what you are doing.',
- section: 'Warnings')
-endif
-if not get_option('nls')
- summary('Translations disabled',
- 'You have disabled the building and installation of translation data. ' +
- 'This will prevent building Pidgin desktop files. ' +
- 'Be sure you know what you are doing.',
- section: 'Warnings')
-endif
diff --git a/meson_options.txt b/meson_options.txt
index f5e8432285..bd0087edcd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,15 +13,6 @@ option('extraversion', type : 'string',
option('introspection', type : 'boolean', value : true,
description : 'build introspection data')
-option('nettle', type : 'feature',
- description : 'enable Nettle support')
-
-option('nls', type : 'boolean', value : true,
- description : 'enable installation of translation files')
-
-option('pixmaps-install', type : 'boolean', value : true,
- description : 'enable installation of pixmap files - Pidgin still needs them!')
-
option('build-dependencies', type : 'boolean', value : false,
description : 'enable the use of subprojects to build missing dependencies.')
diff --git a/pidgin/data/meson.build b/pidgin/data/meson.build
index 1744fb941d..d37924434e 100644
--- a/pidgin/data/meson.build
+++ b/pidgin/data/meson.build
@@ -1,5 +1,3 @@
-if INSTALL_PIXMAPS
- subdir('icons')
-endif
+subdir('icons')
devenv.prepend('XDG_DATA_DIRS', meson.current_source_dir())
diff --git a/pidgin/meson.build b/pidgin/meson.build
index 61688ba98b..e16880b66c 100644
--- a/pidgin/meson.build
+++ b/pidgin/meson.build
@@ -289,41 +289,25 @@ if ENABLE_GTK
variables : ['plugindir=${libdir}/pidgin-@0@'.format(purple_major_version)])
PIDGIN_DESKTOP_FILE = 'im.pidgin.Pidgin3.desktop'
- if get_option('nls')
- i18n = import('i18n')
- desktop_file_in = configure_file(
- input : 'data' / (PIDGIN_DESKTOP_FILE + '.in.in'),
- output : PIDGIN_DESKTOP_FILE + '.in',
- configuration : conf)
- desktop_file = i18n.merge_file(
- input : desktop_file_in,
- output : PIDGIN_DESKTOP_FILE,
- po_dir : meson.project_source_root() / 'po',
- type : 'desktop',
- install : true,
- install_dir : get_option('datadir') / 'applications')
+ i18n = import('i18n')
+ desktop_file_in = configure_file(
+ input : 'data' / (PIDGIN_DESKTOP_FILE + '.in.in'),
+ output : PIDGIN_DESKTOP_FILE + '.in',
+ configuration : conf)
+ desktop_file = i18n.merge_file(
+ input : desktop_file_in,
+ output : PIDGIN_DESKTOP_FILE,
+ po_dir : meson.project_source_root() / 'po',
+ type : 'desktop',
+ install : true,
+ install_dir : get_option('datadir') / 'applications')
- appdata = i18n.merge_file(
- input : 'data/im.pidgin.Pidgin3.appdata.xml.in',
- output : 'im.pidgin.Pidgin3.appdata.xml',
- po_dir : meson.project_source_root() / 'po',
- install : true,
- install_dir : get_option('datadir') / 'metainfo')
- else
- configure_file(
- input : 'data' / (PIDGIN_DESKTOP_FILE + '.in.in'),
- output : PIDGIN_DESKTOP_FILE,
- configuration : conf,
- install : true,
- install_dir : get_option('datadir') / 'applications')
-
- configure_file(
- input : 'data/im.pidgin.Pidgin3.appdata.xml.in',
- output : 'im.pidgin.Pidgin3.appdata.xml',
- configuration : configuration_data(),
- install : true,
- install_dir : get_option('datadir') / 'metainfo')
- endif # INSTALL_I18N
+ appdata = i18n.merge_file(
+ input : 'data/im.pidgin.Pidgin3.appdata.xml.in',
+ output : 'im.pidgin.Pidgin3.appdata.xml',
+ po_dir : meson.project_source_root() / 'po',
+ install : true,
+ install_dir : get_option('datadir') / 'metainfo')
if enable_introspection
introspection_sources = libpidgin_SOURCES + libpidgin_headers + libpidgin_prefs_headers
diff --git a/pidgin/pixmaps/emotes/default/24/meson.build b/pidgin/pixmaps/emotes/default/24/meson.build
index 0a6c795e40..51c7eb7d2e 100644
--- a/pidgin/pixmaps/emotes/default/24/meson.build
+++ b/pidgin/pixmaps/emotes/default/24/meson.build
@@ -185,15 +185,14 @@ SMILEYS = [
'yin-yang.png'
]
-if INSTALL_PIXMAPS
- pidginsmileypixdir = pidginpixmapdir / 'emotes/default'
+pidginsmileypixdir = pidginpixmapdir / 'emotes/default'
- custom_target('default-theme',
- input : 'default.theme.in',
- output : 'theme',
- command : [smiley_theme_generator, '@INPUT@', '@OUTPUT@'],
- install : true,
- install_dir : pidginsmileypixdir)
+custom_target('default-theme',
+ input : 'default.theme.in',
+ output : 'theme',
+ command : [smiley_theme_generator, '@INPUT@', '@OUTPUT@'],
+ install : true,
+ install_dir : pidginsmileypixdir)
+
+install_data(SMILEYS, install_dir : pidginsmileypixdir)
- install_data(SMILEYS, install_dir : pidginsmileypixdir)
-endif
diff --git a/pidgin/pixmaps/emotes/small/16/meson.build b/pidgin/pixmaps/emotes/small/16/meson.build
index 8ec0dd7357..c906fa285f 100644
--- a/pidgin/pixmaps/emotes/small/16/meson.build
+++ b/pidgin/pixmaps/emotes/small/16/meson.build
@@ -85,15 +85,13 @@ SMILEYS = [
'wink.png'
]
-if INSTALL_PIXMAPS
- pidginsmileypixdir = pidginpixmapdir / 'emotes/small'
+pidginsmileypixdir = pidginpixmapdir / 'emotes/small'
- custom_target('small-theme',
- input : 'small.theme.in',
- output : 'theme',
- command : [smiley_theme_generator, '@INPUT@', '@OUTPUT@'],
- install : true,
- install_dir : pidginsmileypixdir)
+custom_target('small-theme',
+ input : 'small.theme.in',
+ output : 'theme',
+ command : [smiley_theme_generator, '@INPUT@', '@OUTPUT@'],
+ install : true,
+ install_dir : pidginsmileypixdir)
- install_data(MOODS + SMILEYS, install_dir : pidginsmileypixdir)
-endif
+install_data(MOODS + SMILEYS, install_dir : pidginsmileypixdir)
diff --git a/po/meson.build b/po/meson.build
index 1f550e6b68..3d7dc9607a 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -3,4 +3,4 @@ i18n = import('i18n')
# use the glib preset which is defined at
# https://github.com/mesonbuild/meson/blob/master/mesonbuild/modules/i18n.py#L93
# at the time of this comment.
-i18n.gettext('pidgin', preset : 'glib', install : get_option('nls'))
+i18n.gettext('pidgin', preset : 'glib')