gnucash-git: remove merged patches, adapt paths for upstream changes.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: gnucash-git: remove merged patches, adapt paths for upstream changes.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Mon, 14 Aug 2017 18:30:13 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Aug 14 20:30:13 2017 +0200
Changeset:	7af2abf9a034f6b958fa8853c43d248496af18bc

Modified Files:
	gnucash-git/Makefile
	gnucash-git/PLIST
	gnucash-git/distinfo
Added Files:
	gnucash-git/patches/patch-gnucash_gnucash-bin.c
Removed Files:
	gnucash-git/patches/patch-configure.ac
	gnucash-git/patches/patch-src_bin_gnucash-bin.c
	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: remove merged patches, adapt paths for upstream changes.

Fix PLIST.

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

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                                  | 26 +++++++---------------
 gnucash-git/distinfo                               |  5 +----
 gnucash-git/patches/patch-configure.ac             | 16 -------------
 gnucash-git/patches/patch-gnucash_gnucash-bin.c    | 25 +++++++++++++++++++++
 gnucash-git/patches/patch-src_bin_gnucash-bin.c    | 25 ---------------------
 ...ch-src_register_register-gnome_gnucash-cursor.h | 15 -------------
 ...patch-src_register_register-gnome_table-gnome.c | 15 -------------
 8 files changed, 44 insertions(+), 97 deletions(-)

diffs:
diff --git a/gnucash-git/Makefile b/gnucash-git/Makefile
index 7537270e20..2f6622e061 100644
--- a/gnucash-git/Makefile
+++ b/gnucash-git/Makefile
@@ -42,10 +42,16 @@ CONFIGURE_ARGS+=	--with-xdg-data-dirs=${PREFIX}/share
 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
-REPLACE_PERL+=		src/quotes/Quote_example.pl
-REPLACE_PERL+=		src/gnc-test-env.pl
+REPLACE_PERL+=		bindings/python/example_scripts/get_quotes.pl
+REPLACE_PERL+=		common/gnc-test-env.pl
+REPLACE_PERL+=		doc/examples/create-bogus-data.pl
+REPLACE_PERL+=		libgnucash/backend/xml/test/grab-types.pl
+REPLACE_PERL+=		libgnucash/engine/xlate.pl
+REPLACE_PERL+=		libgnucash/quotes/gnc-fq-dump
+REPLACE_PERL+=		s/Quote_example.pl
+REPLACE_PERL+=		util/check-po.pl
+REPLACE_PERL+=		util/elegant-sort.pl
+REPLACE_PERL+=		util/fix-license.pl
 
 PLIST_SRC=		PLIST
 
diff --git a/gnucash-git/PLIST b/gnucash-git/PLIST
index 6fd3303597..1ba0eb329b 100644
--- a/gnucash-git/PLIST
+++ b/gnucash-git/PLIST
@@ -76,7 +76,6 @@ include/gnucash/gnc-currency-edit.h
 include/gnucash/gnc-date-delta.h
 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
@@ -88,8 +87,10 @@ include/gnucash/gnc-entry-quickfill.h
 include/gnucash/gnc-euro.h
 include/gnucash/gnc-event.h
 include/gnucash/gnc-exp-parser.h
+include/gnucash/gnc-features.h
 include/gnucash/gnc-file.h
 include/gnucash/gnc-frequency.h
+include/gnucash/gnc-gdate-utils.h
 include/gnucash/gnc-general-search.h
 include/gnucash/gnc-general-select.h
 include/gnucash/gnc-gettext-util.h
@@ -155,6 +156,7 @@ include/gnucash/gnc-tree-view.h
 include/gnucash/gnc-ui-balances.h
 include/gnucash/gnc-ui-util.h
 include/gnucash/gnc-ui.h
+include/gnucash/gnc-uri-utils.h
 include/gnucash/gnc-window.h
 include/gnucash/gncAddress.h
 include/gnucash/gncAddressP.h
