diff --git a/kube/boost-configure b/kube/boost-configure deleted file mode 100755 index caf3c6f..0000000 --- a/kube/boost-configure +++ /dev/null @@ -1,11 +0,0 @@ - -./bootstrap.sh "$@" - - -cat <Makefile -all: - ./b2 -j `nproc` - -install: - ./b2 install -EOF \ No newline at end of file diff --git a/kube/boost.json b/kube/boost.json index 3e5318f..7f93db8 100644 --- a/kube/boost.json +++ b/kube/boost.json @@ -1,17 +1,16 @@ { "name": "boost", - "config-opts": [], "cleanup": [ "/lib/libboost_*.a" ], + "buildsystem": "simple", + "build-commands": [ + "./bootstrap.sh --prefix=/app --with-libraries=graph,program_options,system,thread", + "./b2 -j $FLATPAK_BUILDER_N_JOBS install" + ], "sources": [ { "type": "archive", - "url": "https://downloads.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2", - "sha256": "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b" - }, - { - "type": "file", - "path": "boost-configure", - "dest-filename": "configure" + "url": "https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.bz2", + "sha256": "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7" } ] -} \ No newline at end of file +} diff --git a/kube/com.kubeproject.kube.experimental.json b/kube/com.kubeproject.kube.experimental.json index b9cb11f..ca7986f 100644 --- a/kube/com.kubeproject.kube.experimental.json +++ b/kube/com.kubeproject.kube.experimental.json @@ -1,63 +1,49 @@ { "id": "com.kubeproject.kube", "branch": "experimental", "runtime": "org.freedesktop.Platform", "runtime-version": "1.6", "sdk": "org.freedesktop.Sdk", "command": "kubewrapper.sh", "rename-icon": "kube_icon", "desktop-file-name-prefix": "(Experimental Nightly) ", "tags": ["nightly", "experimental"], "finish-args": [ "--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri", "--filesystem=host", "--filesystem=/tmp", "--share=network", "--env=SASL_PATH=/usr/lib/sasl2/" ], "separate-locales": false, "modules": [ "kubedeps.json", { - "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"], + "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib"], "name": "sink", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ] }, { "config-opts": [ "-DCMAKE_INSTALL_LIBDIR=lib", "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++", "-DKUBE_APPLICATION_ID=com.kubeproject.kube", "-DEXPERIMENTAL_VIEWS=ON", "-DENABLE_EXTENSIONS=ON" ], "name": "kube", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ], "post-install": [ "rm -rf /app/include", "rm -rf /app/lib/*.la /app/lib/*.a /app/lib/*.prl " ] }, - { - "name": "kubewrapper", - "buildsystem": "simple", - "build-commands": [ - "cp kubewrapper.sh /app/bin/kubewrapper.sh", - "chmod +x /app/bin/kubewrapper.sh" - ], - "sources": [ - { - "type": "script", - "commands": ["gpg-agent --homedir ~/.gnupg --daemon --pinentry-program /app/bin/pinentry-qt", "kube --lockfile", "gpg-connect-agent killagent /bye"], - "dest-filename": "kubewrapper.sh" - } - ] - } + "wrapperscript.json" ] } diff --git a/kube/kubedeps.json b/kube/kubedeps.json index d69c4b0..0fc2397 100644 --- a/kube/kubedeps.json +++ b/kube/kubedeps.json @@ -1,95 +1,94 @@ { "name": "kubedeps", "modules": [ "qt.json", "boost.json", "gpgme.json", { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], - "name": "flatbuffers", + "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib"], + "name": "kasync", "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "https://github.com/google/flatbuffers.git", "branch": "v1.6.0" } ] + "sources": [ { "type": "git", "url": "git://anongit.kde.org/kasync.git", "branch": "master" } ] }, { - "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib", - "-DCMAKE_C_COMPILER=/usr/bin/clang", "-DCMAKE_CXX_COMPILER=/usr/bin/clang++"], - "name": "kasync", + "config-opts": ["-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_LIBDIR=lib", "-DFLATBUFFERS_BUILD_TESTS=OFF", "-DFLATBUFFERS_BUILD_FLATC=ON"], + "name": "flatbuffers", "buildsystem": "cmake-ninja", - "sources": [ { "type": "git", "url": "git://anongit.kde.org/kasync.git", "branch": "master" } ] + "sources": [ { "type": "git", "url": "https://github.com/google/flatbuffers.git", "branch": "v1.10.0" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kmime", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kmime.git", "branch": "Applications/17.04" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kimap2", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kimap2.git", "branch": "master" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kcontacts", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcontacts.git", "branch": "Applications/17.04" } ] }, { - "config-opts": [ "-DCMAKE_INSTALL_LIBDIR=lib" ], + "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "libical", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "https://github.com/libical/libical.git", "branch": "v2.0.0" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kcalcore", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcalcore.git", "branch": "v17.12.2" } ] }, { "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"], "name": "kdav2", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdav2.git", "branch": "master" } ] }, { "name": "libgit2", "buildsystem": "cmake-ninja", "sources": [ { "type": "archive", "url": "https://github.com/libgit2/libgit2/archive/v0.24.1.tar.gz", "sha256": "0269ec198c54e44f275f8f51e7391681a03aa45555e2ab6ce60b0757b6bde3de" } ] }, { "name": "lmdb", - "sources": [ { "type": "git", "url": "git://github.com/LMDB/lmdb.git", "branch": "LMDB_0.9.21"}], + "sources": [ { "type": "git", "url": "git://github.com/LMDB/lmdb.git", "branch": "LMDB_0.9.23"}], "no-autogen": true, "make-install-args": ["prefix=/app"], "subdir" : "libraries/liblmdb" }, { "name": "curl", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "https://github.com/curl/curl.git", "branch": "curl-7_55_0"} ] }, { "name": "xapian", "sources": [ { "type": "archive", "url": "https://oligarchy.co.uk/xapian/1.4.2/xapian-core-1.4.2.tar.xz", "sha256": "aec2c4352998127a2f2316218bf70f48cef0a466a87af3939f5f547c5246e1ce" } ], "cleanup": [ "/lib/libxapian.la", "/share/doc/xapian-core", "/bin/xapian-*" ] } ] } diff --git a/kube/kubewrapper.sh b/kube/kubewrapper.sh new file mode 100644 index 0000000..5d1c8df --- /dev/null +++ b/kube/kubewrapper.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +gpg-connect-agent killagent /bye +gpg-agent --homedir ~/.gnupg --daemon --pinentry-program /app/bin/pinentry-qt +kube --lockfile +gpg-connect-agent killagent /bye diff --git a/kube/wrapperscript.json b/kube/wrapperscript.json index 2758269..c24a361 100644 --- a/kube/wrapperscript.json +++ b/kube/wrapperscript.json @@ -1,15 +1,14 @@ { "name": "kubewrapper", "buildsystem": "simple", "build-commands": [ "cp kubewrapper.sh /app/bin/kubewrapper.sh", "chmod +x /app/bin/kubewrapper.sh" ], "sources": [ { - "type": "script", - "commands": ["gpg-connect-agent killagent /bye", "gpg-agent --homedir ~/.gnupg --daemon --pinentry-program /app/bin/pinentry-qt", "kube --lockfile", "gpg-connect-agent killagent /bye"], - "dest-filename": "kubewrapper.sh" + "type": "file", + "path": "kubewrapper.sh" } ] }