Switch to meson build system

.build.yml

@@ -17,6 +17,7 @@ requires:
     - make
     - mate-common
     - mate-panel
+    - meson
     - python
     - upower
     - which
@@ -47,6 +48,7 @@ requires:
     - libxrandr-dev
     - make
     - mate-common
+    - meson
     - pkg-config
     - xmlto
     - yelp-tools
@@ -71,6 +73,7 @@ requires:
     - mate-common
     - mate-panel-devel
     - mesa-libGL-devel
+    - meson
     - pangox-compat-devel
     - polkit-devel
     - popt-devel
@@ -99,6 +102,7 @@ requires:
     - libxrandr-dev
     - make
     - mate-common
+    - meson
     - pkg-config
     - xmlto
     - yelp-tools

.travis.yml

@@ -25,6 +25,7 @@ install:
 
 script:
   - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts
+  - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts --build meson
 
 notifications:
   irc:

applets/brightness/config.h.in

@@ -0,0 +1,32 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2020 Victor A. Santos <[email protected]>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Project */
+#define VERSION "@version@"
+
+/* Directories */
+#define SYSCONFDIR "@sysconfdir@"
+#define DATADIR "@datadir@"
+#define BINDIR "@bindir@"
+#define SBINDIR "@sbindir@"
+#define MATELOCALEDIR "@localedir@"
+#define GPM_ICONS_DATA "@iconsdir@"
+#define BRIGHTNESS_MENU_UI_DIR "@uidir@"

applets/brightness/meson.build

@@ -0,0 +1,59 @@
+conf_data = configuration_data()
+conf_data.set('version', meson.project_version())
+conf_data.set('sysconfdir', sysconfdir_path)
+conf_data.set('datadir', datadir_path)
+conf_data.set('bindir', bindir_path)
+conf_data.set('sbindir', sbindir_path)
+conf_data.set('localedir', localedir_path)
+conf_data.set('iconsdir', iconsdir_path)
+conf_data.set('uidir', uidir_path)
+conf_data.set('gettext_package', meson.project_name())
+
+configure_file(input: 'config.h.in', output: 'config.h', configuration: conf_data)
+
+executable(
+  'mate-brightness-applet',
+  [
+    'brightness-applet.c',
+    'gpm-common.c',
+  ],
+  dependencies: dependencies,
+  install: true,
+  install_dir: libexecdir_path
+)
+
+desktop_data = configuration_data()
+desktop_data.set('LIBEXECDIR', libexecdir_path)
+desktop_data.set('VERSION', meson.project_version())
+
+desktop_in = configure_file(
+  input: 'org.mate.BrightnessApplet.mate-panel-applet.desktop.in.in',
+  output: 'org.mate.BrightnessApplet.mate-panel-applet.desktop.in',
+  configuration: desktop_data 
+)
+
+i18n.merge_file(
+  input: desktop_in,
+  output: 'org.mate.BrightnessApplet.mate-panel-applet.desktop',
+  type: 'desktop',
+  po_dir: podir,
+  install: true,
+  install_dir: appletdir_path,
+)
+
+service_data = configuration_data()
+service_data.set('LIBEXECDIR', libexecdir_path)
+
+service_file = configure_file(
+  input: 'org.mate.panel.applet.BrightnessAppletFactory.service.in',
+  output: 'org.mate.panel.applet.BrightnessAppletFactory.service',
+  configuration: service_data,
+  install: true,
+  install_dir: servicedir_path
+)
+
+install_data(
+  ['brightness-applet-menu.xml'],
+  install_dir: uidir_path
+)
+

applets/inhibit/config.h.in

@@ -0,0 +1,32 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2020 Victor A. Santos <[email protected]>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Project */
+#define VERSION "@version@"
+
+/* Directories */
+#define SYSCONFDIR "@sysconfdir@"
+#define DATADIR "@datadir@"
+#define BINDIR "@bindir@"
+#define SBINDIR "@sbindir@"
+#define MATELOCALEDIR "@localedir@"
+#define GPM_ICONS_DATA "@iconsdir@"
+#define INHIBIT_MENU_UI_DIR "@uidir@"

applets/inhibit/meson.build

@@ -0,0 +1,58 @@
+conf_data = configuration_data()
+conf_data.set('version', meson.project_version())
+conf_data.set('sysconfdir', sysconfdir_path)
+conf_data.set('datadir', datadir_path)
+conf_data.set('bindir', bindir_path)
+conf_data.set('sbindir', sbindir_path)
+conf_data.set('localedir', localedir_path)
+conf_data.set('iconsdir', iconsdir_path)
+conf_data.set('uidir', uidir_path)
+conf_data.set('gettext_package', meson.project_name())
+
+configure_file(input: 'config.h.in', output: 'config.h', configuration: conf_data)
+
+executable(
+  'mate-inhibit-applet',
+  [
+    'inhibit-applet.c',
+    'gpm-common.c',
+  ],
+  dependencies: dependencies,
+  install: true,
+  install_dir: libexecdir_path
+)
+
+desktop_data = configuration_data()
+desktop_data.set('LIBEXECDIR', libexecdir_path)
+desktop_data.set('VERSION', meson.project_version())
+
+desktop_in = configure_file(
+  input: 'org.mate.InhibitApplet.mate-panel-applet.desktop.in.in',
+  output: 'org.mate.InhibitApplet.mate-panel-applet.desktop.in',
+  configuration: desktop_data 
+)
+
+i18n.merge_file(
+  input: desktop_in,
+  output: 'org.mate.InhibitApplet.mate-panel-applet.desktop',
+  type: 'desktop',
+  po_dir: podir,
+  install: true,
+  install_dir: appletdir_path,
+)
+
+service_data = configuration_data()
+service_data.set('LIBEXECDIR', libexecdir_path)
+
+service_file = configure_file(
+  input: 'org.mate.panel.applet.InhibitAppletFactory.service.in',
+  output: 'org.mate.panel.applet.InhibitAppletFactory.service',
+  configuration: service_data,
+  install: true,
+  install_dir: servicedir_path
+)
+
+install_data(
+  ['inhibit-applet-menu.xml'],
+  install_dir: uidir_path
+)

applets/meson.build

@@ -0,0 +1,2 @@
+subdir('brightness')
+subdir('inhibit')

data/icons/Makefile.am

@@ -1,6 +1,6 @@
-actioniconsdir = $(pkgdatadir)/icons/hicolor
+actioniconsdir = $(datadir)/icons/hicolor
 appiconsdir = $(datadir)/icons/hicolor
-statusiconsdir = $(pkgdatadir)/icons/hicolor
+statusiconsdir = $(datadir)/icons/hicolor
 
 sizes = 16x16 22x22 24x24 32x32 48x48 64x64 96x96 128x128 256x256
 

data/icons/meson.build

@@ -0,0 +1,59 @@
+actioniconsdir_path = join_paths(datadir_path, 'icons', 'hicolor')
+appiconsdir_path = join_paths(datadir_path, 'icons', 'hicolor')
+statusiconsdir_path = join_paths(datadir_path, 'icons', 'hicolor')
+
+action_images = [
+  'gpm-hibernate.png',
+  'gpm-suspend.png'
+]
+
+app_images = [
+  'mate-brightness-applet.png',
+  'mate-inhibit-applet.png',
+  'mate-power-manager.png',
+  'mate-power-statistics.png'
+] 
+
+status_images = [
+  'gpm-ac-adapter.png', 'gpm-keyboard-080.png', 'gpm-battery-000-charging.png',
+  'gpm-keyboard-100.png', 'gpm-battery-000.png', 'gpm-mouse-000.png',
+  'gpm-battery-020-charging.png', 'gpm-mouse-020.png', 'gpm-battery-020.png',
+  'gpm-mouse-040.png', 'gpm-battery-040-charging.png', 'gpm-mouse-060.png',
+  'gpm-battery-040.png', 'gpm-mouse-080.png', 'gpm-battery-060-charging.png',
+  'gpm-mouse-100.png', 'gpm-battery-060.png', 'gpm-phone-000.png',
+  'gpm-battery-080-charging.png', 'gpm-phone-020.png', 'gpm-battery-080.png',
+  'gpm-phone-040.png', 'gpm-battery-100-charging.png', 'gpm-phone-060.png',
+  'gpm-battery-100.png', 'gpm-phone-080.png', 'gpm-battery-charged.png',
+  'gpm-phone-100.png', 'gpm-battery-empty.png', 'gpm-ups-000-charging.png',
+  'gpm-battery-missing.png', 'gpm-ups-000.png', 'gpm-brightness-kbd-disabled.png',
+  'gpm-ups-020-charging.png','gpm-brightness-kbd-invalid.png', 'gpm-ups-020.png',
+  'gpm-brightness-kbd.png', 'gpm-ups-040-charging.png', 'gpm-brightness-lcd-disabled.png',
+  'gpm-ups-040.png', 'gpm-brightness-lcd-invalid.png', 'gpm-ups-060-charging.png',
+  'gpm-brightness-lcd.png', 'gpm-ups-060.png', 'gpm-inhibit-invalid.png', 'gpm-ups-080-charging.png',
+  'gpm-inhibit.png', 'gpm-ups-080.png', 'gpm-keyboard-000.png', 'gpm-ups-100-charging.png',
+  'gpm-keyboard-020.png', 'gpm-ups-100.png', 'gpm-keyboard-040.png', 'gpm-ups-missing.png',
+  'gpm-keyboard-060.png'
+]
+
+foreach s: ['16x16', '22x22', '24x24', '32x32', '48x48', '64x64', '96x96', '128x128', '256x256']
+  foreach image: action_images
+    install_data(
+      join_paths(s, 'actions', image),
+      install_dir: join_paths(actioniconsdir_path, s, 'actions')
+    )
+    endforeach
+
+  foreach image: app_images
+    install_data(
+      join_paths(s, 'apps', image),
+      install_dir: join_paths(appiconsdir_path, s, 'apps')
+    )
+  endforeach
+
+  foreach image: status_images
+    install_data(
+      join_paths(s, 'status', image),
+      install_dir: join_paths(statusiconsdir_path, s, 'status')
+    )
+  endforeach
+endforeach

