<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/56dad8fb8ca8ab2ab128fc035f045770b62ff50f">https://github.com/macports/macports-ports/commit/56dad8fb8ca8ab2ab128fc035f045770b62ff50f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 56dad8fb8ca8ab2ab128fc035f045770b62ff50f
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Thu May 10 18:24:57 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gnucash: update to v3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update for new cmake-based build system
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove most variants in the interest of simplicity
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add really awful glibconfig hack to work around an (intentional)
</span><span style='display:block; white-space:pre;color:#404040;'> upstream bug
</span>---
gnome/gnucash/Portfile | 224 +++++--------------
gnome/gnucash/files/autogen.sh | 246 ---------------------
gnome/gnucash/files/glibconfig.h | 195 ----------------
gnome/gnucash/files/patch-configure.ac.diff | 18 --
gnome/gnucash/files/patch-configure.diff | 18 --
.../files/patch-devel-src_bin_environment.in.diff | 11 -
.../patch-devel-src_core-utils_gnc-path.c.diff | 11 -
gnome/gnucash/files/patch-glibconfig.h.diff | 98 ++++++++
.../files/patch-src_bin_environment.in.diff | 11 -
.../files/patch-src_core-utils_gnc-path.c.diff | 11 -
10 files changed, 159 insertions(+), 684 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/Portfile b/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f460ca..ea4b6d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,12 @@
</span>
PortSystem 1.0
PortGroup perl5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name gnucash
conflicts gnucash gnucash-devel
conflicts-delete ${subport}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1
</span> perl5.branches 5.26
categories gnome x11
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,149 +32,85 @@ master_sites sourceforge \
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cce754a8530c109e7724f1b935d4cf0bc5aca105 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 44baf7d0133b8bdc9fcb819ee4360afaca2f03a1a254c0221d02e23f35c93025
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# We'll install gnucash's libraries in a separate subdir of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${prefix}/lib, because gnucash sets DYLD_LIBRARY_PATH at runtime in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# order to dynamically load these directories, and including all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MacPorts libraries in DYLD_LIBRARY_PATH can cause problems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# guile18 modules are also installed in a separate subdirectory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/ticket/52494.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gnclibdir ${prefix}/lib/gnucash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_bin_environment.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@GUILEPATH@@|${prefix}/lib/guile18|" ${worksrcpath}/src/bin/environment.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/src/bin/environment.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/src/core-utils/gnc-path.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gnc-fq-dump needs to be patched to use MacPorts perl.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (autoconf takes care of the other perl scripts.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^#!/usr/bin/perl|#!${perl5.bin}|" ${worksrcpath}/src/quotes/gnc-fq-dump
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {$subport eq "gnucash-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-devel-src_bin_environment.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-devel-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@GUILEPATH@@|${prefix}/lib/guile18|" ${worksrcpath}/gnucash/environment.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/gnucash/environment.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/libgnucash/core-utils/gnc-path.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gnc-fq-dump needs to be patched to use MacPorts perl.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (autoconf takes care of the other perl scripts.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^#!/usr/bin/perl|#!${perl5.bin}|" ${worksrcpath}/libgnucash/quotes/gnc-fq-dump
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${version}-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 336e204c9d19eca2ebe3862b974204e62d1db4de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a1ef66cec3b8b74b7b8bfe791ff12456796a69cc004427e8d9205b6872bdd261
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gnc-fq-dump needs to be patched to use MacPorts perl.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (autoconf takes care of the other perl scripts.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^#!/usr/bin/perl|#!${perl5.bin}|" ${worksrcpath}/libgnucash/quotes/gnc-fq-dump
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch source files to include guile18 header instead of guile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (Note that gnucash's autoconf scripts prefer guile18 over guile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if both are installed.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [regexp {\.(c|h|cpp|hpp)$} ${f}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q -locale C "s|<libguile\\.h>|<libguile18.h>|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q -locale C "s|<libguile/|<libguile18/|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|SET(HAVE_OSX_KEYCHAIN 1)||" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Drop in a patched version of glibconfig.h via
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://git.gnome.org/browse/gtk-osx/plain/patches/glib-gint64-long-long.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # because gnucash incorrectly assumes int64_t and gint64 are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the same size. See https://trac.macports.org/ticket/55446
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${workpath}/glib-2.0/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${prefix}/lib/glib-2.0/include/glibconfig.h ${workpath}/glib-2.0/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/glib-2.0/include "patch -p1 <${filespath}/patch-glibconfig.h.diff"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:guile18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgnomecanvas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:goffice08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PKG_CONFIG_GLIB_2_0_LIBDIR=${workpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-delete -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:intltool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:guile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl${perl5.major} \
</span> port:p${perl5.major}-datemanip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-finance-quote
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-finance-quote \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:${prefix}/libpkgconfig/webkitgtk-3.0.pc:webkit-gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdbi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdbi-drivers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:aqbanking5-gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libofx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python36 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gnucash-docs
</span> # yelp currently requires X11 to build so disable dependency if building
# with +quartz
#
# TODO: add +x11 +quartz variants to distinguish one build from the other
# since they have different binary dependencies. Otherwise, rev-upgrade
# errors may occur
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run port:yelp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:yelp
</span> }
platform darwin {
if {${configure.cxx_stdlib} eq "libstdc++"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete path:${prefix}/libpkgconfig/webkitgtk-3.0.pc:webkit-gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:${prefix}/libpkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
</span> }
}
# aqbanking is not universal
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && ./autogen.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix python exec_prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\\(PYTHON_EXEC_PREFIX=\\).*$|\\1${frameworks_dir}/Python.framework/Versions/2.7/|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\\(PYTHON_PREFIX=\\).*$|\\1${frameworks_dir}/Python.framework/Versions/2.7/|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-dependency-tracking \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-aqbanking \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-ofx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dbi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-guile=1.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --libdir=${gnclibdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DENABLE_BINRELOC=OFF -DWITH_PYTHON=ON
</span> configure.perl ${perl5.bin}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE=${prefix}/bin/guile18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_CONFIG=${prefix}/bin/guile18-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_TOOLS=${prefix}/bin/guile18-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant hbci description {AqBanking/HBCI support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libaqbanking.dylib:aqbanking5-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-aqbanking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-aqbanking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ofx description {OFX support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libofx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-ofx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-ofx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant dbi description {Adds dbi backend support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libdbi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdbi-drivers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-dbi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-dbi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-dbi-dbd-dir=${prefix}/lib/dbd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "gnucash DBI backend support requires the libdbi-drivers port to be built with support for the desired databases. sqlite3 is available by default; for MySQL or PostgreSQL support, ensure that the corresponding variant is selected for libdbi-drivers."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +ofx +hbci
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Install Python bindings for Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_bindir ${frameworks_dir}/Python.framework/Versions/2.7/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_EXTRA_LDFLAGS=\"\`${python_bindir}/python2.7-config --ldflags\`\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_CPPFLAGS=\"\`${python_bindir}/python2.7-config --cflags\`\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${python_bindir}/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${prefix}/lib/libgwengui-gtk3.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/etc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${destroot}/etc${prefix}/gnucash ${destroot}${prefix}/etc
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,52 +118,13 @@ post-activate {
</span> system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "/${name} .*/(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport == $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex "/${name} .*/(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# There currently isn't a separate beta release.
</span> subport gnucash-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.7.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6227bc00052b67ca7c609f56ef1b772ce64448fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 baa6bae13918da62be58fe09d904ccf38893607e57dae4eba53db4ff96ab61b3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-devel-src_bin_environment.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-devel-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:gtest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:libgnomecanvas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:goffice08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-html-engine=webkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gtest-root=${prefix}/src/googletest \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gmock-root=${prefix}/src/googlemock
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lboost_filesystem|-lboost_filesystem-mt|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/libgnucash/core-utils/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lboost_regex|-lboost_regex-mt|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/libgnucash/backend/dbi/Makefile.am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/libgnucash/backend/dbi/test/Makefile.am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/libgnucash/engine/Makefile.am \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/gnucash/import-export/csv-imp/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lboost_locale|-lboost_locale-mt|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/gnucash/import-export/csv-imp/Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Drop in a patched version of glibconfig.h via
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://git.gnome.org/browse/gtk-osx/plain/patches/glib-gint64-long-long.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # because gnucash incorrectly assumes int64_t and gint64 are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the same size. See https://trac.macports.org/ticket/55446
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${filespath}/glibconfig.h ${worksrcpath}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites sourceforge:${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.gnucash.org/pub/gnucash/sources/unstable/${branch}.x/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.regex "/${name} .*/(\[0-9\]+\\.\[0-9\]*\[0-9\]\\.\[0-9\]+)/"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "gnucash DBI backend support requires the libdbi-drivers port to be built with support for the desired databases. sqlite3 is available by default; for MySQL or PostgreSQL support, ensure that the corresponding variant is selected for libdbi-drivers."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/autogen.sh b/gnome/gnucash/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 54641d5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,246 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z "$srcdir" ; then srcdir=`dirname $0` ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z "$srcdir" ; then srcdir=. ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $srcdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DIE=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -n "${GNOME2_PATH}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dir in `echo ${GNOME2_PATH} | sed 's/:/ /g'`; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -d "${dir}/share/aclocal"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL_FLAGS="${ACLOCAL_FLAGS} -I ${dir}/share/aclocal"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -d "${dir}/bin"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH="${PATH}:${dir}/bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# usage: test_version program version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# returns 0 if program >= version; returns 1 if not.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test_version()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this_prog="$1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- want_vers="$2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testv=`"$this_prog" --version 2>/dev/null | head -n 1 | awk '{print $NF}'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$testv" ; then return 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testv_major=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testv_minor=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vers_major=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vers_minor=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if wanted_major > found_major, this isn't good enough
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $vers_major -gt $testv_major ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if wanted_major < found_major, then this is fine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test $vers_major -lt $testv_major ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if we get here, then the majors are equal, so test the minor version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we want found_minor >= want_minor.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # So, if want_minor > found_minor, this is bad.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test $vers_minor -gt $testv_minor ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# usage: find_program preset program version "<other versions>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sets "program" to the name of the program to use.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if preset is set, then use that regardless,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# otherwise check if "program" is of a good enough version and use that,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# otherwise check if "program-version" is of a good enough version and use that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# otherwise return an error.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find="$1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prog="$2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vers="$3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extravers="$4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -n "$find" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_version "$find" "$vers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status="$?"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$status" = 0 ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program="$find"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: cannot use $find"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_version "$prog" "$vers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$status" = 0 ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program="$prog"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for test_vers in $vers $extravers ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_version "$prog-$test_vers" "$vers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$status" = 0 ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program="$prog-$test_vers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Warning**: Could not find a $prog that identifies itself >= $vers."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program="$prog"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Store all required programs in variables. All of these variables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# could have been set by the developer beforehand, if he/she needs to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# override the defaults of here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${GLIB_GETTEXTIZE=glib-gettextize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${INTLTOOLIZE=intltoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${LIBTOOLIZE=libtoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program "$AUTOCONF" autoconf 2.59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOCONF="$program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program "$AUTOHEADER" autoheader 2.59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOHEADER="$program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program "$AUTOMAKE" automake 1.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOMAKE="$program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program "$ACLOCAL" aclocal 1.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ACLOCAL="$program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# All variables are set. Now check whether these programs are really
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# available.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${GLIB_GETTEXTIZE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`glib-gettextize' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Get the development packages of the glib-2.x library from your distribution."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`intltoolize' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Get the package 'intltool' of your distribution."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# On MacOS, libtoolize is installed as glibtoolize, so handle that here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOLIZE=glibtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Could not find either \`libtoolize' or \'glibtoolize'."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`automake' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_AUTOMAKE=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if no automake, don't bother testing for aclocal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: Missing \`aclocal'. The version of \`automake'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "installed doesn't appear recent enough (older than automake-1.4)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`autoconf' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test "$DIE" -eq 1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case $CC in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xlc )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_opt=--include-deps;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# All programs are available. So now actually call them in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# required order.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Creating po/POTFILES.in ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -r po/POTFILES.in || touch po/POTFILES.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Creating aclocal.m4 ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -r aclocal.m4 || touch aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${GLIB_GETTEXTIZE} --force --copy ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "GnuCash note: Please ignore the output of ${GLIB_GETTEXTIZE} below!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "no" | ${GLIB_GETTEXTIZE} --force --copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "GnuCash note: Please ignore the output of ${GLIB_GETTEXTIZE} above!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Ensure aclocal.m4 is writable ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -r aclocal.m4 && chmod u+w aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Ensure po/POTFILES.in is writable ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -r po/POTFILES.in && chmod u+w po/POTFILES.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${INTLTOOLIZE} --force --copy ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${INTLTOOLIZE} --force --copy || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${INTLTOOLIZE} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${LIBTOOLIZE} --force --copy ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${LIBTOOLIZE} --force --copy || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${LIBTOOLIZE} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-aclocalinclude="$ACLOCAL_FLAGS -I macros"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${ACLOCAL} $aclocalinclude ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${ACLOCAL} $aclocalinclude || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${ACLOCAL} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${AUTOHEADER}..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${AUTOHEADER} || { echo "**Error**: ${AUTOHEADER} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${AUTOMAKE} --add-missing --gnu --warnings=no-portability $am_opt ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${AUTOMAKE} --add-missing --gnu --warnings=no-portability $am_opt || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${AUTOMAKE} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${AUTOCONF} ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${AUTOCONF} || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${AUTOCONF} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Done.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conf_flags="--enable-compile-warnings" # --enable-iso-c --enable-error-on-warning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "NOTE: Just run configure. Even if something told you to run"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo " aclocal, automake, or anything else above, IGNORE IT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo " Everything has been run properly. Just run configure..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo You must now run $srcdir/configure $conf_flags "$@" ...
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/glibconfig.h b/gnome/gnucash/files/glibconfig.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8746f99..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/glibconfig.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,195 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* glibconfig.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * This is a generated file. Please modify 'configure.ac'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef __GLIBCONFIG_H__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define __GLIBCONFIG_H__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <glib/gmacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <limits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <float.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_HAVE_ALLOCA_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Specifies that GLib's g_print*() functions wrap the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * system printf functions. This is useful to know, for example,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * when using glibc's register_printf_function().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_USING_SYSTEM_PRINTF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-G_BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MINFLOAT FLT_MIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXFLOAT FLT_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MINDOUBLE DBL_MIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXDOUBLE DBL_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MINSHORT SHRT_MIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXSHORT SHRT_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXUSHORT USHRT_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MININT INT_MIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXINT INT_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXUINT UINT_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MINLONG LONG_MIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXLONG LONG_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXULONG ULONG_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef signed char gint8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef unsigned char guint8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef signed short gint16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef unsigned short guint16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINT16_MODIFIER "h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINT16_FORMAT "hi"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GUINT16_FORMAT "hu"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef signed int gint32;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef unsigned int guint32;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINT32_MODIFIER ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINT32_FORMAT "i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GUINT32_FORMAT "u"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_HAVE_GINT64 1 /* deprecated, always true */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef signed long long gint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef unsigned long long guint64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINT64_CONSTANT(val) (val##LL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GUINT64_CONSTANT(val) (val##ULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINT64_MODIFIER "ll"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINT64_FORMAT "lli"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GUINT64_FORMAT "llu"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SIZEOF_SSIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef signed long gssize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef unsigned long gsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GSIZE_MODIFIER "l"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GSSIZE_MODIFIER "l"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GSIZE_FORMAT "lu"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GSSIZE_FORMAT "li"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXSIZE G_MAXULONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MINSSIZE G_MINLONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXSSIZE G_MAXLONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef gint64 goffset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MINOFFSET G_MININT64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MAXOFFSET G_MAXINT64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GOFFSET_FORMAT G_GINT64_FORMAT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_POLLFD_FORMAT "%d"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GPOINTER_TO_INT(p) ((gint) (gint64) (p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GPOINTER_TO_UINT(p) ((guint) (guint64) (p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT_TO_POINTER(i) ((gpointer) (gint64) (i))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT_TO_POINTER(u) ((gpointer) (guint64) (u))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef signed long long gintptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef unsigned long long guintptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINTPTR_MODIFIER "I64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GINTPTR_FORMAT "I64i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GUINTPTR_FORMAT "I64u"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef G_DISABLE_DEPRECATED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define g_ATEXIT(proc) (atexit (proc))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_MAJOR_VERSION 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_MINOR_VERSION 52
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_MICRO_VERSION 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_OS_UNIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_VA_COPY va_copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_VA_COPY_AS_ARRAY 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifndef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# define G_HAVE_ISO_VARARGS 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# define G_HAVE_ISO_VARARGS 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * is passed ISO vararg support is turned off, and there is no work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * around to turn it on, so we unconditionally turn it off.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# undef G_HAVE_ISO_VARARGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_HAVE_GNUC_VARARGS 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_HAVE_GROWING_STACK 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GNUC_INTERNAL __hidden
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_GNUC_INTERNAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_THREADS_ENABLED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_THREADS_IMPL_POSIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_ATOMIC_LOCK_FREE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT16_TO_LE(val) ((gint16) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT16_TO_LE(val) ((guint16) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT32_TO_LE(val) ((gint32) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT32_TO_LE(val) ((guint32) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT64_TO_LE(val) ((gint64) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT64_TO_LE(val) ((guint64) (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GULONG_TO_LE(val) ((gulong) GUINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GULONG_TO_BE(val) ((gulong) GUINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GSIZE_TO_LE(val) ((gsize) GUINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GSSIZE_TO_LE(val) ((gssize) GINT64_TO_LE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GSIZE_TO_BE(val) ((gsize) GUINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GSSIZE_TO_BE(val) ((gssize) GINT64_TO_BE (val))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_BYTE_ORDER G_LITTLE_ENDIAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_POLLIN =1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_POLLOUT =4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_POLLPRI =2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_POLLHUP =16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_POLLERR =8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_POLLNVAL =32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_MODULE_SUFFIX "so"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef int GPid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define G_PID_FORMAT "i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_AF_UNIX 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_AF_INET 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_AF_INET6 30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_MSG_OOB 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_MSG_PEEK 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define GLIB_SYSDEF_MSG_DONTROUTE 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-G_END_DECLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif /* __GLIBCONFIG_H__ */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-configure.ac.diff b/gnome/gnucash/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b5924f4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-05-16 21:59:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-05-16 22:00:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +357,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform=darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_DEFINE(PLATFORM_OSX,1,[Running on OSX, either X11 or Quartz])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT($platform)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING(For GDK-Quartz)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform=osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -429,7 +428,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(REGEX_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(PLATFORM_LINUX, test "x$platform" = "xlinux/other")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CONDITIONAL(PLATFORM_OSX, test "x$platform" = "xdarwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(PLATFORM_OSX_QUARTZ, test "x$platform" = "xdarwin/quartz")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(PLATFORM_WIN32, test "x$platform" = "xwin32")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-configure.diff b/gnome/gnucash/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3160d1d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2011-01-14 17:48:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2011-01-14 17:48:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14681,13 +14681,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_OSX_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$platform" = "xdarwin/quartz"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_OSX_QUARTZ_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_OSX_QUARTZ_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_OSX_QUARTZ_TRUE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_OSX_QUARTZ_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM_OSX_QUARTZ_TRUE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM_OSX_QUARTZ_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$platform" = "xwin32"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_WIN32_TRUE=
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-devel-src_bin_environment.in.diff b/gnome/gnucash/files/patch-devel-src_bin_environment.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d845785..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/patch-devel-src_bin_environment.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnucash/environment.in.orig 2016-10-04 23:47:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnucash/environment.in 2016-10-04 23:46:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_LOAD_COMPILED_PATH={GNC_LIB}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_COMPILED_LIBS};{GUILE_LOAD_COMPILED_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tell Guile where to find GnuCash specific shared libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GNC_LIBRARY_PATH={SYS_LIB};{GNC_LIB}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GNC_LIBRARY_PATH={GNC_LIB};@@GUILEPATH@@;@@LIBDIR@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD_LIBRARY_PATH={GNC_LIBRARY_PATH};{LD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The same, but for GnuCash on OS X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DYLD_LIBRARY_PATH={GNC_LIBRARY_PATH};{DYLD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-devel-src_core-utils_gnc-path.c.diff b/gnome/gnucash/files/patch-devel-src_core-utils_gnc-path.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a2442b0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/patch-devel-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgnucash/core-utils/gnc-path.c.orig 2016-10-09 12:42:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgnucash/core-utils/gnc-path.c 2016-10-09 12:44:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *gnc_path_get_libdir()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //printf("Returning libdir %s\n", gnc_gbr_find_lib_dir (LIBDIR));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return gnc_gbr_find_lib_dir (LIBDIR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return g_strdup("@@LIBDIR@@");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Returns the datadir path, usually
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-glibconfig.h.diff b/gnome/gnucash/files/patch-glibconfig.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cd8f232
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash/files/patch-glibconfig.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,98 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/glibconfig.h 2018-04-12 20:05:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/glibconfig.h 2017-12-18 17:18:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,42 +48,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_GUINT32_FORMAT "u"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_HAVE_GINT64 1 /* deprecated, always true */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef signed long gint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef unsigned long guint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-G_GNUC_EXTENSION typedef signed long long gint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-G_GNUC_EXTENSION typedef unsigned long long guint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef signed long long gint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned long long guint64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINT64_CONSTANT(val) (val##L)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINT64_CONSTANT(val) (val##UL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINT64_MODIFIER "l"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINT64_FORMAT "li"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINT64_FORMAT "lu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINT64_CONSTANT(val) (val##LL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GUINT64_CONSTANT(val) (val##ULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_GINT64_MODIFIER "ll"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_GINT64_FORMAT "lli"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_GUINT64_FORMAT "llu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GLIB_SIZEOF_SSIZE_T 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GLIB_SIZEOF_SSIZE_T 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef signed long gssize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned long gsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,39 +84,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define G_POLLFD_FORMAT "%d"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GPOINTER_TO_UINT(p) ((guint) (gulong) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GPOINTER_TO_INT(p) ((gint) (gint) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GPOINTER_TO_UINT(p) ((guint) (guint) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GPOINTER_TO_INT(p) ((gint) (gint64) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GPOINTER_TO_UINT(p) ((guint) (guint64) (p))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT_TO_POINTER(i) ((gpointer) (glong) (i))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT_TO_POINTER(u) ((gpointer) (gulong) (u))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GINT_TO_POINTER(i) ((gpointer) (gint) (i))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define GUINT_TO_POINTER(u) ((gpointer) (guint) (u))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GINT_TO_POINTER(i) ((gpointer) (gint64) (i))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GUINT_TO_POINTER(u) ((gpointer) (guint64) (u))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef signed long gintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef unsigned long guintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef signed int gintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef unsigned int guintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef signed long long gintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef unsigned long long guintptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINTPTR_MODIFIER "l"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINTPTR_FORMAT "li"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINTPTR_FORMAT "lu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINTPTR_MODIFIER ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GINTPTR_FORMAT "i"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define G_GUINTPTR_FORMAT "u"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINTPTR_MODIFIER "I64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GINTPTR_FORMAT "I64i"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define G_GUINTPTR_FORMAT "I64u"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef G_DISABLE_DEPRECATED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define g_ATEXIT(proc) (atexit (proc))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-src_bin_environment.in.diff b/gnome/gnucash/files/patch-src_bin_environment.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9308824..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/patch-src_bin_environment.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bin/environment.in.orig 2016-10-04 23:47:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bin/environment.in 2016-10-04 23:46:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_LOAD_COMPILED_PATH={GNC_LIB}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_COMPILED_LIBS};{GUILE_LOAD_COMPILED_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tell Guile where to find GnuCash specific shared libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GNC_LIBRARY_PATH={SYS_LIB};{GNC_LIB}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GNC_LIBRARY_PATH={GNC_LIB};@@GUILEPATH@@;@@LIBDIR@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD_LIBRARY_PATH={GNC_LIBRARY_PATH};{LD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The same, but for GnuCash on OS X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DYLD_LIBRARY_PATH={GNC_LIBRARY_PATH};{DYLD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/files/patch-src_core-utils_gnc-path.c.diff b/gnome/gnucash/files/patch-src_core-utils_gnc-path.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b3be84d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/files/patch-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core-utils/gnc-path.c.orig 2016-10-09 12:42:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core-utils/gnc-path.c 2016-10-09 12:44:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *gnc_path_get_libdir()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //printf("Returning libdir %s\n", gnc_gbr_find_lib_dir (LIBDIR));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return gnc_gbr_find_lib_dir (LIBDIR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return g_strdup("@@LIBDIR@@");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Returns the datadir path, usually
</span></pre><pre style='margin:0'>
</pre>