pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnucash-git: finish package.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Jul 29 12:01:20 2017 +0200
Changeset:	88a68b62785d658360e1cf97b0f40afb57dd5f5a

Modified Files:
	gnucash-git/Makefile
	gnucash-git/PLIST
	gnucash-git/distinfo
	gnucash-git/patches/patch-configure.ac
Added Files:
	gnucash-git/patches/patch-src_register_register-gnome_gnucash-cursor.h
	gnucash-git/patches/patch-src_register_register-gnome_table-gnome.c

Log Message:
gnucash-git: finish package.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=88a68b62785d658360e1cf97b0f40afb57dd5f5a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnucash-git/Makefile                               |  14 ++-
 gnucash-git/PLIST                                  | 113 +++++++++++----------
 gnucash-git/distinfo                               |  12 ++-
 gnucash-git/patches/patch-configure.ac             |  17 ----
 ...ch-src_register_register-gnome_gnucash-cursor.h |  15 +++
 ...patch-src_register_register-gnome_table-gnome.c |  15 +++
 6 files changed, 106 insertions(+), 80 deletions(-)

diffs:
diff --git a/gnucash-git/Makefile b/gnucash-git/Makefile
index 04b65a309b..4fa00b72cb 100644
--- a/gnucash-git/Makefile
+++ b/gnucash-git/Makefile
@@ -4,6 +4,11 @@ DISTNAME=		gnucash-2.6.99
 CATEGORIES=		finance
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnucash/}
 EXTRACT_SUFX=		.tar.bz2
+# take copy mirrored on ftp.NetBSD.org for devel/googletest
+# for better DISTNAME
+# depending on googletest package is not sufficient since not all
+# files that are used are installed
+DISTFILES=		googletest-1.8.0.tar.gz
 
 MAINTAINER=		wiz%NetBSD.org@localhost
 HOMEPAGE=		http://www.gnucash.org/
@@ -29,7 +34,7 @@ GIT_MODULE.github=	gnucash
 GIT_REPO.github=	https://github.com/Gnucash/gnucash.git
 WRKSRC=			${WRKDIR}/gnucash
 
-USE_LANGUAGES=		c c++11
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool makeinfo msgfmt perl:run pkg-config
@@ -40,7 +45,8 @@ INFO_FILES=		YES
 CONFIGURE_ARGS+=	--with-html-engine=webkit
 CONFIGURE_ARGS+=	--enable-python
 CONFIGURE_ARGS+=	--with-xdg-data-dirs=${PREFIX}/share
-#CONFIGURE_ARGS+=	GUILE=${PREFIX}/${GUILE20_SUBDIR}/bin/guile
+CONFIGURE_ARGS+=	GTEST_ROOT=${WRKDIR}/googletest-release-1.8.0/googletest
+CONFIGURE_ARGS+=	GMOCK_ROOT=${WRKDIR}/googletest-release-1.8.0/googlemock
 
 REPLACE_PERL+=		src/quotes/gnc-fq-dump
 REPLACE_PERL+=		src/backend/xml/test/grab-types.pl
@@ -64,12 +70,12 @@ pre-configure:
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.40.0
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.boost-headers+=   boost-headers>=1.64.0nb3
+.include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-#.include "../../devel/googletest/buildlink3.mk"
 .include "../../devel/swig2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-#.include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../lang/guile20/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/gnucash-git/PLIST b/gnucash-git/PLIST
index 813199a6b5..c831455539 100644
--- a/gnucash-git/PLIST
+++ b/gnucash-git/PLIST
@@ -62,6 +62,7 @@ include/gnucash/gnc-account-sel.h
 include/gnucash/gnc-accounting-period.h
 include/gnucash/gnc-addr-quickfill.h
 include/gnucash/gnc-amount-edit.h
+include/gnucash/gnc-aqbanking-templates.h
 include/gnucash/gnc-basic-gobject.h
 include/gnucash/gnc-budget.h
 include/gnucash/gnc-cell-renderer-date.h
@@ -77,6 +78,7 @@ include/gnucash/gnc-date-edit.h
 include/gnucash/gnc-date-format.h
 include/gnucash/gnc-date-p.h
 include/gnucash/gnc-date.h
+include/gnucash/gnc-datetime.hpp
 include/gnucash/gnc-dense-cal-model.h
 include/gnucash/gnc-dense-cal-store.h
 include/gnucash/gnc-dense-cal.h
@@ -102,7 +104,7 @@ include/gnucash/gnc-html-factory.h
 include/gnucash/gnc-html-history.h
 include/gnucash/gnc-html-p.h
 include/gnucash/gnc-html-webkit-p.h
