gdk_pixbuf2 0.90.2 → 0.90.3

data/ChangeLog

@@ -1,3 +1,23 @@
+2010-10-23  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gdk_pixbuf2/depend: ruby-gdkpixbuf2 -> ruby-gdk-pixbuf2.
+
+2010-10-17  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile, ext/gdk_pixbuf2/rbgdk-pixbuf.c, lib/gdk_pixbuf2.rb:
+	move GDK and cairo related code to Ruby/GTK2.
+	Patch by Andrea Dallera. Thanks!!!
+
+2010-10-08  Guillaume Cottenceau
+
+	* RVAL2CSTR2 is deprecated, replace with RVAL2CSTR_ACCEPT_NIL
+
+	* CSTR2RVAL2 is deprecated, replace with CSTR2RVAL_FREE
+
+2010-09-29  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile: fix dependencies.
+
 2010-09-23  Kouhei Sutou  <kou@cozmixng.org>
 
 	* Rakefile: don't add .zip into gem.

data/Rakefile

@@ -38,8 +38,8 @@ spec = Gem::Specification.new do |s|
   s.homepage = "http://ruby-gnome2.sourceforge.jp/"
   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 +69,10 @@ namespace :win32 do
   task :download do
     $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
     require 'gnome2-win32-binary-downloader'
-    GNOME2Win32BinaryDownloader.download(:package => "gtk+")
+    packages = ["glib", "atk", "gdk-pixbuf", "pango", "gtk+"]
+    dependencies = ["gettext-runtime", "zlib", "freetype", "expat",
+                    "fontconfig", "cairo", "libpng"]
+    GNOME2Win32BinaryDownloader.download(:packages => packages,
+                                         :dependencies => dependencies)
   end
 end

data/ext/gdk_pixbuf2/depend

@@ -1,3 +1,5 @@
 install:
-	$(MAKEDIRS) $(libdir)/pkgconfig
-	$(INSTALL_DATA) ruby-gdkpixbuf2.pc $(libdir)/pkgconfig
+	if test -n "$(pkgconfigdir)"; then			\
+	  $(MAKEDIRS) $(pkgconfigdir);				\
+	  $(INSTALL_DATA) ruby-gdk-pixbuf2.pc $(pkgconfigdir);	\
+	fi

data/ext/gdk_pixbuf2/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
@@ -57,5 +57,5 @@ end
                      :top_build_dir => top_build_dir.to_s,
                      :target_build_dir => build_dir)
 end
-create_pkg_config_file("Ruby/GdkPixbuf2", package_id)
+create_pkg_config_file("Ruby/GdkPixbuf2", package_id, nil, "ruby-gdk-pixbuf2.pc")
 create_makefile(module_name)

data/ext/gdk_pixbuf2/rbgdk-pixbuf-format.c

@@ -54,14 +54,14 @@ static VALUE
 get_name(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gdk_pixbuf_format_get_name(_SELF(self)));
+    return CSTR2RVAL_FREE(gdk_pixbuf_format_get_name(_SELF(self)));
 }
 
 static VALUE
 get_description(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gdk_pixbuf_format_get_description(_SELF(self)));
+    return CSTR2RVAL_FREE(gdk_pixbuf_format_get_description(_SELF(self)));
 }
     
 static VALUE

data/ext/gdk_pixbuf2/rbgdk-pixbuf.c

@@ -18,14 +18,6 @@
 #include <gdk-pixbuf/gdk-pixbuf-io.h>
 #endif
 
-#if RBGDK_PIXBUF_CHECK_VERSION(2,8,0) && defined(HAVE_RB_CAIRO_H)
-#  include <gdk/gdkcairo.h>
-#  include <rb_cairo.h>
-#  define CAIRO_AVAILABLE 1
-#else
-#  define CAIRO_AVAILABLE 0
-#endif
-
 #define _SELF(s) GDK_PIXBUF(RVAL2GOBJ(s)) 
 
 #define NOMEM_ERROR(error) g_set_error(error,\
@@ -638,38 +630,6 @@ set_option(self, key, value)
 }
 #endif
 
-static VALUE
-cairo_available_p(self)
-    VALUE self;
-{
-#if CAIRO_AVAILABLE
-    return Qtrue;
-#else
-    return Qfalse;
-#endif
-}
-
-#if CAIRO_AVAILABLE
-/* Move from gtk/src/rbgdkcairo.c */
-static VALUE
-gdkdraw_cairo_set_source_pixbuf(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-{
-    VALUE pixbuf, pixbuf_x, pixbuf_y;
-
-    rb_scan_args(argc, argv, "12", &pixbuf, &pixbuf_x, &pixbuf_y);
-
-    gdk_cairo_set_source_pixbuf(RVAL2CRCONTEXT(self),
-                                GDK_PIXBUF(RVAL2GOBJ(pixbuf)),
-                                NIL_P(pixbuf_x) ? 0 : NUM2DBL(pixbuf_x),
-                                NIL_P(pixbuf_y) ? 0 : NUM2DBL(pixbuf_y));
-    rb_cairo_check_status(cairo_status(RVAL2CRCONTEXT(self)));
-    return self;
-}
-#endif
-
 void 
 Init_gdk_pixbuf2()
 {
@@ -774,16 +734,6 @@ Init_gdk_pixbuf2()
     rb_define_method(gdkPixbuf, "set_option", set_option, 2);
 #endif
 
-    /*
-     * cairo Interface
-     */
-    rb_define_module_function(gdkPixbuf, "cairo_available?",
-                              cairo_available_p, 0);
-#if CAIRO_AVAILABLE
-    rb_define_method(rb_cCairo_Context, "set_source_pixbuf",
-                     gdkdraw_cairo_set_source_pixbuf, -1);
-#endif
-
     Init_gdk_pixbuf_animation(mGdk);
 #if RBGDK_PIXBUF_CHECK_VERSION(2,8,0)
     Init_gdk_pixbuf_simpleanim(mGdk);

data/lib/gdk_pixbuf2.rb

@@ -36,6 +36,16 @@ module Gdk
   end
   class Pixbuf
     LOG_DOMAIN = "GdkPixbuf"
+
+    class << self
+      def cairo_available?
+        if Gdk.respond_to?(:cairo_available?)
+          Gdk.cairo_available?
+        else
+          false
+        end
+      end
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gdk_pixbuf2
 version: !ruby/object:Gem::Version 
-  hash: 371
+  hash: 369
   prerelease: false
   segments: 
   - 0
   - 90
-  - 2
-  version: 0.90.2
+  - 3
+  version: 0.90.3
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,41 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 +09:00
+date: 2010-10-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: cairo
+  name: glib2
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 1
-        - 10
-        - 0
-        version: 1.10.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: glib2
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 371
+        hash: 369
         segments: 
         - 0
         - 90
-        - 2
-        version: 0.90.2
+        - 3
+        version: 0.90.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 description: Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []