From 09fe3a55bca59ffa33694c325039de741eaea0d6 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Sun, 26 Oct 2025 21:48:17 +0100 Subject: [PATCH 1/2] meson: Bump minimum meson version to 1.7 Debian 13 comes with this, allows to rename meson_options.txt to meson.options. --- pam/meson.build | 2 +- portal/meson.build | 2 +- server/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pam/meson.build b/pam/meson.build index a8f02f7f4..216acc337 100644 --- a/pam/meson.build +++ b/pam/meson.build @@ -2,7 +2,7 @@ project( 'oo7-pam', 'rust', version: '0.6.0', - meson_version: '>= 0.61.0', + meson_version: '>= 1.7', ) is_devel = get_option('profile') == 'development' diff --git a/portal/meson.build b/portal/meson.build index 142d0d606..160c299c9 100644 --- a/portal/meson.build +++ b/portal/meson.build @@ -2,7 +2,7 @@ project( 'oo7-portal', 'rust', version: '0.1.0', - meson_version: '>= 0.61.0', + meson_version: '>= 1.7', ) dbus_name = 'org.freedesktop.impl.portal.desktop.oo7' diff --git a/server/meson.build b/server/meson.build index 114453948..33cb38ca0 100644 --- a/server/meson.build +++ b/server/meson.build @@ -2,7 +2,7 @@ project( 'oo7-daemon', 'rust', version: '0.1.0', - meson_version: '>= 0.61.0', + meson_version: '>= 1.7', ) i18n = import('i18n') From c6a1ca1cd61d544a1b2c2bd5a57247fbc5cd1f82 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Sun, 26 Oct 2025 21:48:43 +0100 Subject: [PATCH 2/2] meson: Rename options to meson.options --- pam/{meson_options.txt => meson.options} | 0 portal/{meson_options.txt => meson.options} | 0 server/{meson_options.txt => meson.options} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename pam/{meson_options.txt => meson.options} (100%) rename portal/{meson_options.txt => meson.options} (100%) rename server/{meson_options.txt => meson.options} (100%) diff --git a/pam/meson_options.txt b/pam/meson.options similarity index 100% rename from pam/meson_options.txt rename to pam/meson.options diff --git a/portal/meson_options.txt b/portal/meson.options similarity index 100% rename from portal/meson_options.txt rename to portal/meson.options diff --git a/server/meson_options.txt b/server/meson.options similarity index 100% rename from server/meson_options.txt rename to server/meson.options