-include/gnucash/gnc-html-webkit.h
+include/gnucash/gnc-html-webkit2.h
 include/gnucash/gnc-html.h
 include/gnucash/gnc-icons.h
 include/gnucash/gnc-keyring.h
@@ -111,6 +113,7 @@ include/gnucash/gnc-menu-extensions.h
 include/gnucash/gnc-module-api.h
 include/gnucash/gnc-module.h
 include/gnucash/gnc-numeric.h
+include/gnucash/gnc-numeric.hpp
 include/gnucash/gnc-period-select.h
 include/gnucash/gnc-plugin-file-history.h
 include/gnucash/gnc-plugin-manager.h
@@ -121,6 +124,8 @@ include/gnucash/gnc-plugin.h
 include/gnucash/gnc-prefs-utils.h
 include/gnucash/gnc-pricedb.h
 include/gnucash/gnc-query-view.h
+include/gnucash/gnc-rational-rounding.hpp
+include/gnucash/gnc-rational.hpp
 include/gnucash/gnc-recurrence.h
 include/gnucash/gnc-report.h
 include/gnucash/gnc-session.h
@@ -129,6 +134,7 @@ include/gnucash/gnc-state.h
 include/gnucash/gnc-sx-instance-dense-cal-adapter.h
 include/gnucash/gnc-sx-instance-model.h
 include/gnucash/gnc-sx-list-tree-model-adapter.h
+include/gnucash/gnc-timezone.hpp
 include/gnucash/gnc-tree-control-split-reg.h
 include/gnucash/gnc-tree-model-account-types.h
 include/gnucash/gnc-tree-model-account.h
@@ -178,22 +184,20 @@ include/gnucash/gncVendorP.h
 include/gnucash/gtable.h
 include/gnucash/guid.h
 include/gnucash/guile-util.h
-include/gnucash/import-match-map.h
 include/gnucash/import-parse.h
 include/gnucash/kvp-scm.h
-include/gnucash/kvp-util-p.h
-include/gnucash/kvp-util.h
-include/gnucash/kvp_frame.h
+include/gnucash/kvp-value.hpp
+include/gnucash/kvp_frame.hpp
 include/gnucash/misc-gnome-utils.h
 include/gnucash/numcell.h
 include/gnucash/option-util.h
 include/gnucash/policy.h
 include/gnucash/pricecell.h
 include/gnucash/print-session.h
+include/gnucash/qof-backend.hpp
 include/gnucash/qof-gobject.h
 include/gnucash/qof-string-cache.h
 include/gnucash/qof.h
-include/gnucash/qofbackend-p.h
 include/gnucash/qofbackend.h
 include/gnucash/qofbook.h
 include/gnucash/qofbookslots.h
@@ -208,8 +212,8 @@ include/gnucash/qoflog.h
 include/gnucash/qofobject.h
 include/gnucash/qofquery.h
 include/gnucash/qofquerycore.h
-include/gnucash/qofreference.h
 include/gnucash/qofsession.h
+include/gnucash/qofsession.hpp
 include/gnucash/qofutil.h
 include/gnucash/quickfillcell.h
 include/gnucash/recncell.h
@@ -232,13 +236,13 @@ lib/gnucash/libgncmod-csv-import.la
 lib/gnucash/libgncmod-customer_import.la
 lib/gnucash/libgncmod-engine.la
 lib/gnucash/libgncmod-generic-import.la
+${PLIST.ofx}lib/gnucash/libgncmod-ofx.la
 lib/gnucash/libgncmod-gnome-search.la
 lib/gnucash/libgncmod-gnome-utils.la
 lib/gnucash/libgncmod-html.la
 lib/gnucash/libgncmod-ledger-core.la
 lib/gnucash/libgncmod-locale-reports-us.la
 lib/gnucash/libgncmod-log-replay.la
-${PLIST.ofx}lib/gnucash/libgncmod-ofx.la
 lib/gnucash/libgncmod-python.la
 lib/gnucash/libgncmod-qif-import.la
 lib/gnucash/libgncmod-qif.la
