glib2 0.90.4-x86-mingw32 → 0.90.5-x86-mingw32

data/ChangeLog

@@ -1,3 +1,13 @@
+2010-10-27  Kouhei Sutou  <kou@clear-code.com>
+
+	* lib/glib-mkenums.rb: work on LANG=C environment.
+
+	* Rakefile: depend on pkg-config as not development library.
+
+2010-10-24  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbglib.h: 0.90.4 -> 0.90.5.
+
 2010-10-24  Kouhei Sutou  <kou@clear-code.com>
 
 	* ext/glib2/rbglib.c (rbg_rval2cstr): add missing '*'.

data/Rakefile

@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.extensions = FileList["ext/#{package_name}/extconf.rb"]
   s.require_paths = ["lib"]
-  s.add_development_dependency("pkg-config", ">= 0")
+  s.add_dependency("pkg-config", ">= 0")
   s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
                      "lib/**/*.rb", "{ext,sample,test,test-unit}/**/*"]
 end

data/ext/glib2/extconf.rb

@@ -58,3 +58,11 @@ glib_mkenums(enum_type_prefix, headers, "G_TYPE_", ["glib-object.h"])
 
 $defs << "-DRUBY_GLIB2_COMPILATION"
 create_makefile(module_name)
+
+pkg_config_dir = with_config("pkg-config-dir")
+if pkg_config_dir.is_a?(String)
+  File.open("Makefile", "ab") do |makefile|
+    makefile.puts
+    makefile.puts("pkgconfigdir=#{pkg_config_dir}")
+  end
+end

data/ext/glib2/rbglib.h

@@ -23,7 +23,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 0
 #define RBGLIB_MINOR_VERSION 90
-#define RBGLIB_MICRO_VERSION 4
+#define RBGLIB_MICRO_VERSION 5
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/lib/glib-mkenums.rb

@@ -96,6 +96,7 @@ GType #{@enum_name}_get_type (void);
     def self.parse(data, g_type_prefix, options={})
       options ||= {}
       enums = []
+      data.force_encoding("utf-8") if data.respond_to?(:force_encoding)
       data.scan(/^\s*typedef\s+enum\s*
                 \{?\s*(.*?)
                 \}\s*(\w+);/mx){|constants, name|
@@ -167,7 +168,7 @@ GType #{@enum_name}_get_type (void);
 
     # Create a C source as a String.
     def create_c
-      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3896 2010-09-25 07:49:34Z ktou $) */ \n\n"
+      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3990 2010-10-27 03:38:42Z ktou $) */ \n\n"
       ret << %Q[#include "#{@target_filename}.h"\n]
       @include_files.each do |file|
         ret << "#include <#{file}>\n"
@@ -183,7 +184,7 @@ GType #{@enum_name}_get_type (void);
       header = "#{@target_filename}.h"
       const = "__#{File.basename(header).upcase.gsub(/-|\./, '_')}__"
 
-      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3896 2010-09-25 07:49:34Z ktou $) */ \n\n"
+      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3990 2010-10-27 03:38:42Z ktou $) */ \n\n"
       ret << "#ifndef #{const}\n"
       ret << "#define #{const}\n\n"
       ret << "#include <glib-object.h>\n\n"

data/lib/mkmf-gnome2.rb

@@ -331,16 +331,20 @@ def check_cairo(options={})
   unless have_rb_cairo_h
     begin
       require 'rubygems'
