glib2 1.1.8-x86-mingw32 → 1.1.9-x86-mingw32

data/Rakefile

@@ -8,20 +8,62 @@ package = GNOME2Package.new do |_package|
   _package.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
   _package.dependency.gem.runtime = [["pkg-config", ">= 0"]]
   _package.dependency.gem.development = [["test-unit", ">= 2"]]
-  _package.win32.packages = ["glib"]
-  _package.win32.dependencies = ["gettext-runtime", "gnutls"]
+  _package.win32.packages = []
+  _package.win32.dependencies = ["zlib", "libffi", "gettext-runtime"]
+  libffi_lib_dir     = File.join(_package.win32.absolute_binary_dir, "lib")
+  libffi_include_dir = File.join(libffi_lib_dir, "libffi-3.0.6", "include")
   _package.win32.build_packages = [
+    {
+      :name => "glib",
+      :download_site => :gnome,
+      :label => "GLib",
+      :version => "2.35.3",
+      :configure_args => [
+        "LIBFFI_CFLAGS=-I#{libffi_include_dir}",
+        "LIBFFI_LIBS=-L#{libffi_lib_dir} -lffi",
+        "--disable-modular-tests",
+      ],
+      :compression_method => "xz",
+    },
+    {
+      :name => "gmp",
+      :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-5.1.0",
+      :label => "GNU MP",
+      :version => "5.1.0",
+      :configure_args => [
+        "--disable-static",
+        "--enable-shared",
+      ],
+      :compression_method => "bz2",
+    },
+    {
+      :name => "nettle",
+      :download_base_url => "http://www.lysator.liu.se/~nisse/archive",
+      :label => "Nettle",
+      :version => "2.5",
+      :configure_args => [],
+    },
+    {
+      :name => "gnutls",
+      :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1",
+      :label => "GnuTLS",
+      :version => "3.1.5",
+      :configure_args => [
+        "--with-libnettle-prefix=#{_package.win32.absolute_binary_dir}"
+      ],
+      :compression_method => "xz",
+    },
     {
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
-      :version => "2.28.7",
-      :configure_args => ["--without-libproxy",
-                          "--without-gnome-proxy",
-                          "--without-ca-certificates"],
-      :patches => ["glib-networking-2.28.7-fix-with-gnome-proxy.diff",
-                   "glib-networking-2.28.7-support-gnutls-2.4.2.diff"],
-      :need_autoreconf => true,
+      :version => "2.35.3",
+      :configure_args => [
+        "--without-libproxy",
+        "--without-gnome-proxy",
+        "--without-ca-certificates",
+      ],
+      :compression_method => "xz",
     },
   ]
 end

data/ext/glib2/extconf.rb

@@ -50,7 +50,7 @@ have_var("rb_curr_thread", [ruby_header, "node.h"])
 
 create_pkg_config_file("Ruby/GLib2", package_id)
 
-enum_type_prefix = "glib-enum-types"
+enum_types_prefix = "glib-enum-types"
 include_paths = PKGConfig.cflags_only_I("glib-2.0")
 headers = include_paths.split.inject([]) do |result, path|
   result + Dir.glob(File.join(path.sub(/^-I/, ""), "glib", "*.h"))
@@ -61,7 +61,7 @@ include_paths = PKGConfig.cflags_only_I("gobject-2.0")
 headers = include_paths.split.inject(headers) do |result, path|
   result + Dir.glob(File.join(path.sub(/^-I/, ""), "gobject", "gsignal.h"))
 end
-glib_mkenums(enum_type_prefix, headers, "G_TYPE_", ["glib-object.h"])
+glib_mkenums(enum_types_prefix, headers, "G_TYPE_", ["glib-object.h"])
 
 $defs << "-DRUBY_GLIB2_COMPILATION"
 create_makefile(module_name)

data/ext/glib2/rbglib.h

@@ -35,7 +35,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 1
 #define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 8
+#define RBGLIB_MICRO_VERSION 9
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -110,7 +110,8 @@ typedef int GPid;
 #define CBOOL2RVAL(b)   ((b) ? Qtrue : Qfalse)
 #define RVAL2CBOOL(b)   (RTEST(b))
 #define GERROR2RVAL(error) (rbgerr_gerror2exception(error))
-#define RAISE_GERROR(error) rb_exc_raise(GERROR2RVAL(error))
+#define RG_RAISE_ERROR(error) rb_exc_raise(GERROR2RVAL(error))
+#define RAISE_GERROR(error) RG_RAISE_ERROR(error) /* deprecated */
 #define G_DEF_ERROR(domain, name, module, parent, gtype)         \
     rbgerr_define_gerror(domain, name, module, parent, gtype)
 #define G_DEF_ERROR2(domain, name, module, parent) \

