From 70f1df7e0e7a3966a57cb1539e8e26e2d7292f5e Mon Sep 17 00:00:00 2001
From: Evangelos Ribeiro Tzaras <evangelos.tzaras@puri.sm>
Date: Fri, 16 Apr 2021 18:15:59 +0200
Subject: [PATCH] build: separate version from the rest of the configuration
 data

This should make sure that we always have 'config.h' available and
should fix issues with flatpak build as seen in #257:

`fatal error: config.h: No such file or directory`
---
 src/calls-application.c |  1 +
 src/calls-main-window.c |  1 +
 src/meson.build         | 13 +++++++------
 src/version.h.in        |  1 +
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 src/version.h.in

diff --git a/src/calls-application.c b/src/calls-application.c
index 41b97b0..8dcbad8 100644
--- a/src/calls-application.c
+++ b/src/calls-application.c
@@ -36,6 +36,7 @@
 #include "calls-main-window.h"
 #include "calls-manager.h"
 #include "calls-application.h"
+#include "version.h"
 
 #include <glib/gi18n.h>
 #include <handy.h>
diff --git a/src/calls-main-window.c b/src/calls-main-window.c
index 3dbe898..d973f46 100644
--- a/src/calls-main-window.c
+++ b/src/calls-main-window.c
@@ -33,6 +33,7 @@
 #include "calls-manager.h"
 #include "config.h"
 #include "util.h"
+#include "version.h"
 
 #include <glib/gi18n.h>
 #include <glib-object.h>
diff --git a/src/meson.build b/src/meson.build
index d6b6f3d..6225b17 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -109,20 +109,21 @@ calls_sources = files(['calls-message-source.c', 'calls-message-source.h',
                       ]) + wayland_sources + calls_generated_sources
 
 calls_config_data = config_data
-calls_config_data.set_quoted('VCS_TAG', '@VCS_TAG@')
 calls_config_data.set10('WL_SCANNER_FOUND', wl_scanner.found())
 
-config_h_in = configure_file(
-  output: 'config.h.in',
+config_h = configure_file(
+  output: 'config.h',
   configuration: calls_config_data
 )
 
-config_h = vcs_tag(
+version_h = vcs_tag(
     fallback: '',
-       input: config_h_in,
-      output: 'config.h',
+       input: 'version.h.in',
+      output: 'version.h',
 )
 
+calls_sources += [ version_h ]
+
 executable (
   'gnome-calls',
   calls_sources, 'main.c',
diff --git a/src/version.h.in b/src/version.h.in
new file mode 100644
index 0000000..5d8985d
--- /dev/null
+++ b/src/version.h.in
@@ -0,0 +1 @@
+#define VCS_TAG "@VCS_TAG@"