From 9614dbecc9952cfb2ebcbebe2973407861d15b4b Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Thu, 19 Nov 2020 20:26:29 +0100 Subject: [PATCH 01/19] Provide a Flatpak manifest --- io.elementary.feedback.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 io.elementary.feedback.yml diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml new file mode 100644 index 00000000..3949dcf0 --- /dev/null +++ b/io.elementary.feedback.yml @@ -0,0 +1,22 @@ +app-id: io.elementary.calculator +runtime: org.gnome.Platform +runtime-version: '3.36' +base: io.elementary.BaseApp +base-version: juno-19.08 +sdk: org.gnome.Sdk +command: io.elementary.feedback +finish-args: + - '--share=ipc' + - '--socket=fallback-x11' + - '--socket=wayland' + + # needed for perfers-color-scheme + - '--system-talk-name=org.freedesktop.Accounts' + + - '--metadata=X-DConf=migrate-path=/io/elementary/feedback/' +modules: + - name: feedback + buildsystem: meson + sources: + - type: dir + path: . From 003dc44a1fab6d8797d996f32c071cce9c48e689 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Thu, 19 Nov 2020 20:53:40 +0100 Subject: [PATCH 02/19] Add appstream --- io.elementary.feedback.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 3949dcf0..47c534e0 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -1,8 +1,8 @@ app-id: io.elementary.calculator runtime: org.gnome.Platform -runtime-version: '3.36' +runtime-version: '3.38' base: io.elementary.BaseApp -base-version: juno-19.08 +base-version: juno-20.08 sdk: org.gnome.Sdk command: io.elementary.feedback finish-args: @@ -15,6 +15,12 @@ finish-args: - '--metadata=X-DConf=migrate-path=/io/elementary/feedback/' modules: + - name: appstream + no-autogen: true + sources: + - type: git + url: https://gitlab.com/appstream/appstream + - name: feedback buildsystem: meson sources: From c87acd46691201c96c454e5163058ee4e754dcd9 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Thu, 19 Nov 2020 21:07:21 +0100 Subject: [PATCH 03/19] Add xapian as dependency of appstream --- io.elementary.feedback.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 47c534e0..2e03a832 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -20,6 +20,12 @@ modules: sources: - type: git url: https://gitlab.com/appstream/appstream + modules: + - name: xapian + sources: + - type: archive + url: https://oligarchy.co.uk/xapian/1.4.17/xapian-core-1.4.17.tar.xz + md5: 64cd582a4495c5cbda8e06e63f8ce4f4 - name: feedback buildsystem: meson From bedf473a965b7b60025b2ba471e2b0a4b182da45 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Thu, 19 Nov 2020 21:24:18 +0100 Subject: [PATCH 04/19] Add yaml as dependency of appstream --- io.elementary.feedback.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 2e03a832..889e8122 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -16,6 +16,8 @@ finish-args: - '--metadata=X-DConf=migrate-path=/io/elementary/feedback/' modules: - name: appstream + buildsystem: cmake + builddir: true no-autogen: true sources: - type: git @@ -26,6 +28,11 @@ modules: - type: archive url: https://oligarchy.co.uk/xapian/1.4.17/xapian-core-1.4.17.tar.xz md5: 64cd582a4495c5cbda8e06e63f8ce4f4 + - name: yaml + sources: + - type: git + url: https://github.com/yaml/libyaml + tag: '0.2.5' - name: feedback buildsystem: meson From 294fd0713d939dc85978ac8ada3899b8f02bbd3b Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Thu, 19 Nov 2020 21:41:11 +0100 Subject: [PATCH 05/19] Add more dependencies --- io.elementary.feedback.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 889e8122..25be27f0 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -33,6 +33,27 @@ modules: - type: git url: https://github.com/yaml/libyaml tag: '0.2.5' + - name: Intltool + sources: + - type: archive + url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz + md5: 12e517cac2b57a0121cda351570f1e63 + - name: xmlto + buildsystem: autotools + sources: + - type: archive + url: https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2 + md5: 93bab48d446c826399d130d959fe676f + + - name: handy + buildsystem: meson + config-opts: + - '-Dexamples=false' + - '-Dtests=false' + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/libhandy.git + tag: '1.0.1' - name: feedback buildsystem: meson From d8913de98392a5e0d7cce1c08755f36abffe159f Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sat, 21 Nov 2020 08:55:18 +0100 Subject: [PATCH 06/19] Add lmdb as dependency of appstream --- io.elementary.feedback.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 25be27f0..4591ccee 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -16,12 +16,11 @@ finish-args: - '--metadata=X-DConf=migrate-path=/io/elementary/feedback/' modules: - name: appstream - buildsystem: cmake - builddir: true - no-autogen: true + buildsystem: meson sources: - type: git - url: https://gitlab.com/appstream/appstream + url: https://github.com/ximion/appstream + tag: 'v0.12.11' modules: - name: xapian sources: @@ -44,6 +43,16 @@ modules: - type: archive url: https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2 md5: 93bab48d446c826399d130d959fe676f + - name: lmdb + buildsystem: simple + build-commands: + - 'make' + - 'make install prefix=/app' + subdir: 'libraries/liblmdb' + sources: + - type: git + url: https://git.openldap.org/openldap/openldap + tag: 'LMDB_0.9.27' - name: handy buildsystem: meson From d467f799ea5df2720e172dcffbb390ead93cbd0f Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sat, 21 Nov 2020 12:57:54 +0100 Subject: [PATCH 07/19] Add stemmer as dependency of appstream --- io.elementary.feedback.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 4591ccee..4975a19e 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -53,6 +53,11 @@ modules: - type: git url: https://git.openldap.org/openldap/openldap tag: 'LMDB_0.9.27' + - name: stemmer + buildsystem: cmake + sources: + - type: git + url: https://github.com/zvelo/libstemmer - name: handy buildsystem: meson From 85a3914d7e0adab583b5af7b2d518b41364319b9 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sat, 21 Nov 2020 13:04:24 +0100 Subject: [PATCH 08/19] Build appstream with Vala bindings --- io.elementary.feedback.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 4975a19e..598d7f67 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -17,6 +17,8 @@ finish-args: modules: - name: appstream buildsystem: meson + config-opts: + - '-Dvapi=true' sources: - type: git url: https://github.com/ximion/appstream From f3cdc1ecd795c2daaccfb96497933b17050e634b Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sat, 21 Nov 2020 13:04:50 +0100 Subject: [PATCH 09/19] Add permission to access network --- io.elementary.feedback.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 598d7f67..34f47a73 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -7,6 +7,7 @@ sdk: org.gnome.Sdk command: io.elementary.feedback finish-args: - '--share=ipc' + - '--share=network' - '--socket=fallback-x11' - '--socket=wayland' From 56610adc4945f90b21ee6dc5278b8fec1a469261 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sat, 21 Nov 2020 13:09:46 +0100 Subject: [PATCH 10/19] Update app-id --- io.elementary.feedback.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 34f47a73..b7bee787 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -1,4 +1,4 @@ -app-id: io.elementary.calculator +app-id: io.elementary.feedback runtime: org.gnome.Platform runtime-version: '3.38' base: io.elementary.BaseApp From 91e27d7b678640a8a00b5817389648d78cee4e65 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sun, 22 Nov 2020 11:47:08 +0100 Subject: [PATCH 11/19] Update io.elementary.feedback.yml Co-authored-by: Gustavo Marques --- io.elementary.feedback.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index b7bee787..2a5093ea 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -15,6 +15,15 @@ finish-args: - '--system-talk-name=org.freedesktop.Accounts' - '--metadata=X-DConf=migrate-path=/io/elementary/feedback/' +cleanup: + - '/include' + - '/lib/pkgconfig' + - '/lib/girepository-1.0' + - '/share/gir-1.0' + - '/share/man' + - '/share/vala' + - '*.la' + - '*.a' modules: - name: appstream buildsystem: meson From 927f8a14f6d3dd58522bcafee9c3a4746c8851be Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sun, 22 Nov 2020 11:47:23 +0100 Subject: [PATCH 12/19] Update io.elementary.feedback.yml Co-authored-by: Gustavo Marques --- io.elementary.feedback.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 2a5093ea..dd046cf0 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -29,6 +29,8 @@ modules: buildsystem: meson config-opts: - '-Dvapi=true' + - '-Dapidocs=false' + - '-Dinstall-docs=false' sources: - type: git url: https://github.com/ximion/appstream From 1039f3a84681562a50ae20f0bd328bd7d07c7bba Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sun, 22 Nov 2020 11:47:39 +0100 Subject: [PATCH 13/19] Update io.elementary.feedback.yml Co-authored-by: Gustavo Marques --- io.elementary.feedback.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index dd046cf0..54ca1951 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -47,6 +47,8 @@ modules: url: https://github.com/yaml/libyaml tag: '0.2.5' - name: Intltool + cleanup: + - '*' sources: - type: archive url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz From bad0beaa61feda54ce6704e46349144db782f978 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sun, 22 Nov 2020 11:48:19 +0100 Subject: [PATCH 14/19] Update io.elementary.feedback.yml Co-authored-by: Gustavo Marques --- io.elementary.feedback.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 54ca1951..ffcb1b18 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -60,10 +60,9 @@ modules: url: https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2 md5: 93bab48d446c826399d130d959fe676f - name: lmdb - buildsystem: simple - build-commands: - - 'make' - - 'make install prefix=/app' + no-autogen: true + make-install-args: + - 'prefix=/app' subdir: 'libraries/liblmdb' sources: - type: git From 57b9e9eeb09b120a10cca27ae26a08e61e8be3b6 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sun, 22 Nov 2020 11:48:33 +0100 Subject: [PATCH 15/19] Update io.elementary.feedback.yml Co-authored-by: Gustavo Marques --- io.elementary.feedback.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index ffcb1b18..02d87a91 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -37,6 +37,10 @@ modules: tag: 'v0.12.11' modules: - name: xapian + cleanup: + - '/lib/cmake' + - '/share/alocal' + - '/share/doc' sources: - type: archive url: https://oligarchy.co.uk/xapian/1.4.17/xapian-core-1.4.17.tar.xz From c2215aed46b4f9e99f4fda33afe1e0c3f1e7991f Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sun, 22 Nov 2020 11:48:53 +0100 Subject: [PATCH 16/19] Update io.elementary.feedback.yml Co-authored-by: Gustavo Marques --- io.elementary.feedback.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 02d87a91..96fee6c3 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -73,7 +73,7 @@ modules: url: https://git.openldap.org/openldap/openldap tag: 'LMDB_0.9.27' - name: stemmer - buildsystem: cmake + buildsystem: cmake-ninja sources: - type: git url: https://github.com/zvelo/libstemmer From ce01c559cb9bd16b57f916247dbd2c47b196b001 Mon Sep 17 00:00:00 2001 From: Marius Meisenzahl Date: Sun, 22 Nov 2020 11:50:25 +0100 Subject: [PATCH 17/19] Update io.elementary.feedback.yml --- io.elementary.feedback.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 96fee6c3..9f991f54 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -58,7 +58,6 @@ modules: url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz md5: 12e517cac2b57a0121cda351570f1e63 - name: xmlto - buildsystem: autotools sources: - type: archive url: https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2 From d26ea90f9686672992199b106360c68697312a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20For=C3=A9?= Date: Tue, 26 Jan 2021 13:58:35 -0800 Subject: [PATCH 18/19] Update io.elementary.feedback.yml --- io.elementary.feedback.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/io.elementary.feedback.yml b/io.elementary.feedback.yml index 9f991f54..2d6462f5 100644 --- a/io.elementary.feedback.yml +++ b/io.elementary.feedback.yml @@ -14,6 +14,9 @@ finish-args: # needed for perfers-color-scheme - '--system-talk-name=org.freedesktop.Accounts' + # needed to read app metadata + - '--filesystem=host:ro' + - '--metadata=X-DConf=migrate-path=/io/elementary/feedback/' cleanup: - '/include' From 08490816748f9f8accea7389c10b1b8334bed747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20For=C3=A9?= Date: Tue, 26 Jan 2021 14:15:17 -0800 Subject: [PATCH 19/19] Update main.yml --- .github/workflows/main.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c049149..306cf817 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,6 +21,19 @@ jobs: meson build ninja -C build + flatpak: + runs-on: ubuntu-latest + container: + image: docker.io/bilelmoussaoui/flatpak-github-actions + options: --privileged + steps: + - uses: actions/checkout@v2 + - uses: bilelmoussaoui/flatpak-github-actions@v2 + with: + bundle: "feedback.flatpak" + manifest-path: "io.elementary.feedback.yml" + run-tests: "true" + lint: runs-on: ubuntu-latest