@@ -183,11 +185,12 @@ include/gnucash/gncVendor.h
 include/gnucash/gncVendorP.h
 include/gnucash/gtable.h
 include/gnucash/guid.h
+include/gnucash/guid.hpp
 include/gnucash/guile-util.h
 include/gnucash/import-parse.h
+include/gnucash/kvp-frame.hpp
 include/gnucash/kvp-scm.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
@@ -228,11 +231,10 @@ 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-business-gnome.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-customer-import.la
 lib/gnucash/libgncmod-engine.la
 lib/gnucash/libgncmod-generic-import.la
 ${PLIST.ofx}lib/gnucash/libgncmod-ofx.la
@@ -248,10 +250,8 @@ 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-standard-reports.la
 lib/gnucash/libgncmod-stylesheets.la
 lib/gnucash/libgncmod-tax-us.la
-lib/gnucash/libgncmod-utility-reports.la
 lib/gnucash/scm/ccache/2.0/build-config.go
 lib/gnucash/scm/ccache/2.0/business-options.go
 lib/gnucash/scm/ccache/2.0/business-prefs.go
@@ -267,7 +267,6 @@ lib/gnucash/scm/ccache/2.0/gnc-menu-extensions.go
 lib/gnucash/scm/ccache/2.0/gnc-numeric.go
 lib/gnucash/scm/ccache/2.0/gnucash/app-utils.go
 lib/gnucash/scm/ccache/2.0/gnucash/business-core.go
-lib/gnucash/scm/ccache/2.0/gnucash/business-gnome.go
 lib/gnucash/scm/ccache/2.0/gnucash/core-utils.go
 lib/gnucash/scm/ccache/2.0/gnucash/engine.go
 lib/gnucash/scm/ccache/2.0/gnucash/gettext.go
@@ -382,19 +381,11 @@ lib/gnucash/scm/ccache/2.0/txf.go
 lib/gnucash/scm/ccache/2.0/xml-generator.go
 lib/libgnc-backend-sql.la
 lib/libgnc-backend-xml-utils.la
-lib/libgnc-business-ledger.la
 lib/libgnc-core-utils.la
 lib/libgnc-gnome.la
 lib/libgnc-module.la
-lib/libgnc-qof.la
 libexec/gnucash/overrides/gnucash-env
 libexec/gnucash/overrides/gnucash-make-guids
-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
-libexec/gnucash/src/libqof/qof/test/qofsession.h
-libexec/gnucash/src/libqof/qof/test/unittest-support.h
 man/man1/gnc-fq-dump.1
 man/man1/gnc-fq-helper.1
 man/man1/gnucash.1
@@ -989,7 +980,6 @@ share/gnucash/scm/gnc-menu-extensions.scm
 share/gnucash/scm/gnc-numeric.scm
 share/gnucash/scm/gnucash/app-utils.scm
 share/gnucash/scm/gnucash/business-core.scm
-share/gnucash/scm/gnucash/business-gnome.scm
 share/gnucash/scm/gnucash/core-utils.scm
 share/gnucash/scm/gnucash/engine.scm
 share/gnucash/scm/gnucash/gettext.scm
@@ -1117,7 +1107,7 @@ share/gnucash/ui/gnc-plugin-budget-ui.xml
 share/gnucash/ui/gnc-plugin-business-ui.xml
 share/gnucash/ui/gnc-plugin-csv-export-ui.xml
 share/gnucash/ui/gnc-plugin-csv-import-ui.xml
-share/gnucash/ui/gnc-plugin-customer_import-ui.xml
+share/gnucash/ui/gnc-plugin-customer-import-ui.xml
 share/gnucash/ui/gnc-plugin-file-history-ui.xml
 share/gnucash/ui/gnc-plugin-log-replay-ui.xml
 ${PLIST.ofx}share/gnucash/ui/gnc-plugin-ofx-ui.xml