data/ext/glib2/rbglib_win32.c

@@ -45,21 +45,6 @@ rbglib_m_win32_locale_deprecated(VALUE self)
     return rg_s_locale(self);
 }
 
-static VALUE
-rg_s_get_package_installation_directory(VALUE self, VALUE package, VALUE dll_name)
-{
-    return CSTR2RVAL_FREE(g_win32_get_package_installation_directory(RVAL2CSTR(package), 
-                                                                RVAL2CSTR(dll_name)));
-}
-
-static VALUE
-rg_s_get_package_installation_subdirectory(VALUE self, VALUE package, VALUE dll_name, VALUE subdir)
-{
-    return CSTR2RVAL_FREE(g_win32_get_package_installation_subdirectory(RVAL2CSTR(package), 
-                                                                    RVAL2CSTR(dll_name),
-                                                                    RVAL2CSTR(subdir)));
-}
-
 #if GLIB_CHECK_VERSION(2,6,0)
 static VALUE
 rg_s_version(VALUE self)
@@ -116,8 +101,6 @@ Init_glib_win32(void)
 
     RG_DEF_SMETHOD(error_message, 1);
     RG_DEF_SMETHOD(locale, 0);
-    RG_DEF_SMETHOD(get_package_installation_directory, 2);
-    RG_DEF_SMETHOD(get_package_installation_subdirectory, 3);
     RG_DEF_SMETHOD(version, 0);
     /* Deprecated */
     rbg_define_singleton_method(mGLib, "win32_locale", rbglib_m_win32_locale_deprecated, 0);

data/ext/glib2/rbgobj_type.c

@@ -114,14 +114,19 @@ get_superclass(GType gtype)
         return rb_cObject;
       default:
       {
-          const RGObjClassInfo *cinfo_super;
           GType parent_type;
 
           parent_type = g_type_parent(gtype);
-          cinfo_super = rbgobj_lookup_class_by_gtype_without_lock(parent_type,
-                                                                  Qnil,
-                                                                  TRUE);
-          return cinfo_super->klass;
+          if (parent_type == G_TYPE_INVALID) {
+              return cInstantiatable;
+          } else {
+              const RGObjClassInfo *cinfo_super;
+              cinfo_super =
+                  rbgobj_lookup_class_by_gtype_without_lock(parent_type,
+                                                            Qnil,
+                                                            TRUE);
+              return cinfo_super->klass;
+          }
       }
     }
 }

data/ext/glib2/rbgobject.h

