Updated

6 files changed, 44 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd1be1dc967d..ba1e56be7d89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnucash-git
 	pkgdesc = A personal and small-business financial-accounting application - GIT version
-	pkgver = 2.6.5
-	pkgrel = 2
+	pkgver = 2.7.3.r1.g310442ffe
+	pkgrel = 1
 	url = http://www.gnucash.org
 	install = gnucash.install
 	arch = i686
@@ -11,15 +11,16 @@ pkgbase = gnucash-git
 	makedepends = intltool
 	makedepends = boost
 	makedepends = swig
+	makedepends = gtest
+	makedepends = gmock
+	makedepends = gconf
 	depends = aqbanking
-	depends = desktop-file-utils
-	depends = goffice0.8
+	depends = goffice
 	depends = libdbi-drivers
 	depends = libgnomecanvas
+	depends = boost-libs
 	depends = slib
-	depends = webkitgtk2
-	depends = dconf
-	depends = guile
+	depends = webkit2gtk
 	depends = libgnome-keyring
 	depends = sqlite2
 	optdepends = evince: for print preview
@@ -29,24 +30,13 @@ pkgbase = gnucash-git
 	conflicts = gnucash
 	conflicts = gnucash-devel
 	conflicts = gnucash-latest
-	options = !libtool
-	options = !makeflags
+	conflicts = gnucash-gtk3-git
+	conflicts = gnucash-python
+	conflicts = gnucash-xbt
 	options = !emptydirs
 	source = gnucash-git::git+https://github.com/Gnucash/gnucash.git
-	source = diff.core-utils.i
-	source = diff.engine.i
-	source = diff.business-core.i
-	source = diff.gnc-html.i
 	md5sums = SKIP
-	md5sums = 666655b05ae5c410fd22ccbe50899810
-	md5sums = 98fe83e28d1504d4574b3533e3c85143
-	md5sums = 45c654c304c7d5ac3e45705a903a596d
-	md5sums = efc0fa5ab21327feb7ad0a484e39b6a4
 	sha256sums = SKIP
-	sha256sums = f95acdcf106bb6b2ab4d164bf8d26d8b1026921797b00d96d17436fbb1eccd9a
-	sha256sums = 5bbf3e656e9b2126ff1d893e7778a36929524cbbd380b341f9aefb12a24567b9
-	sha256sums = c4510b5b7f6846c6278bae42779a6d29fa6c7e8f7c44784dc32c840ebac32f1e
-	sha256sums = fccccdadaf8ba86fd8251c44f1ae3117093aabaea178199a94409a481c9c080d
 
 pkgname = gnucash-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4130690fe7f6..8712daaa5863 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,33 @@
 # Maintainer: not_anonymous <nmlibertarian@gmail.com>
-
+# Co-Maintainer: Jeb Rosen <jeb@jebrosen.com>
 # Based on gnucash-latest <- aur package
-#		^^^^^ Current Maintainer: Neng Xu <neng2.xu2@gmail.com>
+#		^^^^^ Maintainer: Neng Xu <neng2.xu2@gmail.com>
 #		^^^^^ Contributor: quizzmaster
+# Based on gnucash-gtk3-git <- aur package
+#		^^^^^ Maintainer: Jeb Rosen <jeb@jebrosen.com>
+#		^^^^^ Contributor: Juergen Hoetzel <juergen@archlinux.org>
+#		^^^^^ Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash-git
 _pkgname=gnucash
 __pkgname=Gnucash
-pkgver=2.6.5
-#a.r382.gd4e5bdc
-_pkgver=2.6.99	# Version reported upon exec of resulting package.
-pkgrel=2
+pkgver=2.7.3.r1.g310442ffe
+pkgrel=1
 pkgdesc="A personal and small-business financial-accounting application - GIT version"
 arch=('i686' 'x86_64')
 url="http://www.gnucash.org"
 license=("GPL")
-depends=('aqbanking' 'desktop-file-utils' 'goffice0.8' 'libdbi-drivers' 'libgnomecanvas' \
-	 'slib' 'webkitgtk2' 'dconf' 'guile' 'libgnome-keyring' 'sqlite2')
+depends=('aqbanking' 'goffice' 'libdbi-drivers' 'libgnomecanvas' 'boost-libs' \
+	 'slib' 'webkit2gtk' 'libgnome-keyring' 'sqlite2')
 optdepends=('evince: for print preview'
 	    'perl-date-manip: for stock information lookups'
 	    'perl-finance-quote: for stock information lookups')
-makedepends=('git' 'intltool' 'boost' 'swig')
-options=('!libtool' '!makeflags' '!emptydirs')
-conflicts=('gnucash' 'gnucash-devel' 'gnucash-latest')
+makedepends=('git' 'intltool' 'boost' 'swig' 'gtest' 'gmock' 'gconf')
+options=('!emptydirs')
+conflicts=('gnucash' 'gnucash-devel' 'gnucash-latest' 'gnucash-gtk3-git' 'gnucash-python' 'gnucash-xbt')
 provides=('gnucash')
 install=gnucash.install
-source=("$pkgname::git+https://github.com/${__pkgname}/${_pkgname}.git"
-	diff.core-utils.i
-	diff.engine.i
-	diff.business-core.i
-	diff.gnc-html.i)
+source=("$pkgname::git+https://github.com/${__pkgname}/${_pkgname}.git")
 
 pkgver() {
 	cd "$srcdir/$pkgname"
@@ -43,6 +41,9 @@ pkgver() {
 prepare() {
 	cd "$srcdir/$pkgname"
 
+	# add -O to the boost c++11 compatibility detection so that -D_FORTIFY_SOURCE doesn't cause an error
+	sed -i '/CXXFLAGS="-Werror -std=gnu++11 $BOOST_CPPFLAGS"/s/-Werror/-Werror -O/' configure.ac
+
 	./autogen.sh
 }
 
@@ -50,32 +51,27 @@ build() {
 	cd "$srcdir/$pkgname"
 
 	# Consider using `sed` for this stuff if it is still needed.
-	patch -p0 < ../diff.core-utils.i
-	patch -p0 < ../diff.engine.i
-	patch -p0 < ../diff.business-core.i
-	patch -p0 < ../diff.gnc-html.i
 
 	./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
-	  --libexecdir=/usr/lib --enable-ofx --enable-aqbanking
-#	  --libexecdir=/usr/lib --enable-ofx --enable-aqbanking --disable-dbi
-#	  --libexecdir=/usr/lib --disable-schemas-compile --enable-ofx --enable-aqbanking
+	  --libexecdir=/usr/lib --disable-schemas-compile --enable-ofx --enable-aqbanking \
+	  --disable-error-on-warning	
 
 	make
 }
 
-check() {
-	cd "$srcdir/$pkgname"
-
-#	make check
-	make -i check	# Needed unless locale -a includes en_US, en_GB, fr_FR (& other(s)?). 
-}
+#check() {
+#	cd "$srcdir/$pkgname"
+#
+##	make check
+#	make -i check	# Needed unless locale -a includes en_US, en_GB, fr_FR (& other(s)?). 
+#}
 
 package() {
 	cd "$srcdir/$pkgname"
 
 	make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
-	cd src/doc/design
+	cd libgnucash/doc/design
 
 	make DESTDIR="${pkgdir}" install-info
 
@@ -83,14 +79,11 @@ package() {
 	gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/gnucash.schemas" --domain gnucash \
 	  "${pkgdir}"/etc/gconf/schemas/*.schemas
 	rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+
+	# Delete the gnucash-valgrind executable because the source files
+	  # are not included with the package and the executable is hardlinked
+	  # to the location that it was built at.
+	rm -f "${pkgdir}"/usr/bin/gnucash-valgrind
 }
-md5sums=('SKIP'
-         '666655b05ae5c410fd22ccbe50899810'
-         '98fe83e28d1504d4574b3533e3c85143'
-         '45c654c304c7d5ac3e45705a903a596d'
-         'efc0fa5ab21327feb7ad0a484e39b6a4')
-sha256sums=('SKIP'
-            'f95acdcf106bb6b2ab4d164bf8d26d8b1026921797b00d96d17436fbb1eccd9a'
-            '5bbf3e656e9b2126ff1d893e7778a36929524cbbd380b341f9aefb12a24567b9'
-            'c4510b5b7f6846c6278bae42779a6d29fa6c7e8f7c44784dc32c840ebac32f1e'
-            'fccccdadaf8ba86fd8251c44f1ae3117093aabaea178199a94409a481c9c080d')
+md5sums=('SKIP')
+sha256sums=('SKIP')
diff --git a/diff.business-core.i b/diff.business-core.i
deleted file mode 100644
index c1b8b41025d0..000000000000
--- a/diff.business-core.i
+++ /dev/null
@@ -1,4 +0,0 @@
---- src/engine/business-core.i	2015-02-12 12:39:10.634721511 -0700
-+++ src/engine/business-core.i	2015-02-12 12:44:50.926955084 -0700
-@@ -169 +168,0 @@
--#undefine SET_ENUM
diff --git a/diff.core-utils.i b/diff.core-utils.i
deleted file mode 100644
index 7abe6b922e4e..000000000000
--- a/diff.core-utils.i
+++ /dev/null
@@ -1,5 +0,0 @@
---- src/core-utils/core-utils.i	2015-02-12 12:01:16.770233517 -0700
-+++ src/core-utils/core-utils.i	2015-02-12 12:14:29.924669376 -0700
-@@ -80,2 +79,0 @@
--#elsif defined(SWIGPYTHON)
--gboolean gnc_utf8_validate(const gchar *, gssize, const gchar**);
diff --git a/diff.engine.i b/diff.engine.i
deleted file mode 100644
index aea0c4c6cce2..000000000000
--- a/diff.engine.i
+++ /dev/null
@@ -1,4 +0,0 @@
---- src/engine/engine.i	2015-02-12 12:39:10.638054867 -0700
-+++ src/engine/engine.i	2015-02-12 12:43:36.586480861 -0700
-@@ -365 +364,0 @@
--#undefine SET_ENUM
diff --git a/diff.gnc-html.i b/diff.gnc-html.i
deleted file mode 100644
index c3e3e43f4666..000000000000
--- a/diff.gnc-html.i
+++ /dev/null
@@ -1,4 +0,0 @@
---- src/html/gnc-html.i	2015-02-12 12:46:07.764105816 -0700
-+++ src/html/gnc-html.i	2015-02-12 12:59:03.043037741 -0700
-@@ -54 +53,0 @@
--#undefine SET_ENUM