gdk_pixbuf2 0.90.2-x86-mingw32 → 0.90.3-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
data/ChangeLog CHANGED
@@ -1,3 +1,23 @@
1
+ 2010-10-23 Kouhei Sutou <kou@cozmixng.org>
2
+
3
+ * ext/gdk_pixbuf2/depend: ruby-gdkpixbuf2 -> ruby-gdk-pixbuf2.
4
+
5
+ 2010-10-17 Kouhei Sutou <kou@cozmixng.org>
6
+
7
+ * Rakefile, ext/gdk_pixbuf2/rbgdk-pixbuf.c, lib/gdk_pixbuf2.rb:
8
+ move GDK and cairo related code to Ruby/GTK2.
9
+ Patch by Andrea Dallera. Thanks!!!
10
+
11
+ 2010-10-08 Guillaume Cottenceau
12
+
13
+ * RVAL2CSTR2 is deprecated, replace with RVAL2CSTR_ACCEPT_NIL
14
+
15
+ * CSTR2RVAL2 is deprecated, replace with CSTR2RVAL_FREE
16
+
17
+ 2010-09-29 Kouhei Sutou <kou@cozmixng.org>
18
+
19
+ * Rakefile: fix dependencies.
20
+
1
21
  2010-09-23 Kouhei Sutou <kou@cozmixng.org>
2
22
 
3
23
  * Rakefile: don't add .zip into gem.
data/Rakefile CHANGED
@@ -38,8 +38,8 @@ spec = Gem::Specification.new do |s|
38
38
  s.homepage = "http://ruby-gnome2.sourceforge.jp/"
39
39
  s.version = version
40
40
  s.platform = Gem::Platform::RUBY
41
- s.add_dependency("cairo", ">= 1.10.0")
42
- s.add_dependency("glib2", "= #{version}")
41
+ compatible_version = version.split(/\./)[0, 3].join(".")
42
+ s.add_dependency("glib2", ">= #{compatible_version}")
43
43
  s.extensions = FileList["ext/#{package_name}/extconf.rb"]
44
44
  s.require_paths = ["lib"]
45
45
  s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
@@ -69,6 +69,10 @@ namespace :win32 do
69
69
  task :download do
70
70
  $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
71
71
  require 'gnome2-win32-binary-downloader'
72
- GNOME2Win32BinaryDownloader.download(:package => "gtk+")
72
+ packages = ["glib", "atk", "gdk-pixbuf", "pango", "gtk+"]
73
+ dependencies = ["gettext-runtime", "zlib", "freetype", "expat",
74
+ "fontconfig", "cairo", "libpng"]
75
+ GNOME2Win32BinaryDownloader.download(:packages => packages,
76
+ :dependencies => dependencies)
73
77
  end
74
78
  end
@@ -1,3 +1,5 @@
1
1
  install:
2
- $(MAKEDIRS) $(libdir)/pkgconfig
3
- $(INSTALL_DATA) ruby-gdkpixbuf2.pc $(libdir)/pkgconfig
2
+ if test -n "$(pkgconfigdir)"; then \
3
+ $(MAKEDIRS) $(pkgconfigdir); \
4
+ $(INSTALL_DATA) ruby-gdk-pixbuf2.pc $(pkgconfigdir); \
5
+ fi
@@ -11,7 +11,7 @@ top_build_dir = Pathname(".").parent.parent.parent.expand_path
11
11
  mkmf_gnome2_dir = top_dir + "glib2" + 'lib'
12
12
  version_suffix = ""
13
13
  unless mkmf_gnome2_dir.exist?
14
- if /(-\d+\.\d+\.\d+)\z/ =~ base_dir.basename.to_s
14
+ if /(-\d+\.\d+\.\d+)(?:\.\d+)?\z/ =~ base_dir.basename.to_s
15
15
  version_suffix = $1
16
16
  mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + 'lib'
17
17
  end
@@ -57,5 +57,5 @@ end
57
57
  :top_build_dir => top_build_dir.to_s,
58
58
  :target_build_dir => build_dir)
59
59
  end
60
- create_pkg_config_file("Ruby/GdkPixbuf2", package_id)
60
+ create_pkg_config_file("Ruby/GdkPixbuf2", package_id, nil, "ruby-gdk-pixbuf2.pc")
61
61
  create_makefile(module_name)
@@ -54,14 +54,14 @@ static VALUE
54
54
  get_name(self)
55
55
  VALUE self;
56
56
  {
57
- return CSTR2RVAL2(gdk_pixbuf_format_get_name(_SELF(self)));
57
+ return CSTR2RVAL_FREE(gdk_pixbuf_format_get_name(_SELF(self)));
58
58
  }
59
59
 
60
60
  static VALUE
61
61
  get_description(self)
62
62
  VALUE self;
63
63
  {
64
- return CSTR2RVAL2(gdk_pixbuf_format_get_description(_SELF(self)));
64
+ return CSTR2RVAL_FREE(gdk_pixbuf_format_get_description(_SELF(self)));
65
65
  }
66
66
 
67
67
  static VALUE
