From 19786e80da6ee0c28953fa41477a06c6b5c64dbb Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jpetridis@gnome.org>
Date: Mon, 3 Aug 2020 20:34:18 +0000
Subject: [PATCH 1/2] ci: flatpak: remove meson-args variable

We no longer need to manually keep it in sync with the ci.
---
 .gitlab-ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8239fb638..5265d7d63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_
 
 variables:
   GIT_SUBMODULE_STRATEGY: 'normal'
-  BUNDLE: "org.gnome.Calendar.Devel.flatpak"
 
 stages:
   - 'flatpak'
@@ -16,10 +15,9 @@ flatpak:master:
         MANIFEST_PATH: "build-aux/flatpak/org.gnome.Calendar.json"
         RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
         FLATPAK_MODULE: "gnome-calendar"
-        # Make sure to keep this in sync with the Flatpak manifest, all arguments
-        # are passed except the config-args because we build it ourselves
-        MESON_ARGS: "-Dtracing=true -Dprofile=development"
         APP_ID: "org.gnome.Calendar.Devel"
+        BUNDLE: "org.gnome.Calendar.Devel.flatpak"
+
 
 flatpak:nightly:
     extends: '.publish_nightly'
-- 
GitLab


From 41a3e0a853faaaa685c5ce9511f70e9d69fb2847 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jpetridis@gnome.org>
Date: Mon, 3 Aug 2020 20:38:20 +0000
Subject: [PATCH 2/2] flatpak: avoid explicitly setting cflags

The runtimes provide a good set of default flags
at /usr/etc/flatpak-builder/defaults.json
which gets automatically exported
---
 build-aux/flatpak/org.gnome.Calendar.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/build-aux/flatpak/org.gnome.Calendar.json b/build-aux/flatpak/org.gnome.Calendar.json
index d0e395ad2..18893ad67 100644
--- a/build-aux/flatpak/org.gnome.Calendar.json
+++ b/build-aux/flatpak/org.gnome.Calendar.json
@@ -28,13 +28,6 @@
         "--filesystem=~/.config/dconf:ro",
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
-    "build-options" : {
-        "cflags" : "-O2 -g",
-        "cxxflags" : "-O2 -g",
-        "env" : {
-            "V" : "1"
-        }
-    },
     "x-run-args" : [
         "--debug"
     ],
-- 
GitLab