gnucash-on-flatpak unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/b80d0a5a (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/8b53153c (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/f0015062 (commit)
	 via  https://github.com/Gnucash/gnucash-on-flatpak/commit/0723e5aa (commit)
	from  https://github.com/Gnucash/gnucash-on-flatpak/commit/8cd4a1af (commit)



commit b80d0a5ab9e7e8e33c339f2af93b6bf8cdbd0841
Merge: 8cd4a1a 8b53153
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jun 23 09:26:24 2020 -0700

    Merge branch 'master' into unstable


commit 8b53153c12b00ebf700d23090f40d06548a08534
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jun 23 09:20:12 2020 -0700

    Include the patch for bug 797803.

diff --git a/patches/0001-Never-recompile.patch b/patches/0001-Never-recompile.patch
new file mode 100755
index 0000000..5b7b7d0
--- /dev/null
+++ b/patches/0001-Never-recompile.patch
@@ -0,0 +1,25 @@
+From 4236586987b4c1f4241da62dc56c25f8b8c9030c Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls at ceridwen.us>
+Date: Mon, 22 Jun 2020 13:29:11 -0700
+Subject: [PATCH] Never recompile.
+
+---
+ libguile/load.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libguile/load.c b/libguile/load.c
+index c209812dc..725fe5ae3 100644
+--- a/libguile/load.c
++++ b/libguile/load.c
+@@ -570,7 +570,7 @@ compiled_is_fresh (SCM full_filename, SCM compiled_filename,
+       scm_puts ("\n", scm_current_warning_port ());
+     }
+ 
+-  return compiled_is_newer;
++  return 1;
+ }
+ 
+ static SCM
+-- 
+2.26.2
+

commit f0015062e585c9fd110d07361b44140719be398d
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jun 23 09:18:43 2020 -0700

    Bug 797803 - Flatpak fails to launch.
    
    Patch Guile to ignore timestamps on files.

diff --git a/modules/guile.json b/modules/guile.json
index c3f2cc1..53fc3f7 100644
--- a/modules/guile.json
+++ b/modules/guile.json
@@ -5,6 +5,10 @@
             "type": "archive",
             "url": "https://ftp.gnu.org/gnu/guile/guile-2.2.3.tar.xz",
             "sha256": "8353a8849cd7aa77be66af04bd6bf7a6207440d2f8722e46672232bb9f0a4086"
+        },
+        {
+            "type": "patch",
+            "path": "../patches/0001-Never-recompile.patch"
         }
     ],
     "modules": [

commit 0723e5aa24e497f237dc6182be58bba1fc8f7ff5
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jun 18 16:01:25 2020 +0200

    Build boost with the program_options library enabled

diff --git a/modules/boost.json b/modules/boost.json
index 05442d0..cab3068 100644
--- a/modules/boost.json
+++ b/modules/boost.json
@@ -9,7 +9,7 @@
         }
     ],
     "build-commands": [
-        "./bootstrap.sh --prefix=/app --with-libraries=locale,filesystem,system,date_time,regex",
+        "./bootstrap.sh --prefix=/app --with-libraries=locale,filesystem,system,date_time,regex,program_options",
         "./b2 headers",
         "./b2 -j$FLATPAK_BUILDER_N_JOBS install variant=release cxxstd=17 --layout=system"
     ]



Summary of changes:
 modules/boost.json                 |  2 +-
 modules/guile.json                 |  4 ++++
 patches/0001-Never-recompile.patch | 25 +++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100755 patches/0001-Never-recompile.patch