[gnumeric] configure: require glib 2.38 or newer.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] configure: require glib 2.38 or newer.
- Date: Mon, 5 May 2014 17:04:32 +0000 (UTC)
commit 4e01a44ac4a904f2e55872dabaccdbb722f45b2f
Author: Morten Welinder <terra gnome org>
Date: Mon May 5 13:04:04 2014 -0400
configure: require glib 2.38 or newer.
README | 2 +-
configure.ac | 8 ++++----
gnumeric.spec.in | 2 +-
src/libgnumeric.c | 7 -------
4 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/README b/README
index 2a1e474..c064aa4 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ Requirements
------------
You need: Debian package name
- glib >= 2.28.0 libglib2.0-dev
+ glib >= 2.38.0 libglib2.0-dev
gtk+ >= 3.8.8 libgtk3.0-dev
libgsf >= 1.14.24 libgsf-1-dev
libgoffice >= 0.10.9 libgoffice-0-8-dev
diff --git a/configure.ac b/configure.ac
index ea33e14..fdbb181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,10 +157,10 @@ libspreadsheet_reqs="
libxml-2.0 >= 2.4.12
"
gnumeric_reqs="$libspreadsheet_reqs
- glib-2.0 >= 2.28.0
- gobject-2.0 >= 2.28.0
- gmodule-2.0 >= 2.28.0
- gthread-2.0 >= 2.28.0
+ glib-2.0 >= 2.38.0
+ gobject-2.0 >= 2.38.0
+ gmodule-2.0 >= 2.38.0
+ gthread-2.0 >= 2.38.0
pango >= 1.24.0
pangocairo >= 1.24.0
"
diff --git a/gnumeric.spec.in b/gnumeric.spec.in
index 934845e..38c14f7 100644
--- a/gnumeric.spec.in
+++ b/gnumeric.spec.in
@@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root
BuildRequires: goffice-devel >= 0.10.9
BuildRequires: libgsf-devel >= 1.14.24
BuildRequires: libxml-2.0-devel >= 2.4.12
-BuildRequires: glib-2.0-devel >= 2.28.0
+BuildRequires: glib-2.0-devel >= 2.38.0
BuildRequires: pango-devel >= 1.24.0
BuildRequires: scrollkeeper
Requires: scrollkeeper hicolor-icon-theme
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index 3b3c703..24c96cf 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -187,13 +187,6 @@ gnm_pre_parse_init (int argc, gchar const **argv)
g_mem_set_vtable (glib_mem_profiler_table);
}
-#if !GLIB_CHECK_VERSION(2,32,0)
- g_thread_init (NULL);
-#endif
-#if !GLIB_CHECK_VERSION(2,36,0)
- g_type_init ();
-#endif
-
/* On win32 argv contains 'ansi' encoded args. We need to manually
* pull in the real versions and convert them to utf-8 */
argv = go_shell_argv_to_glib_encoding (argc, argv);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]