From 57207d2025640891ba1e30221a14ec1dab4cbd4c Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 15 Aug 2018 02:11:26 +0000 Subject: [PATCH 1/4] Remove flatpak deploy. --- .gitlab-ci.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 412c4e7..605d0dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,17 +27,4 @@ build-flatpak: - cd ../ artifacts: paths: - - 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 \ No newline at end of file + - flatpak/matrique.flatpak \ No newline at end of file From bd1ca426f7828e77dac49040893561ad92e63811 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 15 Aug 2018 02:40:25 +0000 Subject: [PATCH 2/4] Less build artifacts. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 605d0dd..8fc139f 100644 --- a/.gitlab-ci.yml +++ b/.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 From f5aac5f40be826597317557825845c565c2923c0 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 15 Aug 2018 18:18:40 +0800 Subject: [PATCH 3/4] Add appdata --- flatpak/org.eu.encom.matrique.json | 13 +++++---- matrique.appdata.xml | 43 ++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 matrique.appdata.xml diff --git a/flatpak/org.eu.encom.matrique.json b/flatpak/org.eu.encom.matrique.json index 607ec0d..127afa3 100644 --- a/flatpak/org.eu.encom.matrique.json +++ b/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", - "build-commands": [ - "ls -l", - "qmake matrique.pro -spec linux-g++ CONFIG+=qtquickcompiler", - "make -j4", - "ls -l", + "buildsystem": "qmake", + "post-install": [ "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": [ diff --git a/matrique.appdata.xml b/matrique.appdata.xml new file mode 100644 index 0000000..3a84768 --- /dev/null +++ b/matrique.appdata.xml @@ -0,0 +1,43 @@ + + + org.eu.encom.matrique + GFDL + GPL-3.0 + Matrique + IM client for the Matrix protocol + +

+ Matrique is a glossy cross-platform client for Matrix, the decentralized communication protocol for instant messaging. +

+

+ The source code is generally available at Gitlab +

+
+ org.eu.encom.matrique + +​ +​ Overview +​ https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/1.png +​ +​ +​ Room Config +​ https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/2.png +​ +​ +​ Create Room +​ https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/3.png +​ +​ +​ Settings Panel +​ https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/4.png +​ +​ + https://gitlab.com/b0/matrique + + intense + intense + + + + +
From 3d04a94f75b830f80d4120ca792ccd4e480cfa90 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 15 Aug 2018 18:26:38 +0800 Subject: [PATCH 4/4] Fix for Flathub. --- icons/64x64.png | Bin 0 -> 9821 bytes matrique.pro | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 icons/64x64.png diff --git a/icons/64x64.png b/icons/64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..961410c06275633d851c311cd94a337c7b1dcf9c GIT binary patch literal 9821 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 D5}EHZ literal 0 HcmV?d00001 diff --git a/matrique.pro b/matrique.pro index 67fe50e..f56f899 100644 --- a/matrique.pro +++ b/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 +}