gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Thu Oct 29 15:19:46 EDT 2015
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/5b10f60e (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/a5759363 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/614bb47a (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/4817c37a (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/5bc6bcd9 (commit)
commit 5b10f60e40a5a1ed31ab5b317fe3d6d596f8d0f2
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 29 12:27:25 2015 -0700
Remove the openssl module. It's provided in gtk-osx.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 017bec8..02770ed 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -68,12 +68,6 @@
repo="sourceforge"/>
</autotools>
- <autotools id="openssl" autogen-sh="Configure"
- autogen-template="%(srcdir)s/Configure --prefix=%(prefix)s darwin-i386-cc"
- supports-non-srcdir-builds="no">
- <branch module="openssl-1.0.1j.tar.gz" version="1.0.1j" repo="openssl"/>
- </autotools>
-
<autotools id="xmlsec">
<branch module="GNOME/xmlsec" repo="github"/>
<dependencies>
commit a57593631aea82bf01986ea1bec6cc3e75860444
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 29 12:23:32 2015 -0700
Remove include to jralls's local gtk-osx modulesets.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 776a385..017bec8 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -32,7 +32,6 @@
href="https://www.openssl.org/source/"/>
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
- <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<autotools id="libchipcard" autogen-sh="configure" >
<branch module="gnucash/Dependencies/libchipcard-5.0.3beta.tar.gz" version="5.0.3"
commit 614bb47a294b13d98443ef211836b4e87eeda883
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 29 12:20:27 2015 -0700
Change hrefs from jralls's personal repo to new gnucash repo.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index d4b2cd6..e4499db 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -25,7 +25,7 @@ modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-stable"]
#instances of "10.5" below with their OS version:
setup_sdk("10.5", "10.5",["i386"])
-moduleset = "http://github.com/jralls/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+moduleset = "http://github.com/gnucash/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
#If you wish to enable the mysql backend, uncomment the lines below.
#MySQL requires CMake 2.6.0 or later to build, so the libmysql module
@@ -52,7 +52,3 @@ append_autogenargs("gnucash", "--with-dbi-dbd-dir=" + prefix +"/lib/dbd")
append_autogenargs("libiconv", "--with-libintl-prefix=" + prefix)
module_makecheck["gmp"] = True
-
-
-
-
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a5d9870..776a385 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -47,7 +47,7 @@
autogenargs="--with-guis=gtk2 --enable-local-install">
<branch module="gnucash/Dependencies/gwenhywfar-4.13.1.tar.gz" version="4.13.1"
repo="sourceforge">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
+ <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
</branch>
<dependencies>
<dep package="libgcrypt"/>
@@ -117,7 +117,7 @@
autogenargs="--disable-static --enable-shared --disable-doc-build --disable-nls">
<branch repo="sourceforge" module="openjade/OpenSP-1.5.2.tar.gz"
version='1.5.2'>
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'/>
+ <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/OpenSP-AC_CONFIG_HEADERS.patch" strip='0'/>
</branch>
</autotools>
@@ -150,7 +150,7 @@
module="slib"/> -->
<branch repo="csail" module="scm/slib-3b4.zip" version="3b3"
checkoutdir="slib">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/slib-install.patch"/>
+ <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/slib-install.patch"/>
</branch>
<dependencies>
<dep package="guile"/>
@@ -160,7 +160,7 @@
<cmake id="mysql">
<branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
version="6.0.2" >
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libmysql.patch"/>
+ <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/libmysql.patch"/>
</branch>
<dependencies>
<dep package="cmake"/>
@@ -170,7 +170,7 @@
<autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
<branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
version="0.8.4">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/libdbi-fix-cflags.patch" strip="1"/>
+ <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/libdbi-fix-cflags.patch" strip="1"/>
</branch>
</autotools>
@@ -178,7 +178,7 @@
autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
<branch repo="sourceforge" version="0.8.3-1"
module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/dbi-drv.patch" strip="1"/>
+ <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/dbi-drv.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libdbi"/>
@@ -202,7 +202,7 @@
<autotools id="goffice" autogen-sh="configure">
<branch module="goffice/0.8/goffice-0.8.17.tar.xz" version="0.8.17"
hash="sha256:165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15">
- <patch file="https://raw.github.com/jralls/gnucash-on-osx/master/patches/goffice-gsize.patch" strip="1"/>
+ <patch file="https://raw.github.com/gnucash/gnucash-on-osx/master/patches/goffice-gsize.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gtk+"/>
commit 4817c37ad70f2046cf8b6251a9a13a660c623e70
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Oct 29 12:19:50 2015 -0700
Delete obsolete patches.
diff --git a/patches/0001-Updated-swig-guile-deprecated-patch.patch b/patches/0001-Updated-swig-guile-deprecated-patch.patch
deleted file mode 100644
index d69f698..0000000
--- a/patches/0001-Updated-swig-guile-deprecated-patch.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From 908eab348ca34f6a8c765682179eb00b8c3bee95 Mon Sep 17 00:00:00 2001
-From: John Ralls <jralls at ceridwen.us>
-Date: Fri, 30 Dec 2011 12:05:12 -0800
-Subject: [PATCH] Updated swig-guile-deprecated patch
-
----
- Lib/guile/ghinterface.i | 8 ++++++++
- Lib/guile/guile_gh_run.swg | 13 ++++++++++---
- Lib/guile/guile_scm_run.swg | 30 +++++++++++++++++++++++-------
- Lib/guile/typemaps.i | 2 +-
- Source/Modules/guile.cxx | 16 ++++++++++++++++
- configure.in | 1 +
- 6 files changed, 59 insertions(+), 11 deletions(-)
-
-diff --git a/Lib/guile/ghinterface.i b/Lib/guile/ghinterface.i
-index c5fda62..2a9e549 100644
---- a/Lib/guile/ghinterface.i
-+++ b/Lib/guile/ghinterface.i
-@@ -20,7 +20,11 @@
- #define gh_scm2int(a) scm_num2int(a, SCM_ARG1, FUNC_NAME)
- #define gh_scm2long(a) scm_num2long(a, SCM_ARG1, FUNC_NAME)
- #define gh_scm2short(a) scm_num2short(a, SCM_ARG1, FUNC_NAME)
-+#ifdef HAVE_SCM_TO_LOCALE_STRINGN
-+#define gh_scm2newstr scm_to_locale_stringn
-+#else
- #define gh_scm2newstr SWIG_Guile_scm2newstr
-+#endif
- #define gh_scm2ulong(a) scm_num2ulong(a, SCM_ARG1, FUNC_NAME)
- #define gh_scm2ushort(a) scm_num2ushort(a, SCM_ARG1, FUNC_NAME)
- #define gh_scm2uint(a) scm_num2uint(a, SCM_ARG1, FUNC_NAME)
-@@ -31,7 +35,11 @@
- #define gh_scm2long_long(a) scm_num2long_long(a, SCM_ARG1, FUNC_NAME)
- #define gh_ulong_long2scm scm_ulong_long2num
- #define gh_scm2ulong_long(a) scm_num2ulong_long(a, SCM_ARG1, FUNC_NAME)
-+#ifdef HAVE_SCM_IS_STRING
-+#define gh_string_p scm_is_string
-+#else
- #define gh_string_p SCM_STRINGP
-+#endif
- #define gh_vector_length SCM_VECTOR_LENGTH
- #define gh_vector_p SCM_VECTORP
- #define gh_vector_ref scm_vector_ref
-diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg
-index 0eba1f9..a15ffc2 100644
---- a/Lib/guile/guile_gh_run.swg
-+++ b/Lib/guile/guile_gh_run.swg
-@@ -17,10 +17,17 @@ extern "C" {
-
- typedef SCM (*swig_guile_proc)();
-
--#define SWIG_malloc(size) \
-- SCM_MUST_MALLOC(size)
-+#ifdef HAVE_SCM_MALLOC
-+#define SWIG_malloc(size)\
-+ scm_malloc(size)
- #define SWIG_free(mem) \
-- scm_must_free(mem)
-+ free(mem)
-+#else
-+ #define SWIG_malloc(size) \
-+ SCM_MUST_MALLOC(size)
-+ #define SWIG_free(mem) \
-+ scm_must_free(mem)
-+#endif
- #define SWIG_ConvertPtr(s, result, type, flags) \
- SWIG_Guile_ConvertPtr(&swig_module, s, result, type, flags)
- #define SWIG_MustGetPtr(s, type, argnum, flags) \
-diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg
-index 91b7409..46cec56 100644
---- a/Lib/guile/guile_scm_run.swg
-+++ b/Lib/guile/guile_scm_run.swg
-@@ -20,12 +20,22 @@ typedef struct swig_guile_clientdata {
- SCM goops_class;
- } swig_guile_clientdata;
-
--#define SWIG_scm2str(s) \
-- SWIG_Guile_scm2newstr(s, NULL)
--#define SWIG_malloc(size) \
-- SCM_MUST_MALLOC(size)
-+#if (defined HAVE_SCM_TO_LOCALE_STRING) && (defined HAVE_SCM_TO_LOCALE_STRINGN)
-+#define SWIG_scm2str(s) scm_to_locale_string(s)
-+#else
-+#define SWIG_scm2str(s) SWIG_Guile_scm2newstr(s, NULL)
-+#endif
-+#ifdef HAVE_SCM_MALLOC
-+#define SWIG_malloc(size)\
-+ scm_malloc(size)
- #define SWIG_free(mem) \
-- scm_must_free(mem)
-+ free(mem)
-+#else
-+ #define SWIG_malloc(size) \
-+ SCM_MUST_MALLOC(size)
-+ #define SWIG_free(mem) \
-+ scm_must_free(mem)
-+#endif
- #define SWIG_ConvertPtr(s, result, type, flags) \
- SWIG_Guile_ConvertPtr(s, result, type, flags)
- #define SWIG_MustGetPtr(s, type, argnum, flags) \
-@@ -56,16 +66,21 @@ typedef struct swig_guile_clientdata {
- static swig_module_info *SWIG_Guile_GetModule(void);
- #define SWIG_GetModule(clientdata) SWIG_Guile_GetModule()
- #define SWIG_SetModule(clientdata, pointer) SWIG_Guile_SetModule(pointer)
--
-+
-+#ifndef HAC_SCM_TO_LOCALE_STRINGN
- SWIGINTERN char *
- SWIG_Guile_scm2newstr(SCM str, size_t *len) {
- #define FUNC_NAME "SWIG_Guile_scm2newstr"
- char *ret;
- size_t l;
-
-- SCM_ASSERT (SCM_STRINGP(str), str, 1, FUNC_NAME);
-+ SCM_ASSERT (gh_string_p(str), str, 1, FUNC_NAME);
-
-+ #ifdef HAC_SCM_C_STRING_LENGTH
-+ l = scn_c_string_length(str);
-+ #else
- l = SCM_STRING_LENGTH(str);
-+ #endif
- ret = (char *) SWIG_malloc( (l + 1) * sizeof(char));
- if (!ret) return NULL;
-
-@@ -75,6 +90,7 @@ SWIG_Guile_scm2newstr(SCM str, size_t *len) {
- return ret;
- #undef FUNC_NAME
- }
-+#endif
-
- static int swig_initialized = 0;
- static scm_t_bits swig_tag = 0;
-diff --git a/Lib/guile/typemaps.i b/Lib/guile/typemaps.i
-index edf227d..3bf969d 100644
---- a/Lib/guile/typemaps.i
-+++ b/Lib/guile/typemaps.i
-@@ -427,7 +427,7 @@ typedef unsigned long SCM;
- }
-
- %typecheck(SWIG_TYPECHECK_STRING) char * {
-- $1 = SCM_STRINGP($input) ? 1 : 0;
-+ $1 = gh_string_p($input) ? 1 : 0;
- }
-
- %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *, SWIGTYPE &, SWIGTYPE [] {
-diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx
-index bdf11ee..4d81587 100644
---- a/Source/Modules/guile.cxx
-+++ b/Source/Modules/guile.cxx
-@@ -335,6 +335,22 @@ public:
- Printf(f_runtime, "\n");
- Printf(f_runtime, "#define SWIGGUILE\n");
-
-+ #ifdef HAVE_SCM_MALLOC
-+ Printf(f_runtime, "#define HAVE_SCM_MALLOC 1\n");
-+ #endif
-+ #ifdef HAVE_SCM_IS_STRING
-+ Printf(f_runtime, "#define HAVE_SCM_IS_STRING 1\n");
-+ #endif
-+ #ifdef HAVE_SCM_C_STRING_LENGTH
-+ Printf(f_runtime, "#define HAVE_SCM_C_STRING_LENGTH 1\n");
-+ #endif
-+ #ifdef HAVE_SCM_TO_LOCALE_STRING
-+ Printf(f_runtime, "#define HAVE_SCM_TO_LOCALE_STRING 1\n");
-+ #endif
-+ #ifdef HAVE_SCM_TO_LOCALE_STRINGN
-+ Printf(f_runtime, "#define HAVE_SCM_TO_LOCALE_STRINGN 1\n");
-+ #endif
-+
- if (!use_scm_interface) {
- if (SwigRuntime == 1)
- Printf(f_runtime, "#define SWIG_GLOBAL\n");
-diff --git a/configure.in b/configure.in
-index 7e3b43d..42ee248 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1266,6 +1266,7 @@ else
- AC_MSG_RESULT(no)
- fi
- CFLAGS=$guilesafe_CFLAGS
-+AC_CHECK_FUNCS(scm_malloc scm_is_string scm_c_string_length scm_to_locale_string scm_to_locale_stringn)
- LIBS=$guilesafe_LIBS
- fi
-
---
-1.7.6.3.dirty
-
diff --git a/patches/dbi.patch b/patches/dbi.patch
deleted file mode 100644
index b17f33c..0000000
--- a/patches/dbi.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -c /Users/john/gtk/source/libdbi-0.8.3/configure.in\~ /Users/john/gtk/source/libdbi-0.8.3/configure.in
---- a/configure.in Wed Feb 6 08:03:27 2008
-@@ -3,5 +3,5 @@
- AM_MAINTAINER_MODE
-
- AM_INIT_AUTOMAKE(libdbi, 0.8.3)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- dnl Library versioning
- LIB_CURRENT=0
-+++ b/configure.in Mon Sep 30 22:10:00 2013
-@@ -61,6 +61,8 @@
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;;
-+ *-*-darwin*)
-+ ;;
- *)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
-
-Diff finished. Mon Sep 30 22:10:24 2013
diff --git a/patches/gnome-vfs-glib-2_36.patch b/patches/gnome-vfs-glib-2_36.patch
deleted file mode 100644
index 0214e46..0000000
--- a/patches/gnome-vfs-glib-2_36.patch
+++ /dev/null
@@ -1,1199 +0,0 @@
---- ./daemon/daemon-connection.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./daemon/daemon-connection.c 2013-08-26 14:56:03.000000000 -0700
-@@ -67,14 +67,14 @@
- gint32 id;
- } FileHandle;
-
--static GStaticMutex cancellations_lock = G_STATIC_MUTEX_INIT;
-+static GMutex cancellations_lock;
- static GHashTable *cancellations;
-
--static GStaticMutex directory_handles_lock = G_STATIC_MUTEX_INIT;
-+static GMutex directory_handles_lock;
- static GHashTable *directory_handles;
- static guint next_directory_id = 1;
-
--static GStaticMutex file_handles_lock = G_STATIC_MUTEX_INIT;
-+static GMutex file_handles_lock;
- static GHashTable *file_handles;
- static guint next_file_id = 1;
-
-@@ -239,21 +239,21 @@
- }
- dbus_connection_unref (conn->conn);
-
-- g_static_mutex_lock (&directory_handles_lock);
-+ g_mutex_lock (&directory_handles_lock);
- if (directory_handles) {
- g_hash_table_foreach_remove (directory_handles,
- directory_handle_last_conn_is,
- conn);
- }
-- g_static_mutex_unlock (&directory_handles_lock);
-+ g_mutex_unlock (&directory_handles_lock);
-
-- g_static_mutex_lock (&file_handles_lock);
-+ g_mutex_lock (&file_handles_lock);
- if (file_handles) {
- g_hash_table_foreach_remove (file_handles,
- file_handle_last_conn_is,
- conn);
- }
-- g_static_mutex_unlock (&file_handles_lock);
-+ g_mutex_unlock (&file_handles_lock);
-
- g_assert (!g_main_loop_is_running (conn->main_loop));
-
-@@ -320,14 +320,14 @@
-
- handle = cancellation_handle_new (id, conn->conn_id);
-
-- g_static_mutex_lock (&cancellations_lock);
-+ g_mutex_lock (&cancellations_lock);
- if (cancellations == NULL) {
- cancellations = g_hash_table_new_full (cancellation_handle_hash, cancellation_handle_equal,
- NULL, (GDestroyNotify) cancellation_handle_free);
- }
-
- g_hash_table_insert (cancellations, handle, handle);
-- g_static_mutex_unlock (&cancellations_lock);
-+ g_mutex_unlock (&cancellations_lock);
-
- return handle;
- }
-@@ -338,11 +338,11 @@
- {
- d(g_print ("Removing cancellation handle %d\n", handle->id));
-
-- g_static_mutex_lock (&cancellations_lock);
-+ g_mutex_lock (&cancellations_lock);
- if (!g_hash_table_remove (cancellations, handle)) {
- g_warning ("Could't remove cancellation.");
- }
-- g_static_mutex_unlock (&cancellations_lock);
-+ g_mutex_unlock (&cancellations_lock);
- }
-
- /* Note: This is called from the main thread. */
-@@ -354,7 +354,7 @@
-
- handle = NULL;
-
-- g_static_mutex_lock (&cancellations_lock);
-+ g_mutex_lock (&cancellations_lock);
-
- lookup.conn_id = conn_id;
- lookup.id = cancellation_id;
-@@ -368,7 +368,7 @@
- }
- }
-
-- g_static_mutex_unlock (&cancellations_lock);
-+ g_mutex_unlock (&cancellations_lock);
- }
-
-
-@@ -408,7 +408,7 @@
- {
- DirectoryHandle *handle;
-
-- g_static_mutex_lock (&directory_handles_lock);
-+ g_mutex_lock (&directory_handles_lock);
- handle = directory_handle_new (conn, vfs_handle, next_directory_id++);
-
- if (directory_handles == NULL) {
-@@ -418,7 +418,7 @@
-
- g_hash_table_insert (directory_handles,
- GINT_TO_POINTER (handle->id), handle);
-- g_static_mutex_unlock (&directory_handles_lock);
-+ g_mutex_unlock (&directory_handles_lock);
-
- return handle;
- }
-@@ -426,13 +426,13 @@
- static void
- remove_directory_handle (DirectoryHandle *handle)
- {
-- g_static_mutex_lock (&directory_handles_lock);
-+ g_mutex_lock (&directory_handles_lock);
- if (!g_hash_table_remove (directory_handles,
- GINT_TO_POINTER (handle->id))) {
- g_warning ("Couldn't remove directory handle %d\n",
- handle->id);
- }
-- g_static_mutex_unlock (&directory_handles_lock);
-+ g_mutex_unlock (&directory_handles_lock);
- }
-
- static DirectoryHandle *
-@@ -441,13 +441,13 @@
- {
- DirectoryHandle *handle;
-
-- g_static_mutex_lock (&directory_handles_lock);
-+ g_mutex_lock (&directory_handles_lock);
- handle = g_hash_table_lookup (directory_handles,
- GINT_TO_POINTER (id));
- if (handle) {
- handle->last_connection = conn;
- }
-- g_static_mutex_unlock (&directory_handles_lock);
-+ g_mutex_unlock (&directory_handles_lock);
- return handle;
- }
-
-@@ -487,7 +487,7 @@
- {
- FileHandle *handle;
-
-- g_static_mutex_lock (&file_handles_lock);
-+ g_mutex_lock (&file_handles_lock);
- handle = file_handle_new (conn, vfs_handle, next_file_id++);
-
- if (file_handles == NULL) {
-@@ -497,7 +497,7 @@
-
- g_hash_table_insert (file_handles,
- GINT_TO_POINTER (handle->id), handle);
-- g_static_mutex_unlock (&file_handles_lock);
-+ g_mutex_unlock (&file_handles_lock);
-
- return handle;
- }
-@@ -505,12 +505,12 @@
- static void
- remove_file_handle (FileHandle *handle)
- {
-- g_static_mutex_lock (&file_handles_lock);
-+ g_mutex_lock (&file_handles_lock);
- if (!g_hash_table_remove (file_handles,
- GINT_TO_POINTER (handle->id))) {
- g_warning ("Couldn't remove file handle %d\n", handle->id);
- }
-- g_static_mutex_unlock (&file_handles_lock);
-+ g_mutex_unlock (&file_handles_lock);
- }
-
- static FileHandle *
-@@ -519,13 +519,13 @@
- {
- FileHandle *handle;
-
-- g_static_mutex_lock (&file_handles_lock);
-+ g_mutex_lock (&file_handles_lock);
- handle = g_hash_table_lookup (file_handles,
- GINT_TO_POINTER (id));
- if (handle) {
- handle->last_connection = conn;
- }
-- g_static_mutex_unlock (&file_handles_lock);
-+ g_mutex_unlock (&file_handles_lock);
-
- return handle;
- }
---- ./libgnomevfs/gnome-vfs-async-job-map.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-async-job-map.c 2013-08-26 13:49:26.000000000 -0700
-@@ -27,14 +27,14 @@
- #include <glib.h>
-
- /* job map bits guarded by this lock */
--static GStaticRecMutex async_job_map_lock = G_STATIC_REC_MUTEX_INIT;
-+static GRecMutex async_job_map_lock;
- static guint async_job_map_next_id;
- static int async_job_map_locked = 0;
- static gboolean async_job_map_shutting_down;
- static GHashTable *async_job_map;
-
- /* callback map bits guarded by this lock */
--static GStaticMutex async_job_callback_map_lock = G_STATIC_MUTEX_INIT;
-+static GMutex async_job_callback_map_lock;
- static GHashTable *async_job_callback_map;
- static guint async_job_callback_map_next_id;
-
-@@ -161,7 +161,7 @@
- void
- _gnome_vfs_async_job_map_lock (void)
- {
-- g_static_rec_mutex_lock (&async_job_map_lock);
-+ g_rec_mutex_lock (&async_job_map_lock);
- async_job_map_locked++;
- }
-
-@@ -169,7 +169,7 @@
- _gnome_vfs_async_job_map_unlock (void)
- {
- async_job_map_locked--;
-- g_static_rec_mutex_unlock (&async_job_map_lock);
-+ g_rec_mutex_unlock (&async_job_map_lock);
- }
-
- void
-@@ -185,7 +185,7 @@
- {
- GnomeVFSNotifyResult *notify_result;
-
-- g_static_mutex_lock (&async_job_callback_map_lock);
-+ g_mutex_lock (&async_job_callback_map_lock);
-
- if (async_job_callback_map == NULL) {
- g_assert (async_job_map_shutting_down);
-@@ -199,7 +199,7 @@
- *valid = notify_result != NULL;
- *cancelled = notify_result != NULL && notify_result->cancelled;
-
-- g_static_mutex_unlock (&async_job_callback_map_lock);
-+ g_mutex_unlock (&async_job_callback_map_lock);
- }
-
- gboolean
-@@ -207,7 +207,7 @@
- {
- gboolean cancelled;
-
-- g_static_mutex_lock (&async_job_callback_map_lock);
-+ g_mutex_lock (&async_job_callback_map_lock);
-
- g_assert (!async_job_map_shutting_down);
-
-@@ -232,7 +232,7 @@
- g_hash_table_insert (async_job_callback_map, GUINT_TO_POINTER (notify_result->callback_id),
- notify_result);
- }
-- g_static_mutex_unlock (&async_job_callback_map_lock);
-+ g_mutex_unlock (&async_job_callback_map_lock);
-
- return !cancelled;
- }
-@@ -243,11 +243,11 @@
- g_assert (async_job_callback_map != NULL);
-
- JOB_DEBUG (("removing callback %d ", callback_id));
-- g_static_mutex_lock (&async_job_callback_map_lock);
-+ g_mutex_lock (&async_job_callback_map_lock);
-
- g_hash_table_remove (async_job_callback_map, GUINT_TO_POINTER (callback_id));
-
-- g_static_mutex_unlock (&async_job_callback_map_lock);
-+ g_mutex_unlock (&async_job_callback_map_lock);
- }
-
- static void
-@@ -268,7 +268,7 @@
- void
- _gnome_vfs_async_job_cancel_job_and_callbacks (GnomeVFSAsyncHandle *job_handle, GnomeVFSJob *job)
- {
-- g_static_mutex_lock (&async_job_callback_map_lock);
-+ g_mutex_lock (&async_job_callback_map_lock);
-
- if (job != NULL) {
- job->cancelled = TRUE;
-@@ -282,18 +282,18 @@
- callback_map_cancel_one, job_handle);
- }
-
-- g_static_mutex_unlock (&async_job_callback_map_lock);
-+ g_mutex_unlock (&async_job_callback_map_lock);
- }
-
- void
- async_job_callback_map_destroy (void)
- {
-- g_static_mutex_lock (&async_job_callback_map_lock);
-+ g_mutex_lock (&async_job_callback_map_lock);
-
- if (async_job_callback_map) {
- g_hash_table_destroy (async_job_callback_map);
- async_job_callback_map = NULL;
- }
-
-- g_static_mutex_unlock (&async_job_callback_map_lock);
-+ g_mutex_unlock (&async_job_callback_map_lock);
- }
---- ./libgnomevfs/gnome-vfs-daemon-method.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-daemon-method.c 2013-08-26 14:31:45.000000000 -0700
-@@ -82,7 +82,7 @@
- DBusMessage *message,
- gpointer data);
-
--static GStaticPrivate local_connection_private = G_STATIC_PRIVATE_INIT;
-+static GPrivate local_connection_private;
-
-
- static DBusObjectPathVTable connection_vtable = {
-@@ -356,7 +356,7 @@
- static void
- private_connection_died (LocalConnection *connection)
- {
-- g_static_private_set (&local_connection_private, NULL, NULL);
-+ g_private_set (&local_connection_private, NULL);
- }
-
- static LocalConnection *
-@@ -370,7 +370,7 @@
- dbus_int32_t conn_id;
- LocalConnection *ret;
-
-- ret = g_static_private_get (&local_connection_private);
-+ ret = g_private_get (&local_connection_private);
- if (ret != NULL) {
- return ret;
- }
-@@ -438,8 +438,7 @@
- ret->conn_id = conn_id;
- ret->handle = 0;
-
-- g_static_private_set (&local_connection_private,
-- ret, destroy_private_connection);
-+ g_private_set (&local_connection_private, ret);
-
- return ret;
- }
---- ./libgnomevfs/gnome-vfs-dbus-utils.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-dbus-utils.c 2013-08-26 14:41:09.000000000 -0700
-@@ -187,16 +187,16 @@
- return main_dbus;
- }
-
--static GStaticPrivate daemon_connection_private = G_STATIC_PRIVATE_INIT;
-+static GPrivate daemon_connection_private;
-
- DBusConnection *
- _gnome_vfs_daemon_get_current_connection (void)
- {
-- return g_static_private_get (&daemon_connection_private);
-+ return g_private_get (&daemon_connection_private);
- }
-
- void
- gnome_vfs_daemon_set_current_connection (DBusConnection *conn)
- {
-- g_static_private_set (&daemon_connection_private, conn, NULL);
-+ g_private_set (&daemon_connection_private, conn);
- }
---- ./libgnomevfs/gnome-vfs-dns-sd.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-dns-sd.c 2013-08-26 14:40:48.000000000 -0700
-@@ -1142,74 +1142,80 @@
- gpointer callback_data,
- GDestroyNotify callback_data_destroy_func)
- {
-- GnomeVFSDNSSDBrowseHandle *handle;
-+ GnomeVFSDNSSDBrowseHandle *handle;
-
-- *handle_out = NULL;
-+ *handle_out = NULL;
-
-- handle = g_new0 (GnomeVFSDNSSDBrowseHandle, 1);
-- handle->domain = g_strdup (domain);
-- handle->type = g_strdup (type);
-- handle->callback = callback;
-- handle->callback_data = callback_data;
-- handle->callback_data_destroy_func = callback_data_destroy_func;
-+ handle = g_new0 (GnomeVFSDNSSDBrowseHandle, 1);
-+ handle->domain = g_strdup (domain);
-+ handle->type = g_strdup (type);
-+ handle->callback = callback;
-+ handle->callback_data = callback_data;
-+ handle->callback_data_destroy_func = callback_data_destroy_func;
-
-- if (strcmp (domain, "local") == 0) {
-+ if (strcmp (domain, "local") == 0)
-+ {
- #ifdef HAVE_AVAHI
-- AvahiClient *client;
-- AvahiServiceBrowser *sb;
-+ AvahiClient *client;
-+ AvahiServiceBrowser *sb;
-
-- handle->is_local = TRUE;
-- client = get_global_avahi_client ();
-- if (client) {
-- sb = avahi_service_browser_new (client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, type, NULL,
-- AVAHI_LOOKUP_USE_MULTICAST,
-- avahi_browse_callback, handle);
-- if (sb != NULL) {
-- handle->avahi_sb = sb;
-- *handle_out = handle;
-- browse_handles = g_slist_append (browse_handles, handle);
-- return GNOME_VFS_OK;
-- }
-- g_warning ("Failed to create service browser: %s\n", avahi_strerror( avahi_client_errno (client)));
-- }
-- return GNOME_VFS_ERROR_GENERIC;
-+ handle->is_local = TRUE;
-+ client = get_global_avahi_client ();
-+ if (client) {
-+ sb = avahi_service_browser_new (client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, type, NULL,
-+ AVAHI_LOOKUP_USE_MULTICAST,
-+ avahi_browse_callback, handle);
-+ if (sb != NULL)
-+ {
-+ handle->avahi_sb = sb;
-+ *handle_out = handle;
-+ browse_handles = g_slist_append (browse_handles, handle);
-+ return GNOME_VFS_OK;
-+ }
-+ g_warning ("Failed to create service browser: %s\n", avahi_strerror( avahi_client_errno (client)));
-+ }
-+ return GNOME_VFS_ERROR_GENERIC;
- #elif defined (HAVE_HOWL)
-- sw_result res;
-- sw_discovery session;
-+ sw_result res;
-+ sw_discovery session;
-
-- handle->is_local = TRUE;
-+ handle->is_local = TRUE;
-
-- session = get_global_howl_session ();
-- if (session) {
-- res = sw_discovery_browse (session,
-- 0,
-- type, domain,
-- howl_browse_reply,
-- handle,
-- &handle->howl_id);
-+ session = get_global_howl_session ();
-+ if (session)
-+ {
-+ res = sw_discovery_browse (session,
-+ 0,
-+ type, domain,
-+ howl_browse_reply,
-+ handle,
-+ &handle->howl_id);
-
-- if (res == SW_OKAY) {
-- *handle_out = handle;
-- return GNOME_VFS_OK;
-- }
-- }
-- return GNOME_VFS_ERROR_GENERIC;
-+ if (res == SW_OKAY)
-+ {
-+ *handle_out = handle;
-+ return GNOME_VFS_OK;
-+ }
-+ }
-+ return GNOME_VFS_ERROR_GENERIC;
- #else
-- free_browse_handle (handle);
-- return GNOME_VFS_ERROR_NOT_SUPPORTED;
-+ free_browse_handle (handle);
-+ return GNOME_VFS_ERROR_NOT_SUPPORTED;
- #endif
-- } else {
-- handle->is_local = FALSE;
-- if (g_thread_create (unicast_browse_thread, handle,
-- FALSE, NULL) == NULL) {
-- g_free (handle->domain);
-- g_free (handle->type);
-- g_free (handle);
-- return GNOME_VFS_ERROR_INTERNAL;
-- }
-- *handle_out = handle;
-- return GNOME_VFS_OK;
-- }
-+ }
-+ else
-+ {
-+ handle->is_local = FALSE;
-+ if (g_thread_new ("foo", unicast_browse_thread, handle) == NULL)
-+ {
-+ g_free (handle->domain);
-+ g_free (handle->type);
-+ g_free (handle);
-+ return GNOME_VFS_ERROR_INTERNAL;
-+ }
-+ *handle_out = handle;
-+ return GNOME_VFS_OK;
-+ }
- }
-
- /**
-@@ -1705,80 +1711,91 @@
- gpointer callback_data,
- GDestroyNotify callback_data_destroy_func)
- {
-- GnomeVFSDNSSDResolveHandle *handle;
-+ GnomeVFSDNSSDResolveHandle *handle;
-
-- *handle_out = NULL;
-+ *handle_out = NULL;
-
-- handle = g_new0 (GnomeVFSDNSSDResolveHandle, 1);
-- handle->name = g_strdup (name);
-- handle->domain = g_strdup (domain);
-- handle->type = g_strdup (type);
-- handle->callback = callback;
-- handle->callback_data = callback_data;
-- handle->callback_data_destroy_func = callback_data_destroy_func;
-+ handle = g_new0 (GnomeVFSDNSSDResolveHandle, 1);
-+ handle->name = g_strdup (name);
-+ handle->domain = g_strdup (domain);
-+ handle->type = g_strdup (type);
-+ handle->callback = callback;
-+ handle->callback_data = callback_data;
-+ handle->callback_data_destroy_func = callback_data_destroy_func;
-
-- if (strcmp (domain, "local") == 0) {
-+ if (strcmp (domain, "local") == 0)
-+ {
- #ifdef HAVE_AVAHI
-- AvahiClient *client;
-- AvahiServiceResolver *sr;
-+ AvahiClient *client;
-+ AvahiServiceResolver *sr;
-
-- handle->is_local = TRUE;
-- client = get_global_avahi_client ();
-- if (client) {
-- sr = avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
-- name, type, domain, AVAHI_PROTO_UNSPEC,
-- AVAHI_LOOKUP_NO_ADDRESS,
-- avahi_resolve_async_callback, handle);
-- if (sr != NULL) {
-- handle->avahi_sr = sr;
-- *handle_out = handle;
-- return GNOME_VFS_OK;
-- }
-- }
-- return GNOME_VFS_ERROR_GENERIC;
-+ handle->is_local = TRUE;
-+ client = get_global_avahi_client ();
-+ if (client)
-+ {
-+ sr = avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ name, type, domain,
-+ AVAHI_PROTO_UNSPEC,
-+ AVAHI_LOOKUP_NO_ADDRESS,
-+ avahi_resolve_async_callback,
-+ handle);
-+ if (sr != NULL)
-+ {
-+ handle->avahi_sr = sr;
-+ *handle_out = handle;
-+ return GNOME_VFS_OK;
-+ }
-+ }
-+ return GNOME_VFS_ERROR_GENERIC;
- #elif defined (HAVE_HOWL)
-- sw_result res;
-- sw_discovery session;
-+ sw_result res;
-+ sw_discovery session;
-
-- handle->is_local = TRUE;
-+ handle->is_local = TRUE;
-
-- session = get_global_howl_session ();
-- if (session) {
-- res = sw_discovery_resolve (session,
-- 0,
-- name,
-- type,
-- domain,
-- howl_resolve_reply,
-- handle,
-- &handle->howl_id);
-- if (res == SW_OKAY) {
-- if (timeout != 0) {
-- handle->timeout_tag = g_timeout_add (timeout,
-- howl_resolve_timeout,
-- handle);
-- }
--
-- *handle_out = handle;
-- return GNOME_VFS_OK;
-- }
-+ session = get_global_howl_session ();
-+ if (session)
-+ {
-+ res = sw_discovery_resolve (session,
-+ 0,
-+ name,
-+ type,
-+ domain,
-+ howl_resolve_reply,
-+ handle,
-+ &handle->howl_id);
-+ if (res == SW_OKAY)
-+ {
-+ if (timeout != 0)
-+ {
-+ handle->timeout_tag = g_timeout_add (timeout,
-+ howl_resolve_timeout,
-+ handle);
- }
-- return GNOME_VFS_ERROR_GENERIC;
-+
-+ *handle_out = handle;
-+ return GNOME_VFS_OK;
-+ }
-+ }
-+ return GNOME_VFS_ERROR_GENERIC;
- #else
-- return GNOME_VFS_ERROR_NOT_SUPPORTED;
-+ return GNOME_VFS_ERROR_NOT_SUPPORTED;
- #endif
-- } else {
-- handle->is_local = FALSE;
-- if (g_thread_create (unicast_resolve_thread, handle,
-- FALSE, NULL) == NULL) {
-- g_free (handle->domain);
-- g_free (handle->type);
-- g_free (handle);
-- return GNOME_VFS_ERROR_INTERNAL;
-- }
-- *handle_out = handle;
-- return GNOME_VFS_OK;
-- }
-+ }
-+ else
-+ {
-+ handle->is_local = FALSE;
-+ if (g_thread_new ("bar", unicast_resolve_thread, handle) == NULL)
-+ {
-+ g_free (handle->domain);
-+ g_free (handle->type);
-+ g_free (handle);
-+ return GNOME_VFS_ERROR_INTERNAL;
-+ }
-+ *handle_out = handle;
-+ return GNOME_VFS_OK;
-+ }
- }
-
- /**
---- ./libgnomevfs/gnome-vfs-file-info.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-file-info.c 2013-08-26 13:50:29.000000000 -0700
-@@ -31,7 +31,7 @@
- /* Mutex for making GnomeVFSFileInfo ref's/unref's atomic */
- /* Note that an atomic increment function (such as is present in NSPR) is preferable */
- /* FIXME: This mutex is probably not needed and might be causing performance issues */
--static GStaticMutex file_info_ref_lock = G_STATIC_MUTEX_INIT;
-+static GMutex file_info_ref_lock;
-
- /* Register GnomeVFSFileInfo in the type system */
- GType
-@@ -83,9 +83,9 @@
- g_return_if_fail (info != NULL);
- g_return_if_fail (info->refcount > 0);
-
-- g_static_mutex_lock (&file_info_ref_lock);
-+ g_mutex_lock (&file_info_ref_lock);
- info->refcount += 1;
-- g_static_mutex_unlock (&file_info_ref_lock);
-+ g_mutex_unlock (&file_info_ref_lock);
-
- }
-
-@@ -101,9 +101,9 @@
- g_return_if_fail (info != NULL);
- g_return_if_fail (info->refcount > 0);
-
-- g_static_mutex_lock (&file_info_ref_lock);
-+ g_mutex_lock (&file_info_ref_lock);
- info->refcount -= 1;
-- g_static_mutex_unlock (&file_info_ref_lock);
-+ g_mutex_unlock (&file_info_ref_lock);
-
- if (info->refcount == 0) {
- gnome_vfs_file_info_clear (info);
-@@ -133,13 +133,13 @@
- g_free (info->selinux_context);
-
- /* Ensure the ref count is maintained correctly */
-- g_static_mutex_lock (&file_info_ref_lock);
-+ g_mutex_lock (&file_info_ref_lock);
-
- old_refcount = info->refcount;
- memset (info, 0, sizeof (*info));
- info->refcount = old_refcount;
-
-- g_static_mutex_unlock (&file_info_ref_lock);
-+ g_mutex_unlock (&file_info_ref_lock);
- }
-
-
-@@ -182,7 +182,7 @@
- * want serialize access differently (or perhaps you shouldn't
- * use copy)
- */
-- g_static_mutex_lock (&file_info_ref_lock);
-+ g_mutex_lock (&file_info_ref_lock);
-
- old_refcount = dest->refcount;
-
-@@ -199,7 +199,7 @@
-
- dest->refcount = old_refcount;
-
-- g_static_mutex_unlock (&file_info_ref_lock);
-+ g_mutex_unlock (&file_info_ref_lock);
-
- }
-
---- ./libgnomevfs/gnome-vfs-init.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-init.c 2013-08-26 14:50:23.000000000 -0700
-@@ -114,9 +114,6 @@
- return FALSE;
- }
-
-- if (!g_thread_supported ())
-- g_thread_init (NULL);
--
- G_LOCK (vfs_already_initialized);
-
- if (!vfs_already_initialized) {
-@@ -227,9 +224,5 @@
- gboolean
- gnome_vfs_is_primary_thread (void)
- {
-- if (g_thread_supported()) {
-- return GPOINTER_TO_UINT(g_private_get (private_is_primary_thread)) == 1;
-- } else {
-- return TRUE;
-- }
-+ return GPOINTER_TO_UINT(g_private_get (private_is_primary_thread)) == 1;
- }
---- ./libgnomevfs/gnome-vfs-job.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-job.c 2013-08-26 14:03:17.000000000 -0700
-@@ -43,7 +43,7 @@
- #include <string.h>
- #include <unistd.h>
-
--static GStaticPrivate job_private = G_STATIC_PRIVATE_INIT;
-+static GPrivate job_private;
-
- #if GNOME_VFS_JOB_DEBUG
-
-@@ -64,7 +64,7 @@
- * Since this id debug only, just use what the macro should be here.
- * even though it is not portable.
- */
--GStaticMutex debug_mutex = G_STATIC_MUTEX_INIT;
-+
- #endif
-
- static int job_count = 0;
-@@ -630,8 +630,8 @@
-
- new_job = g_new0 (GnomeVFSJob, 1);
-
-- new_job->job_lock = g_mutex_new ();
-- new_job->notify_ack_condition = g_cond_new ();
-+ g_mutex_init (new_job->job_lock);
-+ g_cond_init (new_job->notify_ack_condition);
- new_job->priority = priority;
-
- /* Add the new job into the job hash table. This also assigns
-@@ -652,9 +652,6 @@
-
- gnome_vfs_op_destroy (job->op);
-
-- g_mutex_free (job->job_lock);
-- g_cond_free (job->notify_ack_condition);
--
- memset (job, 0xaa, sizeof (GnomeVFSJob));
-
- g_free (job);
-@@ -1734,9 +1731,9 @@
- set_current_job (GnomeVFSJob *job)
- {
- /* There shouldn't have been anything here. */
-- g_assert (g_static_private_get (&job_private) == NULL);
-+ g_assert (g_private_get (&job_private) == NULL);
-
-- g_static_private_set (&job_private, job, NULL);
-+ g_private_set (&job_private, job);
-
- _gnome_vfs_module_callback_use_stack_info (job->op->stack_info);
- _gnome_vfs_module_callback_set_in_async_thread (TRUE);
-@@ -1745,7 +1742,7 @@
- static void
- clear_current_job (void)
- {
-- g_static_private_set (&job_private, NULL, NULL);
-+ g_private_set (&job_private, NULL);
-
- _gnome_vfs_module_callback_clear_stacks ();
- }
-@@ -1757,7 +1754,7 @@
-
- g_return_if_fail (context != NULL);
-
-- job = g_static_private_get (&job_private);
-+ job = g_private_get (&job_private);
-
- if (job != NULL) {
- *context = job->op->context;
-@@ -1777,7 +1774,7 @@
- GnomeVFSJob *job;
- GnomeVFSNotifyResult notify_result;
-
-- job = g_static_private_get (&job_private);
-+ job = g_private_get (&job_private);
-
- g_return_if_fail (job != NULL);
-
---- ./libgnomevfs/gnome-vfs-method.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-method.c 2013-08-26 14:01:58.000000000 -0700
-@@ -63,7 +63,7 @@
-
- static GHashTable *module_hash = NULL;
- G_LOCK_DEFINE_STATIC (gnome_vfs_method_init);
--static GStaticRecMutex module_hash_lock = G_STATIC_REC_MUTEX_INIT;
-+static GRecMutex module_hash_lock;
-
- static GList *module_path_list = NULL;
-
-@@ -343,7 +343,7 @@
- const char *args;
- gboolean run_in_daemon;
-
-- g_static_rec_mutex_lock (&module_hash_lock);
-+ g_rec_mutex_lock (&module_hash_lock);
-
- module_element = g_hash_table_lookup (module_hash, name);
-
-@@ -408,7 +408,7 @@
- g_hash_table_insert (module_hash, module_element->name, module_element);
-
- add_module_out:
-- g_static_rec_mutex_unlock (&module_hash_lock);
-+ g_rec_mutex_unlock (&module_hash_lock);
-
- return module_element;
- }
---- ./libgnomevfs/gnome-vfs-module-callback.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-module-callback.c 2013-08-26 14:27:56.000000000 -0700
-@@ -56,20 +56,23 @@
- GHashTable *current_async_callbacks;
- };
-
--
-+static void stack_table_destroy (gpointer specific);
- /* -- Global variables -- */
-
--static GStaticMutex callback_table_lock = G_STATIC_MUTEX_INIT;
-+static GMutex callback_table_lock;
- static GHashTable *default_callbacks = NULL;
- static GHashTable *default_async_callbacks = NULL;
- static GHashTable *stack_tables_to_free = NULL;
-
--static GPrivate *callback_stacks_key;
--static GPrivate *async_callback_stacks_key;
--static GPrivate *in_async_thread_key;
-+static GPrivate callback_stacks_key_item = G_PRIVATE_INIT (stack_table_destroy);
-+static GPrivate async_callback_stacks_key_item = G_PRIVATE_INIT (stack_table_destroy);
-+static GPrivate in_async_thread_key_item;
-+static GPrivate *callback_stacks_key = &callback_stacks_key_item;
-+static GPrivate *async_callback_stacks_key = &async_callback_stacks_key_item;
-+static GPrivate *in_async_thread_key = &in_async_thread_key_item;
-
- static GCond *async_callback_cond;
--static GStaticMutex async_callback_lock = G_STATIC_MUTEX_INIT;
-+static GMutex async_callback_lock;
-
- /* -- Helper functions -- */
-
-@@ -120,12 +123,12 @@
- {
- CallbackResponseData *response_data;
-
-- g_static_mutex_lock (&async_callback_lock);
-+ g_mutex_lock (&async_callback_lock);
- response_data = data;
- response_data->done = TRUE;
- g_cond_broadcast (async_callback_cond);
-
-- g_static_mutex_unlock (&async_callback_lock);
-+ g_mutex_unlock (&async_callback_lock);
- }
-
- static void
-@@ -146,7 +149,7 @@
- * new mutexes and condition variables all the time.
- */
-
-- g_static_mutex_lock (&async_callback_lock);
-+ g_mutex_lock (&async_callback_lock);
- response_data.done = FALSE;
- _gnome_vfs_dispatch_module_callback (async_callback->callback,
- in, in_size,
-@@ -155,11 +158,10 @@
- async_callback_response,
- &response_data);
- while (!response_data.done) {
-- g_cond_wait (async_callback_cond,
-- g_static_mutex_get_mutex (&async_callback_lock));
-+ g_cond_wait (async_callback_cond, &async_callback_lock);
- }
-
-- g_static_mutex_unlock (&async_callback_lock);
-+ g_mutex_unlock (&async_callback_lock);
- }
-
- static void
-@@ -410,13 +412,13 @@
-
- stack_table = specific;
-
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
- if (stack_tables_to_free != NULL) {
- g_hash_table_remove (stack_tables_to_free, stack_table);
- } else {
- stack_table = NULL;
- }
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
-
- if (stack_table) {
- clear_stack_table (stack_table);
-@@ -443,31 +445,26 @@
- static void
- free_stack_tables_to_free (void)
- {
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
- g_hash_table_foreach_remove (stack_tables_to_free, stack_table_free_hr_func , NULL);
- g_hash_table_destroy (stack_tables_to_free);
- stack_tables_to_free = NULL;
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
- }
-
- void
- _gnome_vfs_module_callback_private_init (void)
- {
-- callback_stacks_key = g_private_new (stack_table_destroy);
-- async_callback_stacks_key = g_private_new (stack_table_destroy);
-- in_async_thread_key = g_private_new (NULL);
--
- stack_tables_to_free = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-- async_callback_cond = g_cond_new ();
-+ g_cond_init (async_callback_cond);
-
-- g_atexit (free_stack_tables_to_free);
- }
-
- static void
- free_default_callbacks (void)
- {
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
-
- clear_callback_table (default_callbacks);
- g_hash_table_destroy (default_callbacks);
-@@ -475,7 +472,7 @@
- clear_callback_table (default_async_callbacks);
- g_hash_table_destroy (default_async_callbacks);
-
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
- }
-
- /* This function should only be called with the mutex held. */
-@@ -486,7 +483,6 @@
- default_callbacks = g_hash_table_new (g_str_hash, g_str_equal);
- default_async_callbacks = g_hash_table_new (g_str_hash, g_str_equal);
-
-- g_atexit (free_default_callbacks);
- }
- }
-
-@@ -496,23 +492,23 @@
- {
- /* Initialize per-thread data, if needed. */
- if (g_private_get (callback_stacks_key) == NULL) {
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
- g_private_set (callback_stacks_key,
- g_hash_table_new (g_str_hash, g_str_equal));
- g_hash_table_insert (stack_tables_to_free,
- g_private_get (callback_stacks_key),
- GINT_TO_POINTER (1));
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
- }
-
- if (g_private_get (async_callback_stacks_key) == NULL) {
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
- g_private_set (async_callback_stacks_key,
- g_hash_table_new (g_str_hash, g_str_equal));
- g_hash_table_insert (stack_tables_to_free,
- g_private_get (async_callback_stacks_key),
- GINT_TO_POINTER (1));
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
- }
- }
-
-@@ -618,12 +614,12 @@
-
- callback_info = callback_info_new (callback, callback_data, destroy_notify);
-
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
-
- initialize_global_if_needed ();
- insert_callback_into_table (default_callbacks, callback_name, callback_info);
-
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
-
- callback_info_unref (callback_info);
- }
-@@ -730,12 +726,12 @@
-
- callback_info = async_callback_info_new (callback, callback_data, notify);
-
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
-
- initialize_global_if_needed ();
- insert_callback_into_table (default_async_callbacks, callback_name, callback_info);
-
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
-
- callback_info_unref (callback_info);
- }
-@@ -864,13 +860,13 @@
- g_assert (callback != NULL);
- callback_info_ref (callback);
- } else {
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
- initialize_global_if_needed ();
- callback = g_hash_table_lookup (default_async_callbacks, callback_name);
- if (callback != NULL) {
- callback_info_ref (callback);
- }
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
- }
- }
-
-@@ -883,13 +879,13 @@
- g_assert (callback != NULL);
- callback_info_ref (callback);
- } else {
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
- initialize_global_if_needed ();
- callback = g_hash_table_lookup (default_callbacks, callback_name);
- if (callback != NULL) {
- callback_info_ref (callback);
- }
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
- }
- }
-
-@@ -920,9 +916,9 @@
- stack_info->current_callbacks = g_hash_table_new (g_str_hash, g_str_equal);
- stack_info->current_async_callbacks = g_hash_table_new (g_str_hash, g_str_equal);
-
-- g_static_mutex_lock (&callback_table_lock);
-+ g_mutex_lock (&callback_table_lock);
- initialize_global_if_needed ();
-- g_static_mutex_unlock (&callback_table_lock);
-+ g_mutex_unlock (&callback_table_lock);
-
- initialize_per_thread_if_needed ();
- copy_callback_stack_tops (g_private_get (callback_stacks_key),
---- ./libgnomevfs/gnome-vfs-resolve.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-resolve.c 2013-08-26 14:18:16.000000000 -0700
-@@ -139,11 +139,11 @@
- restart_resolve (void)
- {
- static GTimeVal last_reload = { 0, 0 };
-- static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
-+ static GMutex mutex;
- GTimeVal now;
- gboolean ret;
-
-- g_static_mutex_lock (&mutex);
-+ g_mutex_lock (&mutex);
- g_get_current_time (&now);
-
- if ((now.tv_sec - last_reload.tv_sec) > RELOAD_TIMEVAL) {
-@@ -155,7 +155,7 @@
- ret = FALSE;
- }
-
-- g_static_mutex_unlock (&mutex);
-+ g_mutex_unlock (&mutex);
- return ret;
- }
- #else
---- ./libgnomevfs/gnome-vfs-volume-ops.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./libgnomevfs/gnome-vfs-volume-ops.c 2013-08-26 14:47:01.000000000 -0700
-@@ -164,8 +164,8 @@
- gsize out_size;
- gboolean invoked;
-
-- GCond *cond;
-- GMutex *mutex;
-+ GCond cond;
-+ GMutex mutex;
- } MountThreadAuth;
-
-
-@@ -281,12 +281,12 @@
- static gboolean
- invoke_async_auth_cb (MountThreadAuth *auth)
- {
-- g_mutex_lock (auth->mutex);
-+ g_mutex_lock (&(auth->mutex));
- auth->invoked = gnome_vfs_module_callback_invoke (auth->callback,
- auth->in_args, auth->in_size,
- auth->out_args, auth->out_size);
-- g_cond_signal (auth->cond);
-- g_mutex_unlock (auth->mutex);
-+ g_cond_signal (&(auth->cond));
-+ g_mutex_unlock (&(auth->mutex));
- return FALSE;
- }
-
-@@ -302,18 +302,16 @@
- auth.out_args = out;
- auth.out_size = out_size;
- auth.invoked = FALSE;
-- auth.mutex = g_mutex_new ();
-- auth.cond = g_cond_new ();
-+ g_mutex_init (&auth.mutex);
-+ g_cond_init (&auth.cond);
-
- DEBUG_MOUNT (("mount invoking auth callback: %s\n", callback_name));
-
-- g_mutex_lock (auth.mutex);
-+ g_mutex_lock (&auth.mutex);
- g_idle_add_full (G_PRIORITY_HIGH_IDLE, (GSourceFunc)invoke_async_auth_cb, &auth, NULL);
-- g_cond_wait (auth.cond, auth.mutex);
-+ g_cond_wait (&auth.cond, &auth.mutex);
-
-- g_mutex_unlock (auth.mutex);
-- g_mutex_free (auth.mutex);
-- g_cond_free (auth.cond);
-+ g_mutex_unlock (&auth.mutex);
-
- DEBUG_MOUNT (("mount invoked auth callback: %s %d\n", callback_name, auth.invoked));
-
---- ./modules/sftp-method.c 2009-04-20 03:46:46.000000000 -0700
-+++ ./modules/sftp-method.c 2013-08-26 14:54:28.000000000 -0700
-@@ -1488,8 +1488,6 @@
- invoke_save_auth (uri, keyring, user_name, object, authtype, password);
- }
-
-- if (!g_thread_supported ()) g_thread_init (NULL);
--
- *connection = g_new0 (SftpConnection, 1);
- (*connection)->ref_count = 1;
- (*connection)->in_fd = in_fd;
diff --git a/patches/libbonobo-glib-2_36.patch b/patches/libbonobo-glib-2_36.patch
deleted file mode 100644
index 6b91696..0000000
--- a/patches/libbonobo-glib-2_36.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- ./activation-server/activation-server-main.c 2009-04-23 15:37:55.000000000 -0700
-+++ ./activation-server/activation-server-main.c 2013-08-26 13:41:08.000000000 -0700
-@@ -70,7 +70,7 @@
-
- static gboolean server_threaded = FALSE;
- static glong server_guard_depth = 0;
--static GStaticRecMutex server_guard = G_STATIC_REC_MUTEX_INIT;
-+static GRecMutex server_guard;
-
- static PortableServer_POA
- server_get_poa (void)
-@@ -104,7 +104,7 @@
- #endif
- server_guard_depth = 0;
- for (i = 0; i < state; i++)
-- g_static_rec_mutex_unlock (&server_guard);
-+ g_rec_mutex_unlock (&server_guard);
- return state;
- }
-
-@@ -117,7 +117,7 @@
- return;
-
- for (i = 0; i < state; i++)
-- g_static_rec_mutex_lock (&server_guard);
-+ g_rec_mutex_lock (&server_guard);
- server_guard_depth = state;
- #ifdef BONOBO_ACTIVATION_DEBUG
- fprintf (stderr, "thread %p re-taken server guard with depth %ld\n",
-@@ -131,7 +131,7 @@
- if (!server_threaded)
- return;
-
-- g_static_rec_mutex_lock (&server_guard);
-+ g_rec_mutex_lock (&server_guard);
- server_guard_depth++;
- fprintf (stderr, "thread %p take guard [%ld]\n",
- g_thread_self (), server_guard_depth);
-@@ -146,7 +146,7 @@
- fprintf (stderr, "thread %p release guard [%ld]\n",
- g_thread_self (), server_guard_depth);
- server_guard_depth--;
-- g_static_rec_mutex_unlock (&server_guard);
-+ g_rec_mutex_unlock (&server_guard);
- }
-
- #ifdef G_OS_WIN32
---- ./bonobo-activation/bonobo-activation-init.c 2009-04-23 15:37:55.000000000 -0700
-+++ ./bonobo-activation/bonobo-activation-init.c 2013-08-26 13:39:08.000000000 -0700
-@@ -46,7 +46,7 @@
-
- #include <orbit/orbit.h>
-
--GStaticRecMutex _bonobo_activation_guard = G_STATIC_REC_MUTEX_INIT;
-+GRecMutex _bonobo_activation_guard;
- static CORBA_ORB bonobo_activation_orb = CORBA_OBJECT_NIL;
- static CORBA_Context bonobo_activation_context;
- static gboolean is_initialized = FALSE;
---- ./bonobo-activation/bonobo-activation-private.h 2009-04-23 15:37:55.000000000 -0700
-+++ ./bonobo-activation/bonobo-activation-private.h 2013-08-26 13:37:19.000000000 -0700
-@@ -31,9 +31,9 @@
-
- #define BONOBO_ACTIVATION_FACTORY_PRIVATE_TIMEOUT 1
-
--extern GStaticRecMutex _bonobo_activation_guard;
--#define BONOBO_ACTIVATION_LOCK() g_static_rec_mutex_lock (&_bonobo_activation_guard)
--#define BONOBO_ACTIVATION_UNLOCK() g_static_rec_mutex_unlock (&_bonobo_activation_guard)
-+extern GRecMutex _bonobo_activation_guard;
-+#define BONOBO_ACTIVATION_LOCK() g_rec_mutex_lock (&_bonobo_activation_guard)
-+#define BONOBO_ACTIVATION_UNLOCK() g_rec_mutex_unlock (&_bonobo_activation_guard)
-
- void bonobo_activation_timeout_reg_check_set (gboolean on);
- gboolean bonobo_activation_timeout_reg_check (gpointer data);
diff --git a/patches/libgnome-glib-2_36.patch b/patches/libgnome-glib-2_36.patch
deleted file mode 100644
index bca0b24..0000000
--- a/patches/libgnome-glib-2_36.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- ./libgnome/gnome-i18n.c 2009-03-17 07:42:06.000000000 -0700
-+++ ./libgnome/gnome-i18n.c 2013-08-26 14:58:56.000000000 -0700
-@@ -55,12 +55,12 @@
- const GList *
- gnome_i18n_get_language_list (const gchar *ignored)
- {
-- static GStaticRecMutex lang_list_lock = G_STATIC_REC_MUTEX_INIT;
-+ static GRecMutex lang_list_lock;
- static GList *list = NULL;
- const char * const* langs;
- int i;
-
-- g_static_rec_mutex_lock (&lang_list_lock);
-+ g_rec_mutex_lock (&lang_list_lock);
-
- if (list == NULL) {
- langs = g_get_language_names ();
-@@ -71,7 +71,7 @@
- list = g_list_reverse (list);
- }
-
-- g_static_rec_mutex_unlock (&lang_list_lock);
-+ g_rec_mutex_unlock (&lang_list_lock);
-
- return list;
- }
---- ./libgnome/gnome-init.c 2009-03-17 07:42:06.000000000 -0700
-+++ ./libgnome/gnome-init.c 2013-08-26 15:02:41.000000000 -0700
-@@ -115,9 +115,6 @@
- static void
- bonobo_activation_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
- {
-- if (!g_thread_supported ())
-- g_thread_init (NULL);
--
- if (!bonobo_activation_is_initialized ())
- bonobo_activation_preinit (program, mod_info);
- }
---- ./libgnome/gnome-program.c 2009-03-17 07:42:06.000000000 -0700
-+++ ./libgnome/gnome-program.c 2013-08-26 14:59:50.000000000 -0700
-@@ -149,16 +149,6 @@
- GObject, G_TYPE_OBJECT)
-
- static void
--global_program_unref (void)
--{
-- if (global_program) {
-- g_object_unref (global_program);
-- global_program = NULL;
-- program_initialized = FALSE;
-- }
--}
--
--static void
- gnome_program_set_property (GObject *object, guint param_id,
- const GValue *value, GParamSpec *pspec)
- {
-@@ -1878,12 +1868,6 @@
- GnomeProgram *program;
- va_list args;
-
-- /* g_thread_init() has to be the first GLib function called ever */
-- if (!g_threads_got_initialized)
-- g_thread_init (NULL);
--
-- g_type_init ();
--
- va_start(args, first_property_name);
- program = gnome_program_initv (GNOME_TYPE_PROGRAM,
- app_id, app_version, module_info,
-@@ -1913,8 +1897,6 @@
- g_print ("Starting gnome_program_init:\n\n");
- #endif
-
-- g_type_init ();
--
- klass = g_type_class_ref (type);
-
- if (!program_initialized) {
-@@ -2064,7 +2046,6 @@
-
- program_initialized = TRUE;
-
-- g_atexit (global_program_unref);
- }
-
- gnome_program_preinit (program, app_id, app_version, argc, argv);
diff --git a/patches/libgnomeprint.patch b/patches/libgnomeprint.patch
deleted file mode 100644
index 3d1a6fe..0000000
--- a/patches/libgnomeprint.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** configure Fri Mar 6 02:31:09 2009
---- configure Sun Mar 22 10:38:33 2009
-***************
-*** 20084,20090 ****
- esac
-
-
-! if test "x$LIBM" = "x"; then
- { { $as_echo "$as_me:$LINENO: error: You need -lm(mathematic library) for this version of libgnomeprint." >&5
- $as_echo "$as_me: error: You need -lm(mathematic library) for this version of libgnomeprint." >&2;}
- { (exit 1); exit 1; }; }
---- 20084,20090 ----
- esac
-
-
-! if $host != *-*-darwin* && test "x$LIBM" = "x"; then
- { { $as_echo "$as_me:$LINENO: error: You need -lm(mathematic library) for this version of libgnomeprint." >&5
- $as_echo "$as_me: error: You need -lm(mathematic library) for this version of libgnomeprint." >&2;}
- { (exit 1); exit 1; }; }
diff --git a/patches/libgnomeui.patch b/patches/libgnomeui.patch
deleted file mode 100644
index ad78d5f..0000000
--- a/patches/libgnomeui.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig 2009-03-06 02:47:56.000000000 -0800
-+++ configure 2009-03-21 17:44:49.000000000 -0700
-@@ -15866,7 +15866,7 @@
- gnome_keyring_requirement="gnome-keyring-1 >= 0.4"
- GNOME_KEYRING="gnome-keyring-1"
-
-- if test x$GNOME_HAVE_X11 != xyes ; then
-+ if test x$have_x != xdisabled && x$GNOME_HAVE_X11 != xyes ; then
- { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5
- $as_echo "$as_me: error: libX11 not found" >&2;}
- { (exit 1); exit 1; }; }
-
Summary of changes:
.jhbuildrc-custom | 6 +-
modulesets/gnucash.modules | 21 +-
.../0001-Updated-swig-guile-deprecated-patch.patch | 186 ---
patches/dbi.patch | 23 -
patches/gnome-vfs-glib-2_36.patch | 1199 --------------------
patches/libbonobo-glib-2_36.patch | 73 --
patches/libgnome-glib-2_36.patch | 87 --
patches/libgnomeprint.patch | 19 -
patches/libgnomeui.patch | 12 -
9 files changed, 8 insertions(+), 1618 deletions(-)
delete mode 100644 patches/0001-Updated-swig-guile-deprecated-patch.patch
delete mode 100644 patches/dbi.patch
delete mode 100644 patches/gnome-vfs-glib-2_36.patch
delete mode 100644 patches/libbonobo-glib-2_36.patch
delete mode 100644 patches/libgnome-glib-2_36.patch
delete mode 100644 patches/libgnomeprint.patch
delete mode 100644 patches/libgnomeui.patch
More information about the gnucash-changes
mailing list