[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-76-g65ab1fa)
The branch, master has been updated
via 65ab1fad22f6879f1a296ee5382f633870613c78 (commit)
via 61f488315da15d0be48acbe65ee9c1bf69c60e03 (commit)
from 9a7c363c572d32a30fa1522cd7d14b21c2958ca8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gattrib/configure.ac | 4 ++--
gnetlist/configure.ac | 4 ++--
gschem/configure.ac.in | 4 ++--
gschem/include/prototype.h | 4 ----
gschem/src/x_menus.c | 29 -----------------------------
gsymcheck/configure.ac | 4 ++--
libgeda/configure.ac.in | 4 ++--
libgeda/src/s_clib.c | 16 ----------------
utils/configure.ac | 4 ++--
9 files changed, 12 insertions(+), 61 deletions(-)
=================
Commit Messages
=================
commit 65ab1fad22f6879f1a296ee5382f633870613c78
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Remove support for GLib < 2.12.0.
Requiring GLib 2.12.0 means that we no longer require *any* of the
existing GLIB_CHECK_VERSION ifdef blocks.
:100644 100644 3b47a29... ea94a98... M gschem/include/prototype.h
:100644 100644 5587aaf... 80cb131... M gschem/src/x_menus.c
:100644 100644 2ec82af... c18cdc0... M libgeda/src/s_clib.c
commit 61f488315da15d0be48acbe65ee9c1bf69c60e03
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Require GLib 2.12.0 or newer.
We now require GTK+ 2.10.0, and since that requires GLib 2.12.0, we
can bump the GLib version we require up to match.
Thanks to Peter Clifton for spotting this.
:100644 100644 7bc1f2c... 168390d... M gattrib/configure.ac
:100644 100644 c97e9dd... 771e88c... M gnetlist/configure.ac
:100644 100644 4351cf7... 8d947cc... M gschem/configure.ac.in
:100644 100644 2bc2786... f35eff4... M gsymcheck/configure.ac
:100644 100644 78e8a8d... 1a03e2d... M libgeda/configure.ac.in
:100644 100644 054cf38... 97910e3... M utils/configure.ac
=========
Changes
=========
commit 65ab1fad22f6879f1a296ee5382f633870613c78
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Remove support for GLib < 2.12.0.
Requiring GLib 2.12.0 means that we no longer require *any* of the
existing GLIB_CHECK_VERSION ifdef blocks.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 3b47a29..ea94a98 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -842,10 +842,6 @@ void x_menu_attach_recent_files_submenu(GSCHEM_TOPLEVEL *w_current);
void recent_files_load();
void recent_files_save(gpointer user_data);
void recent_files_add(const char *filename);
-#if !GLIB_CHECK_VERSION(2,8,0)
-gboolean g_file_set_contents(const gchar *filename, const gchar *contents,
- gssize length, GError **error);
-#endif
/* x_multiattrib.c */
void x_multiattrib_open (GSCHEM_TOPLEVEL *w_current);
void x_multiattrib_close (GSCHEM_TOPLEVEL *w_current);
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index 5587aaf..80cb131 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -357,35 +357,6 @@ void x_menus_popup_sensitivity (GSCHEM_TOPLEVEL *w_current, const char *buf, int
}
}
-#if !GLIB_CHECK_VERSION(2,8,0)
-/* g_file_set_contents() exists only in glib >= 2.8 */
-gboolean g_file_set_contents(const gchar *filename, const gchar *contents,
- gssize length, GError **error)
-{
- FILE *fp;
- gboolean ret = FALSE;
-
- fp = fopen(filename, "wb");
- if(fp == NULL)
- return FALSE;
-
- if(length == -1) {
- /* It's a null-terminated string. */
- if(fputs(contents, fp) == EOF)
- goto out;
- } else {
- if(fwrite(contents, length, 1, fp) != 1)
- goto out;
- }
-
- ret = TRUE;
-out:
- fclose(fp);
- return ret;
-}
-#endif /* !GLIB_CHECK_VERSION(2,8,0) */
-
-
/* The list of recently loaded files. */
static GList *recent_files = NULL;
diff --git a/libgeda/src/s_clib.c b/libgeda/src/s_clib.c
index 2ec82af..c18cdc0 100644
--- a/libgeda/src/s_clib.c
+++ b/libgeda/src/s_clib.c
@@ -1315,14 +1315,6 @@ GList *s_clib_search (const gchar *pattern, const CLibSearchMode mode)
}
-#if !GLIB_CHECK_VERSION(2,12,0)
-/*! \brief g_hash_table_foreach_remove foreach function
- */
-static gboolean remove_entry(gpointer key, gpointer val, gpointer data)
-{
- return TRUE;
-}
-#endif
/*! \brief Flush the symbol name lookup cache.
@@ -1333,11 +1325,7 @@ static gboolean remove_entry(gpointer key, gpointer val, gpointer data)
*/
void s_clib_flush_search_cache ()
{
-#if GLIB_CHECK_VERSION(2,12,0)
g_hash_table_remove_all (clib_search_cache); /* Introduced in glib 2.12 */
-#else
- g_hash_table_foreach_remove(clib_search_cache, remove_entry, NULL);
-#endif
}
@@ -1349,11 +1337,7 @@ void s_clib_flush_search_cache ()
*/
void s_clib_flush_symbol_cache ()
{
-#if GLIB_CHECK_VERSION(2,12,0)
g_hash_table_remove_all (clib_symbol_cache); /* Introduced in glib 2.12 */
-#else
- g_hash_table_foreach_remove(clib_symbol_cache, remove_entry, NULL);
-#endif
}
/*! \brief Get symbol structure for a given symbol name.
commit 61f488315da15d0be48acbe65ee9c1bf69c60e03
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Require GLib 2.12.0 or newer.
We now require GTK+ 2.10.0, and since that requires GLib 2.12.0, we
can bump the GLib version we require up to match.
Thanks to Peter Clifton for spotting this.
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 7bc1f2c..168390d 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -166,10 +166,10 @@ then
GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
# Search for glib
- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.10.0], GLIB="yes", no_GLIB="yes")
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
if test "$GLIB" != "yes"
then
- AC_MSG_ERROR([Cannot find glib 2.10.0 or later, please install it and rerun ./configure.])
+ AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
fi
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac
index c97e9dd..771e88c 100644
--- a/gnetlist/configure.ac
+++ b/gnetlist/configure.ac
@@ -217,12 +217,12 @@ fi
# Check for glib start
#
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.10.0], GLIB="yes", no_GLIB="yes")
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
# This next bit of code figures out what glib we need to use.
if test "$GLIB" != "yes"
then
- AC_MSG_ERROR([Cannot find glib 2.10.0 or later, please install it and rerun ./configure.])
+ AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
fi
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 4351cf7..8d947cc 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -160,10 +160,10 @@ then
GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
# Search for glib
- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.10.0], GLIB="yes", no_GLIB="yes")
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
if test "$GLIB" != "yes"
then
- AC_MSG_ERROR([Cannot find glib 2.10.0 or later, please install it and rerun ./configure.])
+ AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
fi
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac
index 2bc2786..f35eff4 100644
--- a/gsymcheck/configure.ac
+++ b/gsymcheck/configure.ac
@@ -127,12 +127,12 @@ fi
# Check for glib start
#
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.10.0], GLIB="yes", no_GLIB="yes")
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
# This next bit of code figures out what glib we need to use.
if test "$GLIB" != "yes"
then
- AC_MSG_ERROR([Cannot find glib 2.10.0 or later, please install it and rerun ./configure.])
+ AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
fi
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 78e8a8d..1a03e2d 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -168,12 +168,12 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
# Check for glib start
#
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.10.0], GLIB="yes", no_GLIB="yes")
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
# This next bit of code figures out what glib we need to use.
if test "$GLIB" != "yes"
then
- AC_MSG_ERROR([Cannot find glib 2.10.0 or later, please install it and rerun ./configure.])
+ AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
fi
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
diff --git a/utils/configure.ac b/utils/configure.ac
index 054cf38..97910e3 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -162,12 +162,12 @@ fi
# Check for glib start
#
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.10.0], GLIB="yes", no_GLIB="yes")
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0], GLIB="yes", no_GLIB="yes")
# This next bit of code figures out what glib we need to use.
if test "$GLIB" != "yes"
then
- AC_MSG_ERROR([Cannot find glib 2.10.0 or later, please install it and rerun ./configure.])
+ AC_MSG_ERROR([Cannot find glib 2.12.0 or later, please install it and rerun ./configure.])
fi
GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs