pidgin/pidgin

9e5a5eb54a57
Parents 4f2160a2edce
Children cb640ea0f315
bump the minimum meson to 0.56.0 and fix the deprecations

Testing Done:
Verfied meson didn't complain about any deprecations.

Reviewed at https://reviews.imfreedom.org/r/843/
--- a/finch/meson.build Mon Jul 26 04:20:08 2021 -0500
+++ b/finch/meson.build Tue Jul 27 01:31:54 2021 -0500
@@ -16,7 +16,7 @@
)
libgnt_dep = libgnt_proj.get_variable('libgnt_dep')
- libgnt_docpath = meson.build_root() / 'subprojects/libgnt/doc/'
+ libgnt_docpath = meson.project_build_root() / 'subprojects/libgnt/doc/'
if enable_introspection
libgnt_gir = libgnt_proj.get_variable('libgnt_gir')
endif
--- a/libpurple/meson.build Mon Jul 26 04:20:08 2021 -0500
+++ b/libpurple/meson.build Tue Jul 27 01:31:54 2021 -0500
@@ -353,7 +353,7 @@
i18n.merge_file(
input : desktop_file_in,
output : PURPLE3_URL_HANDLER_DESKTOP,
- po_dir : meson.source_root() / 'po',
+ po_dir : meson.project_source_root() / 'po',
type : 'desktop',
install : true,
install_dir : get_option('datadir') / 'applications')
--- a/meson.build Mon Jul 26 04:20:08 2021 -0500
+++ b/meson.build Tue Jul 27 01:31:54 2021 -0500
@@ -22,7 +22,7 @@
#
project('pidgin', 'c',
version : '3.0.0-devel',
- meson_version : '>=0.52.0')
+ meson_version : '>=0.56.0')
purple_soversion = 20
parts = meson.project_version().split('-')
@@ -280,7 +280,7 @@
)
talkatu_dep = talkatu_proj.get_variable('talkatu_dep')
- talkatu_docpath = meson.build_root() / 'subprojects/talkatu/talkatu/reference/'
+ talkatu_docpath = meson.project_build_root() / 'subprojects/talkatu/talkatu/reference/'
if enable_introspection
talkatu_gir = talkatu_proj.get_variable('talkatu_gir')[0]
endif
@@ -548,7 +548,7 @@
# Check for KWallet headers
#######################################################################
-if IS_WIN32 or not add_languages('cpp', required : get_option('kwallet'))
+if IS_WIN32 or not add_languages('cpp', required : get_option('kwallet'), native: false)
kwallet = disabler()
else
# Use C++ compiler
@@ -606,7 +606,7 @@
gplugin_dep = gplugin_proj.get_variable('gplugin_dep')
- gplugin_docpath = meson.build_root() / 'subprojects/gplugin/gplugin/reference/'
+ gplugin_docpath = meson.project_build_root() / 'subprojects/gplugin/gplugin/reference/'
if enable_introspection
gplugin_gir = gplugin_proj.get_variable('gplugin_gir')[0]
@@ -616,7 +616,7 @@
if get_option('gtkui')
gplugin_gtk_dep = gplugin_proj.get_variable('gplugin_gtk_dep')
- gplugin_gtk_docpath = meson.build_root() / 'subprojects/gplugin/gplugin-gtk/reference/'
+ gplugin_gtk_docpath = meson.project_build_root() / 'subprojects/gplugin/gplugin-gtk/reference/'
if enable_introspection
gplugin_gtk_gir = gplugin_proj.get_variable('gplugin_gtk_gir')[0]
@@ -772,7 +772,7 @@
bindir = get_option('prefix') / get_option('bindir')
message('Pidgin will be installed in @0@.'.format(bindir))
if pidgin3path.found()
- message('Warning: You have an old copy of pidgin3 at @0@.'.format(pidgin3path.path()))
+ message('Warning: You have an old copy of pidgin3 at @0@.'.format(pidgin3path.full_path()))
endif
if not INSTALL_PIXMAPS
message('')
--- a/pidgin/meson.build Mon Jul 26 04:20:08 2021 -0500
+++ b/pidgin/meson.build Tue Jul 27 01:31:54 2021 -0500
@@ -262,7 +262,7 @@
c_args : ['-DPIDGIN_COMPILATION', '-DG_LOG_DOMAIN="Pidgin"'],
include_directories : toplevel_inc,
dependencies : IS_WIN32 ? [] : [libpurple_dep, libpidgin_dep],
- gui_app : true,
+ win_subsystem : 'windows',
install : true)
pkgconfig.generate(
@@ -285,7 +285,7 @@
desktop_file = i18n.merge_file(
input : desktop_file_in,
output : PIDGIN_DESKTOP_FILE,
- po_dir : meson.source_root() / 'po',
+ po_dir : meson.project_source_root() / 'po',
type : 'desktop',
install : true,
install_dir : get_option('datadir') / 'applications')
@@ -293,7 +293,7 @@
appdata = i18n.merge_file(
input : 'data/im.pidgin.Pidgin3.appdata.xml.in',
output : 'im.pidgin.Pidgin3.appdata.xml',
- po_dir : meson.source_root() / 'po',
+ po_dir : meson.project_source_root() / 'po',
install : true,
install_dir : get_option('datadir') / 'metainfo')
else