-      gem 'cairo'
-      require 'cairo'
-      rcairo_src_gem_path_re =
-        /\A#{Regexp.escape(Gem.dir)}\/gems\/cairo-[\d.]+\/ext\/cairo\z/
-      $LOAD_PATH.each do |path|
-        if rcairo_src_gem_path_re =~ path
-          $CFLAGS += " -I#{path} "
-          have_rb_cairo_h = have_header('rb_cairo.h')
-          break
-        end
+      rcairo_gem = Gem.cache.find_name("cairo").sort_by do |gem|
+        gem.version
+      end.last
+      if rcairo_gem
+        rcairo_source_dir = rcairo_gem.full_gem_path
+        rb_cairo_h_dir = File.join(rcairo_source_dir, "ext", "cairo")
+        $CFLAGS += " -I#{rb_cairo_h_dir} "
+        have_rb_cairo_h = have_header('rb_cairo.h')
+      else
+        require "cairo"
+        rcairo_source_dir = File.dirname($".grep(/cairo\.(?!rb\z)\w+\z/).first)
+        rb_cairo_h_dir = rcairo_source_dir
+        $CFLAGS += " -I#{rcairo_h_dir} "
+        have_rb_cairo_h = have_header('rb_cairo.h')
       end
     rescue LoadError
     end

data/vendor/local/bin/glib-gettextize

@@ -38,11 +38,11 @@ Usage: glib-gettextize [OPTION]... [package-dir]
   -f, --force          force writing of new files even if old exist
 Report bugs to http://bugzilla.gnome.org/."
 package=glib
-version=2.24.2
+version=2.26.0
 try_ln_s=:
 
 # Directory where the sources are stored.
-prefix=c:/devel/target/fd56e00a6de2dc0ebdb82aea42c4eec0
+prefix=c:/devel/target/c2a2ac5b8143772ac09bf90d51bafa5f
 case `uname` in
 MINGW32*)
     prefix="`dirname $0`/.."

data/vendor/local/bin/glib-mkenums

@@ -1,6 +1,7 @@
 #!/bin/perl -w
 
 use File::Basename;
+use Safe;
 
 # glib-mkenums.pl 
 # Information about the current enumeration
@@ -21,6 +22,7 @@ my $enumname_prefix;		# prefix of $enumname
 my $enumindex = 0;		# Global enum counter
 my $firstenum = 1;		# Is this the first enumeration per file?
 my @entries;			# [ $name, $val ] for each entry
