glib2 3.1.0-x86-mingw32 → 3.1.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b91d2ee97cd4a99550c7af3b609b5949f0e288ed
-  data.tar.gz: fc6f8d59d4ce119e5ccc3cccbd75c17a40419e81
+  metadata.gz: 73f5bd3c313946391f89b67d5b1abe326257b0c0
+  data.tar.gz: 4f4de89c485d946f3016c37ea48c1ac9c5360877
 SHA512:
-  metadata.gz: 5255f12718a022a36ca867d3171855dd2343be4b1d1c8da5d22a521685d9b3518bb1b946898762c4065fffa5f4e76f0a55f078e6fd02ca7f56a469d3a829926c
-  data.tar.gz: 098716aa4d68cc2c22416d6c542d04b27946dbd59e742ec2b5f1328c26e607b2b2039faade52049e196371d9a949712d2e6f1fdcc7fcc83502dc26b238a80747
+  metadata.gz: 0de43fa7cdd8ff369a5a6fc3519498b8ac8574adc3c28ff12d6dd59342edbedd02cba71f44b7fa6b494080cea5346ba231544872ede2870b4e0c6eb79a987b9d
+  data.tar.gz: feb187f9bada12f36573d6dd385799707cf0c3cd4affa9453e2fc28c7b856eb8206b05634d1658cda4792726d9076643fcd857e470d6ff671139bb6b5d3f4aa4

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2011-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2011-2017  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -73,7 +73,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "pcre",
       :download_base_url => "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre",
       :label => "PCRE",
