gnucash-on-flatpak master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Thu Sep 19 07:04:37 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/1570d58a (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/2a353995 (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/9f057f91 (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/83b41e28 (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/a711a435 (commit)
	from  https://github.com/Gnucash/gnucash-on-flatpak/commit/ca101447 (commit)



commit 1570d58ae0f330abfa8d10bf8a325a5a568516bd
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Sep 19 13:04:18 2019 +0200

    Add support for libchipcard and the pcsc socket
    
    Several banks have 2 factor authentication these days, which
    often makes use of smartcards

diff --git a/templates/org.gnucash.GnuCash.json.tpl b/templates/org.gnucash.GnuCash.json.tpl
index b2e2e0f..b97e8b0 100644
--- a/templates/org.gnucash.GnuCash.json.tpl
+++ b/templates/org.gnucash.GnuCash.json.tpl
@@ -10,7 +10,9 @@
   "rename-appdata-file": "gnucash.appdata.xml",
   "finish-args": [
     "--socket=wayland",
-    "--socket=x11", "--share=ipc",
+    "--socket=x11",
+    "--socket=pcsc",
+    "--share=ipc",
     "--share=network",
     "--filesystem=home",
     "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
@@ -266,10 +268,27 @@
         }
       ]
     },
+    {
+      "name": "libpcsclite",
+      "config-opts": [
+        "--disable-libsystemd",
+        "--disable-serial",
+        "--disable-usb",
+        "--disable-libudev",
+        "--with-systemdsystemunitdir=no"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://pcsclite.apdu.fr/files/pcsc-lite-1.8.24.tar.bz2",
+          "sha256": "b81864fa6a5ec776639c02ae89998955f7702a8d10e8b8f70023c5a599d97568"
+        }
+      ]
+    },
     {
       "name": "gwenhywfar",
       "config-opts": [
-        "--with-guis=''"
+        "--with-guis='gtk3'"
       ],
       "sources": [
         {
@@ -279,6 +298,16 @@
         }
       ]
     },
+    {
+      "name": "libchipcard",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://www.aquamaniac.de/rdm/attachments/download/138/libchipcard-5.1.3beta.tar.gz",
+          "sha256": "11daac6e924f850162b51979cc9926fdd849d2b587aff518f755b3cc8448a592"
+        }
+      ]
+    },
     {
       "name": "aqbanking",
       "no-parallel-make": true,

commit 2a35399528da51346eb884934b7f3532a9953cfb
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Sep 19 11:33:26 2019 +0200

    Bump gwenhywfar and aqbanking to most recent betas
    
    This allows German users to test the newer PSD2 features

diff --git a/templates/org.gnucash.GnuCash.json.tpl b/templates/org.gnucash.GnuCash.json.tpl
index f83e765..b2e2e0f 100644
--- a/templates/org.gnucash.GnuCash.json.tpl
+++ b/templates/org.gnucash.GnuCash.json.tpl
@@ -274,8 +274,8 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://www.aquamaniac.de/rdm/attachments/download/108/gwenhywfar-4.20.2.tar.gz",
-          "sha256": "0f4fd92351c8a11f053aa482fc5c459499db3dc78dd8bb469e878890ef3d3270"
+          "url": "https://www.aquamaniac.de/rdm/attachments/download/136/gwenhywfar-4.99.15beta.tar.gz",
+          "sha256": "2a78b26f556688ad8f40c8727a8ec54c214746981ab83b539bd6a175f99d9878"
         }
       ]
     },
@@ -285,8 +285,8 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://www.aquamaniac.de/rdm/attachments/download/107/aqbanking-5.8.2.tar.gz",
-          "sha256": "93ca523fe175e72042db75f8c3fc6255ab058cf82caf52796e15f030809fb15e"
+          "url": "https://www.aquamaniac.de/rdm/attachments/download/134/aqbanking-5.99.30beta.tar.gz",
+          "sha256": "6bea8f8b9159c95e71bd6cc19f26b7d3347bcd5a62903f542cebeb19c835534b"
         }
       ]
     },

commit 9f057f916a561bf4adcb48acf092c788b361a20c
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Sep 19 11:32:28 2019 +0200

    Refine cleanup of the gnucash module
    
    Remove additional files that serve no purpose for a flatpak target audience