@@ -18,14 +18,6 @@
18
18
  #include <gdk-pixbuf/gdk-pixbuf-io.h>
19
19
  #endif
20
20
 
21
- #if RBGDK_PIXBUF_CHECK_VERSION(2,8,0) && defined(HAVE_RB_CAIRO_H)
22
- # include <gdk/gdkcairo.h>
23
- # include <rb_cairo.h>
24
- # define CAIRO_AVAILABLE 1
25
- #else
26
- # define CAIRO_AVAILABLE 0
27
- #endif
28
-
29
21
  #define _SELF(s) GDK_PIXBUF(RVAL2GOBJ(s))
30
22
 
31
23
  #define NOMEM_ERROR(error) g_set_error(error,\
@@ -638,38 +630,6 @@ set_option(self, key, value)
638
630
  }
639
631
  #endif
640
632
 
641
- static VALUE
642
- cairo_available_p(self)
643
- VALUE self;
644
- {
645
- #if CAIRO_AVAILABLE
646
- return Qtrue;
647
- #else
648
- return Qfalse;
649
- #endif
650
- }
651
-
652
- #if CAIRO_AVAILABLE
653
- /* Move from gtk/src/rbgdkcairo.c */
654
- static VALUE
655
- gdkdraw_cairo_set_source_pixbuf(argc, argv, self)
656
- int argc;
657
- VALUE *argv;
658
- VALUE self;
659
- {
660
- VALUE pixbuf, pixbuf_x, pixbuf_y;
661
-
662
- rb_scan_args(argc, argv, "12", &pixbuf, &pixbuf_x, &pixbuf_y);
663
-
664
- gdk_cairo_set_source_pixbuf(RVAL2CRCONTEXT(self),
665
- GDK_PIXBUF(RVAL2GOBJ(pixbuf)),
666
- NIL_P(pixbuf_x) ? 0 : NUM2DBL(pixbuf_x),
667
- NIL_P(pixbuf_y) ? 0 : NUM2DBL(pixbuf_y));
668
- rb_cairo_check_status(cairo_status(RVAL2CRCONTEXT(self)));
669
- return self;
670
- }
671
- #endif
672
-
673
633
  void
674
634
  Init_gdk_pixbuf2()
675
635
  {
@@ -774,16 +734,6 @@ Init_gdk_pixbuf2()
774
734
  rb_define_method(gdkPixbuf, "set_option", set_option, 2);
775
735
  #endif
776
736
 
777
- /*
778
- * cairo Interface
779
- */
780
- rb_define_module_function(gdkPixbuf, "cairo_available?",
781
- cairo_available_p, 0);
782
- #if CAIRO_AVAILABLE
783
- rb_define_method(rb_cCairo_Context, "set_source_pixbuf",
784
- gdkdraw_cairo_set_source_pixbuf, -1);
785
- #endif
786
-
787
737
  Init_gdk_pixbuf_animation(mGdk);
788
738
  #if RBGDK_PIXBUF_CHECK_VERSION(2,8,0)
789
739
  Init_gdk_pixbuf_simpleanim(mGdk);
Binary file
Binary file
data/lib/gdk_pixbuf2.rb CHANGED
@@ -36,6 +36,16 @@ module Gdk
36
36
  end
37
37
  class Pixbuf
38
38
  LOG_DOMAIN = "GdkPixbuf"
39
+
40
+ class << self
41
+ def cairo_available?
42
+ if Gdk.respond_to?(:cairo_available?)
43
+ Gdk.cairo_available?
44
+ else
45
+ false
46
+ end
47
+ end
48
+ end
39
49
  end
40
50
  end
41
51
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gdk_pixbuf2
3
3
  version: !ruby/object:Gem::Version
4
- hash: 371
4
+ hash: 369
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 90
9
- - 2
10
- version: 0.90.2
9
+ - 3
10
+ version: 0.90.3
11
11
  platform: x86-mingw32
12
12
  authors:
13
13
  - The Ruby-GNOME2 Proejct Team
@@ -15,41 +15,25 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-09-26 00:00:00 +09:00
18
+ date: 2010-10-23 00:00:00 +09:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- name: cairo
22
+ name: glib2
23
23
  prerelease: false
24
24
  requirement: &id001 !ruby/object:Gem::Requirement
25
25
  none: false
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- hash: 63
30
- segments:
31
- - 1
32
- - 10
33
- - 0
34
- version: 1.10.0
35
- type: :runtime
36
- version_requirements: *id001
37
- - !ruby/object:Gem::Dependency
38
- name: glib2
39
- prerelease: false
40
- requirement: &id002 !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - "="
44
- - !ruby/object:Gem::Version
45
- hash: 371
29
+ hash: 369
46
30
  segments:
47
31
  - 0
48
32
  - 90
49
- - 2
50
- version: 0.90.2
33
+ - 3
34
+ version: 0.90.3
51
35
  type: :runtime
52
- version_requirements: *id002
36
+ version_requirements: *id001
53
37
  description: Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.
54
38
  email: ruby-gnome2-devel-en@lists.sourceforge.net
55
39
  executables: []