From fa44b505de421397493a2d3eed5f90567693a48f Mon Sep 17 00:00:00 2001 From: TheJackiMonster Date: Mon, 16 May 2022 16:01:12 +0200 Subject: [PATCH] Removing old flatpak files and adding generic package resources Signed-off-by: TheJackiMonster --- package/build_flatpak.sh | 9 -- package/flatpak/ch.theologeek.Manuskript.json | 147 ------------------ package/flatpak/manuskript.py | 12 ++ package/flatpak/python3-modules.json | 68 -------- package/flatpak/test_flatpak.sh | 3 - .../ch.theologeek.Manuskript.appdata.xml | 3 +- .../ch.theologeek.Manuskript.desktop | 0 7 files changed, 14 insertions(+), 228 deletions(-) delete mode 100755 package/build_flatpak.sh delete mode 100644 package/flatpak/ch.theologeek.Manuskript.json create mode 100644 package/flatpak/manuskript.py delete mode 100644 package/flatpak/python3-modules.json delete mode 100755 package/flatpak/test_flatpak.sh rename {package/flatpak => resources}/ch.theologeek.Manuskript.appdata.xml (93%) rename {package/flatpak => resources}/ch.theologeek.Manuskript.desktop (100%) diff --git a/package/build_flatpak.sh b/package/build_flatpak.sh deleted file mode 100755 index 1be394f..0000000 --- a/package/build_flatpak.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -cd flatpak - -# Generate config for python dependencies as modules: -flatpak-pip-generator lxml pyenchant pyspellchecker symspellpy markdown - -# Build flatpak with all necessary modules: -flatpak permission-reset ch.theologeek.Manuskript -flatpak-builder build-dir ch.theologeek.Manuskript.json --force-clean diff --git a/package/flatpak/ch.theologeek.Manuskript.json b/package/flatpak/ch.theologeek.Manuskript.json deleted file mode 100644 index 9414128..0000000 --- a/package/flatpak/ch.theologeek.Manuskript.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "app-id": "ch.theologeek.Manuskript", - "runtime": "org.kde.Platform", - "runtime-version": "5.15-21.08", - "base": "io.qt.qtwebengine.BaseApp", - "base-version": "5.15-21.08", - "sdk": "org.kde.Sdk", - "add-extensions": { - "org.freedesktop.Sdk.Extension.texlive": { - "directory": "texlive", - "subdirectories": true, - "autodelete": true, - "version": "21.08" - } - }, - "command": "manuskript", - "finish-args": [ - "--share=ipc", - "--socket=x11", - "--device=dri", - - /* access to local files */ - "--filesystem=home", - "--env=QT_QPA_PLATFORM=xcb", - "--env=TMPDIR=/var/tmp", - - /* add paths of TeXlive Flatpak extension binaries */ - "--env=PATH=/usr/bin:/app/bin:/app/texlive/bin:/app/texlive/bin/x86_64-linux:/app/texlive/bin/aarch64-linux" - - /* allow using the QtWebEngine */ - "--env=QTWEBENGINEPROCESS_PATH=/app/bin/QtWebEngineProcess" - ], - "modules": [ - "python3-modules.json", - { - "name": "sip", - "buildsystem": "simple", - "build-commands": [ - "python3 configure.py -b ${FLATPAK_DEST}/bin -d ${FLATPAK_DEST}/lib/python3.9/site-packages -e ${FLATPAK_DEST}/include -v ${FLATPAK_DEST}/share/sip --stubsdir=/app/lib/python3.9/site-packages --sip-module PyQt5.sip", - "make -j $FLATPAK_BUILDER_N_JOBS", - "make install" - ], - "sources": [ - { - "type" : "archive", - "url" : "https://distfiles.macports.org/py-sip/sip-4.19.22.tar.gz", - "sha256" : "e1b768824ec1a2ee38dd536b6b6b3d06de27b00a2f5f55470d1b512306e3be45" - } - ] - }, - { - "name" : "pyqt5", - "buildsystem": "simple", - "build-commands": [ - "python3 configure.py --confirm-license --sip-incdir=/app/include --bindir=/app/bin --destdir=/app/lib/python3.9/site-packages --designer-plugindir=/app/lib/plugins/designer --qml-plugindir=/app/lib/plugins/PyQt5 --sipdir=/app/share/sip --stubsdir=/app/lib/python3.9/site-packages/PyQt5 --sip=/app/bin/sip", - "make -j $FLATPAK_BUILDER_N_JOBS", - "make install" - ], - "sources" : [ - { - "type" : "archive", - "url": "https://files.pythonhosted.org/packages/4d/81/b9a66a28fb9a7bbeb60e266f06ebc4703e7e42b99e3609bf1b58ddd232b9/PyQt5-5.14.2.tar.gz", - "sha256": "bd230c6fd699eabf1ceb51e13a8b79b74c00a80272c622427b80141a22269eb0" - } - ] - }, - { - "name": "enchant", - "buildsystem": "autotools", - "sources": [ - { - "type": "archive", - "url": "https://github.com/AbiWord/enchant/releases/download/v2.3.1/enchant-2.3.1.tar.gz", - "sha256": "7b4b1afcf2cd8bfa691deea6188404d337f23174bbc39b9c2add2bf340736e9c" - } - ] - }, - { - "name": "pandoc", - "buildsystem": "simple", - "build-commands": [ - "cp -R . /app/" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/jgm/pandoc/releases/download/2.16.1/pandoc-2.16.1-linux-amd64.tar.gz", - "sha256": "3fe3d42179af289d4f5452b9317d2bc9cd139a4f33a37f68d70e128f1d415aa4", - "only-arches": [ "x86_64" ] - }, - { - "type": "archive", - "url": "https://github.com/jgm/pandoc/releases/download/2.16.1/pandoc-2.16.1-linux-arm64.tar.gz", - "sha256": "c1130d917fb6e8c9a29cadc52ef9e4c4405450868d5f7dd3018f413755ac2b31", - "only-arches": [ "aarch64" ] - } - ], - "modules": [ - { - "name": "texlive-extension", - "buildsystem": "simple", - "build-commands": [ - "mkdir /app/texlive" - ] - } - ] - }, - { - "name": "manuskript", - "buildsystem": "simple", - "build-commands": [ - "mkdir -p /app/share/manuskript/", - "cp -R . /app/share/manuskript/", - "mkdir -p /app/bin/", - "ln -s ../share/manuskript/bin/manuskript /app/bin/manuskript" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/olivierkes/manuskript/archive/0.12.0.zip", - "sha256": "676da858d0a3bb658234191b2b36c56dbb07f03371469990de34f7701842c441" - }, - { - "type": "file", - "path": "ch.theologeek.Manuskript.desktop" - }, - { - "type": "file", - "path": "ch.theologeek.Manuskript.appdata.xml" - } - ], - "post-install": [ - /* install icons in several resolutions */ - "install -Dm644 icons/Manuskript/icon-16px.png /app/share/app-info/icons/flatpak/16x16/ch.theologeek.Manuskript.png", - "install -Dm644 icons/Manuskript/icon-32px.png /app/share/app-info/icons/flatpak/32x32/ch.theologeek.Manuskript.png", - "install -Dm644 icons/Manuskript/icon-64px.png /app/share/app-info/icons/flatpak/64x64/ch.theologeek.Manuskript.png", - "install -Dm644 icons/Manuskript/icon-128px.png /app/share/app-info/icons/flatpak/128x128/ch.theologeek.Manuskript.png", - "install -Dm644 icons/Manuskript/icon-256px.png /app/share/app-info/icons/flatpak/256x256/ch.theologeek.Manuskript.png", - "install -Dm644 icons/Manuskript/icon-512px.png /app/share/app-info/icons/flatpak/512x512/ch.theologeek.Manuskript.png", - - /* install desktop file and application data */ - "install -Dm644 ch.theologeek.Manuskript.desktop /app/share/desktop/ch.theologeek.Manuskript.desktop", - "install -Dm644 ch.theologeek.Manuskript.appdata.xml /app/share/appdata/ch.theologeek.Manuskript.appdata.xml" - ] - } - ] -} diff --git a/package/flatpak/manuskript.py b/package/flatpak/manuskript.py new file mode 100644 index 0000000..7e6d122 --- /dev/null +++ b/package/flatpak/manuskript.py @@ -0,0 +1,12 @@ +#! /usr/bin/env python3 + +import sys +sys.path.insert(1, "/app/lib/manuskript") +print(sys.version) + +# for debugging only +import PyQt5.QtWebEngineWidgets as webengine +print(webengine) + +from manuskript import main +main.run() diff --git a/package/flatpak/python3-modules.json b/package/flatpak/python3-modules.json deleted file mode 100644 index bb2af09..0000000 --- a/package/flatpak/python3-modules.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name": "python3-modules", - "buildsystem": "simple", - "build-commands": [], - "modules": [ - { - "name": "python3-lxml", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"lxml\" --no-build-isolation --ignore-installed" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/fe/4c/a4dbb4e389f75e69dbfb623462dfe0d0e652107a95481d40084830d29b37/lxml-4.6.4.tar.gz", - "sha256": "daf9bd1fee31f1c7a5928b3e1059e09a8d683ea58fb3ffc773b6c88cb8d1399c" - } - ] - }, - { - "name": "python3-pyenchant", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pyenchant\" --no-build-isolation" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/b1/a3/86763b6350727ca81c8fcc5bb5bccee416e902e0085dc7a902c81233717e/pyenchant-3.2.2.tar.gz", - "sha256": "1cf830c6614362a78aab78d50eaf7c6c93831369c52e1bb64ffae1df0341e637" - } - ] - }, - { - "name": "python3-pyspellchecker", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"pyspellchecker\" --no-build-isolation" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/11/ff/eeccf958759193883dfe63c9cf2dcb6374a581471dcfdb2e775c28ec56c4/pyspellchecker-0.6.2.tar.gz", - "sha256": "af6a1d0393a175499475a873f31e52135f1efd5fc912c979101b795b3c2ee77f" - } - ] - }, - { - "name": "python3-symspellpy", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"symspellpy\" --no-build-isolation" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/c8/83/d3192c486d81f6ccc10940c9be084682271e514c70ced94b29f4575a4c5c/editdistpy-0.1.3.tar.gz", - "sha256": "b3cad07319d79fe8b3ba6bf92293de962932917d88e9c624df7b6a44bddf1dcc" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/eb/2b/cc0303a1890bd1d622e9d63e0a3b8144917e8bb25df5c1e8465b8f40ca2a/symspellpy-6.7.5.tar.gz", - "sha256": "cde72316ce6082ea2d9da369eb0971b1f7b38b1cca9cf3ffea57c2f7680c1116" - } - ] - } - ] -} diff --git a/package/flatpak/test_flatpak.sh b/package/flatpak/test_flatpak.sh deleted file mode 100755 index 4bd13a9..0000000 --- a/package/flatpak/test_flatpak.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -flatpak-builder --user --install --force-clean build-dir ch.theologeek.Manuskript.json -flatpak run ch.theologeek.Manuskript diff --git a/package/flatpak/ch.theologeek.Manuskript.appdata.xml b/resources/ch.theologeek.Manuskript.appdata.xml similarity index 93% rename from package/flatpak/ch.theologeek.Manuskript.appdata.xml rename to resources/ch.theologeek.Manuskript.appdata.xml index 8178169..a4f1e7a 100644 --- a/package/flatpak/ch.theologeek.Manuskript.appdata.xml +++ b/resources/ch.theologeek.Manuskript.appdata.xml @@ -7,7 +7,7 @@ Manuskript - A open-source tool for writers + An open-source tool for writers

Manuskript provides a rich environment to help writers create their first draft and then further refine and edit their masterpiece.

With Manuskript you can:

@@ -38,6 +38,7 @@ ch.theologeek.Manuskript.desktop + diff --git a/package/flatpak/ch.theologeek.Manuskript.desktop b/resources/ch.theologeek.Manuskript.desktop similarity index 100% rename from package/flatpak/ch.theologeek.Manuskript.desktop rename to resources/ch.theologeek.Manuskript.desktop