From 8d77591d895d4eb280936ddc94f6bfd83452141a Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Tue, 22 Nov 2022 16:31:28 +0000
Subject: [PATCH 1/2] build: Deprecate -Druntime_libdir option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s been broken since we ported to Meson and nobody has complained, so
let’s deprecate it this cycle and remove it in GLib ≥ 2.78.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Fixes: #2786
---
 docs/reference/glib/building.xml | 17 -----------------
 meson_options.txt                |  3 ++-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/docs/reference/glib/building.xml b/docs/reference/glib/building.xml
index f8a71db7d..dd1a4495b 100644
--- a/docs/reference/glib/building.xml
+++ b/docs/reference/glib/building.xml
@@ -334,23 +334,6 @@
         <filename>meson-logs</filename> directory.
       </para>
     </formalpara>
-
-    <formalpara>
-      <title><option>-Druntime_libdir=RELPATH</option></title>
-
-      <para>
-        Allows specifying a relative path to where to install the runtime
-        libraries (meaning library files used for running, not developing,
-        GLib applications). This can be used in operating system setups where
-        programs using GLib needs to run before e.g. <filename>/usr</filename>
-        is mounted.
-        For example, if <varname>LIBDIR</varname> is <filename>/usr/lib</filename> and
-        <filename>../../lib</filename> is passed to
-        <option>-Druntime_libdir</option> then the
-        runtime libraries are installed into <filename>/lib</filename> rather
-        than <filename>/usr/lib</filename>.
-      </para>
-    </formalpara>
   </refsect1>
 
 </refentry>
diff --git a/meson_options.txt b/meson_options.txt
index f13cbfdd5..a38b6423b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,8 @@
 option('runtime_libdir',
        type : 'string',
        value : '',
-       description : 'install runtime libraries relative to libdir')
+       description : 'install runtime libraries relative to libdir',
+       deprecated: true)
 
 option('iconv',
        type : 'combo',

From e71ecc8771a4f13bc6046438ab0845944831b9a6 Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Tue, 22 Nov 2022 16:32:42 +0000
Subject: [PATCH 2/2] build: Remove deprecated -Diconv option

It was deprecated in GLib 2.74, so we can now remove it.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #2786
---
 meson_options.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index a38b6423b..9c2c70b6c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,12 +4,6 @@ option('runtime_libdir',
        description : 'install runtime libraries relative to libdir',
        deprecated: true)
 
-option('iconv',
-       type : 'combo',
-       choices : ['auto', 'libc', 'external'],
-       value : 'auto',
-       deprecated: true,)
-
 option('charsetalias_dir',
        type : 'string',
        value : '',