From 633ccc2bd0a5e1261e27f83ed3bd9cf9c6e066b9 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Fri, 4 Sep 2020 00:13:25 +0200
Subject: [PATCH 1/3] Fix CMAKE_INSTALL_LIBDIR var

Signed-off-by: Tilo Spannagel <development@tilosp.de>
---
 com.nextcloud.desktopclient.nextcloud.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/com.nextcloud.desktopclient.nextcloud.yml b/com.nextcloud.desktopclient.nextcloud.yml
index 47b3d2d..1f83215 100644
--- a/com.nextcloud.desktopclient.nextcloud.yml
+++ b/com.nextcloud.desktopclient.nextcloud.yml
@@ -20,7 +20,6 @@ finish-args:
   - --talk-name=org.freedesktop.secrets
   - --talk-name=org.kde.StatusNotifierWatcher
   - --own-name=org.kde.*
-  - --env=LD_LIBRARY_PATH=/app/lib:/app/lib/nextcloud
   - --env=TMPDIR=/var/tmp
 
 cleanup:
@@ -40,8 +39,7 @@ modules:
   - name: qtkeychain
     buildsystem: cmake
     config-opts:
-      - -DCMAKE_INSTALL_LIBDIR=/app/lib
-      - -DLIB_INSTALL_DIR=/app/lib
+      - -DCMAKE_INSTALL_LIBDIR=lib
       - -DBUILD_TRANSLATIONS=NO
     sources:
       - type: archive
@@ -52,9 +50,8 @@ modules:
     buildsystem: cmake
     config-opts:
       - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_LIBDIR=lib
       - -DNO_SHIBBOLETH=1
-      - -DCMAKE_INSTALL_LIBDIR=/app/lib
-      - -DLIB_INSTALL_DIR=/app/lib
       - -DBUILD_SHELL_INTEGRATION_DOLPHIN=0
       - -DBUILD_SHELL_INTEGRATION_NAUTILUS=0
     post-install:

From bc1ed9ea428109f3ec24d9bf696839b198b3df94 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Fri, 4 Sep 2020 01:52:07 +0200
Subject: [PATCH 2/3] Update to org.kde.Platform version 5.15

Signed-off-by: Tilo Spannagel <development@tilosp.de>
---
 .gitmodules                               |  3 +++
 com.nextcloud.desktopclient.nextcloud.yml | 17 +++++++----------
 shared-modules                            |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 shared-modules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1e7a990
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "shared-modules"]
+	path = shared-modules
+	url = https://github.com/flathub/shared-modules.git
diff --git a/com.nextcloud.desktopclient.nextcloud.yml b/com.nextcloud.desktopclient.nextcloud.yml
index 1f83215..7c1a973 100644
--- a/com.nextcloud.desktopclient.nextcloud.yml
+++ b/com.nextcloud.desktopclient.nextcloud.yml
@@ -1,9 +1,12 @@
 app-id: com.nextcloud.desktopclient.nextcloud
 
 runtime: org.kde.Platform
-runtime-version: '5.12'
+runtime-version: '5.15'
 sdk: org.kde.Sdk
 
+base: io.qt.qtwebengine.BaseApp
+base-version: '5.15'
+
 command: nextcloud
 rename-icon: Nextcloud
 copy-icon: true
@@ -24,17 +27,11 @@ finish-args:
 
 cleanup:
   - /share/icons/hicolor/1024x1024
+cleanup-commands:
+  - /app/cleanup-BaseApp.sh
 
 modules:
-  - name: libsecret
-    config-opts:
-      - --disable-static
-      - --disable-gtk-doc
-      - --disable-manpages
-    sources:
-      - type: archive
-        url: https://gitlab.gnome.org/GNOME/libsecret/-/archive/0.19.1/libsecret-0.19.1.tar.gz
-        sha256: 303c6e8cf3e12534e885b0682cd6130716c6834397b76d3829321b6d83b2389c
+  - shared-modules/libsecret/libsecret.json
 
   - name: qtkeychain
     buildsystem: cmake
diff --git a/shared-modules b/shared-modules
new file mode 160000
index 0000000..cc50bdb
--- /dev/null
+++ b/shared-modules
@@ -0,0 +1 @@
+Subproject commit cc50bdbb34cc3d29bf61cfea5e27cd980b7bda04

From ec4f8dc7a41da579e87e5cb28d25899e13693b46 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Fri, 4 Sep 2020 02:25:43 +0200
Subject: [PATCH 3/3] Do cleanup

Signed-off-by: Tilo Spannagel <development@tilosp.de>
---
 com.nextcloud.desktopclient.nextcloud.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/com.nextcloud.desktopclient.nextcloud.yml b/com.nextcloud.desktopclient.nextcloud.yml
index 7c1a973..f38a588 100644
--- a/com.nextcloud.desktopclient.nextcloud.yml
+++ b/com.nextcloud.desktopclient.nextcloud.yml
@@ -38,6 +38,10 @@ modules:
     config-opts:
       - -DCMAKE_INSTALL_LIBDIR=lib
       - -DBUILD_TRANSLATIONS=NO
+    cleanup:
+      - /include
+      - /mkspecs
+      - /lib/cmake
     sources:
       - type: archive
         url: https://github.com/frankosterfeld/qtkeychain/archive/v0.10.0.tar.gz
@@ -51,6 +55,8 @@ modules:
       - -DNO_SHIBBOLETH=1
       - -DBUILD_SHELL_INTEGRATION_DOLPHIN=0
       - -DBUILD_SHELL_INTEGRATION_NAUTILUS=0
+    cleanup:
+      - /include
     post-install:
       - install -Dm644 -t /app/share/metainfo com.nextcloud.desktopclient.nextcloud.metainfo.xml
     sources: