Date: Fri, 27 Jul 2012 17:31:19 +0200 From: Guido Falsi <madpilot@FreeBSD.org> To: gnome@FreeBSD.org Cc: Chris Rees <crees@FreeBSD.org>, Thomas Abthorpe <tabthorpe@FreeBSD.org> Subject: [PATCH] Gnucash port update and fix for pkgconf Message-ID: <20120727153119.GE22954@megatron.madpilot.net>
next in thread | raw e-mail | index | archive | help
--8GpibOaaTibBMecb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi! The finance/gnucash port is broken right now. It contains an improper use of pkg-config which was innocuous, but is fatal with pkgconf. It causes an invalid Makefile to be generated by configure. Since a new version is also out I made a patch with a quick and dirty fix for the brokenness. The fix just forces a bogus value in the configure script in place of a backtick comamnd. That variable really looks unused anyway by the build system. GnuCash builds fine in tinderbox and wiorks correctly on a real system with real data. I'm attaching it requesting approval to commit it. I also wrote a bug report for this on the gnome bugzilla, waiting feedback. ( https://bugzilla.gnome.org/show_bug.cgi?id=680708 ) Thanks in advance! -- Guido Falsi <madpilot@FreeBSD.org> --8GpibOaaTibBMecb Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="gnucash.diff" Index: distinfo =================================================================== --- distinfo (revision 301620) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gnucash-2.4.10.tar.bz2) = 52e65623b5ad812b8eeb4c221951e9b0ba3c49e28916acfb7b92566da159e6cc -SIZE (gnucash-2.4.10.tar.bz2) = 9367104 +SHA256 (gnucash-2.4.11.tar.bz2) = 93c3d66af8d75da66dad814cabeb35aac417018ccc98e833af93b2ab4d7b7761 +SIZE (gnucash-2.4.11.tar.bz2) = 9408193 Index: files/patch-configure =================================================================== --- files/patch-configure (revision 0) +++ files/patch-configure (working copy) @@ -0,0 +1,11 @@ +--- configure.orig 2012-07-12 21:51:32.000000000 +0200 ++++ configure 2012-07-27 15:10:34.324724219 +0200 +@@ -20969,7 +20969,7 @@ + as_fn_error $? "Library requirements (libxml-2.0 >= $LIBXML2_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + fi + +-LIBXML_VERSION=`$PKG_CONFIG --version xml` ++LIBXML_VERSION=0.0 + + GIVEN_CFLAGS=$LIBXML2_CFLAGS + INCLUDE_DIRS=`echo | cpp -v 2>&1` Property changes on: files/patch-configure ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 301620) +++ pkg-plist (working copy) @@ -95,6 +95,7 @@ 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-general-search.h @@ -655,6 +656,8 @@ share/gnucash/accounts/sk/acctchrt_retiremt.gnucash-xea share/gnucash/accounts/sk/acctchrt_spouseinc.gnucash-xea share/gnucash/accounts/sk/acctchrt_spouseretire.gnucash-xea +share/gnucash/accounts/sv_SE/bas_2012.gnucash-xea +share/gnucash/accounts/sv_SE/swedish_small_business.gnucash-xea share/gnucash/accounts/tr_TR/acctchrt_TEKDUZ.gnucash-xea share/gnucash/accounts/tr_TR/acctchrt_brokerage.gnucash-xea share/gnucash/accounts/tr_TR/acctchrt_carloan.gnucash-xea @@ -1062,6 +1065,7 @@ @dirrm share/gnucash/checks @dirrm share/gnucash/accounts/zh_CN @dirrm share/gnucash/accounts/tr_TR +@dirrm share/gnucash/accounts/sv_SE @dirrm share/gnucash/accounts/sk @dirrm share/gnucash/accounts/ru @dirrm share/gnucash/accounts/pt_PT Index: Makefile =================================================================== --- Makefile (revision 301620) +++ Makefile (working copy) @@ -7,8 +7,7 @@ # PORTNAME= gnucash -PORTVERSION= 2.4.10 -PORTREVISION= 1 +PORTVERSION= 2.4.11 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} --8GpibOaaTibBMecb--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120727153119.GE22954>