@@ -291,6 +295,7 @@ lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/de_DE.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/locale-specific/us.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/owner-report.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/payables.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/receipt.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/receivables.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/report-gnome.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/report-system.go
@@ -326,6 +331,7 @@ lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/trial-balance.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-easy.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-fancy.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-footer.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-head-or-tail.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheet-plain.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/stylesheets.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/taxinvoice.go
@@ -392,7 +398,7 @@ ${PYSITELIB}/gnucash/gnucash_core.py
 ${PYSITELIB}/gnucash/gnucash_core_c.py
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
-libexec/gnucash/src/libqof/qof/test/kvp_frame.h
+libexec/gnucash/src/libqof/qof/test/kvp_frame.hpp
 libexec/gnucash/src/libqof/qof/test/qofbook.h
 libexec/gnucash/src/libqof/qof/test/qofinstance.h
 libexec/gnucash/src/libqof/qof/test/qofobject.h
@@ -872,6 +878,8 @@ share/gnucash/gtkbuilder/dialog-date-close.glade
 share/gnucash/gtkbuilder/dialog-employee.glade
 share/gnucash/gtkbuilder/dialog-file-access.glade
 share/gnucash/gtkbuilder/dialog-fincalc.glade
+share/gnucash/gtkbuilder/dialog-find-account.glade
+share/gnucash/gtkbuilder/dialog-imap-editor.glade
 share/gnucash/gtkbuilder/dialog-import.glade
 share/gnucash/gtkbuilder/dialog-invoice.glade
 share/gnucash/gtkbuilder/dialog-job.glade
@@ -893,6 +901,7 @@ share/gnucash/gtkbuilder/dialog-sx.glade
 share/gnucash/gtkbuilder/dialog-tax-info.glade
 share/gnucash/gtkbuilder/dialog-tax-table.glade
 share/gnucash/gtkbuilder/dialog-totd.glade
+share/gnucash/gtkbuilder/dialog-trans-assoc.glade
 share/gnucash/gtkbuilder/dialog-transfer.glade
 share/gnucash/gtkbuilder/dialog-userpass.glade
 share/gnucash/gtkbuilder/dialog-vendor.glade
@@ -905,6 +914,42 @@ share/gnucash/gtkbuilder/gnc-recurrence.glade
 share/gnucash/gtkbuilder/gnc-tree-view-owner.glade
 share/gnucash/gtkbuilder/window-autoclear.glade
 share/gnucash/gtkbuilder/window-reconcile.glade
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-delete.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-edit.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-new.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-open.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account-report.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-account.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-gnome-pdf.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-duplicate.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-edit.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-new.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-pay.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-post.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice-unpost.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-invoice.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-jumpto.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-split-trans.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-sx-new.png
+share/gnucash/icons/hicolor/16x16/actions/gnc-transfer.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-delete.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-edit.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-new.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-open.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account-report.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-account.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-gnome-pdf.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-duplicate.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-edit.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-new.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-pay.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-post.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice-unpost.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-invoice.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-jumpto.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-split-trans.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-sx-new.png
+share/gnucash/icons/hicolor/24x24/actions/gnc-transfer.png
 share/gnucash/jqplot/jqplot.BezierCurveRenderer.js
 share/gnucash/jqplot/jqplot.barRenderer.js
 share/gnucash/jqplot/jqplot.blockRenderer.js
@@ -935,54 +980,9 @@ share/gnucash/jqplot/jquery.jqplot.js
 share/gnucash/jqplot/jquery.min.js
 share/gnucash/make-prefs-migration-script.xsl
 share/gnucash/migratable-prefs.xml
