rsvg2 0.90.2-x86-mingw32 → 0.90.2.1-x86-mingw32

data/ChangeLog

@@ -1,3 +1,12 @@
+2010-09-29  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile: fix dependencies.
+
+	* Rakefile: add missing gdk-pixbuf dependency.
+
+	* Rakefile: add missing libcroco dependency.
+	Reported by U.Nakamura. Thanks!!!
+
 2010-09-26  Kouhei Sutou  <kou@cozmixng.org>
 
 	* ext/rsvg2/rbrsvg.c: also check rb_cairo.h availability.

data/Rakefile

@@ -39,7 +39,8 @@ spec = Gem::Specification.new do |s|
   s.version = version
   s.platform = Gem::Platform::RUBY
   s.add_dependency("cairo", ">= 1.10.0")
-  s.add_dependency("glib2", "= #{version}")
+  compatible_version = version.split(/\./)[0, 3].join(".")
+  s.add_dependency("glib2", ">= #{compatible_version}")
   s.extensions = FileList["ext/#{package_name}/extconf.rb"]
   s.require_paths = ["lib"]
   s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
@@ -69,6 +70,11 @@ namespace :win32 do
   task :download do
     $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
     require 'gnome2-win32-binary-downloader'
-    GNOME2Win32BinaryDownloader.download(:packages => ["gtk+", "librsvg"])
+    packages = ["glib", "atk", "gdk-pixbuf", "pango", "gtk+",
+                "librsvg", "libcroco"]
+    dependencies = ["gettext-runtime", "zlib", "freetype", "expat",
+                    "fontconfig", "cairo", "libpng"]
+    GNOME2Win32BinaryDownloader.download(:packages => packages,
+                                         :dependencies => dependencies)
   end
 end

data/ext/rsvg2/extconf.rb

@@ -11,7 +11,7 @@ top_build_dir = Pathname(".").parent.parent.parent.expand_path
 mkmf_gnome2_dir = top_dir + "glib2" + 'lib'
 version_suffix = ""
 unless mkmf_gnome2_dir.exist?
-  if /(-\d+\.\d+\.\d+)\z/ =~ base_dir.basename.to_s
+  if /(-\d+\.\d+\.\d+)(?:\.\d+)?\z/ =~ base_dir.basename.to_s
     version_suffix = $1
     mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + 'lib'
   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/etc/gtk-2.0/gtk.immodules

@@ -1,4 +1,4 @@
 # GTK+ Input Method Modules file
 #
-# ModulesPath = c:\Users\tml\.gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\2.10.0\immodules;c:\Users\tml\.gtk-2.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\immodules;c:\devel\target\f1543098cfe02605135956ac7172e11e\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\devel\target\f1543098cfe02605135956ac7172e11e\lib\gtk-2.0\2.10.0\immodules;c:\devel\target\f1543098cfe02605135956ac7172e11e\lib\gtk-2.0\i686-pc-mingw32\immodules;c:\devel\target\f1543098cfe02605135956ac7172e11e\lib\gtk-2.0\immodules
+# ModulesPath = c:\Users\tml\.gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\2.10.0\immodules;c:\Users\tml\.gtk-2.0\i686-pc-mingw32\immodules;c:\Users\tml\.gtk-2.0\immodules;c:\devel\target\9962736c19ef5680e0566e9250da06e2\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;c:\devel\target\9962736c19ef5680e0566e9250da06e2\lib\gtk-2.0\2.10.0\immodules;c:\devel\target\9962736c19ef5680e0566e9250da06e2\lib\gtk-2.0\i686-pc-mingw32\immodules;c:\devel\target\9962736c19ef5680e0566e9250da06e2\lib\gtk-2.0\immodules
 #

data/vendor/local/include/atk-1.0/atk/atk-enum-types.h

@@ -1,5 +1,5 @@
 
-/* Generated data (by glib-mkenums) */
+
 
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
@@ -41,5 +41,5 @@ G_END_DECLS
 
 #endif /* __ATK_ENUM_TYPES_H__ */
 
-/* Generated data ends here */
+
 

data/vendor/local/include/atk-1.0/atk/atktext.h

@@ -43,7 +43,7 @@ G_BEGIN_DECLS
  *@ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP: Pixels of blank space to leave between wrapped lines inside the same newline-terminated line (paragraph).
  *@ATK_TEXT_ATTR_BG_FULL_HEIGHT: "true" or "false" whether to make the background color for each character the height of the highest font used on the current line, or the height of the font used for the current character.
  *@ATK_TEXT_ATTR_RISE: Number of pixels that the characters are risen above the baseline
- *@ATK_TEXT_ATTR_UNDERLINE: "none", "single", "double" or "low"
+ *@ATK_TEXT_ATTR_UNDERLINE: "none", "single", "double", "low", or "error"
  *@ATK_TEXT_ATTR_STRIKETHROUGH: "true" or "false" whether the text is strikethrough 
  *@ATK_TEXT_ATTR_SIZE: The size of the characters. 
  *@ATK_TEXT_ATTR_SCALE: The scale of the characters. The value is a string representation of a double 

data/vendor/local/include/{gtk-2.0 → gdk-pixbuf-2.0}/gdk-pixbuf/gdk-pixbuf-features.h

@@ -6,9 +6,9 @@
 #define GDK_PIXBUF_FEATURES_H 1
 
 #define GDK_PIXBUF_MAJOR (2)
-#define GDK_PIXBUF_MINOR (20)
-#define GDK_PIXBUF_MICRO (1)
-#define GDK_PIXBUF_VERSION "2.20.1"
+#define GDK_PIXBUF_MINOR (22)
+#define GDK_PIXBUF_MICRO (0)
+#define GDK_PIXBUF_VERSION "2.22.0"
 
 /* We prefix variable declarations so they can
  * properly get exported/imported from Windows DLLs.

data/vendor/local/include/{gtk-2.0 → gdk-pixbuf-2.0}/gdk-pixbuf/gdk-pixbuf-io.h

@@ -43,6 +43,8 @@ G_BEGIN_DECLS
 
 typedef struct _GdkPixbufFormat GdkPixbufFormat;
  
+GType gdk_pixbuf_format_get_type (void) G_GNUC_CONST;
+
 GSList    *gdk_pixbuf_get_formats            (void);
 gchar     *gdk_pixbuf_format_get_name        (GdkPixbufFormat *format);
 gchar     *gdk_pixbuf_format_get_description (GdkPixbufFormat *format);
@@ -59,6 +61,9 @@ GdkPixbufFormat *gdk_pixbuf_get_file_info    (const gchar     *filename,
 					      gint            *width, 
 					      gint            *height);
 
+GdkPixbufFormat *gdk_pixbuf_format_copy (const GdkPixbufFormat *format);
+void             gdk_pixbuf_format_free (GdkPixbufFormat       *format);
+
 #ifdef GDK_PIXBUF_ENABLE_BACKEND
 
 
@@ -164,7 +169,6 @@ struct _GdkPixbufFormat {
   gchar *license;
 };
 
-
 #endif /* GDK_PIXBUF_ENABLE_BACKEND */
 
 G_END_DECLS

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__ */