-      :version => "8.38",
+      :version => "8.40",
       :windows => {
         :configure_args => [
           "--enable-unicode-properties",

data/ext/glib2/rbglib.c

@@ -1187,4 +1187,6 @@ union       GDoubleIEEE754;
     Init_glib_variant();
     Init_glib_regex();
     Init_glib_matchinfo();
+    Init_glib_date_time();
+    Init_glib_time_zone();
 }

data/ext/glib2/rbglib.h

@@ -36,7 +36,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 3
 #define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 0
+#define RBGLIB_MICRO_VERSION 1
 
 #ifndef RB_ZALLOC
 #  ifdef ZALLOC

data/ext/glib2/rbglib2conversions.h

@@ -62,4 +62,7 @@
 #define RVAL2GREGEXMATCHOPTIONSFLAGS(o)    (RVAL2GFLAGS(o, G_TYPE_REGEX_MATCH_FLAGS))
 #define RVAL2GREGEXCOMPILEOPTIONSFLAGS(o)  (RVAL2GFLAGS(o, G_TYPE_REGEX_COMPILE_FLAGS))
 #define GMATCHINFO2RVAL(o)                 (BOXED2RVAL(o, G_TYPE_MATCH_INFO))
+#define GDATETIME2RVAL(o)                  (BOXED2RVAL(o, G_TYPE_DATE_TIME))
+#define GTIMEZONE2RVAL(o)                  (BOXED2RVAL(o, G_TYPE_TIME_ZONE))
+#define RVAL2GTIMEZONE(o)                  ((GTimeZone*)RVAL2BOXED(o, G_TYPE_TIME_ZONE))
 #endif /* __GLIB2CONVERSIONS_H__ */

data/ext/glib2/rbglib_datetime.c

@@ -0,0 +1,250 @@
+/*
+ *  Copyright (C) 2016  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbgprivate.h"
+
+#define RG_TARGET_NAMESPACE cDateTime
+#define _SELF(s) ((GDateTime*)RVAL2BOXED(s, G_TYPE_DATE_TIME))
+
+static gboolean
+is_local_timezone(VALUE rb_timezone)
+{
+    ID id_equal;
+    ID id_local;
+
+    if (NIL_P(rb_timezone)) {
+        return TRUE;
+    }
+
+    CONST_ID(id_equal, "==");
+    CONST_ID(id_local, "local");
+    return RVAL2CBOOL(rb_funcall(rb_timezone, id_equal, 1, ID2SYM(id_local)));
+}
+
+static gboolean
+is_utc_timezone(VALUE rb_timezone)
+{
+    ID id_equal;
+    ID id_utc;
+
+    CONST_ID(id_equal, "==");
+    CONST_ID(id_utc, "utc");
+    return RVAL2CBOOL(rb_funcall(rb_timezone, id_equal, 1, ID2SYM(id_utc)));
+}
+
+static gboolean
+is_timezone(VALUE rb_timezone)
+{
+    VALUE rb_cTimeZone;
+
+    rb_cTimeZone = rb_const_get(mGLib, rb_intern("TimeZone"));
+    return RVAL2CBOOL(rb_obj_is_kind_of(rb_timezone, rb_cTimeZone));
+}
+
+static VALUE
+rg_s_now(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
+{
+    GDateTime *date = NULL;
+    VALUE rb_timezone;
+
+    rb_scan_args(argc, argv, "01", &rb_timezone);
+
+    if (is_local_timezone(rb_timezone)) {
+        date = g_date_time_new_now_local();
+    } else if (is_utc_timezone(rb_timezone)) {
+        date = g_date_time_new_now_utc();
+    } else if (is_timezone(rb_timezone)) {
+        date = g_date_time_new_now(RVAL2GTIMEZONE(rb_timezone));
+    } else {
+        rb_raise(rb_eArgError,
+                 "timezone must be nil, :local, :utc or GLib::TimeZone: "
+                 "%+" PRIsVALUE,
+                 rb_timezone);
+    }
+
+    return GDATETIME2RVAL(date);
+}
+
+static VALUE
+rg_initialize(int argc, VALUE *argv, VALUE self)
+{
+    /*
+     * Not implemented:
+     * GDateTime * 	g_date_time_new_from_timeval_local ()
+     * GDateTime * 	g_date_time_new_from_timeval_utc ()
+     * https://developer.gnome.org/glib/stable/glib-Date-and-Time-Functions.html#GTimeVal
+     * */
+    VALUE rb_options;
+    VALUE rb_unix;
+    VALUE rb_timezone;
+    VALUE rb_year;
+    VALUE rb_month;
+    VALUE rb_day;
+    VALUE rb_hour;
+    VALUE rb_minute;
+    VALUE rb_second;
+    GDateTime *datetime = NULL;
+
+    rb_scan_args(argc, argv, "1", &rb_options);
+    rbg_scan_options(rb_options,
+                     "unix", &rb_unix,
+                     "timezone", &rb_timezone,
+                     "year", &rb_year,
+                     "month", &rb_month,
+                     "day", &rb_day,
+                     "hour", &rb_hour,
+                     "minute", &rb_minute,
+                     "second", &rb_second,
+                     NULL);
+
+    if (!NIL_P(rb_unix)) {
+        gint64 unix_time;
+
+        unix_time = rbglib_num_to_int64(rb_unix);
+        if (is_local_timezone(rb_timezone)) {
+            datetime = g_date_time_new_from_unix_local(unix_time);
+        } else if (is_utc_timezone(rb_timezone)) {
+            datetime = g_date_time_new_from_unix_utc(unix_time);
+        } else {
+            rb_raise(rb_eArgError,
+                     ":timezone must be nil, :local or :utc: %+" PRIsVALUE,
+                     rb_timezone);
+        }
+    } else if (!NIL_P(rb_year) &&
+               !NIL_P(rb_month) &&
+               !NIL_P(rb_hour) &&
+               !NIL_P(rb_minute) &&
+               !NIL_P(rb_second)) {
+        gint year = 0;
+        gint month = 0;
+        gint day = 0;
+        gint hour = 0;
+        gint minute = 0;
+        gdouble second = 0.0;
+
+        year = NUM2INT(rb_year);
+        month = NUM2INT(rb_month);
+        day = NUM2INT(rb_day);
+        hour = NUM2INT(rb_hour);
+        minute = NUM2INT(rb_minute);
+        second = NUM2DBL(rb_second);
+        if (is_local_timezone(rb_timezone)) {
+            datetime = g_date_time_new_local(year,
+                                             month,
+                                             day,
+                                             hour,
+                                             minute,
+                                             second);
+        } else if (is_utc_timezone(rb_timezone)) {
+            datetime = g_date_time_new_utc(year,
+                                           month,
+                                           day,
+                                           hour,
+                                           minute,
+                                           second);
+        } else if (is_timezone(rb_timezone)) {
+            GTimeZone *timezone = NULL;
+
+            timezone = RVAL2GTIMEZONE(rb_timezone);
+            datetime = g_date_time_new(timezone,
+                                       year,
+                                       month,
+                                       day,
+                                       hour,
+                                       minute,
+                                       second);
+        } else {
+            rb_raise(rb_eArgError,
+                     ":timezone must be nil, :local, :utc or GLib::TimeZone: "
+                     "%+" PRIsVALUE,
+                     rb_timezone);
+        }
+    } else {
+        rb_raise(rb_eArgError,
+                 ":unix or (:year, :month, :day, :hour, :minute and :second) "
+                 "must be specified: %+" PRIsVALUE,
+                 rb_options);
+    }
+
+    G_INITIALIZE(self, datetime);
+
+    return Qnil;
+}
+
+static VALUE
+rg_year(VALUE self)
+{
+    return INT2NUM(g_date_time_get_year(_SELF(self)));
+}
+
+static VALUE
+rg_month(VALUE self)
+{
+    return INT2NUM(g_date_time_get_month(_SELF(self)));
+}
+
+static VALUE
+rg_day_of_month(VALUE self)
+{
+    return INT2NUM(g_date_time_get_day_of_month(_SELF(self)));
+}
+
+static VALUE
+rg_hour(VALUE self)
+{
+    return INT2NUM(g_date_time_get_hour(_SELF(self)));
+}
+
+static VALUE
+rg_minute(VALUE self)
+{
+    return INT2NUM(g_date_time_get_minute(_SELF(self)));
+}
+
+static VALUE
+rg_second(VALUE self)
+{
+    return DBL2NUM(g_date_time_get_second(_SELF(self)));
+}
+
+static VALUE
+rg_format(VALUE self, VALUE rb_format)
+{
+    const gchar *format = RVAL2CSTR(rb_format);
+    return CSTR2RVAL(g_date_time_format(_SELF(self), format));
+}
+
+void
+Init_glib_date_time(void)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_DATE_TIME, "DateTime", mGLib);
+
+    RG_DEF_SMETHOD(now, -1);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(year, 0);
+    RG_DEF_METHOD(month, 0);
+    RG_DEF_METHOD(day_of_month, 0);
+    RG_DEF_METHOD(hour, 0);
+    RG_DEF_METHOD(minute, 0);
+    RG_DEF_METHOD(second, 0);
+    RG_DEF_METHOD(format, 1);
+}

