From 975f0db7ec150f324a31ef0d14641a1c31c563ec Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Fri, 14 Feb 2020 11:33:12 +0100 Subject: [PATCH] build: Add a Flatpak manifest This allows building the master branch of QElectroTech with a simple command: $ flatpak-builder _build build-aux/flatpak/org.qelectrotech.QElectroTech.json --- .gitignore | 1 + .../org.qelectrotech.QElectroTech.json | 37 ++++++++++++++++ ...001-build-Fix-the-installation-paths.patch | 44 +++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 build-aux/flatpak/org.qelectrotech.QElectroTech.json create mode 100644 build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch diff --git a/.gitignore b/.gitignore index d29445011..21f10bf57 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.snap +.flatpak-builder diff --git a/build-aux/flatpak/org.qelectrotech.QElectroTech.json b/build-aux/flatpak/org.qelectrotech.QElectroTech.json new file mode 100644 index 000000000..69278dbdd --- /dev/null +++ b/build-aux/flatpak/org.qelectrotech.QElectroTech.json @@ -0,0 +1,37 @@ +{ + "id": "org.qelectrotech.QElectroTech", + "runtime": "org.kde.Platform", + "runtime-version": "5.14", + "sdk": "org.kde.Sdk", + "command": "qelectrotech", + "rename-desktop-file": "qelectrotech.desktop", + "rename-appdata-file": "qelectrotech", + "rename-icon": "qelectrotech", + "copy-icon": true, + "finish-args": [ + "--socket=wayland", + "--socket=x11", + "--device=dri", + "--share=ipc", + "--filesystem=host" + ], + "modules": [ + { + "name": "qelectrotech", + "buildsystem": "qmake", + "post-install": [ + "mv /app/share/mime/packages/qelectrotech.xml /app/share/mime/packages/org.qelectrotech.QElectroTech.xml" + ], + "sources": [ + { + "type": "dir", + "path": "../.." + }, + { + "type": "patch", + "path": "patches/0001-build-Fix-the-installation-paths.patch" + } + ] + } + ] +} diff --git a/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch b/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch new file mode 100644 index 000000000..fb1b335df --- /dev/null +++ b/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch @@ -0,0 +1,44 @@ +From 579ee22f1d2bef560ec90d324a0e476b81faf495 Mon Sep 17 00:00:00 2001 +From: Mathieu Bridon +Date: Tue, 7 Jan 2020 14:39:08 +0100 +Subject: [PATCH] build: Fix the installation paths + +--- + qelectrotech.pro | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/qelectrotech.pro b/qelectrotech.pro +index 07e51fb..2a86b91 100644 +--- a/qelectrotech.pro ++++ b/qelectrotech.pro +@@ -5,20 +5,20 @@ + # Chemins utilises pour la compilation et l'installation de QET + unix { + # Chemins UNIX +- COMPIL_PREFIX = '/usr/local/' +- INSTALL_PREFIX = '/usr/local/' ++ COMPIL_PREFIX = '/app/' ++ INSTALL_PREFIX = '/app/' + QET_BINARY_PATH = 'bin/' + QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/' + QET_COMMON_TBT_PATH = 'share/qelectrotech/titleblocks/' + QET_LANG_PATH = 'share/qelectrotech/lang/' + QET_EXAMPLES_PATH = 'share/qelectrotech/examples/' +- QET_LICENSE_PATH = 'doc/qelectrotech/' +- QET_MIME_XML_PATH = '../share/mime/application/' +- QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/' +- QET_MIME_PACKAGE_PATH = '../share/mime/packages/' ++ QET_LICENSE_PATH = 'share/doc/qelectrotech/' ++ QET_MIME_XML_PATH = 'share/mime/application/' ++ QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/' ++ QET_MIME_PACKAGE_PATH = 'share/mime/packages/' + QET_DESKTOP_PATH = 'share/applications/' + QET_ICONS_PATH = 'share/icons/hicolor/' +- QET_MAN_PATH = 'man/' ++ QET_MAN_PATH = 'share/man/' + QET_APPDATA_PATH = 'share/appdata' + } + win32 { +-- +2.24.1 +