Revision
87598
Author
dports@macports.org
Date
2011-11-27 21:41:22 -0800 (Sun, 27 Nov 2011)

Log Message

gnucash-devel: add patch to fix libgcrypt multiple initialization
error that causes bus error wen loading aqbanking module (#31595;
merge of r87597 from gnucash port)

Modified Paths

Added Paths

Property Changed

Diff

Property changes: trunk/dports/gnome/gnucash-devel

Modified: svn:mergeinfo

+ /trunk/dports/gnome/gnucash:75076,76649,87597

Modified: trunk/dports/gnome/gnucash-devel/Portfile (87597 => 87598)


--- trunk/dports/gnome/gnucash-devel/Portfile	2011-11-28 05:40:02 UTC (rev 87597)
+++ trunk/dports/gnome/gnucash-devel/Portfile	2011-11-28 05:41:22 UTC (rev 87598)
@@ -6,6 +6,7 @@
 name              gnucash-devel
 set my_name       gnucash
 version           2.4.8
+revision          1
 categories        gnome x11
 license           GPL-2+
 maintainers       dports openmaintainer
@@ -38,6 +39,9 @@
 # to use dbus-launch or muck with DYLD_LIBRARY_PATH.
 patchfiles        patch-configure.diff
 
+# fix libgcrypt multiple initialization error; see #31595
+patchfiles-append patch-src_gnc-module_gnc-module.c.diff
+
 post-patch {
     # gnc-fq-dump needs to be patched to use MacPorts perl.
     # (autoconf takes care of the other perl scripts.)
Property changes on: trunk/dports/gnome/gnucash-devel/Portfile
___________________________________________________________________

Modified: svn:mergeinfo

+ /trunk/dports/gnome/gnucash/Portfile:75076,76649,77149,77299,77346,78188,79161,80328,80330,84977,86481,87597

Copied: trunk/dports/gnome/gnucash-devel/files/patch-src_gnc-module_gnc-module.c.diff (from rev 87597, trunk/dports/gnome/gnucash/files/patch-src_gnc-module_gnc-module.c.diff) (0 => 87598)


--- trunk/dports/gnome/gnucash-devel/files/patch-src_gnc-module_gnc-module.c.diff	                        (rev 0)
+++ trunk/dports/gnome/gnucash-devel/files/patch-src_gnc-module_gnc-module.c.diff	2011-11-28 05:41:22 UTC (rev 87598)
@@ -0,0 +1,11 @@
+--- src/gnc-module/gnc-module.c	2011-10-11 11:47:40.706200237 -0400
++++ src/gnc-module/gnc-module.c	2011-10-11 11:48:21.254201370 -0400
+@@ -323,7 +323,7 @@ gnc_module_get_info(const char * fullpat
+     info->module_age         = *(int *)age;
+     info->module_revision    = *(int *)revision;
+ 
+-
++    g_module_make_resident(gmodule);
+ get_info_close:
+     /*   g_debug("(init) closing '%s'\n", fullpath); */
+     g_module_close(gmodule);