-share/gnucash/pixmaps/gnc-account-16.png
-share/gnucash/pixmaps/gnc-account-delete-16.png
-share/gnucash/pixmaps/gnc-account-delete.png
-share/gnucash/pixmaps/gnc-account-edit-16.png
-share/gnucash/pixmaps/gnc-account-edit.png
-share/gnucash/pixmaps/gnc-account-new-16.png
-share/gnucash/pixmaps/gnc-account-new.png
-share/gnucash/pixmaps/gnc-account-open-16.png
-share/gnucash/pixmaps/gnc-account-open.png
-share/gnucash/pixmaps/gnc-account-report-16.png
-share/gnucash/pixmaps/gnc-account-report.png
-share/gnucash/pixmaps/gnc-account.png
-share/gnucash/pixmaps/gnc-gnome-pdf-16.png
-share/gnucash/pixmaps/gnc-gnome-pdf-24.png
-share/gnucash/pixmaps/gnc-invoice-16.png
-share/gnucash/pixmaps/gnc-invoice-duplicate-16.png
-share/gnucash/pixmaps/gnc-invoice-duplicate.png
-share/gnucash/pixmaps/gnc-invoice-edit-16.png
-share/gnucash/pixmaps/gnc-invoice-edit.png
-share/gnucash/pixmaps/gnc-invoice-new-16.png
-share/gnucash/pixmaps/gnc-invoice-new.png
-share/gnucash/pixmaps/gnc-invoice-pay-16.png
-share/gnucash/pixmaps/gnc-invoice-pay.png
-share/gnucash/pixmaps/gnc-invoice-post-16.png
-share/gnucash/pixmaps/gnc-invoice-post.png
-share/gnucash/pixmaps/gnc-invoice-unpost-16.png
-share/gnucash/pixmaps/gnc-invoice-unpost.png
-share/gnucash/pixmaps/gnc-invoice.png
-share/gnucash/pixmaps/gnc-jumpto-16.png
-share/gnucash/pixmaps/gnc-jumpto.png
-share/gnucash/pixmaps/gnc-split-trans-16.png
-share/gnucash/pixmaps/gnc-split-trans.png
-share/gnucash/pixmaps/gnc-sx-new-16.png
-share/gnucash/pixmaps/gnc-sx-new.png
-share/gnucash/pixmaps/gnc-transfer-16.png
-share/gnucash/pixmaps/gnc-transfer.png
-share/gnucash/pixmaps/gnucash-icon-128x128.png
-share/gnucash/pixmaps/gnucash-icon-16x16.png
-share/gnucash/pixmaps/gnucash-icon-256x256.png
-share/gnucash/pixmaps/gnucash-icon-32x32.png
 share/gnucash/pixmaps/gnucash-icon-48x48.bmp
-share/gnucash/pixmaps/gnucash-icon-48x48.png
-share/gnucash/pixmaps/gnucash-icon-64x64.png
-share/gnucash/pixmaps/gnucash-icon-96x96.png
 share/gnucash/pixmaps/gnucash-icon.ico
 share/gnucash/pixmaps/gnucash_splash.png
-share/gnucash/pixmaps/stock_split_title.png
-share/gnucash/pixmaps/stock_split_watermark.png
 share/gnucash/python/init.py
 share/gnucash/python/pycons/__init__.py
 share/gnucash/python/pycons/console.py
@@ -1034,6 +1034,9 @@ share/gnucash/scm/gnucash/report/locale-specific/de_DE.scm
 share/gnucash/scm/gnucash/report/locale-specific/us.scm
 share/gnucash/scm/gnucash/report/owner-report.scm
 share/gnucash/scm/gnucash/report/payables.scm
+share/gnucash/scm/gnucash/report/receipt.css
+share/gnucash/scm/gnucash/report/receipt.eguile.scm
+share/gnucash/scm/gnucash/report/receipt.scm
 share/gnucash/scm/gnucash/report/receivables.scm
 share/gnucash/scm/gnucash/report/report-gnome.scm
 share/gnucash/scm/gnucash/report/report-system.scm
@@ -1069,6 +1072,7 @@ share/gnucash/scm/gnucash/report/standard-reports/trial-balance.scm
 share/gnucash/scm/gnucash/report/stylesheet-easy.scm
 share/gnucash/scm/gnucash/report/stylesheet-fancy.scm
 share/gnucash/scm/gnucash/report/stylesheet-footer.scm
+share/gnucash/scm/gnucash/report/stylesheet-head-or-tail.scm
 share/gnucash/scm/gnucash/report/stylesheet-plain.scm
 share/gnucash/scm/gnucash/report/stylesheets.scm
 share/gnucash/scm/gnucash/report/taxinvoice.css
@@ -1156,6 +1160,7 @@ share/gnucash/ui/gnc-sxed-window-ui-full.xml
 share/gnucash/ui/gnc-sxed-window-ui.xml
 share/gnucash/ui/gnc-windows-menu-ui-quartz.xml
 share/gnucash/ui/gnc-windows-menu-ui.xml
+share/gnucash/ui/gnucash.css
 share/gnucash/ui/osx_accel_map
 share/icons/hicolor/128x128/apps/gnucash-icon.png
 share/icons/hicolor/16x16/apps/gnucash-icon.png
diff --git a/gnucash-git/distinfo b/gnucash-git/distinfo
index 3e83997fa9..f0e87ebbef 100644
--- a/gnucash-git/distinfo
+++ b/gnucash-git/distinfo
@@ -1,8 +1,10 @@
 $NetBSD: distinfo,v 1.82 2017/07/03 11:49:37 wiz Exp $
 
