From 0ff0b3f8ad1478ea208306f5cf0c81ccb4e41070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Str=C3=B6ger?= <florian.stroeger@gmail.com>
Date: Sat, 3 Nov 2018 16:44:53 +0100
Subject: [PATCH] merged the flathub changes here

---
 .gitmodules                            | 3 ---
 sh.popcorntime.PopcornTime.appdata.xml | 3 ++-
 sh.popcorntime.PopcornTime.yml         | 5 ++---
 shared-modules                         | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 160000 shared-modules

diff --git a/.gitmodules b/.gitmodules
index ea3adf1..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "shared-modules"]
-	path = shared-modules
-	url = https://github.com/flathub/shared-modules
diff --git a/sh.popcorntime.PopcornTime.appdata.xml b/sh.popcorntime.PopcornTime.appdata.xml
index dcba2d2..0cfeb0c 100644
--- a/sh.popcorntime.PopcornTime.appdata.xml
+++ b/sh.popcorntime.PopcornTime.appdata.xml
@@ -1,7 +1,8 @@
 <!-- Copyright 2018 Ströger Florian -->
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>sh.popcorntime.PopcornTime.desktop</id>
+  <id>sh.popcorntime.PopcornTime</id>
+  <launchable type="sh.popcorntime.PopcornTime.desktop"/>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <name>PopcornTime</name>
diff --git a/sh.popcorntime.PopcornTime.yml b/sh.popcorntime.PopcornTime.yml
index 6073d6b..602435e 100644
--- a/sh.popcorntime.PopcornTime.yml
+++ b/sh.popcorntime.PopcornTime.yml
@@ -3,8 +3,8 @@ runtime: org.freedesktop.Platform
 runtime-version: '18.08'
 branch: stable
 sdk: org.freedesktop.Sdk
-base: org.electronjs.Electron2.BaseApp
-base-version: stable
+base: io.atom.electron.BaseApp
+base-version: '18.08'
 command: popcorntime-wrapper
 separate-locales: false
 finish-args:
@@ -15,7 +15,6 @@ finish-args:
 - --filesystem=home:ro
 - --talk-name=org.freedesktop.Notifications
 modules:
-- shared-modules/gtk2/gtk2.json
 - name: popcorntime
   buildsystem: simple
   cleanup:
diff --git a/shared-modules b/shared-modules
deleted file mode 160000
index b66d4b9..0000000
--- a/shared-modules
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b66d4b9d4ecb0a56b278eb293a18ae3d3a066e99