diff --git a/templates/gnucash-targets-git.json.tpl b/templates/gnucash-targets-git.json.tpl
index 5c7a7d5..84e1aa3 100644
--- a/templates/gnucash-targets-git.json.tpl
+++ b/templates/gnucash-targets-git.json.tpl
@@ -6,10 +6,14 @@
       ],
       "cleanup": [
         "/share/info",
-        "/share/doc/*.qif",
-        "/share/doc/*.gnucash",
-        "/share/doc/ChangLog*",
-        "/share/doc/README*"
+        "/share/doc/gnucash/*.csv",
+        "/share/doc/gnucash/*.qif",
+        "/share/doc/gnucash/*.gnucash",
+        "/share/doc/gnucash/ChangeLog*",
+        "/share/doc/gnucash/HACKING",
+        "/share/doc/gnucash/README*",
+        "/share/doc/gnucash/guile-hackers.txt",
+        "/share/doc/gnucash/projects.html"
       ],
       "sources": [
         {
diff --git a/templates/gnucash-targets-tar.json.tpl b/templates/gnucash-targets-tar.json.tpl
index 3865687..8ecff76 100644
--- a/templates/gnucash-targets-tar.json.tpl
+++ b/templates/gnucash-targets-tar.json.tpl
@@ -6,10 +6,14 @@
       ],
       "cleanup": [
         "/share/info",
-        "/share/doc/*.qif",
-        "/share/doc/*.gnucash",
-        "/share/doc/ChangLog*",
-        "/share/doc/README*"
+        "/share/doc/gnucash/*.csv",
+        "/share/doc/gnucash/*.qif",
+        "/share/doc/gnucash/*.gnucash",
+        "/share/doc/gnucash/ChangeLog*",
+        "/share/doc/gnucash/HACKING",
+        "/share/doc/gnucash/README*",
+        "/share/doc/gnucash/guile-hackers.txt",
+        "/share/doc/gnucash/projects.html"
       ],
       "sources": [
       {

commit 83b41e286affb1bb557f3e61de603b28e7974acc
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Sep 11 18:05:47 2019 +0200

    Be more selective in cleaning up the doc directory
    
    We do require AUTHORS, DOCUMENTERS and LICENSE files for the about dialog to work properly.

diff --git a/templates/gnucash-targets-git.json.tpl b/templates/gnucash-targets-git.json.tpl
index a4088d3..5c7a7d5 100644
--- a/templates/gnucash-targets-git.json.tpl
+++ b/templates/gnucash-targets-git.json.tpl
@@ -6,7 +6,10 @@
       ],
       "cleanup": [
         "/share/info",
-        "/share/doc"
+        "/share/doc/*.qif",
+        "/share/doc/*.gnucash",
+        "/share/doc/ChangLog*",
+        "/share/doc/README*"
       ],
       "sources": [
         {
diff --git a/templates/gnucash-targets-tar.json.tpl b/templates/gnucash-targets-tar.json.tpl
index f8ae9f5..3865687 100644
--- a/templates/gnucash-targets-tar.json.tpl
+++ b/templates/gnucash-targets-tar.json.tpl
@@ -6,7 +6,10 @@
       ],
       "cleanup": [
         "/share/info",
-        "/share/doc"
+        "/share/doc/*.qif",
+        "/share/doc/*.gnucash",
+        "/share/doc/ChangLog*",
+        "/share/doc/README*"
       ],
       "sources": [
       {

commit a711a435f09e7856ada80ebddf830b56b3b0b005
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Sep 11 18:04:57 2019 +0200

    Let flatpak itself decide when a build is neede
    
    It's much smarter at this than my simple 'the branch already exists' test.
    Flatpak knows it has to rebuild if any of the manifest parameters changes as well.
    So it's now easier to trigger a rebuild if a branch already exists

diff --git a/build_package.sh b/build_package.sh
index e39df96..4ac7df4 100755
--- a/build_package.sh
+++ b/build_package.sh
@@ -100,18 +100,6 @@ else
     build_type=git
 fi
 
-echo "Checking for existing build of revision $fp_branch"
-# The command below will print an error on first run as the repo doesn't exist yet
-# You can safely ignore the error message
-if flatpak repo $fp_repo --branches | grep -q "/$fp_branch[[:space:]]"
-then
-    echo "Nothing to do: build already in repo"
-    upload_build_log
-    exit 0
-else
-    echo "Branch $fp_branch not found in repo, starting build"
-fi
-
 # Set up gpg
 prepare_gpg
 # Create the flatpak manifest



Summary of changes:
 build_package.sh                       | 12 ----------
 templates/gnucash-targets-git.json.tpl |  9 +++++++-
 templates/gnucash-targets-tar.json.tpl |  9 +++++++-
 templates/org.gnucash.GnuCash.json.tpl | 41 +++++++++++++++++++++++++++++-----
 4 files changed, 51 insertions(+), 20 deletions(-)



More information about the gnucash-changes mailing list