pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnucash-devel: fix build with cmake.

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Sat Feb 10 12:08:29 2018 +0100
Changeset:	e765f8adfc82e7a1783dac3ea96add3b60309ca9

Modified Files:
	gnucash-devel/Makefile
	gnucash-devel/PLIST
	gnucash-devel/distinfo
Added Files:
	gnucash-devel/TODO
	gnucash-devel/patches/patch-gnucash_CMakeLists.txt
	gnucash-devel/patches/patch-gnucash_ugly-hack_CMakeLists.txt

Log Message:
gnucash-devel: fix build with cmake.

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

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

diffstat:
 gnucash-devel/Makefile                             |   7 +-
 gnucash-devel/PLIST                                | 150 ++++++++++++++++-----
 gnucash-devel/TODO                                 |   1 +
 gnucash-devel/distinfo                             |   2 +
 gnucash-devel/patches/patch-gnucash_CMakeLists.txt |  26 ++++
 .../patches/patch-gnucash_ugly-hack_CMakeLists.txt |   8 ++
 6 files changed, 157 insertions(+), 37 deletions(-)

diffs:
diff --git a/gnucash-devel/Makefile b/gnucash-devel/Makefile
index b90af632c6..36f7bb715e 100644
--- a/gnucash-devel/Makefile
+++ b/gnucash-devel/Makefile
@@ -53,8 +53,11 @@ CONF_FILES+=		${PREFIX}/share/examples/gnucash/gnucash/environment ${PKG_SYSCONF
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/gnucash
 
 # for CMake build
-#pre-build:
-#	${MKDIR} -p ${WRKDIR}/.home/.local/share
+pre-patch:
+	${MKDIR} -p ${WRKSRC}/gnucash/ugly-hack
+
+pre-build:
+	${MKDIR} -p ${WRKDIR}/.home/.local/share
 
 .include "options.mk"
 
diff --git a/gnucash-devel/PLIST b/gnucash-devel/PLIST
index e53594fe47..d6f576984a 100644
--- a/gnucash-devel/PLIST
+++ b/gnucash-devel/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.63 2017/04/05 16:45:47 wiz Exp $
+@comment $NetBSD$
 bin/gnc-fq-check
 bin/gnc-fq-dump
 bin/gnc-fq-helper
 bin/gnc-fq-update
 bin/gnucash
+bin/gnucash-valgrind
+etc/gnucash/config
+etc/gnucash/environment
 include/gnucash/Account.h
 include/gnucash/FreqSpec.h
 include/gnucash/Query.h
@@ -101,6 +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
@@ -224,30 +228,30 @@ include/gnucash/table-model.h
 include/gnucash/tree-view-utils.h
 include/gnucash/window-main-summarybar.h
 include/gnucash/window-report.h
-lib/gnucash/libgncmod-app-utils.la
-${PLIST.dbi}lib/gnucash/libgncmod-backend-dbi.la
-lib/gnucash/libgncmod-backend-xml.la
-lib/gnucash/libgncmod-bi-import.la
-lib/gnucash/libgncmod-csv-export.la
-lib/gnucash/libgncmod-csv-import.la
-lib/gnucash/libgncmod-customer-import.la
-lib/gnucash/libgncmod-engine.la
-lib/gnucash/libgncmod-generic-import.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-qif-import.la
-lib/gnucash/libgncmod-qif.la
-lib/gnucash/libgncmod-register-core.la
-lib/gnucash/libgncmod-register-gnome.la
-lib/gnucash/libgncmod-report-gnome.la
-lib/gnucash/libgncmod-report-system.la
-lib/gnucash/libgncmod-stylesheets.la
-lib/gnucash/libgncmod-tax-us.la
+lib/gnucash/libgncmod-app-utils.so
+${PLIST.dbi}lib/gnucash/libgncmod-backend-dbi.so
+lib/gnucash/libgncmod-backend-xml.so
+lib/gnucash/libgncmod-bi-import.so
+lib/gnucash/libgncmod-csv-export.so
+lib/gnucash/libgncmod-csv-import.so
+lib/gnucash/libgncmod-customer-import.so
+lib/gnucash/libgncmod-engine.so
+lib/gnucash/libgncmod-generic-import.so
+lib/gnucash/libgncmod-gnome-search.so
+lib/gnucash/libgncmod-gnome-utils.so
+lib/gnucash/libgncmod-html.so
+lib/gnucash/libgncmod-ledger-core.so
+lib/gnucash/libgncmod-locale-reports-us.so
+lib/gnucash/libgncmod-log-replay.so
+${PLIST.ofx}lib/gnucash/libgncmod-ofx.so
+lib/gnucash/libgncmod-qif-import.so
+lib/gnucash/libgncmod-qif.so
+lib/gnucash/libgncmod-register-core.so
+lib/gnucash/libgncmod-register-gnome.so
+lib/gnucash/libgncmod-report-gnome.so
+lib/gnucash/libgncmod-report-system.so
+lib/gnucash/libgncmod-stylesheets.so
+lib/gnucash/libgncmod-tax-us.so
 lib/gnucash/scm/ccache/2.2/build-config.go
 lib/gnucash/scm/ccache/2.2/business-options.go
 lib/gnucash/scm/ccache/2.2/business-prefs.go
@@ -262,11 +266,21 @@ lib/gnucash/scm/ccache/2.2/fin.go
 lib/gnucash/scm/ccache/2.2/gnc-menu-extensions.go
 lib/gnucash/scm/ccache/2.2/gnc-numeric.go
 lib/gnucash/scm/ccache/2.2/gnucash/app-utils.go
+lib/gnucash/scm/ccache/2.2/gnucash/baz.go
 lib/gnucash/scm/ccache/2.2/gnucash/business-core.go
 lib/gnucash/scm/ccache/2.2/gnucash/core-utils.go
 lib/gnucash/scm/ccache/2.2/gnucash/engine.go
+lib/gnucash/scm/ccache/2.2/gnucash/engine/test/test-extras.go
+lib/gnucash/scm/ccache/2.2/gnucash/foo.go
 lib/gnucash/scm/ccache/2.2/gnucash/gettext.go
 lib/gnucash/scm/ccache/2.2/gnucash/gnc-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-load-deps.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-load-scm.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-dynload.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-init.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-scm-multi.go
+lib/gnucash/scm/ccache/2.2/gnucash/gnc-modules/test/test-gnc-module-swigged-c.go
 lib/gnucash/scm/ccache/2.2/gnucash/gnome-utils.go
 lib/gnucash/scm/ccache/2.2/gnucash/import-export/qif-import.go
 lib/gnucash/scm/ccache/2.2/gnucash/main.go
@@ -295,6 +309,11 @@ lib/gnucash/scm/ccache/2.2/gnucash/report/report-system.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/collectors.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/list-extras.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/report-collectors.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-collectors.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-extras.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-list-extras.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-load-report-system-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/report-system/test/test-report-utilities.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/account-piecharts.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/account-summary.go
@@ -321,6 +340,14 @@ lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/portfolio.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/price-scatter.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/register.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/sx-summary.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-cash-flow.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-cashflow-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-generic-category-report.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-generic-net-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-generic-net-linechart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-standard-category-report.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-standard-net-barchart.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-standard-net-linechart.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/transaction.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/trial-balance.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheet-easy.go
@@ -332,9 +359,13 @@ lib/gnucash/scm/ccache/2.2/gnucash/report/stylesheets.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/taxinvoice.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/taxtxf-de_DE.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/taxtxf.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/test-load-report-stylesheets-module.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/utility-reports.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/view-column.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/welcome-to-gnucash.go
+lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-app-utils-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-gnome-utils-module.go
+lib/gnucash/scm/ccache/2.2/gnucash/reports/test-load-report-gnome-module.go
 lib/gnucash/scm/ccache/2.2/gnucash/tax/de_DE.go
 lib/gnucash/scm/ccache/2.2/gnucash/tax/us.go
 lib/gnucash/scm/ccache/2.2/gnucash/unittest-support.go
@@ -372,23 +403,27 @@ lib/gnucash/scm/ccache/2.2/report.go
 lib/gnucash/scm/ccache/2.2/simple-obj.go
 lib/gnucash/scm/ccache/2.2/string.go
 lib/gnucash/scm/ccache/2.2/substring-search.go
+lib/gnucash/scm/ccache/2.2/test-account.go
+lib/gnucash/scm/ccache/2.2/test-c-interface.go
+lib/gnucash/scm/ccache/2.2/test-create-account.go
+lib/gnucash/scm/ccache/2.2/test-split.go
+lib/gnucash/scm/ccache/2.2/test-test-extras.go
 lib/gnucash/scm/ccache/2.2/txf-de_DE.go
 lib/gnucash/scm/ccache/2.2/txf-help-de_DE.go
 lib/gnucash/scm/ccache/2.2/txf-help.go
 lib/gnucash/scm/ccache/2.2/txf.go
 lib/gnucash/scm/ccache/2.2/xml-generator.go
-lib/libgnc-backend-sql.la
-lib/libgnc-backend-xml-utils.la
-lib/libgnc-core-utils.la
-lib/libgnc-gnome.la
-lib/libgnc-module.la
+lib/libgnc-backend-sql.so
+lib/libgnc-backend-xml-utils.so
+lib/libgnc-core-utils.so
+lib/libgnc-gnome.so
+lib/libgnc-module.so
 man/man1/gnc-fq-dump.1
 man/man1/gnc-fq-helper.1
 man/man1/gnucash.1
 share/appdata/gnucash.appdata.xml
 share/applications/gnucash.desktop
 share/doc/gnucash/AUTHORS
-share/doc/gnucash/COPYING
 share/doc/gnucash/ChangeLog
 share/doc/gnucash/ChangeLog.1999
 share/doc/gnucash/ChangeLog.2000
@@ -408,9 +443,9 @@ share/doc/gnucash/ChangeLog.2013
 share/doc/gnucash/ChangeLog.2014
 share/doc/gnucash/ChangeLog.2015
 share/doc/gnucash/ChangeLog.2016
+share/doc/gnucash/ChangeLog.2017
 share/doc/gnucash/DOCUMENTERS
 share/doc/gnucash/HACKING
-share/doc/gnucash/INSTALL
 share/doc/gnucash/LICENSE
 share/doc/gnucash/Money95bank_fr.qif
 share/doc/gnucash/Money95invst_fr.qif
@@ -445,8 +480,6 @@ share/doc/gnucash/quicktest.qif
 share/doc/gnucash/swipe.qif
 share/doc/gnucash/taxreport.gnucash
 share/doc/gnucash/web.qif
-share/examples/gnucash/gnucash/config
-share/examples/gnucash/gnucash/environment
 share/glib-2.0/schemas/org.gnucash.dialogs.business.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.checkprinting.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.commodities.gschema.xml
@@ -459,6 +492,7 @@ share/glib-2.0/schemas/org.gnucash.dialogs.import.qif.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.reconcile.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.sxs.gschema.xml
 share/glib-2.0/schemas/org.gnucash.dialogs.totd.gschema.xml
+share/glib-2.0/schemas/org.gnucash.general.finance-quote.gschema.xml
 share/glib-2.0/schemas/org.gnucash.gschema.xml
 share/glib-2.0/schemas/org.gnucash.history.gschema.xml
 share/glib-2.0/schemas/org.gnucash.warnings.gschema.xml
@@ -845,7 +879,10 @@ share/gnucash/checks/quicken_3part.chk
 share/gnucash/checks/quicken_check_21.chk
 share/gnucash/checks/quicken_wallet.chk
 share/gnucash/checks/voucher.chk
-share/gnucash/gnome
+share/gnucash/gtkbuilder/CMakeFiles/CMakeDirectoryInformation.cmake
+share/gnucash/gtkbuilder/CMakeFiles/progress.marks
+share/gnucash/gtkbuilder/CTestTestfile.cmake
+share/gnucash/gtkbuilder/Makefile
 share/gnucash/gtkbuilder/assistant-acct-period.glade
 share/gnucash/gtkbuilder/assistant-csv-account-import.glade
 share/gnucash/gtkbuilder/assistant-csv-export.glade
@@ -858,6 +895,7 @@ share/gnucash/gtkbuilder/assistant-stock-split.glade
 share/gnucash/gtkbuilder/assistant-xml-encoding.glade
 share/gnucash/gtkbuilder/business-options-gnome.glade
 share/gnucash/gtkbuilder/business-prefs.glade
+share/gnucash/gtkbuilder/cmake_install.cmake
 share/gnucash/gtkbuilder/dialog-account-picker.glade
 share/gnucash/gtkbuilder/dialog-account.glade
 share/gnucash/gtkbuilder/dialog-bi-import-gui.glade
@@ -975,6 +1013,11 @@ 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/CMakeFiles/CMakeDirectoryInformation.cmake
+share/gnucash/pixmaps/CMakeFiles/progress.marks
+share/gnucash/pixmaps/CTestTestfile.cmake
+share/gnucash/pixmaps/Makefile
+share/gnucash/pixmaps/cmake_install.cmake
 share/gnucash/pixmaps/gnucash-icon-48x48.bmp
 share/gnucash/pixmaps/gnucash-icon.ico
 share/gnucash/pixmaps/gnucash_splash.png
@@ -992,11 +1035,21 @@ share/gnucash/scm/fin.scm
 share/gnucash/scm/gnc-menu-extensions.scm
 share/gnucash/scm/gnc-numeric.scm
 share/gnucash/scm/gnucash/app-utils.scm
+share/gnucash/scm/gnucash/baz.scm
 share/gnucash/scm/gnucash/business-core.scm
 share/gnucash/scm/gnucash/core-utils.scm
 share/gnucash/scm/gnucash/engine.scm
+share/gnucash/scm/gnucash/engine/test/test-extras.scm
+share/gnucash/scm/gnucash/foo.scm
 share/gnucash/scm/gnucash/gettext.scm
 share/gnucash/scm/gnucash/gnc-module.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-load-deps.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-load-scm.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-dynload.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-init.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-module.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-scm-multi.scm
+share/gnucash/scm/gnucash/gnc-modules/test/test-gnc-module-swigged-c.scm
 share/gnucash/scm/gnucash/gnome-utils.scm
 share/gnucash/scm/gnucash/import-export/qif-import.scm
 share/gnucash/scm/gnucash/main.scm
@@ -1029,6 +1082,11 @@ share/gnucash/scm/gnucash/report/report-system.scm
 share/gnucash/scm/gnucash/report/report-system/collectors.scm
 share/gnucash/scm/gnucash/report/report-system/list-extras.scm
 share/gnucash/scm/gnucash/report/report-system/report-collectors.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-collectors.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-extras.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-list-extras.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-load-report-system-module.scm
+share/gnucash/scm/gnucash/report/report-system/test/test-report-utilities.scm
 share/gnucash/scm/gnucash/report/standard-reports.scm
 share/gnucash/scm/gnucash/report/standard-reports/account-piecharts.scm
 share/gnucash/scm/gnucash/report/standard-reports/account-summary.scm
@@ -1055,6 +1113,14 @@ share/gnucash/scm/gnucash/report/standard-reports/portfolio.scm
 share/gnucash/scm/gnucash/report/standard-reports/price-scatter.scm
 share/gnucash/scm/gnucash/report/standard-reports/register.scm
 share/gnucash/scm/gnucash/report/standard-reports/sx-summary.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-cash-flow.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-cashflow-barchart.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-generic-category-report.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-generic-net-barchart.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-generic-net-linechart.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-standard-category-report.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-standard-net-barchart.scm
+share/gnucash/scm/gnucash/report/standard-reports/test/test-standard-net-linechart.scm
 share/gnucash/scm/gnucash/report/standard-reports/transaction.scm
 share/gnucash/scm/gnucash/report/standard-reports/trial-balance.scm
 share/gnucash/scm/gnucash/report/stylesheet-easy.scm
@@ -1068,9 +1134,13 @@ share/gnucash/scm/gnucash/report/taxinvoice.eguile.scm
 share/gnucash/scm/gnucash/report/taxinvoice.scm
 share/gnucash/scm/gnucash/report/taxtxf-de_DE.scm
 share/gnucash/scm/gnucash/report/taxtxf.scm
+share/gnucash/scm/gnucash/report/test-load-report-stylesheets-module.scm
 share/gnucash/scm/gnucash/report/utility-reports.scm
 share/gnucash/scm/gnucash/report/view-column.scm
 share/gnucash/scm/gnucash/report/welcome-to-gnucash.scm
+share/gnucash/scm/gnucash/reports/test-load-app-utils-module.scm
+share/gnucash/scm/gnucash/reports/test-load-gnome-utils-module.scm
+share/gnucash/scm/gnucash/reports/test-load-report-gnome-module.scm
 share/gnucash/scm/gnucash/tax/de_DE.scm
 share/gnucash/scm/gnucash/tax/us.scm
 share/gnucash/scm/gnucash/unittest-support.scm
@@ -1108,12 +1178,22 @@ share/gnucash/scm/report.scm
 share/gnucash/scm/simple-obj.scm
 share/gnucash/scm/string.scm
 share/gnucash/scm/substring-search.scm
+share/gnucash/scm/test-account.scm
+share/gnucash/scm/test-c-interface.scm
+share/gnucash/scm/test-create-account.scm
+share/gnucash/scm/test-split.scm
+share/gnucash/scm/test-test-extras.scm
 share/gnucash/scm/txf-de_DE.scm
 share/gnucash/scm/txf-help-de_DE.scm
 share/gnucash/scm/txf-help.scm
 share/gnucash/scm/txf.scm
 share/gnucash/scm/xml-generator.scm
 share/gnucash/tip_of_the_day.list
+share/gnucash/ui/CMakeFiles/CMakeDirectoryInformation.cmake
+share/gnucash/ui/CMakeFiles/progress.marks
+share/gnucash/ui/CTestTestfile.cmake
+share/gnucash/ui/Makefile
+share/gnucash/ui/cmake_install.cmake
 share/gnucash/ui/gnc-main-window-ui.xml
 share/gnucash/ui/gnc-plugin-account-tree-ui.xml
 share/gnucash/ui/gnc-plugin-basic-commands-ui.xml
diff --git a/gnucash-devel/TODO b/gnucash-devel/TODO
new file mode 100644
index 0000000000..9a8f8b5631
--- /dev/null
+++ b/gnucash-devel/TODO
@@ -0,0 +1 @@
+Install example config files to share/examples instead of etc.
diff --git a/gnucash-devel/distinfo b/gnucash-devel/distinfo
index 9ad323c5eb..3ec1edca2a 100644
--- a/gnucash-devel/distinfo
+++ b/gnucash-devel/distinfo
@@ -8,4 +8,6 @@ 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-gnucash_CMakeLists.txt) = e88a47ee90e9db8d91238a81a89b89d436fd6f5d
 SHA1 (patch-gnucash_gnucash-bin.c) = 065610e4bdf340913cb15e08e6382a7f92a0908f