data/meson.build

@@ -0,0 +1,86 @@
+common_desktop_data = configuration_data()
+common_desktop_data.set('VERSION', meson.project_version())
+
+preferences_desktop = configure_file(
+  input: 'mate-power-preferences.desktop.in.in',
+  output: 'mate-power-preferences.desktop.in',
+  configuration: common_desktop_data
+)
+
+statistics_desktop = configure_file(
+  input: 'mate-power-statistics.desktop.in.in',
+  output: 'mate-power-statistics.desktop.in',
+  configuration: common_desktop_data
+)
+
+mpm_autostart = configure_file(
+  input: 'mate-power-manager.desktop.in.in',
+  output: 'mate-power-manager.desktop.in',
+  configuration: common_desktop_data
+)
+
+mpm_service_data = configuration_data()
+mpm_service_data.set('servicedir', servicedir_path)
+
+mpm_service = configure_file(
+  input: 'org.mate.PowerManager.service.in',
+  output: 'org.mate.PowerManager.service',
+  configuration: mpm_service_data,
+  install: true,
+  install_dir: servicedir_path
+)
+
+mpm_gsettings_schema_data = configuration_data()
+mpm_gsettings_schema_data.set('GETTEXT_PACKAGE', meson.project_name())
+
+mpm_gsettings_schema = configure_file(
+  input: 'org.mate.power-manager.gschema.xml.in',
+  output: 'org.mate.power-manager.gschema.xml',
+  configuration: mpm_gsettings_schema_data,
+  install: true,
+  install_dir: join_paths(datadir_path, 'glib-2.0', 'schemas')
+)
+meson.add_install_script('meson_post_install.py')
+
+i18n.merge_file(
+  input: preferences_desktop,
+  output: 'mate-power-preferences.desktop',
+  type: 'desktop',
+  po_dir: podir,
+  install: true,
+  install_dir: desktopdir_path
+)
+
+i18n.merge_file(
+  input: statistics_desktop,
+  output: 'mate-power-statistics.desktop',
+  type: 'desktop',
+  po_dir: podir,
+  install: true,
+  install_dir: desktopdir_path
+)
+
+i18n.merge_file(
+  input: mpm_autostart,
+  output: 'mate-power-manager.desktop',
+  type: 'desktop',
+  po_dir: podir,
+  install: true,
+  install_dir: join_paths(sysconfdir_path, 'xdg', 'autostart')
+)
+
+install_man(
+  [
+    'mate-power-manager.1',
+    'mate-power-backlight-helper.1',
+    'mate-power-statistics.1',
+    'mate-power-preferences.1'
+  ]
+)
+
+install_data(
+  ['acme.ui'],
+  install_dir: pkgdatadir_path
+)
+
+subdir('icons')

data/meson_post_install.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+
+schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
+
+if not os.environ.get('DESTDIR'):
+    print('Compiling gsettings schemas...')
+    subprocess.call(['glib-compile-schemas', schemadir])