[libgdata] build: Bump minimum GLib dependency to 2.38.0



commit 192bcf3ec7752aaf03f19a1f801a9d66cf306a69
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Mar 15 11:14:06 2017 +0000

    build: Bump minimum GLib dependency to 2.38.0
    
    Since the 0.17.7 release, we’ve actually depended on API from GLib
    2.38.0 (G_TEST_DIST), so this will just cause earlier build failure than
    before.
    
    This means we can drop some backwards compatibility code for older GLib
    releases.
    
    Spotted by Mart Raudsepp in
    https://bugzilla.gnome.org/show_bug.cgi?id=780081#c1.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 README                      |    2 +-
 configure.ac                |    4 ++--
 demos/scrapbook/scrapbook.c |    3 ---
 gdata/tests/common.c        |    4 ----
 4 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/README b/README
index 5354b66..c7e51ee 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ libgdata is API and ABI stable.
 Dependencies
 ============
 
- • glib-2.0 ≥ 2.31.0
+ • glib-2.0 ≥ 2.38.0
  • libxml-2.0
  • gio-2.0 ≥ 2.17.3
  • libsoup-2.4 ≥ 2.42.0
diff --git a/configure.ac b/configure.ac
index 54f2701..5cfb45f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,8 +35,8 @@ AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
 # Requirements
-GLIB_REQS=2.31.0
-GLIB_MIN_REQUIRED=GLIB_VERSION_2_32
+GLIB_REQS=2.38.0
+GLIB_MIN_REQUIRED=GLIB_VERSION_2_38
 GLIB_MAX_ALLOWED='(G_ENCODE_VERSION(2, 38))'
 GIO_REQS=2.17.3
 SOUP_REQS=2.42.0
diff --git a/demos/scrapbook/scrapbook.c b/demos/scrapbook/scrapbook.c
index 534dc3f..399fba7 100644
--- a/demos/scrapbook/scrapbook.c
+++ b/demos/scrapbook/scrapbook.c
@@ -644,9 +644,6 @@ main(int argc, char **argv)
        scrapbook = g_slice_new (struct _ScrapData);
        scrapbook->max_rows                     = 5;
 
-#if !GLIB_CHECK_VERSION (2, 35, 0)
-       g_type_init ();
-#endif
        gtk_init        (&argc, &argv);
 
        scrapbook->currentCol                                                   = 0;
diff --git a/gdata/tests/common.c b/gdata/tests/common.c
index a707221..0815ccf 100644
--- a/gdata/tests/common.c
+++ b/gdata/tests/common.c
@@ -55,10 +55,6 @@ gdata_test_init (int argc, char **argv)
 
        setlocale (LC_ALL, "");
 
-#if !GLIB_CHECK_VERSION (2, 35, 0)
-       g_type_init ();
-#endif
-
        /* Parse the custom options */
        for (i = 1; i < argc; i++) {
                if (strcmp ("--no-interactive", argv[i]) == 0 || strcmp ("-ni", argv[i]) == 0) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]