gnucash-on-flatpak master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Fri Aug 16 11:23:14 EDT 2019
Updated via https://github.com/Gnucash/gnucash-on-flatpak/commit/42f89eb7 (commit)
via https://github.com/Gnucash/gnucash-on-flatpak/commit/c8456c72 (commit)
via https://github.com/Gnucash/gnucash-on-flatpak/commit/ecbe7201 (commit)
from https://github.com/Gnucash/gnucash-on-flatpak/commit/8bfcb380 (commit)
commit 42f89eb7290e2fd8bdf22e6cee162383185bd37d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Aug 16 16:33:39 2019 +0200
ignore gpg key
diff --git a/.gitignore b/.gitignore
index e233c2e..b021a60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
custom.sh
code_last_rev
docs_last_rev
+gnucash-flatpak.gpg
org.gnucash.GnuCash.json
commit c8456c72780c1fbb3508af566d776a9e6474b8b2
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Aug 16 16:25:45 2019 +0200
Import recent updates from flathub/org.gnucash.GnuCash
These
- update the gnome sdk/runtime to 3.30
- update gc to 8.0.4 to use the compiler's built-in atomic support
- add patches to fix libaio build on i386
- enable parallel builds on boost
diff --git a/fix-build-flags.patch b/fix-build-flags.patch
new file mode 100644
index 0000000..c5b01a9
--- /dev/null
+++ b/fix-build-flags.patch
@@ -0,0 +1,79 @@
+Description: Honour user build flags
+ CPPFLAGS, CFLAGS and LDFLAGS are user flags, which we need to preserve, any
+ required flag that the build system needs, has to be set in some other flag
+ so that the build will succeed even of the user flags are passed.
+Author: Guillem Jover <guillem at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2014-10-09
+
+
+---
+ harness/Makefile | 7 +++++--
+ src/Makefile | 18 +++++++++---------
+ 2 files changed, 14 insertions(+), 11 deletions(-)
+
+--- a/harness/Makefile
++++ b/harness/Makefile
+@@ -6,13 +6,16 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
+ HARNESS_SRCS:=main.c
+ # io_queue.c
+
+-CFLAGS+=-Wall -I../src -g -O
++MK_CPPFLAGS:=-I../src
++CFLAGS=-Wall -g -O
+ #-lpthread -lrt
++MK_CFLAGS=$(CFLAGS)
++MK_LDFLAGS=main.c ../src/libaio.a $(LDFLAGS)
+
+ all: $(PROGS)
+
+ $(PROGS): %.p: %.t $(HARNESS_SRCS)
+- $(CC) $(CFLAGS) -DTEST_NAME=\"$<\" -o $@ main.c ../src/libaio.a
++ $(CC) $(MK_CPPFLAGS) $(MK_CFLAGS) -DTEST_NAME=\"$<\" -o $@ $(MK_LDFLAGS)
+
+ clean:
+ rm -f $(PROGS) *.o runtests.out rofile wofile rwfile
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -4,12 +4,12 @@ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
+ libdevdir=$(prefix)/lib
+
+-CFLAGS ?= -g -fomit-frame-pointer -O2
+-CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
+-SO_CFLAGS=-shared $(CFLAGS)
+-L_CFLAGS=$(CFLAGS)
+-LINK_FLAGS=-Wl,--as-needed -lgcc -lc
+-LINK_FLAGS+=$(LDFLAGS)
++MK_CPPFLAGS=-I.
++MK_CFLAGS=-nostdlib -nostartfiles -fomit-frame-pointer -fPIC $(CFLAGS)
++CFLAGS=-Wall -g -O2
++SO_CFLAGS=-shared $(MK_CFLAGS)
++L_CFLAGS=$(MK_CFLAGS)
++MK_LDFLAGS=-Wl,--as-needed -lgcc -lc $(LDFLAGS)
+
+ soname=libaio.so.1
+ minor=0
+@@ -39,10 +39,10 @@ libaio_sobjs := $(patsubst %.c,%.os,$(li
+ $(libaio_objs) $(libaio_sobjs): libaio.h vsys_def.h
+
+ %.os: %.c
+- $(CC) $(SO_CFLAGS) -c -o $@ $<
++ $(CC) $(MK_CPPFLAGS) $(SO_CFLAGS) -c -o $@ $<
+
+ %.ol: %.c
+- $(CC) $(L_CFLAGS) -c -o $@ $<
++ $(CC) $(MK_CPPFLAGS) $(L_CFLAGS) -c -o $@ $<
+
+ AR ?= ar
+ RANLIB ?= ranlib
+@@ -52,7 +52,7 @@ libaio.a: $(libaio_objs)
+ $(RANLIB) libaio.a
+
+ $(libname): $(libaio_sobjs) libaio.map
+- $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
++ $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(MK_LDFLAGS)
+
+ install: $(all_targets)
+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
diff --git a/fix-install-dirs.patch b/fix-install-dirs.patch
new file mode 100644
index 0000000..18368a5
--- /dev/null
+++ b/fix-install-dirs.patch
@@ -0,0 +1,68 @@
+Description: Fix installation of shared vs static libraries
+Author: Guillem Jover <guillem at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2007-09-11
+
+
+---
+ Makefile | 9 ++++++++-
+ src/Makefile | 12 +++++++-----
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -5,9 +5,11 @@ RELEASE=$(shell awk '/Release:/ { print
+ CVSTAG = $(NAME)_$(subst .,-,$(VERSION))_$(subst .,-,$(RELEASE))
+ RPMBUILD=$(shell `which rpmbuild >&/dev/null` && echo "rpmbuild" || echo "rpm")
+
++DESTDIR=
+ prefix=/usr
+ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
++libdevdir=$(prefix)/lib
+
+ default: all
+
+@@ -15,7 +17,12 @@ all:
+ @$(MAKE) -C src
+
+ install:
+- @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
++ @$(MAKE) -C src install \
++ DESTDIR=$(DESTDIR) \
++ prefix=$(prefix) \
++ includedir=$(includedir) \
++ libdir=$(libdir) \
++ libdevdir=$(libdevdir)
+
+ check:
+ @$(MAKE) -C harness check
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,6 +1,8 @@
++DESTDIR=
+ prefix=/usr
+ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
++libdevdir=$(prefix)/lib
+
+ CFLAGS ?= -g -fomit-frame-pointer -O2
+ CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
+@@ -53,11 +55,11 @@ $(libname): $(libaio_sobjs) libaio.map
+ $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
+
+ install: $(all_targets)
+- install -D -m 644 libaio.h $(includedir)/libaio.h
+- install -D -m 644 libaio.a $(libdir)/libaio.a
+- install -D -m 755 $(libname) $(libdir)/$(libname)
+- ln -sf $(libname) $(libdir)/$(soname)
+- ln -sf $(libname) $(libdir)/libaio.so
++ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
++ install -D -m 644 libaio.a $(DESTDIR)$(libdevdir)/libaio.a
++ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
++ ln -sf $(libdir)/$(libname) $(DESTDIR)$(libdir)/$(soname)
++ ln -sf $(libdir)/$(libname) $(DESTDIR)$(libdevdir)/libaio.so
+
+ $(libaio_objs): libaio.h
+
diff --git a/link-libs.patch b/link-libs.patch
new file mode 100644
index 0000000..5be59a3
--- /dev/null
+++ b/link-libs.patch
@@ -0,0 +1,29 @@
+Description: Link against libgcc and libc to avoid unresolved symbols
+ We need to link agaisnt -lgcc, on at least hppa.
+ .
+ We also link against -lc and -Wl,--as-needed, this way we pull the
+ required fortified functions from the internal libc_nonshared.a, but
+ do not link against the shared library because we do not use any of
+ its symbols.
+Author: Guillem Jover <guillem at debian.org>
+Origin: vendor
+Bug-Debian: 764509
+Forwarded: no
+Last-Update: 2014-10-09
+
+
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -6,7 +6,7 @@ CFLAGS ?= -g -fomit-frame-pointer -O2
+ CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
+ SO_CFLAGS=-shared $(CFLAGS)
+ L_CFLAGS=$(CFLAGS)
+-LINK_FLAGS=
++LINK_FLAGS=-Wl,--as-needed -lgcc -lc
+ LINK_FLAGS+=$(LDFLAGS)
+
+ soname=libaio.so.1
diff --git a/no-werror.patch b/no-werror.patch
new file mode 100644
index 0000000..a61260a
--- /dev/null
+++ b/no-werror.patch
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with newer gcc 4.6
+ Using -Werror on a released project is in general not a good idea, as changes
+ in the toolchain and environment can trigger unexpected build failures.
+Author: Guillem Jover <guillem at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2014-10-09
+
+
+---
+ harness/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/harness/Makefile
++++ b/harness/Makefile
+@@ -6,7 +6,7 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
+ HARNESS_SRCS:=main.c
+ # io_queue.c
+
+-CFLAGS+=-Wall -Werror -I../src -g -O
++CFLAGS+=-Wall -I../src -g -O
+ #-lpthread -lrt
+
+ all: $(PROGS)
diff --git a/templates/org.gnucash.GnuCash.json.tpl b/templates/org.gnucash.GnuCash.json.tpl
index 0b67de8..5a034e1 100644
--- a/templates/org.gnucash.GnuCash.json.tpl
+++ b/templates/org.gnucash.GnuCash.json.tpl
@@ -1,7 +1,7 @@
{
"app-id": "org.gnucash.GnuCash",
"runtime": "org.gnome.Platform",
- "runtime-version": "3.28",
+ "runtime-version": "3.30",
"sdk": "org.gnome.Sdk",
"command": "gnucash",
"copy-icon": true,
@@ -9,6 +9,7 @@
"rename-desktop-file": "gnucash.desktop",
"rename-appdata-file": "gnucash.appdata.xml",
"finish-args": [
+ "--socket=wayland",
"--socket=x11", "--share=ipc",
"--share=network",
"--filesystem=home",
@@ -30,8 +31,8 @@
"sources": [
{
"type": "archive",
- "url": "http://www.hboehm.info/gc/gc_source/gc-7.6.4.tar.gz",
- "sha256": "b94c1f2535f98354811ee644dccab6e84a0cf73e477ca03fb5a3758fb1fecd1c"
+ "url": "http://www.hboehm.info/gc/gc_source/gc-8.0.4.tar.gz",
+ "sha256": "436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d"
}
]
},
@@ -133,16 +134,24 @@
},
{
"name": "libaio",
- "buildsystem": "simple",
- "build-commands": [
- "make",
- "make prefix=/app install"
+ "no-autogen": true,
+ "make-install-args": [
+ "prefix=/app"
],
"sources": [
{
"type": "archive",
"url": "http://ftp.de.debian.org/debian/pool/main/liba/libaio/libaio_0.3.110.orig.tar.gz",
"sha256": "e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e"
+ },
+ {
+ "type": "patch",
+ "paths": [
+ "link-libs.patch",
+ "fix-install-dirs.patch",
+ "no-werror.patch",
+ "fix-build-flags.patch"
+ ]
}
]
},
@@ -263,23 +272,6 @@
"--with-guis=''"
],
"sources": [
- {
- "type": "script",
- "dest-filename": "libgcrypt-config",
- "commands": [
- "case $1 in",
- "--version) pkg-config --modversion libgcrypt ;;",
- "--libs) echo $(pkg-config --libs libgcrypt) -lgpg-error ;;",
- "*) pkg-config $* libgcrypt",
- "esac"
- ]
- },
- {
- "type": "shell",
- "commands": [
- "install -Dm755 libgcrypt-config /app/bin/libgcrypt-config"
- ]
- },
{
"type": "archive",
"url": "https://www.aquamaniac.de/rdm/attachments/download/10/gwenhywfar-4.20.0.tar.gz",
@@ -311,7 +303,7 @@
"build-commands": [
"./bootstrap.sh --prefix=/app --with-libraries=locale,filesystem,system,date_time,regex",
"./b2 headers",
- "./b2 install variant=release --layout=system"
+ "./b2 -j$FLATPAK_BUILDER_N_JOBS install variant=release --layout=system"
]
},
{
commit ecbe72018ebeef052c478eedcd83005cb448bd81
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Aug 16 16:18:49 2019 +0200
Drop ktoblzcheck and update aqbanking
ktoblzcheck is no longer used
aqbanking -> 5.8.1 to support new European bank regulations
diff --git a/templates/org.gnucash.GnuCash.json.tpl b/templates/org.gnucash.GnuCash.json.tpl
index 7a0d016..0b67de8 100644
--- a/templates/org.gnucash.GnuCash.json.tpl
+++ b/templates/org.gnucash.GnuCash.json.tpl
@@ -257,16 +257,6 @@
}
]
},
- {
- "name": "ktoblzcheck",
- "sources": [
- {
- "type": "archive",
- "url": "http://downloads.sourceforge.net/project/ktoblzcheck/ktoblzcheck-1.49.tar.gz",
- "sha256": "e8971bc6689ea72b174c194bd43ba2c0b65112b0c3f9fd2371562e0c3ab57d29"
- }
- ]
- },
{
"name": "gwenhywfar",
"config-opts": [
@@ -303,7 +293,7 @@
"sources": [
{
"type": "archive",
- "url": "https://www.aquamaniac.de/rdm/attachments/download/5/aqbanking-5.8.1.tar.gz",
+ "url": "https://www.aquamaniac.de/rdm/attachments/download/105/aqbanking-5.8.1.tar.gz",
"sha256": "af063a75ba401de3538f41cca0c7001950086b3e2d4f190ffe3ddfeea1b08454"
}
]
Summary of changes:
.gitignore | 1 +
fix-build-flags.patch | 79 ++++++++++++++++++++++++++++++++++
fix-install-dirs.patch | 68 +++++++++++++++++++++++++++++
link-libs.patch | 29 +++++++++++++
no-werror.patch | 24 +++++++++++
templates/org.gnucash.GnuCash.json.tpl | 54 ++++++++---------------
6 files changed, 219 insertions(+), 36 deletions(-)
create mode 100644 fix-build-flags.patch
create mode 100644 fix-install-dirs.patch
create mode 100644 link-libs.patch
create mode 100644 no-werror.patch
More information about the gnucash-changes
mailing list