@@ -45,8 +45,10 @@ extern "C" {
     G_DEF_CLASS_WITH_GC_FUNC(gtype, name, module, mark, free)
 #define G_DEF_CLASS3(gtype_name, name, module)\
     (rbgobj_define_class_dynamic(gtype_name, name, module, 0, 0))
-#define G_DEF_CLASS4(gtype, name, module, parent) \
+#define G_DEF_CLASS_WITH_PARENT(gtype, name, module, parent) \
     (rbgobj_define_class(gtype, name, module, 0, 0, parent))
+#define G_DEF_CLASS4(gtype, name, module, parent) \
+    G_DEF_CLASS_WITH_PARENT(gtype, name, module, parent)
 
 #define G_DEF_INTERFACE(gtype, name, module)\
     (rbgobj_define_class(gtype, name, module, 0, 0, Qnil))

data/lib/gnome2-win32-binary-build-task.rb

@@ -10,6 +10,9 @@ class GNOME2Win32BinaryBuildTask
 
   def initialize(configuration)
     @configuration = configuration
+    @configuration.build_packages.each do |package|
+      package[:compression_method] ||= "gz"
+    end
     define
   end
 
@@ -38,20 +41,20 @@ class GNOME2Win32BinaryBuildTask
     namespace :download do
       build_packages.each do |package|
         base = "#{package[:name]}-#{package[:version]}"
-        tar_gz = "#{base}.tar.gz"
-        tar_gz_url = "#{download_base_url(package)}/#{tar_gz}"
-        tar_gz_full_path = download_dir + tar_gz
+        tar = "#{base}.tar.#{package[:compression_method]}"
+        tar_url = "#{download_base_url(package)}/#{tar}"
+        tar_full_path = download_dir + tar
 
         desc "Download #{package[:label]} into #{download_dir}."
-        task package[:name] => tar_gz_full_path.to_s
+        task package[:name] => tar_full_path.to_s
 
-        directory_path = tar_gz_full_path.dirname
+        directory_path = tar_full_path.dirname
         directory directory_path.to_s
-        file tar_gz_full_path.to_s => directory_path.to_s do
-          rake_output_message "downloading... #{tar_gz_url}"
-          open(tar_gz_url) do |downloaded_tar_gz|
-            tar_gz_full_path.open("wb") do |tar_gz_file|
-              tar_gz_file.print(downloaded_tar_gz.read)
+        file tar_full_path.to_s => directory_path.to_s do
+          rake_output_message "downloading... #{tar_url}"
+          open(tar_url) do |downloaded_tar|
+            tar_full_path.open("wb") do |tar_file|
+              tar_file.print(downloaded_tar.read)
             end
           end
         end
@@ -82,10 +85,10 @@ class GNOME2Win32BinaryBuildTask
           mkdir_p(package_tmp_dir)
 
           base = "#{package[:name]}-#{package[:version]}"
-          tar_gz = "#{base}.tar.gz"
-          tar_gz_full_path = download_dir + tar_gz
+          tar = "#{base}.tar.#{package[:compression_method]}"
+          tar_full_path = download_dir + tar
           Dir.chdir(package_tmp_dir.to_s) do
-            sh("tar", "xzf", tar_gz_full_path.to_s) or exit(false)
+            sh("tar", "xf", tar_full_path.to_s) or exit(false)
           end
 
           Dir.chdir((package_tmp_dir + base).to_s) do
@@ -95,8 +98,8 @@ class GNOME2Win32BinaryBuildTask
             sh("./autogen.sh") if package[:need_autogen]
             sh("autoreconf -i") if package[:need_autoreconf]
             sh("./configure",
-               "CPPFLAGS=-I#{rcairo_win32_include_path} -I#{dist_dir + 'include'}",
-               "LDFLAGS=-L#{rcairo_win32_lib_path} -L#{dist_dir + 'lib'}",
+               "CPPFLAGS=#{cppflags(package)}",
+               "LDFLAGS=#{ldflags(package)}",
                "--prefix=#{dist_dir}",
                "--host=#{@configuration.build_host}",
                *package[:configure_args]) or exit(false)
@@ -188,4 +191,28 @@ class GNOME2Win32BinaryBuildTask
     end
     download_base_url
   end
+
+  def cppflags(package)
+    include_paths = package[:include_paths] || []
+    include_paths += [
+      rcairo_win32_include_path,
+      dist_dir + 'include',
+    ]
+    cppflags = include_paths.collect do |path|
+      "-I#{path}"
+    end
+    cppflags.join(" ")
+  end
+
+  def ldflags(package)
+    library_paths = package[:library_paths] || []
+    library_paths += [
+      rcairo_win32_lib_path,
+      dist_dir + 'lib',
+    ]
+    ldflags = library_paths.collect do |path|
+      "-L#{path}"
+    end
+    ldflags.join(" ")
+  end
 end

data/vendor/local/bin/gdbus-codegen

@@ -0,0 +1,41 @@
+#!/usr/bin/python
+
+# GDBus - GLib D-Bus Library
+#
+# Copyright (C) 2008-2011 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>
+
+
+import os
+import sys
+
+srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
+
+if srcdir is not None:
+    path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+elif os.name == 'nt':
+    # Makes gdbus-codegen 'relocatable' at runtime on Windows.
+    path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
+else:
+    path = os.path.join('/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local/share', 'glib-2.0')
+
+sys.path.insert(0, os.path.abspath(path))
+from codegen import codegen_main
+
+sys.exit(codegen_main.codegen_main())

data/vendor/local/bin/glib-gettextize

@@ -38,19 +38,19 @@ 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.28.8
+version=2.35.3
 try_ln_s=:
 
 # Directory where the sources are stored.
-prefix=/devel/target/9af0ed5b9823f125da25c47653b9c863
+prefix=/home/kou/work/ruby/ruby-gnome2.win32/glib2/vendor/local
 case `uname` in
 MINGW32*)
     prefix="`dirname $0`/.."
     ;;
 esac
 
-datadir=${datarootdir}
 datarootdir=${prefix}/share
+datadir=${datarootdir}
 
 gettext_dir=$prefix/share/glib-2.0/gettext
 

data/vendor/local/bin/glib-mkenums

@@ -1,4 +1,4 @@
-#! /bin/perl
+#! /usr/bin/perl
 
 use warnings;
 use File::Basename;