diff --git a/gnucash-git/distinfo b/gnucash-git/distinfo
index f0e87ebbef..c749e1cb17 100644
--- a/gnucash-git/distinfo
+++ b/gnucash-git/distinfo
@@ -4,7 +4,4 @@ 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
+SHA1 (patch-gnucash_gnucash-bin.c) = 13ab8aa17c3188668c22151a333fdad46b25cd36
diff --git a/gnucash-git/patches/patch-configure.ac b/gnucash-git/patches/patch-configure.ac
deleted file mode 100644
index 7444191c75..0000000000
--- a/gnucash-git/patches/patch-configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-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
-@@ -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])
- AC_SUBST([GMOCK_HEADERS], [$ac_cv_gmock_headers])
--AM_CONDITIONAL([GOOGLE_TEST_LIBS], [test "x$ac_cv_have_gtest_libs" == "xyes"])
-+AM_CONDITIONAL([GOOGLE_TEST_LIBS], [test "x$ac_cv_have_gtest_libs" = "xyes"])
- ### --------------------------------------------------------------------------
- ### Register2
- AC_ARG_ENABLE( register2,
diff --git a/gnucash-git/patches/patch-gnucash_gnucash-bin.c b/gnucash-git/patches/patch-gnucash_gnucash-bin.c
new file mode 100644
index 0000000000..6b7f3eb0e2
--- /dev/null
+++ b/gnucash-git/patches/patch-gnucash_gnucash-bin.c
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Allow starting gnucash in the background.
+python's readline module causes a SIGTTOU to be sent and if this
+is not handled (even by ignoring it), it stops the process.
+
+--- gnucash/gnucash-bin.c.orig	2017-08-14 17:05:01.000000000 +0000
++++ gnucash/gnucash-bin.c
+@@ -22,6 +22,7 @@
+  */
+ #include "config.h"
+ 
++#include <signal.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -610,6 +611,8 @@ inner_main (void *closure, int argc, cha
+     SCM main_mod;
+     char* fn;
+ 
++    signal(SIGTTOU, SIG_IGN);
++
+     scm_c_eval_string("(debug-set! stack 200000)");
+ 
+     main_mod = scm_c_resolve_module("gnucash main");
diff --git a/gnucash-git/patches/patch-src_bin_gnucash-bin.c b/gnucash-git/patches/patch-src_bin_gnucash-bin.c
deleted file mode 100644
index 2ebe1e8065..0000000000
--- a/gnucash-git/patches/patch-src_bin_gnucash-bin.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_bin_gnucash-bin.c,v 1.1 2014/04/21 21:40:01 wiz Exp $
-
-Allow starting gnucash in the background.
-python's readline module causes a SIGTTOU to be sent and if this
-is not handled (even by ignoring it), it stops the process.
-
---- src/bin/gnucash-bin.c.orig	2017-07-27 09:52:15.000000000 +0000
-+++ src/bin/gnucash-bin.c
-@@ -22,6 +22,7 @@
-  */
- #include "config.h"
- 
-+#include <signal.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -614,6 +615,8 @@ inner_main (void *closure, int argc, cha
-     SCM main_mod;
-     char* fn;
- 
-+    signal(SIGTTOU, SIG_IGN);
-+
-     scm_c_eval_string("(debug-set! stack 200000)");
- 
-     main_mod = scm_c_resolve_module("gnucash main");
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
deleted file mode 100644
index d2e0773fce..0000000000
--- a/gnucash-git/patches/patch-src_register_register-gnome_gnucash-cursor.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 342925991d..0000000000
--- a/gnucash-git/patches/patch-src_register_register-gnome_table-gnome.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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"
Prev by Date: compiler-rt-netbsd: Update to SVN r. 310832
Next by Date: py-xpra: update to 2.1.1.
Previous by Thread: compiler-rt-netbsd: Update to SVN r. 310832
Next by Thread: py-xpra: update to 2.1.1.
Indexes:
Home | Main Index | Thread Index | Old Index