[gnome-calculator] Flatpak: now is possible to build without GCalc

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 687f051367aa8457dae4cd069c85f62a4e02a422
Author: Daniel Espinosa <esodan gmail com>
Date:   Wed Apr 13 20:19:53 2022 -0500

    Flatpak: now is possible to build without GCalc
    
    Fixes #265

 gcalc/meson.build                 | 17 -----------------
 lib/meson.build                   |  2 +-
 libmpfr/meson.build               | 19 +++++++++++++++++++
 {gcalc => libmpfr}/mpfr-glue.vala |  0
 meson.build                       |  1 +
 org.gnome.Calculator.Devel.json   |  1 +
 search-provider/meson.build       |  2 +-
 src/meson.build                   |  5 ++---
 8 files changed, 25 insertions(+), 22 deletions(-)
---
diff --git a/gcalc/meson.build b/gcalc/meson.build
index ee29644e..30e1461d 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -38,23 +38,6 @@ confh.set_quoted('GETTEXT_PACKAGE', 'GCalc')
 configure_file(output : 'config.h',
        configuration : confh)
 
-
-lib_mpfrg_sources = files([
-  'mpfr-glue.vala'
-])
-
-lib_mpfrg = static_library ('mpfrg',
-       lib_mpfrg_sources,
-       vala_header: 'mpfrg.h',
-       vala_vapi: 'mpfrg.vapi',
-       dependencies: [
-               gio,
-               mpc,
-               mpfr,
-       ],
-       install: false,
-)
-
 gcalc_sources = files([
        'gcalc-assign.vala',
        'gcalc-constant.vala',
diff --git a/lib/meson.build b/lib/meson.build
index f7f5f117..59826a4f 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -34,7 +34,7 @@ libcalculator_deps = [
   mpc,
   mpfr,
   posix,
-  gcalc_inc_libh_dep
+  libmpfr_inc_libh_dep
 ]
 
 libcalculator = static_library('calculator', libcalculator_sources,
diff --git a/libmpfr/meson.build b/libmpfr/meson.build
new file mode 100644
index 00000000..5479de01
--- /dev/null
+++ b/libmpfr/meson.build
@@ -0,0 +1,19 @@
+
+lib_mpfrg_sources = files([
+  'mpfr-glue.vala'
+])
+
+libmpfr_inc_libh = include_directories ('.')
+libmpfr_inc_libh_dep = declare_dependency (include_directories : libmpfr_inc_libh)
+
+lib_mpfrg = static_library ('mpfrg',
+       lib_mpfrg_sources,
+       vala_header: 'mpfrg.h',
+       vala_vapi: 'mpfrg.vapi',
+       dependencies: [
+               gio,
+               mpc,
+               mpfr,
+       ],
+       install: false,
+)
diff --git a/gcalc/mpfr-glue.vala b/libmpfr/mpfr-glue.vala
similarity index 100%
rename from gcalc/mpfr-glue.vala
rename to libmpfr/mpfr-glue.vala
diff --git a/meson.build b/meson.build
index d7adef93..9062dc63 100644
--- a/meson.build
+++ b/meson.build
@@ -84,6 +84,7 @@ config_h_dir = include_directories('.')
 # Subdirs
 subdir('po')
 subdir('vapi')
+subdir('libmpfr')
 if get_option ('gcalc')
 subdir('gcalc')
 endif
diff --git a/org.gnome.Calculator.Devel.json b/org.gnome.Calculator.Devel.json
index 43cdbbda..99813ea3 100644
--- a/org.gnome.Calculator.Devel.json
+++ b/org.gnome.Calculator.Devel.json
@@ -86,6 +86,7 @@
             "buildsystem" : "meson",
             "config-opts" : [
                 "-Ddisable-introspection=true",
+                "-Dgcalc=false",
                 "-Ddevelopment=true"
             ],
             "sources" : [
diff --git a/search-provider/meson.build b/search-provider/meson.build
index 52bf5fc0..90271877 100644
--- a/search-provider/meson.build
+++ b/search-provider/meson.build
@@ -11,7 +11,7 @@ search_provider_deps = [
   mpc,
   mpfr,
   posix,
-  gcalc_inc_libh_dep
+  libmpfr_inc_libh_dep
 ]
 
 search_provider_vala_flags = [
diff --git a/src/meson.build b/src/meson.build
index a1a2b26e..fc3e2a7a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -28,8 +28,7 @@ gnome_calculator_deps = [
   libadwaita,
   mpc,
   mpfr,
-  posix,
-  gcalc_inc_libh_dep
+  posix
 ]
 
 gnome_calculator_vala_flags = [
@@ -73,7 +72,7 @@ gcalccmd_deps = [
   mpc,
   mpfr,
   posix,
-  gcalc_inc_libh_dep
+  libmpfr_inc_libh_dep
 ]
 
 gcalccmd_vala_flags = [