+SHA1 (patch-gnucash_ugly-hack_CMakeLists.txt) = f5f163869ec55e3f895c30343412ffe793909517
diff --git a/gnucash-devel/patches/patch-gnucash_CMakeLists.txt b/gnucash-devel/patches/patch-gnucash_CMakeLists.txt
new file mode 100644
index 0000000000..0bd91740bd
--- /dev/null
+++ b/gnucash-devel/patches/patch-gnucash_CMakeLists.txt
@@ -0,0 +1,26 @@
+$NetBSD$
+
+From https://bugzilla.gnome.org/show_bug.cgi?id=792884
+
+--- gnucash/CMakeLists.txt.orig	2018-02-03 15:01:36.000000000 +0000
++++ gnucash/CMakeLists.txt
+@@ -27,6 +27,9 @@ ADD_SUBDIRECTORY (import-export)
+ ADD_SUBDIRECTORY (python)
+ ADD_SUBDIRECTORY (register)
+ ADD_SUBDIRECTORY (report)
++#This needs to go last so that glib-compile-schemas runs after all of
++#the schema files are installed.
++ADD_SUBDIRECTORY (ugly-hack)
+ 
+ ADD_DEFINITIONS (-DHAVE_CONFIG_H)
+ 
+@@ -257,9 +260,6 @@ add_custom_command(
+ 
+ add_custom_target(compiled-schemas ALL DEPENDS ${SCHEMADIR_BUILD}/gschemas.compiled)
+ 
+-install(FILES ${SCHEMADIR_BUILD}/gschemas.compiled DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
+-
+-
+ # The GResource Files are absolute paths but SET_LOCAL_DIST requires
+ # relative paths.
+ FOREACH(gres_file ${gresource_files})
diff --git a/gnucash-devel/patches/patch-gnucash_ugly-hack_CMakeLists.txt b/gnucash-devel/patches/patch-gnucash_ugly-hack_CMakeLists.txt
new file mode 100644
index 0000000000..15ff388420
--- /dev/null
+++ b/gnucash-devel/patches/patch-gnucash_ugly-hack_CMakeLists.txt
@@ -0,0 +1,8 @@
+$NetBSD$
+
+From https://bugzilla.gnome.org/show_bug.cgi?id=792884
+
+--- gnucash/ugly-hack/CMakeLists.txt.orig	2018-02-09 20:30:58.475024471 +0000
++++ gnucash/ugly-hack/CMakeLists.txt
+@@ -0,0 +1 @@
++install(CODE "execute_process(COMMAND ${GLIB_COMPILE_SCHEMAS} ${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas)")
Home | Main Index | Thread Index | Old Index