+my $sandbox = Safe->new;        # sandbox for safe evaluation of expressions
 
 sub parse_trigraph {
     my $opts = shift;
@@ -110,10 +112,10 @@ sub parse_entries {
 	    if (defined $options) {
 		my %options = parse_trigraph($options);
 		if (!defined $options{skip}) {
-		    push @entries, [ $name, $options{nick} ];
+		    push @entries, [ $name, $value, $options{nick} ];
 		}
 	    } else {
-		push @entries, [ $name ];
+		push @entries, [ $name, $value ];
 	    }
 	} elsif (m@^\s*\#@) {
 	    # ignore preprocessor directives
@@ -126,7 +128,7 @@ sub parse_entries {
 }
 
 sub version {
-    print "glib-mkenums version glib-2.24.2\n";
+    print "glib-mkenums version glib-2.26.0\n";
     print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n";
     print "You may redistribute copies of glib-mkenums under the terms of\n";
     print "the GNU General Public License which can be found in the\n";
@@ -158,6 +160,7 @@ sub usage {
     print "  \@ENUMPREFIX\@          PREFIX\n";
     print "  \@VALUENAME\@           PREFIX_THE_XVALUE\n";
     print "  \@valuenick\@           the-xvalue\n";
+    print "  \@valuenum\@            the integer value (limited support, Since: 2.26)\n";
     print "  \@type\@                either enum or flags\n";
     print "  \@Type\@                either Enum or Flags\n";
     print "  \@TYPE\@                either ENUM or FLAGS\n";
@@ -174,8 +177,7 @@ my $eprod = "";   # per enum text (produced prior to value itarations)
 my $vhead = "";   # value header, produced before iterating over enum values
 my $vprod = "";   # value text, produced for each enum value
 my $vtail = "";   # value tail, produced after iterating over enum values
-# other options
-my $comment_tmpl = "/* \@comment\@ */";
+my $comment_tmpl = "";   # comment template
 
 sub read_template_file {
   my ($file) = @_;
@@ -218,6 +220,9 @@ sub read_template_file {
   $vprod = $tmpl{'value-production'};
   $vtail = $tmpl{'value-tail'};
   $comment_tmpl = $tmpl{'comment'};
+
+  # default to C-style comments
+  $comment_tmpl = "/* \@comment\@ */" if $comment_tmpl eq "";
 }
 
 if (!defined $ARGV[0]) {
@@ -329,7 +334,7 @@ while (<>) {
 	# Autogenerate a prefix
 	if (!defined $enum_prefix) {
 	    for (@entries) {
-		my $nick = $_->[1];
+		my $nick = $_->[2];
 		if (!defined $nick) {
 		    my $name = $_->[0];
 		    if (defined $enum_prefix) {
@@ -355,12 +360,12 @@ while (<>) {
 	}
 	
 	for $entry (@entries) {
-	    my ($name,$nick) = @{$entry};
+	    my ($name,$num,$nick) = @{$entry};
             if (!defined $nick) {
  	        ($nick = $name) =~ s/^$enum_prefix//;
 	        $nick =~ tr/_/-/;
 	        $nick = lc($nick);
-	        @{$entry} = ($name, $nick);
+	        @{$entry} = ($name, $num, $nick);
             }
 	}
 	
@@ -452,13 +457,34 @@ while (<>) {
 
 	if (length($vprod)) {
 	    my $prod = $vprod;
+            my $next_num = 0;
 	    
 	    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
 	    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
 	    for (@entries) {
-		my ($name,$nick) = @{$_};
+		my ($name,$num,$nick) = @{$_};
 		my $tmp_prod = $prod;
 
+                if ($prod =~ /\@valuenum\@/) {
+                    # only attempt to eval the value if it is requested
+                    # this prevents us from throwing errors otherwise
+                    if (defined $num) {
+                        # use sandboxed perl evaluation as a reasonable
+                        # approximation to C constant folding
+                        $num = $sandbox->reval ($num);
+
+                        # make sure it parsed to an integer
+                        if (!defined $num or $num !~ /^-?\d+$/) {
+                            die "Unable to parse enum value '$num'";
+                        }
+                    } else {
+                        $num = $next_num;
+                    }
+
+                    $tmp_prod =~ s/\@valuenum\@/$num/g;
+                    $next_num = $num + 1;
+                }
+
 		$tmp_prod =~ s/\@VALUENAME\@/$name/g;
 		$tmp_prod =~ s/\@valuenick\@/$nick/g;
 		if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }

data/vendor/local/include/glib-2.0/gio/gappinfo.h

@@ -186,7 +186,6 @@ gboolean  g_app_info_launch_default_for_uri      (const char              *uri,
 
 /**
  * GAppLaunchContext:
- * @parent_instance: The parent instance.
  *
  * Integrating the launch with the launching application. This is used to
  * handle for instance startup notification and launching the new application

data/vendor/local/include/glib-2.0/gio/gbufferedoutputstream.h

@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 
 /**
  * GBufferedOutputStream:
- * @parent_class: The parent class.
  *
  * An implementation of #GFilterOutputStream with a sized buffer.
  **/

data/vendor/local/include/glib-2.0/gio/gcontenttype.h

@@ -31,24 +31,24 @@
 
 G_BEGIN_DECLS
 
-gboolean g_content_type_equals            (const char   *type1,
-					   const char   *type2);
-gboolean g_content_type_is_a              (const char   *type,
-					   const char   *supertype);
-gboolean g_content_type_is_unknown        (const char   *type);
-char *   g_content_type_get_description   (const char   *type);
-char *   g_content_type_get_mime_type     (const char   *type);
-GIcon *  g_content_type_get_icon          (const char   *type);
-gboolean g_content_type_can_be_executable (const char   *type);
-
-char *   g_content_type_from_mime_type    (const char   *mime_type);
-
-char *   g_content_type_guess             (const char   *filename,
-					   const guchar *data,
-					   gsize         data_size,
-					   gboolean     *result_uncertain);
-
-char **  g_content_type_guess_for_tree    (GFile        *root);
+gboolean g_content_type_equals            (const gchar  *type1,
+                                           const gchar  *type2);
+gboolean g_content_type_is_a              (const gchar  *type,
+                                           const gchar  *supertype);
+gboolean g_content_type_is_unknown        (const gchar  *type);
+gchar *  g_content_type_get_description   (const gchar  *type);
+gchar *  g_content_type_get_mime_type     (const gchar  *type);
+GIcon *  g_content_type_get_icon          (const gchar  *type);
+gboolean g_content_type_can_be_executable (const gchar  *type);
+
+gchar *  g_content_type_from_mime_type    (const gchar  *mime_type);
+
+gchar *  g_content_type_guess             (const gchar  *filename,
+                                           const guchar *data,
+                                           gsize         data_size,
+                                           gboolean     *result_uncertain);
+
+gchar ** g_content_type_guess_for_tree    (GFile        *root);
 
 GList *  g_content_types_get_registered   (void);
 

data/vendor/local/include/glib-2.0/gio/gconverterinputstream.h

@@ -41,7 +41,6 @@ G_BEGIN_DECLS
 
 /**
  * GConverterInputStream:
- * @parent_interface: a #GFilterInputStream.
  *
  * An implementation of #GFilterInputStream that allows data
  * conversion.

data/vendor/local/include/glib-2.0/gio/gconverteroutputstream.h

@@ -41,7 +41,6 @@ G_BEGIN_DECLS
 
 /**
  * GConverterOutputStream:
- * @parent_instance: a #GFilterOutputStream.
  *
  * An implementation of #GFilterOutputStream that allows data
  * conversion.

data/vendor/local/include/glib-2.0/gio/gcredentials.h

@@ -0,0 +1,76 @@
+/* GDBus - GLib D-Bus Library
+ *
+ * Copyright (C) 2008-2010 Red Hat, Inc.
+ *
+ * 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 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., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz@redhat.com>
+ */
+
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
+#ifndef __G_CREDENTIALS_H__
+#define __G_CREDENTIALS_H__
+
+#include <gio/giotypes.h>
+
+#ifdef G_OS_UNIX
+/* To get the uid_t type */
+#include <unistd.h>
+#include <sys/types.h>
+#endif
+
+G_BEGIN_DECLS
+
+#define G_TYPE_CREDENTIALS         (g_credentials_get_type ())
+#define G_CREDENTIALS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_CREDENTIALS, GCredentials))
+#define G_CREDENTIALS_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_CREDENTIALS, GCredentialsClass))
+#define G_CREDENTIALS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_CREDENTIALS, GCredentialsClass))
+#define G_IS_CREDENTIALS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_CREDENTIALS))
+#define G_IS_CREDENTIALS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_CREDENTIALS))
+
+typedef struct _GCredentialsClass   GCredentialsClass;
+
+GType            g_credentials_get_type           (void) G_GNUC_CONST;
+
+GCredentials    *g_credentials_new                (void);
+
+gchar           *g_credentials_to_string          (GCredentials    *credentials);
+
+gpointer         g_credentials_get_native         (GCredentials    *credentials,
+                                                   GCredentialsType native_type);
+
+void             g_credentials_set_native         (GCredentials    *credentials,
+                                                   GCredentialsType native_type,
+                                                   gpointer         native);
+
+gboolean         g_credentials_is_same_user       (GCredentials    *credentials,
+                                                   GCredentials    *other_credentials,
+                                                   GError         **error);
+
+#ifdef G_OS_UNIX
+uid_t            g_credentials_get_unix_user      (GCredentials    *credentials,
+                                                   GError         **error);
+gboolean         g_credentials_set_unix_user      (GCredentials    *credentials,
+                                                   uid_t           uid,
+                                                   GError         **error);
+#endif
+
+G_END_DECLS
+
+#endif /* __G_DBUS_PROXY_H__ */

data/vendor/local/include/glib-2.0/gio/gdatainputstream.h

@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 
 /**
  * GDataInputStream:
- * @parent: a #GBufferedInputStream.
  *
  * An implementation of #GBufferedInputStream that allows for high-level
  * data manipulation of arbitrary data (including binary operations).
@@ -73,36 +72,36 @@ GType                  g_data_input_stream_get_type             (void) G_GNUC_CO
 GDataInputStream *     g_data_input_stream_new                  (GInputStream            *base_stream);
 
 void                   g_data_input_stream_set_byte_order       (GDataInputStream        *stream,
-							         GDataStreamByteOrder     order);
+                                                                 GDataStreamByteOrder     order);
 GDataStreamByteOrder   g_data_input_stream_get_byte_order       (GDataInputStream        *stream);
 void                   g_data_input_stream_set_newline_type     (GDataInputStream        *stream,
-							         GDataStreamNewlineType   type);
+                                                                 GDataStreamNewlineType   type);
 GDataStreamNewlineType g_data_input_stream_get_newline_type     (GDataInputStream        *stream);
 guchar                 g_data_input_stream_read_byte            (GDataInputStream        *stream,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 gint16                 g_data_input_stream_read_int16           (GDataInputStream        *stream,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 guint16                g_data_input_stream_read_uint16          (GDataInputStream        *stream,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 gint32                 g_data_input_stream_read_int32           (GDataInputStream        *stream,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 guint32                g_data_input_stream_read_uint32          (GDataInputStream        *stream,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 gint64                 g_data_input_stream_read_int64           (GDataInputStream        *stream,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 guint64                g_data_input_stream_read_uint64          (GDataInputStream        *stream,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 char *                 g_data_input_stream_read_line            (GDataInputStream        *stream,
-							         gsize                   *length,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 gsize                   *length,
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 void                   g_data_input_stream_read_line_async      (GDataInputStream        *stream,
                                                                  gint                     io_priority,
                                                                  GCancellable            *cancellable,
@@ -113,12 +112,12 @@ char *                 g_data_input_stream_read_line_finish     (GDataInputStrea
                                                                  gsize                   *length,
                                                                  GError                 **error);
 char *                 g_data_input_stream_read_until           (GDataInputStream        *stream,
-							         const gchar             *stop_chars,
-							         gsize                   *length,
-							         GCancellable            *cancellable,
-							         GError                 **error);
+                                                                 const gchar             *stop_chars,
+                                                                 gsize                   *length,
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
 void                   g_data_input_stream_read_until_async     (GDataInputStream        *stream,
-							         const gchar             *stop_chars,
+                                                                 const gchar             *stop_chars,
                                                                  gint                     io_priority,
                                                                  GCancellable            *cancellable,
                                                                  GAsyncReadyCallback      callback,
@@ -128,6 +127,24 @@ char *                 g_data_input_stream_read_until_finish    (GDataInputStrea
                                                                  gsize                   *length,
                                                                  GError                 **error);
 
+char *                 g_data_input_stream_read_upto            (GDataInputStream        *stream,
+                                                                 const gchar             *stop_chars,
+                                                                 gssize                   stop_chars_len,
+                                                                 gsize                   *length,
+                                                                 GCancellable            *cancellable,
+                                                                 GError                 **error);
+void                   g_data_input_stream_read_upto_async      (GDataInputStream        *stream,
+                                                                 const gchar             *stop_chars,
+                                                                 gssize                   stop_chars_len,
+                                                                 gint                     io_priority,
+                                                                 GCancellable            *cancellable,
+                                                                 GAsyncReadyCallback      callback,
+                                                                 gpointer                 user_data);
+char *                 g_data_input_stream_read_upto_finish     (GDataInputStream        *stream,
+                                                                 GAsyncResult            *result,
+                                                                 gsize                   *length,
+                                                                 GError                 **error);
+
 G_END_DECLS
 
 #endif /* __G_DATA_INPUT_STREAM_H__ */