[Gnucash-changes] r11991 - gnucash/trunk - Modifying Scott's 64bit
patch to work on OSX
Neil Williams
codehelp at cvs.gnucash.org
Sun Nov 20 13:53:21 EST 2005
Author: codehelp
Date: 2005-11-20 13:53:20 -0500 (Sun, 20 Nov 2005)
New Revision: 11991
Trac: http://svn.gnucash.org/trac/changeset/11991
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/doc/build-osx.txt
gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.c
Log:
Modifying Scott's 64bit patch to work on OSX
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2005-11-20 17:10:14 UTC (rev 11990)
+++ gnucash/trunk/ChangeLog 2005-11-20 18:53:20 UTC (rev 11991)
@@ -1,3 +1,9 @@
+2005-11-20 Neil Williams <linux at codehelp.co.uk>
+
+ * src/core-utils/gnc-gkeyfile-utils.c : Modifying Scott's
+ 64bit patch to retain compatibility with OSX.
+ * doc/build-osx.txt : Updating build advice for OSX.
+
2005-11-20 David Hampton <hampton at employees.org>
* TRANSLATORS:
Modified: gnucash/trunk/doc/build-osx.txt
===================================================================
--- gnucash/trunk/doc/build-osx.txt 2005-11-20 17:10:14 UTC (rev 11990)
+++ gnucash/trunk/doc/build-osx.txt 2005-11-20 18:53:20 UTC (rev 11991)
@@ -9,7 +9,7 @@
To avoid these problems, you are advised to change your PATH variable
in ~/.bashrc to put the Fink binaries ahead of the main OSX binaries
-in your path:
+in your path or export a new PATH in the script that calls autogen.sh.
Instead of:
\verbatim
PATH=/usr/bin/:/sbin/:/usr/sbin/:/bin:/opt/local/bin:/sw/bin
@@ -19,7 +19,7 @@
PATH=/sw/bin:/usr/bin/:/sbin/:/usr/sbin/:/bin:/opt/local/bin
/endverbatim
-Then, when calling ./autogen.sh and ./configure, it may be necessary
+Then, when calling ./autogen.sh and ./configure, it is necessary
to direct OSX to the correct Guile installation environment using:
\verbatim
@@ -28,12 +28,6 @@
./autogen.sh
guile16-build env LIBRARY_PATH=/sw/lib CPATH=/sw/include \
./configure <your configure options>
-\endverbatim
-
-You may also need to specify the same environment to the first
-make command:
-
-\verbatim
guile16-build env LIBRARY_PATH=/sw/lib CPATH=/sw/include \
make
\endverbatim
@@ -41,6 +35,9 @@
If (when) you do a 'make distclean', this whole process will have to
be done again.
+If you have to change automake or autoconf versions, make sure you
+remove the autom4te.cache/ directory before running autogen.sh again.
+
\section osxtools OSX tools
GnuCash recommends <b>only>/b> the most recent versions of each of the
Modified: gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.c
===================================================================
--- gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.c 2005-11-20 17:10:14 UTC (rev 11990)
+++ gnucash/trunk/src/core-utils/gnc-gkeyfile-utils.c 2005-11-20 18:53:20 UTC (rev 11991)
@@ -122,10 +122,10 @@
success = FALSE;
if (error) {
*error = g_error_new(G_FILE_ERROR, g_file_error_from_errno(errno),
- "File %s truncated (provided %d, written %zd)",
+ "File %s truncated (provided %d, written %d)",
filename, length, written);
} else {
- g_critical("File %s truncated (provided %d, written %zd)",
+ g_critical("File %s truncated (provided %d, written %d)",
filename, length, written);
}
/* Ignore any error */
More information about the gnucash-changes
mailing list