jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnucash: fix for new intltool

Browse Source
This commit is contained in:
Vladimír Čunát 2013-02-16 15:35:14 +01:00
parent f91bb489e4
commit 60e52fd8db
3 changed files with 155 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/office/gnucash/default.nix
View File

@ -1,6 +1,7 @@
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx
, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
, libgsf, libart_lgpl
}:
/* If you experience GConf errors when running GnuCash on NixOS, see
@ -19,9 +20,12 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml
libgnomeprint goffice enchant gettext intltool perl guile slibGuile
swig isocodes bzip2 makeWrapper libofx
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
];
# fix a problem with new intltool versions, taken from Gentoo
patchPhase = "patch -p3 < ${./potfiles-skip.patch}";
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx";
postInstall = ''

147
pkgs/applications/office/gnucash/potfiles-skip.patch Normal file
View File

@ -0,0 +1,147 @@
Index: gnucash/branches/2.4/po/POTFILES.skip
===================================================================
--- gnucash/branches/2.4/po/POTFILES.skip (revision 18623)
+++ gnucash/branches/2.4/po/POTFILES.skip (revision 22300)
@@ -19,2 +19,142 @@
src/libqof/qof/qofquery-serialize.c
src/libqof/qof/qofsql.c
+
+# The scheme files are handled by intl-scm/guile-strings.c because
+# intltool wouldn't scan scheme files. They're here now because
+# intltool 0.50 *does* scan them, and it creates an error during make
+# check. Once the whole world has upgraded to intltool 0.50, intl-scm
+# can be deleted and these files added to POTFILES.in.
+
+src/app-utils/date-utilities.scm
+src/app-utils/prefs.scm
+src/business/business-utils/business-prefs.scm
+src/business/business-utils/business-utils.scm
+src/business/business-utils/gnucash/business-utils.scm
+src/import-export/qif-import/qif-dialog-utils.scm
+src/import-export/qif-import/qif-file.scm
+src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+src/import-export/qif-import/qif-import/qif-file.scm
+src/import-export/qif-import/qif-import/qif-merge-groups.scm
+src/import-export/qif-import/qif-import/qif-parse.scm
+src/import-export/qif-import/qif-import/qif-to-gnc.scm
+src/import-export/qif-import/qif-merge-groups.scm
+src/import-export/qif-import/qif-parse.scm
+src/import-export/qif-import/qif-to-gnc.scm
+src/report/business-reports/aging.scm
+src/report/business-reports/balsheet-eg.eguile.scm
+src/report/business-reports/balsheet-eg.scm
+src/report/business-reports/business-reports.scm
+src/report/business-reports/customer-summary.scm
+src/report/business-reports/easy-invoice.scm
+src/report/business-reports/fancy-invoice.scm
+src/report/business-reports/gnucash/report/aging.scm
+src/report/business-reports/gnucash/report/balsheet-eg.eguile.scm
+src/report/business-reports/gnucash/report/balsheet-eg.scm
+src/report/business-reports/gnucash/report/business-reports.scm
+src/report/business-reports/gnucash/report/customer-summary.scm
+src/report/business-reports/gnucash/report/easy-invoice.scm
+src/report/business-reports/gnucash/report/fancy-invoice.scm
+src/report/business-reports/gnucash/report/invoice.scm
+src/report/business-reports/gnucash/report/job-report.scm
+src/report/business-reports/gnucash/report/owner-report.scm
+src/report/business-reports/gnucash/report/payables.scm
+src/report/business-reports/gnucash/report/receivables.scm
+src/report/business-reports/gnucash/report/taxinvoice.eguile.scm
+src/report/business-reports/gnucash/report/taxinvoice.scm
+src/report/business-reports/invoice.scm
+src/report/business-reports/job-report.scm
+src/report/business-reports/owner-report.scm
+src/report/business-reports/payables.scm
+src/report/business-reports/receivables.scm
+src/report/business-reports/taxinvoice.eguile.scm
+src/report/business-reports/taxinvoice.scm
+src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+src/report/locale-specific/us/gnucash/report/taxtxf.scm
+src/report/locale-specific/us/taxtxf-de_DE.scm
+src/report/locale-specific/us/taxtxf.scm
+src/report/report-gnome/gnucash/report/report-gnome.scm
+src/report/report-gnome/report-gnome.scm
+src/report/report-system/eguile-gnc.scm
+src/report/report-system/gnucash/report/eguile-gnc.scm
+src/report/report-system/html-acct-table.scm
+src/report/report-system/html-fonts.scm
+src/report/report-system/html-style-sheet.scm
+src/report/report-system/html-utilities.scm
+src/report/report-system/options-utilities.scm
+src/report/report-system/report-utilities.scm
+src/report/report-system/report.scm
+src/report/standard-reports/account-piecharts.scm
+src/report/standard-reports/account-summary.scm
+src/report/standard-reports/advanced-portfolio.scm
+src/report/standard-reports/average-balance.scm
+src/report/standard-reports/balance-sheet.scm
+src/report/standard-reports/budget-balance-sheet.scm
+src/report/standard-reports/budget-barchart.scm
+src/report/standard-reports/budget-flow.scm
+src/report/standard-reports/budget-income-statement.scm
+src/report/standard-reports/budget.scm
+src/report/standard-reports/cash-flow.scm
+src/report/standard-reports/category-barchart.scm
+src/report/standard-reports/daily-reports.scm
+src/report/standard-reports/equity-statement.scm
+src/report/standard-reports/general-journal.scm
+src/report/standard-reports/general-ledger.scm
+src/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm
+src/report/standard-reports/gnucash/report/standard-reports/account-summary.scm
+src/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm
+src/report/standard-reports/gnucash/report/standard-reports/average-balance.scm
+src/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm
+src/report/standard-reports/gnucash/report/standard-reports/budget.scm
+src/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm
+src/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm
+src/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm
+src/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm
+src/report/standard-reports/gnucash/report/standard-reports/general-journal.scm
+src/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm
+src/report/standard-reports/gnucash/report/standard-reports/income-statement.scm
+src/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm
+src/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm
+src/report/standard-reports/gnucash/report/standard-reports/portfolio.scm
+src/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm
+src/report/standard-reports/gnucash/report/standard-reports/register.scm
+src/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm
+src/report/standard-reports/gnucash/report/standard-reports/transaction.scm
+src/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm
+src/report/standard-reports/income-statement.scm
+src/report/standard-reports/net-barchart.scm
+src/report/standard-reports/net-linechart.scm
+src/report/standard-reports/portfolio.scm
+src/report/standard-reports/price-scatter.scm
+src/report/standard-reports/register.scm
+src/report/standard-reports/sx-summary.scm
+src/report/standard-reports/transaction.scm
+src/report/standard-reports/trial-balance.scm
+src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+src/report/stylesheets/gnucash/report/stylesheet-footer.scm
+src/report/stylesheets/gnucash/report/stylesheet-plain.scm
+src/report/stylesheets/stylesheet-easy.scm
+src/report/stylesheets/stylesheet-fancy.scm
+src/report/stylesheets/stylesheet-footer.scm
+src/report/stylesheets/stylesheet-plain.scm
+src/report/utility-reports/gnucash/report/hello-world.scm
+src/report/utility-reports/gnucash/report/view-column.scm
+src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
+src/report/utility-reports/hello-world.scm
+src/report/utility-reports/view-column.scm
+src/report/utility-reports/welcome-to-gnucash.scm
+src/scm/build-config.scm
+src/scm/build-config.scm.in
+src/scm/command-line.scm
+src/scm/gnucash/price-quotes.scm
+src/scm/main-window.scm
+src/scm/price-quotes.scm
+src/tax/us/de_DE.scm
+src/tax/us/gnucash/tax/de_DE.scm
+src/tax/us/txf-de_DE.scm
+src/tax/us/txf.scm
+

4
pkgs/top-level/all-packages.nix
View File

@ -7167,8 +7167,8 @@ let
gmrun = callPackage ../applications/misc/gmrun {};
gnucash = callPackage ../applications/office/gnucash {
inherit (gnome) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint;
gconf = gnome.GConf;
inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl;
gconf = gnome2.GConf;
guile = guile_1_8;
slibGuile = slibGuile.override { scheme = guile_1_8; };
};