data/ext/glib2/rbglib_timezone.c

@@ -0,0 +1,82 @@
+/*
+ *  Copyright (C) 2016  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbgprivate.h"
+
+#define RG_TARGET_NAMESPACE cTimeZone
+#define _SELF(s) ((GTimeZone*)RVAL2BOXED(s, G_TYPE_TIME_ZONE))
+
+static VALUE
+rg_initialize(gint argc, VALUE *argv, VALUE self)
+{
+    VALUE rb_identifier = Qnil;
+    const gchar *identifier = NULL;
+    GTimeZone *time_zone = NULL;
+
+    rb_scan_args(argc, argv, "01", &rb_identifier);
+
+    if (!NIL_P(rb_identifier))
+        identifier = RVAL2CSTR(rb_identifier);
+
+    time_zone = g_time_zone_new(identifier);
+    G_INITIALIZE(self, time_zone);
+    return Qnil;
+}
+
+static VALUE
+rg_s_local(G_GNUC_UNUSED VALUE self)
+{
+    GTimeZone *time_zone = NULL;
+    time_zone = g_time_zone_new_local();
+    return GTIMEZONE2RVAL(time_zone);
+}
+
+static VALUE
+rg_s_utc(G_GNUC_UNUSED VALUE self)
+{
+    GTimeZone *time_zone = NULL;
+    time_zone = g_time_zone_new_utc();
+    return GTIMEZONE2RVAL(time_zone);
+}
+
+static VALUE
+rg_abbreviation(VALUE self, VALUE rb_interval)
+{
+    gint interval = NUM2INT(rb_interval);
+    return CSTR2RVAL(g_time_zone_get_abbreviation(_SELF(self), interval));
+}
+
+static VALUE
+rg_offset(VALUE self, VALUE rb_interval)
+{
+    gint interval = NUM2INT(rb_interval);
+    return INT2NUM(g_time_zone_get_offset(_SELF(self), interval));
+}
+
+void
+Init_glib_time_zone(void)
+{
+    VALUE RG_TARGET_NAMESPACE;
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_TIME_ZONE, "TimeZone", mGLib);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_SMETHOD(local, 0);
+    RG_DEF_SMETHOD(utc, 0);
+    RG_DEF_METHOD(abbreviation, 1);
+    RG_DEF_METHOD(offset, 1);
+}

data/ext/glib2/rbgprivate.h

@@ -150,6 +150,8 @@ G_GNUC_INTERNAL void Init_glib_variant_type(void);
 G_GNUC_INTERNAL void Init_glib_variant(void);
 G_GNUC_INTERNAL void Init_glib_regex(void);
 G_GNUC_INTERNAL void Init_glib_matchinfo(void);
+G_GNUC_INTERNAL void Init_glib_date_time(void);
+G_GNUC_INTERNAL void Init_glib_time_zone(void);
 
 G_GNUC_INTERNAL void Init_gobject_convert(void);
 G_GNUC_INTERNAL void Init_gobject_gtype(void);

data/lib/glib2.rb

@@ -187,7 +187,7 @@ module GLib
 
   module Log
     DOMAIN = "Ruby/GLib"
-    LEVELS = { 
+    LEVELS = {
       LEVEL_ERROR => "ERROR",
       LEVEL_CRITICAL => "CRITICAL",
       LEVEL_WARNING => "WARNING",
@@ -207,15 +207,23 @@ module GLib
       log(DOMAIN, LEVEL_CRITICAL, caller(1)[0] << ": " << str)
     end
     def warning(str)
-      log(DOMAIN,  LEVEL_WARNING, caller(1)[0] << ": " << str)
+      log(DOMAIN, LEVEL_WARNING, caller(1)[0] << ": " << str)
     end
-    
+
     def set_log_domain(domain)
-      level = GLib::Log::LEVEL_MASK
+      level =
+        FLAG_RECURSION |
+        FLAG_FATAL |
+        LEVEL_ERROR |
+        LEVEL_CRITICAL |
+        LEVEL_WARNING
+      if $VERBOSE or $DEBUG
+        level |=
+          LEVEL_MESSAGE |
+          LEVEL_INFO
+      end
       if $DEBUG
-        level = 255
-      elsif $VERBOSE
-        level = 127
+        level |= LEVEL_DEBUG
       end
       GLib::Log.set_handler(domain, level)
     end