@@ -129,7 +129,7 @@ sub parse_entries {
 }
 
 sub version {
-    print "glib-mkenums version glib-2.28.8\n";
+    print "glib-mkenums version glib-2.35.3\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";
@@ -143,16 +143,18 @@ sub usage {
     print "Help Options:\n";
     print "  -h, --help            Show this help message\n\n";
     print "Utility Options:\n";
-    print "  --fhead <text>        Output file header\n";
-    print "  --fprod <text>        Per input file production\n";
-    print "  --ftail <text>        Output file trailer\n";
-    print "  --eprod <text>        Per enum text (produced prior to value itarations)\n";
-    print "  --vhead <text>        Value header, produced before iterating over enum values\n";
-    print "  --vprod <text>        Value text, produced for each enum value\n";
-    print "  --vtail <text>        Value tail, produced after iterating over enum values\n";
-    print "  --comments <text>     Comment structure\n";
-    print "  --template file       Template file\n";
-    print "  -v, --version         Print version informations\n\n";
+    print "  --identifier-prefix <text>   Identifier prefix\n";
+    print "  --symbol-prefix <text>       Symbol prefix\n";
+    print "  --fhead <text>               Output file header\n";
+    print "  --fprod <text>               Per input file production\n";
+    print "  --ftail <text>               Output file trailer\n";
+    print "  --eprod <text>               Per enum text (produced prior to value itarations)\n";
+    print "  --vhead <text>               Value header, produced before iterating over enum values\n";
+    print "  --vprod <text>               Value text, produced for each enum value\n";
+    print "  --vtail <text>               Value tail, produced after iterating over enum values\n";
+    print "  --comments <text>            Comment structure\n";
+    print "  --template file              Template file\n";
+    print "  -v, --version                Print version informations\n\n";
     print "Production text substitutions:\n";
     print "  \@EnumName\@            PrefixTheXEnum\n";
     print "  \@enum_name\@           prefix_the_xenum\n";
@@ -171,6 +173,8 @@ sub usage {
 }
 
 # production variables:
+my $idprefix = "";    # "G", "Gtk", etc
+my $symprefix = "";   # "g", "gtk", etc, if not just lc($idprefix)
 my $fhead = "";   # output file header
 my $fprod = "";   # per input file production
 my $ftail = "";   # output file trailer
@@ -233,6 +237,8 @@ while ($_=$ARGV[0],/^-/) {
     shift;
     last if /^--$/;
     if (/^--template$/)                      { read_template_file (shift); }
+    elsif (/^--identifier-prefix$/)          { $idprefix = shift }
+    elsif (/^--symbol-prefix$/)              { $symprefix = shift }
     elsif (/^--fhead$/)                      { $fhead = $fhead . shift }
     elsif (/^--fprod$/)                      { $fprod = $fprod . shift }
     elsif (/^--ftail$/)                      { $ftail = $ftail . shift }
@@ -284,6 +290,9 @@ while (<>) {
        ([^*]+|\*(?!/))*
        \*/@@gx;
 	
+    # ignore forward declarations
+    next if /^\s*typedef\s+enum.*;/;
+
     if (m@^\s*typedef\s+enum\s*
            ({)?\s*
            (?:/\*<
@@ -315,6 +324,9 @@ while (<>) {
 	# Didn't have trailing '{' look on next lines
 	if (!defined $1 && !defined $4) {
 	    while (<>) {
+		if (eof) {
+		    die "Hit end of file while parsing enum in $ARGV";
+		}
 		if (s/^\s*\{//) {
 		    last;
 		}
@@ -379,8 +391,8 @@ while (<>) {
 	    $enumshort =~ s/^[A-Z][A-Z0-9]*_//;
 
 	    $enumname_prefix = $enumlong;
-	    $enumname_prefix =~ s/$enumshort$//;
-	} else {
+	    $enumname_prefix =~ s/_$enumshort$//;
+	} elsif (!$symprefix && !$idprefix) {
 	    # enumname is e.g. GMatchType
 	    $enspace = $enumname;
 	    $enspace =~ s/^([A-Z][a-z]*).*$/$1/;
@@ -401,6 +413,21 @@ while (<>) {
 	    if (defined($option_lowercase_name)) {
 		$enumsym = $option_lowercase_name;
 	    }
+	} else {
+	    $enumshort = $enumname;
+	    if ($idprefix) {
+		$enumshort =~ s/^${idprefix}//;
+	    } else {
+		$enumshort =~ s/^[A-Z][a-z]*//;
+	    }
+	    $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g;
+	    $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
+	    $enumshort = uc($enumshort);
+
+	    $enumname_prefix = $symprefix && uc($symprefix) || uc($idprefix);
+
+	    $enumlong = $enumname_prefix . "_" . $enumshort;
+	    $enumsym = lc($enumlong);
 	}
 
 	if ($firstenum) {