[44456] trunk/dports/gnome/gnucash
gwhitney at macports.org
gwhitney at macports.org
Sun Dec 28 15:47:29 PST 2008
Revision: 44456
http://trac.macports.org/changeset/44456
Author: gwhitney at macports.org
Date: 2008-12-28 15:47:29 -0800 (Sun, 28 Dec 2008)
Log Message:
-----------
update gnucash to 2.2.8 and add no_x11 variant
Besides updating this to 2.2.8 and updating the configure patch,
I've made the following changes:
* switched to lzma archive as it is 40% smaller
* added no_x11 variant as I could not get gnucash to link with
Macports-built +no_x11 libraries unless I eliminated the check for
Xlib.h in configure.
* As long as I was adding a +no_x11 variant, removed the evince
dependency in this variant as noted by Ticket #15327
* Added a warning after activation about the dbus-launch issues as
discussed in http://trac.macports.org/ticket/16755#comment:17
Modified Paths:
--------------
trunk/dports/gnome/gnucash/Portfile
trunk/dports/gnome/gnucash/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/gnome/gnucash/files/patch-nox-configure.diff
Modified: trunk/dports/gnome/gnucash/Portfile
===================================================================
--- trunk/dports/gnome/gnucash/Portfile 2008-12-28 23:36:05 UTC (rev 44455)
+++ trunk/dports/gnome/gnucash/Portfile 2008-12-28 23:47:29 UTC (rev 44456)
@@ -4,8 +4,7 @@
PortSystem 1.0
name gnucash
-version 2.2.7
-revision 2
+version 2.2.8
categories gnome x11
maintainers nomaintainer
@@ -24,11 +23,13 @@
homepage http://www.gnucash.org/
master_sites sourceforge \
http://www.gnucash.org/pub/gnucash/sources/stable/
-use_bzip2 yes
-checksums md5 0f3f324c274b136070b769aa10591ccf \
- sha1 55aeb126de4b195b3a84b8fe88cc16e8679f3cc5 \
- rmd160 db6cf249ca8f2a2497d48b4a1815b6ae5c681b97
+# lzma archive for gnucash is 40% smaller than bzip2
+use_lzma yes
+checksums md5 764f6c3c3d420c8393c31f03ea74cb20 \
+ sha1 804feb9e17f976186cfdb4e829064d60923571f8 \
+ rmd160 d3c2cf32c719debee55690db603329788644cc26
+
depends_lib port:p5-xml-parser \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gconf \
@@ -81,6 +82,12 @@
configure.args-append --disable-ofx
}
+variant no_x11 description {Let this port know that graphics libraries were built without X11} {
+ depends_run-delete port:evince
+ patchfiles-append patch-nox-configure.diff
+ patchfiles-delete patch-configure.diff
+}
+
set storagedir ${prefix}/etc/macports/gconf
set storagefile $storagedir/${name}
@@ -121,4 +128,17 @@
system "cd ${prefix}/etc/gconf/schemas && \
GCONF_CONFIG_SOURCE=`${prefix}/bin/gconftool-2 --get-default-source` ${prefix}/bin/gconftool-2 --makefile-install-rule $schemastring"
+
+ if {[variant_isset no_x11]} {
+ ui_warn "When you run gnucash, if it pops up a window saying:"
+ ui_warn " An error occurred while loading or saving configuration"
+ ui_warn " information for gnucash."
+ ui_warn "it is probably because it cannot connect to"
+ ui_warn "the DBus server. Either place the following in your login"
+ ui_warn "shell profile:"
+ ui_warn " eval `dbus-launch --auto-syntax`"
+ ui_warn "or invoke gnucash via 'dbus-launch gnucash'. Note that with"
+ ui_warn "the latter alternative you may end up with a stray dbus"
+ ui_warn "process after you quit gnucash."
+ }
}
Modified: trunk/dports/gnome/gnucash/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gnucash/files/patch-configure.diff 2008-12-28 23:36:05 UTC (rev 44455)
+++ trunk/dports/gnome/gnucash/files/patch-configure.diff 2008-12-28 23:47:29 UTC (rev 44456)
@@ -1,6 +1,6 @@
---- configure.orig 2008-03-02 14:30:21.000000000 +0100
-+++ configure 2008-03-17 18:42:05.000000000 +0100
-@@ -25464,9 +25464,9 @@
+--- configure.orig 2008-12-13 22:41:47.000000000 -0500
++++ configure 2008-12-28 01:31:29.000000000 -0500
+@@ -26210,9 +26210,9 @@
if test "x$cross_compiling" = "xyes" ; then
@@ -12,7 +12,7 @@
fi
# Extract the first word of "$name_build_guile", so it can be a program name with args.
-@@ -25649,13 +25649,13 @@
+@@ -26395,13 +26395,13 @@
if test "x$BUILD_GUILE" = "xyes"; then
@@ -30,7 +30,7 @@
GUILE_INCS="`$name_build_guile compile`"
{ echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
echo "${ECHO_T}$GUILE_INCS" >&6; }
-@@ -25981,7 +25981,7 @@
+@@ -26727,7 +26727,7 @@
GUILE_LIBS="$GUILE_LIBS -lsocket"
fi
@@ -39,7 +39,7 @@
fi
-@@ -25991,8 +25991,8 @@
+@@ -26737,8 +26737,8 @@
LIBS="$LIBS $GUILE_LIBS"
CPPFLAGS="$saved_cppflags $GUILE_INCS"
@@ -50,7 +50,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26000,8 +26000,8 @@
+@@ -26746,8 +26746,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -61,7 +61,7 @@
int
main ()
-@@ -26104,8 +26104,8 @@
+@@ -26850,8 +26850,8 @@
if test x${GUILE} = x ; then
@@ -72,7 +72,7 @@
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GUILE+set}" = set; then
-@@ -26243,8 +26243,8 @@
+@@ -26989,8 +26989,8 @@
if test x${GUILE} = x ; then
@@ -83,15 +83,16 @@
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GUILE+set}" = set; then
-@@ -26391,20 +26391,20 @@
+@@ -27137,7 +27137,7 @@
### Check size of long_long - some guile's are broken.
{ echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
-echo $ECHO_N "checking if guile long_long is at least as big as gint64... $ECHO_C" >&6; }
+echo $ECHO_N "checking if guile16 long_long is at least as big as gint64... $ECHO_C" >&6; }
GNC_OLDCFLAGS="$CFLAGS"
+ GNC_OLDLDFLAGS="$LDFLAGS"
CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
- if test "$cross_compiling" = yes; then
+@@ -27146,13 +27146,13 @@
{ echo "$as_me:$LINENO: result: assuming yes" >&5
echo "${ECHO_T}assuming yes" >&6; }
@@ -108,7 +109,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26477,7 +26477,7 @@
+@@ -27225,7 +27225,7 @@
/* end confdefs.h. */
#include <glib.h>
@@ -117,7 +118,7 @@
int main(int argc, char *argv[]) {
return(!(sizeof(long_long) >= sizeof(gint64)));
}
-@@ -26506,13 +26506,13 @@
+@@ -27254,13 +27254,13 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
@@ -134,7 +135,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26704,8 +26704,8 @@
+@@ -27456,8 +27456,8 @@
{ echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
echo $ECHO_N "checking if guile needs our copy of (guile www)... $ECHO_C" >&6; }
@@ -145,7 +146,7 @@
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GUILE+set}" = set; then
-@@ -26745,13 +26745,13 @@
+@@ -27497,13 +27497,13 @@
if test "$GUILE" = "" ; then
@@ -163,7 +164,7 @@
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
-@@ -26791,13 +26791,13 @@
+@@ -27543,13 +27543,13 @@
if test "$GUILE_CONFIG" = "" ; then
Copied: trunk/dports/gnome/gnucash/files/patch-nox-configure.diff (from rev 44455, trunk/dports/gnome/gnucash/files/patch-configure.diff)
===================================================================
--- trunk/dports/gnome/gnucash/files/patch-nox-configure.diff (rev 0)
+++ trunk/dports/gnome/gnucash/files/patch-nox-configure.diff 2008-12-28 23:47:29 UTC (rev 44456)
@@ -0,0 +1,194 @@
+--- configure.orig 2008-12-13 22:41:47.000000000 -0500
++++ configure 2008-12-28 02:34:37.000000000 -0500
+@@ -24157,7 +24157,8 @@
+ # These are unavailable on windows/mingw32
+
+
+-for ac_header in X11/Xlib.h glob.h
++#for ac_header in X11/Xlib.h glob.h
++for ac_header in glob.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -26210,9 +26211,9 @@
+
+
+ if test "x$cross_compiling" = "xyes" ; then
+- name_build_guile="$target_alias-guile-config"
++ name_build_guile="$target_alias-guile16-config"
+ else
+- name_build_guile="guile-config"
++ name_build_guile="guile16-config"
+ fi
+
+ # Extract the first word of "$name_build_guile", so it can be a program name with args.
+@@ -26395,13 +26396,13 @@
+
+
+ if test "x$BUILD_GUILE" = "xyes"; then
+- { echo "$as_me:$LINENO: checking for guile libraries" >&5
+-echo $ECHO_N "checking for guile libraries... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for guile16 libraries" >&5
++echo $ECHO_N "checking for guile16 libraries... $ECHO_C" >&6; }
+ GUILE_LIBS="`$name_build_guile link`"
+ { echo "$as_me:$LINENO: result: $GUILE_LIBS" >&5
+ echo "${ECHO_T}$GUILE_LIBS" >&6; }
+- { echo "$as_me:$LINENO: checking for guile headers" >&5
+-echo $ECHO_N "checking for guile headers... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for guile16 headers" >&5
++echo $ECHO_N "checking for guile16 headers... $ECHO_C" >&6; }
+ GUILE_INCS="`$name_build_guile compile`"
+ { echo "$as_me:$LINENO: result: $GUILE_INCS" >&5
+ echo "${ECHO_T}$GUILE_INCS" >&6; }
+@@ -26727,7 +26728,7 @@
+ GUILE_LIBS="$GUILE_LIBS -lsocket"
+ fi
+
+- GUILE_LIBS="-lguile $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
++ GUILE_LIBS="-lguile16 $GUILE_LIBS $QTTHREADS_LIB $READLINE_LIB $TERMCAP_LIB"
+ fi
+
+
+@@ -26737,8 +26738,8 @@
+ LIBS="$LIBS $GUILE_LIBS"
+ CPPFLAGS="$saved_cppflags $GUILE_INCS"
+
+- { echo "$as_me:$LINENO: checking whether guile works" >&5
+-echo $ECHO_N "checking whether guile works... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking whether guile16 works" >&5
++echo $ECHO_N "checking whether guile16 works... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -26746,8 +26747,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+- #include <libguile.h>
+- #include <guile/gh.h>
++ #include <libguile16.h>
++ #include <guile16/gh.h>
+
+ int
+ main ()
+@@ -26850,8 +26851,8 @@
+
+
+ if test x${GUILE} = x ; then
+- # Extract the first word of "guile", so it can be a program name with args.
+-set dummy guile; ac_word=$2
++ # Extract the first word of "guile16", so it can be a program name with args.
++set dummy guile16; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+@@ -26989,8 +26990,8 @@
+
+
+ if test x${GUILE} = x ; then
+- # Extract the first word of "guile", so it can be a program name with args.
+-set dummy guile; ac_word=$2
++ # Extract the first word of "guile16", so it can be a program name with args.
++set dummy guile16; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+@@ -27137,7 +27138,7 @@
+
+ ### Check size of long_long - some guile's are broken.
+ { echo "$as_me:$LINENO: checking if guile long_long is at least as big as gint64" >&5
+-echo $ECHO_N "checking if guile long_long is at least as big as gint64... $ECHO_C" >&6; }
++echo $ECHO_N "checking if guile16 long_long is at least as big as gint64... $ECHO_C" >&6; }
+ GNC_OLDCFLAGS="$CFLAGS"
+ GNC_OLDLDFLAGS="$LDFLAGS"
+ CFLAGS="${GNOME_CFLAGS} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}"
+@@ -27146,13 +27147,13 @@
+
+ { echo "$as_me:$LINENO: result: assuming yes" >&5
+ echo "${ECHO_T}assuming yes" >&6; }
+- { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
+-echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
++echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lguile $LIBS"
++LIBS="-lguile16 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27225,7 +27226,7 @@
+ /* end confdefs.h. */
+
+ #include <glib.h>
+- #include <libguile/__scm.h>
++ #include <libguile16/__scm.h>
+ int main(int argc, char *argv[]) {
+ return(!(sizeof(long_long) >= sizeof(gint64)));
+ }
+@@ -27254,13 +27255,13 @@
+
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+- { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile" >&5
+-echo $ECHO_N "checking for scm_long_long2num in -lguile... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for scm_long_long2num in -lguile16" >&5
++echo $ECHO_N "checking for scm_long_long2num in -lguile16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_guile_scm_long_long2num+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lguile $LIBS"
++LIBS="-lguile16 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -27456,8 +27457,8 @@
+
+ { echo "$as_me:$LINENO: checking if guile needs our copy of (guile www)" >&5
+ echo $ECHO_N "checking if guile needs our copy of (guile www)... $ECHO_C" >&6; }
+-# Extract the first word of "guile", so it can be a program name with args.
+-set dummy guile; ac_word=$2
++# Extract the first word of "guile16", so it can be a program name with args.
++set dummy guile16; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE+set}" = set; then
+@@ -27497,13 +27498,13 @@
+
+
+ if test "$GUILE" = "" ; then
+- { { echo "$as_me:$LINENO: error: guile required but not found" >&5
+-echo "$as_me: error: guile required but not found" >&2;}
++ { { echo "$as_me:$LINENO: error: guile16 required but not found" >&5
++echo "$as_me: error: guile16 required but not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+- # Extract the first word of "guile-config", so it can be a program name with args.
+-set dummy guile-config; ac_word=$2
++ # Extract the first word of "guile16-config", so it can be a program name with args.
++set dummy guile16-config; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE_CONFIG+set}" = set; then
+@@ -27543,13 +27544,13 @@
+
+
+ if test "$GUILE_CONFIG" = "" ; then
+- { { echo "$as_me:$LINENO: error: guile-config required but not found" >&5
+-echo "$as_me: error: guile-config required but not found" >&2;}
++ { { echo "$as_me:$LINENO: error: guile16-config required but not found" >&5
++echo "$as_me: error: guile16-config required but not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+- # Extract the first word of "guile-tools", so it can be a program name with args.
+-set dummy guile-tools; ac_word=$2
++ # Extract the first word of "guile16-tools", so it can be a program name with args.
++set dummy guile16-tools; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GUILE_TOOLS+set}" = set; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081228/05e469e1/attachment-0001.html>
More information about the macports-changes
mailing list