From 21457c6fcd027940e40ff3f0ec823a0ae6f75db8 Mon Sep 17 00:00:00 2001
From: Stefan Kebekus <stefan.kebekus@math.uni-freiburg>
Date: Wed, 22 Jul 2020 08:00:03 +0200
Subject: [PATCH] Translate app data

---
 .github/workflows/windows.yml                 |  2 --
 3rdParty/enrouteText                          |  2 +-
 metadata/CMakeLists.txt                       |  6 ++--
 ...e.akaflieg_freiburg.enroute.appdata.xml.in | 33 -------------------
 .../de.akaflieg_freiburg.enroute.desktop.in   | 11 -------
 metadata/de.akaflieg_freiburg.enroute.json.in | 27 ---------------
 6 files changed, 3 insertions(+), 78 deletions(-)
 delete mode 100644 metadata/de.akaflieg_freiburg.enroute.appdata.xml.in
 delete mode 100644 metadata/de.akaflieg_freiburg.enroute.desktop.in
 delete mode 100644 metadata/de.akaflieg_freiburg.enroute.json.in

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 4c69444a0..ce6df749e 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -21,8 +21,6 @@ jobs:
         version: '5.15.0'
     - name: Configure
       run: |
-        export CC=/usr/bin/clang
-        export CXX=/usr/bin/clang++
         cmake -E make_directory build
         cd build
         cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS='-Werror -Wall -Wextra'
diff --git a/3rdParty/enrouteText b/3rdParty/enrouteText
index 780009ef9..dfb5a7c59 160000
--- a/3rdParty/enrouteText
+++ b/3rdParty/enrouteText
@@ -1 +1 @@
-Subproject commit 780009ef9ed471b66e1be65486483f591d9409d6
+Subproject commit dfb5a7c59e9b83e1f896743684d82854493b94b4
diff --git a/metadata/CMakeLists.txt b/metadata/CMakeLists.txt
index 02bfe6b82..55590076f 100644
--- a/metadata/CMakeLists.txt
+++ b/metadata/CMakeLists.txt
@@ -2,11 +2,9 @@
 # Configure files
 #
 
-configure_file(${APP_ID}.json.in ${APP_ID}.json)
-
 if (NOT ANDROID)
-  configure_file(${APP_ID}.appdata.xml.in ${APP_ID}.appdata.xml)
-  configure_file(${APP_ID}.desktop.in ${APP_ID}.desktop)
+  configure_file(${CMAKE_SOURCE_DIR}/3rdParty/enrouteText/desktop/linux/${APP_ID}.appdata.xml.in ${APP_ID}.appdata.xml)
+  configure_file(${CMAKE_SOURCE_DIR}/3rdParty/enrouteText/desktop/linux/${APP_ID}.desktop.in ${APP_ID}.desktop)
   configure_file(${APP_ID}.svg ${APP_ID}.svg)
   
   install(FILES ${PROJECT_BINARY_DIR}/metadata/${APP_ID}.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
diff --git a/metadata/de.akaflieg_freiburg.enroute.appdata.xml.in b/metadata/de.akaflieg_freiburg.enroute.appdata.xml.in
deleted file mode 100644
index 904591457..000000000
--- a/metadata/de.akaflieg_freiburg.enroute.appdata.xml.in
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component type="desktop">
-  <id>${APP_ID}</id>
-  <launchable type="desktop-id">${APP_ID}.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0+</project_license>
-  <name>enroute flight navigation</name>
-  <summary>A flight navigation app for VFR pilots</summary>
-  <description>
-    <p>enroute flight navigation is a flight navigation app for VFR pilots. The
-    app is free, open source, 100% non-commercial and does not collect user
-    data.</p>
-  </description>
-  <content_rating type="oars-1.1" />
-  <releases>
-    <release version="${PROJECT_VERSION}" date="${GIT_DATE}"/>
-  </releases>
-  <screenshots>
-    <screenshot type="default">
-      <image type="source">https://akaflieg-freiburg.github.io/enroute/assets/images/10-Map.png</image>
-    </screenshot>
-  </screenshots>
-  <categories>
-    <category>Utility</category>
-    <category>Maps</category>
-  </categories>
-  <url type="homepage">https://akaflieg-freiburg.github.io/enroute/</url>
-  <project_group>Flatpak</project_group>
-  <update_contact>stefan.kebekus@gmail.com</update_contact>
-  <provides>
-    <binary>${PROJECT_NAME}</binary>
-  </provides>
-</component>
diff --git a/metadata/de.akaflieg_freiburg.enroute.desktop.in b/metadata/de.akaflieg_freiburg.enroute.desktop.in
deleted file mode 100644
index 0f60ef91f..000000000
--- a/metadata/de.akaflieg_freiburg.enroute.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=enroute flight navigation
-GenericName=Flight Navigation
-Comment=Navigation app for VFR pilots
-Icon=${APP_ID}
-TryExec=${PROJECT_NAME}
-Exec=${PROJECT_NAME}
-Terminal=false
-MimeType=application/geo+json;application/gpx+xml;
-Categories=Utility;Maps;
diff --git a/metadata/de.akaflieg_freiburg.enroute.json.in b/metadata/de.akaflieg_freiburg.enroute.json.in
deleted file mode 100644
index f829486ed..000000000
--- a/metadata/de.akaflieg_freiburg.enroute.json.in
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "app-id": "${APP_ID}",
-    "runtime": "org.kde.Platform",
-    "runtime-version": "5.12",
-    "sdk": "org.kde.Sdk",
-    "command": "${PROJECT_NAME}",
-    "finish-args": [
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--device=dri"
-    ],
-    "modules": [
-        {
-            "name": "enroute",
-            "buildsystem": "cmake-ninja",
-            "config-opts": ["-DCMAKE_BUILD_TYPE=RelWithDebInfo"],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/Akaflieg-Freiburg/enroute.git",
-                    "tag": "${PROJECT_VERSION}",
-                }
-            ]
-        }
-    ]
-}