-SHA1 (gnucash-2.6.17.tar.bz2) = 5e21d20ee96cc27a15c3213c623b2e6bb4b3a953
-RMD160 (gnucash-2.6.17.tar.bz2) = c847025dc7f99248e015ad633e2fdf6bf6e11b28
-SHA512 (gnucash-2.6.17.tar.bz2) = 086f31644e29eaf4360db48124e3760d28ea186ef638bcdb6091db1acecb9641932777ac2969331c93d9aec0cd428a04f555e96b1b4e643e07905b86cb6209ca
-Size (gnucash-2.6.17.tar.bz2) = 13508462 bytes
-SHA1 (patch-configure.ac) = 85e1639e432a92613abd1ab394aaa17ce5797474
+SHA1 (googletest-1.8.0.tar.gz) = e7e646a6204638fe8e87e165292b8dd9cd4c36ed
+RMD160 (googletest-1.8.0.tar.gz) = b0a9e48874df3291a261ed85a0c0a4d677b01dc1
+SHA512 (googletest-1.8.0.tar.gz) = 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
+Size (googletest-1.8.0.tar.gz) = 1281617 bytes
+SHA1 (patch-configure.ac) = 382961e9e218601cb1667a5d4c089f56f0b69a8d
 SHA1 (patch-src_bin_gnucash-bin.c) = 18c8909af46cef77adddabd015bf57e4b0fd3f9b
+SHA1 (patch-src_register_register-gnome_gnucash-cursor.h) = 8c377dac6739e3d864af5d5790b9c693d8ca3f2b
+SHA1 (patch-src_register_register-gnome_table-gnome.c) = 074a5b3af739ce5349692dc81fba469b6efeff50
diff --git a/gnucash-git/patches/patch-configure.ac b/gnucash-git/patches/patch-configure.ac
index 733667b935..7444191c75 100644
--- a/gnucash-git/patches/patch-configure.ac
+++ b/gnucash-git/patches/patch-configure.ac
@@ -1,27 +1,10 @@
 $NetBSD$
 
-Do not insist on googletest.
-https://bugzilla.gnome.org/show_bug.cgi?id=785492
-
 Fix unportable test(1) operator.
 https://github.com/Gnucash/gnucash/pull/163
 
 --- configure.ac.orig	2017-07-27 09:52:14.000000000 +0000
 +++ configure.ac
-@@ -962,12 +962,7 @@ fi
- if test "x$google_test_found" = "xyes"; then
-     AC_MSG_RESULT([Yes])
- else
--    AC_MSG_ERROR([
--
-- Unable to find the Google test framework. Either install gtest/gmock
-- packages or point to the base directories of the sources using
-- GTEST_ROOT and GMOCK_ROOT environment variables.
--])
-+    AC_MSG_RESULT([No])
- fi
- 
- if test "x$ac_cv_have_gtest_libs" = xyes; then
 @@ -989,7 +984,7 @@ AC_SUBST([GTEST_HEADERS], [$ac_cv_gtest_
  AC_SUBST([GMOCK_SRC_PATH], [$ac_cv_gmock_src_path])
  AC_SUBST([GMOCK_SRC], [$ac_cv_gmock_root])
diff --git a/gnucash-git/patches/patch-src_register_register-gnome_gnucash-cursor.h b/gnucash-git/patches/patch-src_register_register-gnome_gnucash-cursor.h
new file mode 100644
index 0000000000..d2e0773fce
--- /dev/null
+++ b/gnucash-git/patches/patch-src_register_register-gnome_gnucash-cursor.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use proper glib2 header path.
+
+--- src/register/register-gnome/gnucash-cursor.h.orig	2017-07-27 09:52:15.000000000 +0000
++++ src/register/register-gnome/gnucash-cursor.h
+@@ -21,7 +21,7 @@
+ #ifndef GNUCASH_CURSOR_H
+ #define GNUCASH_CURSOR_H
+ 
+-#include <glib-2.0/glib.h>
++#include <glib.h>
+ #include "gnucash-sheet.h"
+ 
+ /** @ingroup Register
diff --git a/gnucash-git/patches/patch-src_register_register-gnome_table-gnome.c b/gnucash-git/patches/patch-src_register_register-gnome_table-gnome.c
new file mode 100644
index 0000000000..342925991d
--- /dev/null
+++ b/gnucash-git/patches/patch-src_register_register-gnome_table-gnome.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use proper glib2 header path.
+
+--- src/register/register-gnome/table-gnome.c.orig	2017-07-27 09:52:15.000000000 +0000
++++ src/register/register-gnome/table-gnome.c
+@@ -42,7 +42,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <glib-2.0/glib.h>
++#include <glib.h>
+ 
+ #include "gnucash-sheet.h"
+ #include "gnucash-sheetP.h"


Home | Main Index | Thread Index | Old Index