diff --git a/.gitignore b/.gitignore index 8aa3903..0bc0c0c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ build/ .vscode/ .idea/ builddir/* -build-aux/* +build-aux/flatpak/_build/* +build-aux/flatpak/.flatpak-builder/* flatpak/* diff --git a/build-aux/flatpak/de.wolfvollprecht.UberWriter.json b/build-aux/flatpak/de.wolfvollprecht.UberWriter.json index a847af9..aca8a30 100644 --- a/build-aux/flatpak/de.wolfvollprecht.UberWriter.json +++ b/build-aux/flatpak/de.wolfvollprecht.UberWriter.json @@ -1,10 +1,10 @@ { - "app-id" : "de.wolfvollprecht.UberWriter", - "runtime" : "org.gnome.Platform", - "runtime-version" : "3.34", - "sdk" : "org.gnome.Sdk", - "command" : "uberwriter", - "finish-args" : [ + "app-id": "de.wolfvollprecht.UberWriter", + "runtime": "org.gnome.Platform", + "runtime-version": "3.36", + "sdk": "org.gnome.Sdk", + "command": "uberwriter", + "finish-args": [ "--socket=x11", "--socket=wayland", "--share=ipc", @@ -13,108 +13,97 @@ "--env=PATH=/app/bin:/usr/bin:/app/extensions/TexLive/2019/bin/x86_64-linux/", "--metadata=X-DConf=migrate-path=/de/wolfvollprecht/UberWriter/" ], - "add-extensions" : { - "de.wolfvollprecht.UberWriter.Plugin" : { - "directory" : "extensions", - "version" : "stable", - "subdirectories" : true, - "no-autodownload" : true, - "autodelete" : true - } + "add-extensions": { + "de.wolfvollprecht.UberWriter.Plugin": { + "directory": "extensions", + "version": "stable", + "subdirectories": true, + "no-autodownload": true, + "autodelete": true + } }, - "modules" : [ - { - "name" : "gspell", - "sources" : [ - { - "type" : "archive", - "url" : "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz", - "sha256" : "819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5" - } - ] + "modules": [{ + "name":"gspell", + "sources":[{ + "type":"archive", + "url":"https://download.gnome.org/sources/gspell/1.8/gspell-1.8.3.tar.xz", + "sha256":"5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8" + }] + }, + { + "name": "pandoc", + "only-arches": [ + "x86_64" + ], + "buildsystem": "simple", + "build-commands": [ + "cp bin/pandoc /app/bin/pandoc", + "cp bin/pandoc-citeproc /app/bin/pandoc-citeproc" + ], + "sources": [{ + "type": "archive", + "url": "https://github.com/jgm/pandoc/releases/download/2.9.2/pandoc-2.9.2-linux-amd64.tar.gz", + "sha256": "039f155b6166c1e268479bcb06af2dba99eb7795cbff7b3c13b4875388195d08" + }] + }, + { + "name": "pipdeps", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} regex pypandoc" + ], + "sources": [{ + "type": "file", + "url": "https://files.pythonhosted.org/packages/75/28/521c6dc7fef23a68368efefdcd682f5b3d1d58c2b90b06dc1d0b805b51ae/wheel-0.34.2.tar.gz", + "sha256": "8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96" }, { - "name" : "pandoc", - "only-arches" : [ - "x86_64" - ], - "buildsystem" : "simple", - "build-commands" : [ - "cp bin/pandoc /app/bin/pandoc", - "cp bin/pandoc-citeproc /app/bin/pandoc-citeproc" - ], - "sources" : [ - { - "type" : "archive", - "url" : "https://github.com/jgm/pandoc/releases/download/2.2/pandoc-2.2-linux.tar.gz", - "sha256" : "06ecd882e42ef9b7390b1c82e1e71b3ea48679181289b9b810a8797825bed8ed" - } - ] + "type": "file", + "url": "https://files.pythonhosted.org/packages/8e/76/66066b7bc71817238924c7e4b448abdb17eb0c92d645769c223f9ace478f/pip-20.0.2.tar.gz", + "sha256": "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/71/81/00184643e5a10a456b4118fc12c96780823adb8ed974eb2289f29703b29b/pypandoc-1.4.tar.gz", + "sha256": "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b" }, { - "name" : "pipdeps", - "buildsystem" : "simple", - "build-commands" : [ - "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} regex pypandoc" - ], - "sources" : [ - { - "type" : "file", - "url" : "https://files.pythonhosted.org/packages/5d/c1/45947333669b31bc6b4933308dd07c2aa2fedcec0a95b14eedae993bd449/wheel-0.31.0.tar.gz", - "sha256" : "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce" - }, - { - "type" : "file", - "url" : "https://files.pythonhosted.org/packages/ae/e8/2340d46ecadb1692a1e455f13f75e596d4eab3d11a57446f08259dee8f02/pip-10.0.1.tar.gz", - "sha256" : "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68" - }, - { - "type" : "file", - "url" : "https://files.pythonhosted.org/packages/71/81/00184643e5a10a456b4118fc12c96780823adb8ed974eb2289f29703b29b/pypandoc-1.4.tar.gz", - "sha256" : "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b" - }, - { - "type" : "file", - "url" : "https://files.pythonhosted.org/packages/a2/51/c39562cfed3272592c60cfd229e5464d715b78537e332eac2b695422dc49/regex-2018.02.21.tar.gz", - "sha256" : "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29" - }, - { - "type" : "file", - "url" : "https://files.pythonhosted.org/packages/9e/54/04d88a59efa33fefb88133ceb638cdf754319030c28aadc5a379d82140ed/pyenchant-2.0.0.tar.gz", - "sha256" : "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0" - } - ] + "type": "file", + "url": "https://files.pythonhosted.org/packages/e8/76/8ac7f467617b9cfbafcef3c76df6f22b15de654a62bea719792b00a83195/regex-2020.2.20.tar.gz", + "sha256": "9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5" }, { - "name" : "fonts", - "buildsystem" : "simple", - "build-commands" : [ - "mkdir -p /app/share/fonts/", - "cp ttf/* /app/share/fonts/" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/mozilla/Fira", - "tag" : "4.202" - } - ] - }, - { - "name" : "uberwriter", - "buildsystem" : "meson", - "config-opts" : [ - "-Dprofile=development" - ], - "sources" : [ - { - "type" : "dir", - "path" : "../../" - } - ], - "post-install" : [ - "install -d /app/extensions" - ] - } + "type": "file", + "url": "https://files.pythonhosted.org/packages/14/4b/6f7a3f2bb1e2fa4d3007126578cae0b9910ff46c4957bef5bd4b92733011/pyenchant-3.0.1.tar.gz", + "sha256": "1bd26a644abf80196a9de3f2d820ebafb7e7f78385e392ce77cb1552f164d559" + }] + }, + { + "name": "fonts", + "buildsystem": "simple", + "build-commands": [ + "mkdir -p /app/share/fonts/", + "cp ttf/* /app/share/fonts/" + ], + "sources": [{ + "type": "git", + "url": "https://github.com/mozilla/Fira", + "tag": "4.202" + }] + }, + { + "name": "uberwriter", + "buildsystem": "meson", + "config-opts" : [ + "-Dprofile=development" + ], + "sources": [{ + "type" : "dir", + "path" : "../../" + }], + "post-install": [ + "install -d /app/extensions" + ] + } ] } diff --git a/build-aux/flatpak/de.wolfvollprecht.UberWriter.pipdeps.json b/build-aux/flatpak/de.wolfvollprecht.UberWriter.pipdeps.json deleted file mode 100644 index dde1450..0000000 --- a/build-aux/flatpak/de.wolfvollprecht.UberWriter.pipdeps.json +++ /dev/null @@ -1,35 +0,0 @@ - - { - "name": "pipdeps", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} pyenchant regex pypandoc" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/5d/c1/45947333669b31bc6b4933308dd07c2aa2fedcec0a95b14eedae993bd449/wheel-0.31.0.tar.gz", - "sha256": "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/ae/e8/2340d46ecadb1692a1e455f13f75e596d4eab3d11a57446f08259dee8f02/pip-10.0.1.tar.gz", - "sha256": "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/71/81/00184643e5a10a456b4118fc12c96780823adb8ed974eb2289f29703b29b/pypandoc-1.4.tar.gz", - "sha256": "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/a2/51/c39562cfed3272592c60cfd229e5464d715b78537e332eac2b695422dc49/regex-2018.02.21.tar.gz", - "sha256": "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/9e/54/04d88a59efa33fefb88133ceb638cdf754319030c28aadc5a379d82140ed/pyenchant-2.0.0.tar.gz", - "sha256": "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0" - } - ] - } \ No newline at end of file diff --git a/build-aux/flatpak/flatpak_gnome_web_photo.json b/build-aux/flatpak/flatpak_gnome_web_photo.json deleted file mode 100644 index 1990d45..0000000 --- a/build-aux/flatpak/flatpak_gnome_web_photo.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "id": "de.wolfvollprecht.UberWriter.Plugin.WebPhoto", - "runtime": "de.wolfvollprecht.UberWriter", - "branch": "stable", - "sdk": "org.gnome.Sdk//3.32", - "build-extension": true, - "separate-locales": false, - "appstream-compose": false, - "finish-args": [ - ], - "build-options" : { - "prefix": "/app/extensions/WebPhoto", - "env": { - "PATH": "/app/extensions/TexLive/bin:/app/extensions/TexLive/2018/bin/x86_64-linux:/app/bin:/usr/bin" - } - }, - "cleanup": [], - "modules": [ - { - "name": "Glib2", - "sources": [ - { - "type": "archive", - "url": "http://ftp.gnome.org/pub/gnome/sources/glib/2.56/glib-2.56.1.tar.xz", - "sha256": "40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d" - } - ] - }, - { - "name": "LibIDL", - "buildsystem": "autotools", - "sources": [ - { - "type": "git", - "url": "https://github.com/GNOME/libIDL/", - "tag": "LIBIDL_0_8_14", - "commit": "666fcbf086fb859738b67417c99a9895bb3d8ce5" - } - ] - }, - { - "name": "ORBit2", - "rm-configure": true, - "config-opts": ["--prefix=/app/extensions/WebPhoto"], - "build-options": { - "env":{ - "PKG_CONFIG_PATH": "/app/extensions/WebPhoto/lib/pkgconfig", - "GNOME2_DIR": "/app/extensions/WebPhoto", - "LD_LIBRARY_PATH": "/app/extensions/WebPhoto/lib", - "PATH": "/app/extensions/WebPhoto/bin:/usr/bin" - } - }, - "sources": [ - { - "type": "archive", - "url": "http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2", - "sha256": "55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550" - }, - { - "type": "patch", - "path": "ORBit2.patch" - }, - { - "type": "script", - "dest-filename": "autogen.sh", - "commands": [ - "autoreconf -fi" - ] - } - ] - }, - { - "name": "gconf", - "buildsystem": "autotools", - "config-opts": ["--prefix=/app/extensions/WebPhoto"], - "build-options": { - "env":{ - "PKG_CONFIG_PATH": "/app/extensions/WebPhoto/lib/pkgconfig", - "GNOME2_DIR": "/app/extensions/WebPhoto", - "LD_LIBRARY_PATH": "/app/extensions/WebPhoto/lib", - "PATH": "/app/extensions/WebPhoto/bin:/usr/bin" - } - }, - "sources": [ - { - "type": "archive", - "url": "http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-3.2.6.tar.xz", - "sha256": "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c" - } - ] - }, - { - "name": "gnome-web-photo", - "buildsystem": "autotools", - "config-opts": [ - "--with-gtk=3.0", - "--prefix=/app/extensions/WebPhoto" - ], - "build-options": { - "env":{ - "LD_LIBRARY_PATH": "/app/extensions/WebPhoto/lib", - "PATH": "/app/bin:/app/extensions/WebPhoto/bin:/usr/bin", - "ACLOCAL_PATH": "/app/extensions/WebPhoto/share/aclocal" - } - }, - "sources": [ - { - "type": "git", - "url": "https://github.com/GNOME/gnome-web-photo/", - "tag": "0.10.6", - "commit": "827d6b98c120b4dd8d689a1faf52450685ca6d46" - }, - { - "type": "patch", - "path": "GnomeWebPhoto.patch" - } - - ] - } - ] -}