Merge branch 'dev' into 'master'

Dev -> Master

See merge request b0/matrique!12

.gitlab-ci.yml

@@ -13,7 +13,7 @@ build-native:
     - make -j4
   artifacts:
     paths:
-    - build
+    - build/matrique
 
 build-flatpak:
   image: registry.gitlab.com/b0/matrique/flatpak
@@ -27,17 +27,4 @@ build-flatpak:
     - cd ../
   artifacts:
     paths:
-    - flatpak/matrique.flatpak
+    - flatpak/matrique.flatpak
-    
-deploy-flatpak:
-  stage: deploy
-  only:
-  - master
-  tags:
-  - deploy-flatpak
-  dependencies: []
-  before_script:
-    - git submodule update --init --recursive
-  script:
-    - cd flatpak
-    - flatpak-builder --repo=/var/www/matrique-flatpak build-dir org.eu.encom.matrique.json --force-clean --gpg-sign=52986BF4D61350EC249F2E891B0DB3358FC5E4B2

flatpak/org.eu.encom.matrique.json

@@ -3,8 +3,9 @@
     "id": "org.eu.encom.matrique",
     "rename-icon": "matrique",
     "rename-desktop-file": "matrique.desktop",
+    "rename-appdata-file": "matrique.appdata.xml",
     "runtime": "org.kde.Platform",
-    "runtime-version": "5.10",
+    "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "matrique",
     "finish-args": [
@@ -21,14 +22,12 @@
     "modules": [
         {
             "name": "matrique",
-            "buildsystem": "simple",
+            "buildsystem": "qmake",
-            "build-commands": [
+            "post-install": [
-		"ls -l",
-                "qmake matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler",
-		"make -j4",
-		"ls -l",
 		"install -D matrique /app/bin/matrique",
 		"install -D matrique.desktop /app/share/applications/matrique.desktop",
+		"mkdir -p /app/share/appdata",
+		"install -D matrique.appdata.xml /app/share/appdata/",
 		 "for i in 16x16 32x32 128x128 256x256 512x512; do install -Dm644 icons/${i}.png /app/share/icons/hicolor/${i}/apps/matrique.png; done"
             ],
             "sources": [

matrique.appdata.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.eu.encom.matrique</id>
+  <metadata_license>GFDL</metadata_license>
+  <project_license>GPL-3.0</project_license>
+  <name>Matrique</name>
+  <summary>IM client for the Matrix protocol</summary>
+  <description>
+    <p>
+      Matrique is a glossy cross-platform client for Matrix, the decentralized communication protocol for instant messaging.
+    </p>
+    <p>
+      The source code is generally available at <a href="https://gitlab.com/b0/matrique" target="_blank">Gitlab</a>
+    </p>
+  </description>
+  <launchable type="desktop-id">org.eu.encom.matrique</launchable>
+  <screenshots>
+​    <screenshot type="default">
+​      <caption>Overview</caption>
+​      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/1.png</image>
+​    </screenshot>
+​    <screenshot>
+​      <caption>Room Config</caption>
+​      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/2.png</image>
+​    </screenshot>
+​    <screenshot>
+​      <caption>Create Room</caption>
+​      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/3.png</image>
+​    </screenshot>
+​    <screenshot>
+​      <caption>Settings Panel</caption>
+​      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/4.png</image>
+​    </screenshot>
+​  </screenshots>
+  <url type="homepage">https://gitlab.com/b0/matrique</url>
+  <content_rating type="oars-1.0">
+    <content_attribute id="social-chat">intense</content_attribute>
+    <content_attribute id="social-audio">intense</content_attribute>
+  </content_rating>
+  <releases>
+    <release version="167" date="2018-08-14" type="stable"></release>
+  </releases>
+</component>

matrique.pro

@@ -60,3 +60,13 @@ HEADERS += \
     src/messageeventmodel.h \
     src/imageproviderconnection.h \
     src/emojimodel.h
+
+unix:!mac {
+    metainfo.files = $$PWD/matrique.appdata.xml
+    metainfo.path = $$PREFIX/share/metainfo
+    desktop.files = $$PWD/matrique.desktop
+    desktop.path = $$PREFIX/share/applications
+    icons.files = $$PWD/icons/64x64.png
+    icons.path = $$PREFIX/share/icons/hicolor/64x64/apps
+    INSTALLS += metainfo desktop mime icons
+}