cairo 1.14.2-x64-mingw32 → 1.14.3-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of cairo might be problematic. Click here for more details.

Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS +14 -0
  3. data/Rakefile +17 -5
  4. data/ext/cairo/extconf.rb +0 -2
  5. data/ext/cairo/rb_cairo.c +0 -2
  6. data/ext/cairo/rb_cairo.h +2 -2
  7. data/ext/cairo/rb_cairo_quartz_surface.c +207 -0
  8. data/lib/2.0/cairo.so +0 -0
  9. data/lib/2.1/cairo.so +0 -0
  10. data/lib/2.2/cairo.so +0 -0
  11. data/vendor/local/bin/fc-cache.exe +0 -0
  12. data/vendor/local/bin/fc-cat.exe +0 -0
  13. data/vendor/local/bin/fc-list.exe +0 -0
  14. data/vendor/local/bin/fc-match.exe +0 -0
  15. data/vendor/local/bin/fc-pattern.exe +0 -0
  16. data/vendor/local/bin/fc-query.exe +0 -0
  17. data/vendor/local/bin/fc-scan.exe +0 -0
  18. data/vendor/local/bin/fc-validate.exe +0 -0
  19. data/vendor/local/bin/libcairo-2.dll +0 -0
  20. data/vendor/local/bin/libcairo-gobject-2.dll +0 -0
  21. data/vendor/local/bin/libcairo-script-interpreter-2.dll +0 -0
  22. data/vendor/local/bin/libfontconfig-1.dll +0 -0
  23. data/vendor/local/bin/libfreetype-6.dll +0 -0
  24. data/vendor/local/bin/libpixman-1-0.dll +0 -0
  25. data/vendor/local/bin/libpng16-16.dll +0 -0
  26. data/vendor/local/bin/libxml2-2.dll +0 -0
  27. data/vendor/local/bin/png-fix-itxt.exe +0 -0
  28. data/vendor/local/bin/pngfix.exe +0 -0
  29. data/vendor/local/bin/xmlcatalog.exe +0 -0
  30. data/vendor/local/bin/xmllint.exe +0 -0
  31. data/vendor/local/bin/zlib1.dll +0 -0
  32. data/vendor/local/lib/libcairo-gobject.a +0 -0
  33. data/vendor/local/lib/libcairo-gobject.dll.a +0 -0
  34. data/vendor/local/lib/libcairo-gobject.la +1 -1
  35. data/vendor/local/lib/libcairo-script-interpreter.a +0 -0
  36. data/vendor/local/lib/libcairo-script-interpreter.dll.a +0 -0
  37. data/vendor/local/lib/libcairo.a +0 -0
  38. data/vendor/local/lib/libcairo.dll.a +0 -0
  39. data/vendor/local/lib/libfontconfig.dll.a +0 -0
  40. data/vendor/local/lib/libfreetype.a +0 -0
  41. data/vendor/local/lib/libfreetype.dll.a +0 -0
  42. data/vendor/local/lib/libpixman-1.a +0 -0
  43. data/vendor/local/lib/libpixman-1.dll.a +0 -0
  44. data/vendor/local/lib/libpng.a +0 -0
  45. data/vendor/local/lib/libpng.dll.a +0 -0
  46. data/vendor/local/lib/libpng16.a +0 -0
  47. data/vendor/local/lib/libpng16.dll.a +0 -0
  48. data/vendor/local/lib/libxml2.a +0 -0
  49. data/vendor/local/lib/libxml2.dll.a +0 -0
  50. data/vendor/local/lib/libz.a +0 -0
  51. data/vendor/local/lib/libz.dll.a +0 -0
  52. metadata +22 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 85a07a5ca8cf1873637f789b0ceb10d5f6f52b60
4
- data.tar.gz: 6021dffa2ec593c807ea97175e057f06a4bf4824
3
+ metadata.gz: e43d87b5041c0703ff1a8c9db3fa56a82d10bd34
4
+ data.tar.gz: 1ec7d8e282dec70812a05ba8e200f1f062152109
5
5
  SHA512:
6
- metadata.gz: acd64778a837e67b2f55e584aa49c52cf038a3e9904aeb877ec19db21a746b5779767e1a1d23ab29fb8f863738e713b679f666a5853ea930dc611d985c42edb1
7
- data.tar.gz: b9a8f065d5d13a3db38778b052c1d95411100b94c9c41c947b3a8315af0e042a7277ac9358206579d9c8102acd9f3ef04fe40bc98bafedae34569bb1cce7250d
6
+ metadata.gz: 49bc97ff072bcf27e805880d9e9d1f5c6ce8e887fe9f7ee7748df14d25dc0ae6dd1a3015f09f4120b81486b385e1012d8c05689bb71ab603e741fe3c9c24471c
7
+ data.tar.gz: 5f0dc72b8835ead70a6f29205c440732d7a93cb71dc85a5744931d5e800cf7c139581087c787d0535b3f75f58bce5ba9b00845b11c97c5c30090d60c4a596646
data/NEWS CHANGED
@@ -1,3 +1,17 @@
1
+ Release 1.14.3 (2015-09-08) Kouhei Sutou <kou@cozmixng.org>
2
+ ===========================================================
3
+
4
+ Fixes
5
+ -----
6
+
7
+ * Fixed run-time error on OS X.
8
+ [shocker-ja:1270][Reported by Junichi Oya]
9
+
10
+ Thanks
11
+ ------
12
+
13
+ * Junichi Oya
14
+
1
15
  Release 1.14.2 (2015-09-06) Kouhei Sutou <kou@cozmixng.org>
2
16
  ===========================================================
3
17
 
data/Rakefile CHANGED
@@ -527,13 +527,25 @@ windows_task.define
527
527
 
528
528
  namespace :vm do
529
529
  namespace :windows do
530
- desc "Build all packages for Windows in VM"
531
- task :build do
532
- cd("build") do
533
- sh("vagrant", "destroy", "--force")
534
- sh("vagrant", "up")
530
+ architectures = ["32", "64"]
531
+ build_tasks = []
532
+
533
+ namespace :build do
534
+ architectures.each do |architecture|
535
+ desc "Build all packages for Windows #{architecture}"
536
+ task_name = "win#{architecture}"
537
+ build_tasks << task_name
538
+ task task_name do
539
+ cd("build") do
540
+ sh("vagrant", "destroy", "--force", task_name)
541
+ sh("vagrant", "up", task_name)
542
+ end
543
+ end
535
544
  end
536
545
  end
546
+
547
+ desc "Build all packages for Windows"
548
+ task :build => build_tasks
537
549
  end
538
550
  end
539
551
 
data/ext/cairo/extconf.rb CHANGED
@@ -199,8 +199,6 @@ checking_for(checking_message("Mac OS X")) do
199
199
  end
200
200
  true
201
201
  else
202
- MakeMakefile::C_EXT.delete("m")
203
- MakeMakefile::SRC_EXT.delete("m")
204
202
  false
205
203
  end
206
204
  end
data/ext/cairo/rb_cairo.c CHANGED
@@ -99,9 +99,7 @@ Init_cairo ()
99
99
  Init_cairo_region ();
100
100
  Init_cairo_device ();
101
101
  Init_cairo_surface ();
102
- #ifdef CAIRO_HAS_QUARTZ_SURFACE
103
102
  Init_cairo_quartz_surface ();
104
- #endif
105
103
  Init_cairo_exception ();
106
104
  Init_cairo_font ();
107
105
  Init_cairo_font_extents ();
data/ext/cairo/rb_cairo.h CHANGED
@@ -5,7 +5,7 @@
5
5
  * $Author: kou $
6
6
  * $Date: 2008-09-19 12:56:27 $
7
7
  *
8
- * Copyright 2006-2014 Kouhei Sutou <kou@cozmixng.org>
8
+ * Copyright 2006-2015 Kouhei Sutou <kou@cozmixng.org>
9
9
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
10
10
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
11
11
  *
@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
73
73
 
74
74
  #define RB_CAIRO_VERSION_MAJOR 1
75
75
  #define RB_CAIRO_VERSION_MINOR 14
76
- #define RB_CAIRO_VERSION_MICRO 2
76
+ #define RB_CAIRO_VERSION_MICRO 3
77
77
 
78
78
  RB_CAIRO_VAR VALUE rb_mCairo;
79
79
  RB_CAIRO_VAR VALUE rb_cCairo_Context;
@@ -0,0 +1,207 @@
1
+ /* -*- mode: objc; c-file-style: "gnu"; indent-tabs-mode: nil -*- */
2
+ /*
3
+ * Ruby Cairo Binding
4
+ *
5
+ * Copyright 2008-2015 Kouhei Sutou <kou@cozmixng.org>
6
+ * Copyright 2014 Patrick Hanevold <patrick.hanevold@gmail.com>
7
+ *
8
+ * This file is made available under the same terms as Ruby
9
+ *
10
+ */
11
+
12
+ #include "rb_cairo.h"
13
+ #include "rb_cairo_private.h"
14
+
15
+ #if CAIRO_CHECK_VERSION(1, 5, 12)
16
+ # define RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE_TYPE
17
+ #endif
18
+
19
+ #ifdef CAIRO_HAS_QUARTZ_SURFACE
20
+ # ifndef HAVE_TYPE_ENUM_RUBY_VALUE_TYPE
21
+ enum ruby_value_type {
22
+ RUBY_T_DATA = T_DATA
23
+ };
24
+ # endif
25
+ # undef T_DATA
26
+ # include <cairo-quartz.h>
27
+ # define T_DATA RUBY_T_DATA
28
+ # define RB_CAIRO_HAS_QUARTZ_SURFACE
29
+ # ifdef CAIRO_HAS_QUARTZ_IMAGE_SURFACE
30
+ # include <cairo-quartz-image.h>
31
+ # define RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
32
+ # endif
33
+ #endif
34
+
35
+ #define _SELF (RVAL2CRSURFACE(self))
36
+
37
+ #ifdef RB_CAIRO_HAS_QUARTZ_SURFACE
38
+ /* Quartz-surface functions */
39
+ #include <objc/objc-runtime.h>
40
+
41
+ # ifdef HAVE_RUBY_COCOA
42
+ BOOL rbobj_to_nsobj (VALUE obj, id* nsobj);
43
+ VALUE ocid_to_rbobj (VALUE context_obj, id ocid);
44
+ # endif
45
+
46
+ static VALUE
47
+ cr_quartz_surface_initialize (int argc, VALUE *argv, VALUE self)
48
+ {
49
+ id objc_object = nil;
50
+ CGContextRef context;
51
+ unsigned int width, height;
52
+ cairo_surface_t *surface = NULL;
53
+ cairo_format_t format = CAIRO_FORMAT_ARGB32;
54
+ VALUE arg1, arg2, arg3, rb_width, rb_height;
55
+ # ifdef HAVE_RUBY_COCOA
56
+ static VALUE rb_cOSXCGContextRef = Qnil;
57
+ # endif
58
+
59
+ rb_scan_args (argc, argv, "21", &arg1, &arg2, &arg3);
60
+
61
+ if (argc == 2)
62
+ {
63
+ rb_width = arg1;
64
+ rb_height = arg2;
65
+ }
66
+ else
67
+ {
68
+ switch (TYPE (arg1))
69
+ {
70
+ case T_NIL:
71
+ break;
72
+ case T_STRING:
73
+ case T_SYMBOL:
74
+ case T_FIXNUM:
75
+ format = RVAL2CRFORMAT (arg1);
76
+ break;
77
+ default:
78
+ # ifdef HAVE_RUBY_COCOA
79
+ if (NIL_P (rb_cOSXCGContextRef))
80
+ rb_cOSXCGContextRef =
81
+ rb_const_get (rb_const_get (rb_cObject, rb_intern ("OSX")),
82
+ rb_intern ("CGContextRef"));
83
+ # endif
84
+
85
+ # ifdef HAVE_RUBY_COCOA
86
+ if (RTEST (rb_obj_is_kind_of (arg1, rb_cOSXCGContextRef)))
87
+ {
88
+ rbobj_to_nsobj (arg1, &objc_object);
89
+ }
90
+ else
91
+ # endif
92
+ {
93
+ if (!NIL_P (rb_cairo__cFFIPointer) &&
94
+ RTEST (rb_obj_is_kind_of (arg1, rb_cairo__cFFIPointer)))
95
+ {
96
+ VALUE rb_objc_pointer;
97
+ rb_objc_pointer = rb_funcall (arg1,
98
+ rb_intern ("address"),
99
+ 0);
100
+ objc_object = (id) NUM2ULONG (rb_objc_pointer);
101
+ }
102
+ else
103
+ {
104
+ rb_raise (rb_eArgError,
105
+ "invalid argument (expect "
106
+ "(width, height), "
107
+ "(format, width, height), "
108
+ "(cg_context, width, height) or "
109
+ "(ffi_pointer, width, height)): %s",
110
+ rb_cairo__inspect (rb_ary_new3 (3, arg1, arg2, arg3)));
111
+ }
112
+ }
113
+ break;
114
+ }
115
+
116
+ rb_width = arg2;
117
+ rb_height = arg3;
118
+ }
119
+
120
+ width = NUM2UINT (rb_width);
121
+ height = NUM2UINT (rb_height);
122
+
123
+ if (objc_object == nil)
124
+ {
125
+ surface = cairo_quartz_surface_create (format, width, height);
126
+ }
127
+ else
128
+ {
129
+ context = (CGContextRef)objc_object;
130
+ surface =
131
+ cairo_quartz_surface_create_for_cg_context (context, width, height);
132
+ }
133
+
134
+ rb_cairo_surface_check_status (surface);
135
+ DATA_PTR (self) = surface;
136
+ if (rb_block_given_p ())
137
+ rb_cairo__surface_yield_and_finish (self);
138
+ return Qnil;
139
+ }
140
+
141
+ static VALUE
142
+ cr_quartz_surface_get_cg_context (VALUE self)
143
+ {
144
+ # ifdef HAVE_RUBY_COCOA
145
+ CGContextRef context;
146
+ id objc_object;
147
+
148
+ context = cairo_quartz_surface_get_cg_context (_SELF);
149
+ objc_object = (id)context;
150
+ return ocid_to_rbobj (Qnil, objc_object);
151
+ # else
152
+ rb_raise (rb_eNotImpError,
153
+ "%s#cg_context requires RubyCocoa",
154
+ rb_obj_classname(self));
155
+ return Qnil;
156
+ # endif
157
+ }
158
+ #endif
159
+
160
+ #ifdef RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
161
+
162
+ /* Quartz image surface functions */
163
+ static VALUE
164
+ cr_quartz_image_surface_initialize (VALUE self, VALUE image_surface)
165
+ {
166
+ cairo_surface_t *surface;
167
+
168
+ surface = cairo_quartz_image_surface_create (RVAL2CRSURFACE (image_surface));
169
+ rb_cairo_surface_check_status (surface);
170
+ DATA_PTR (self) = surface;
171
+ if (rb_block_given_p ())
172
+ rb_cairo__surface_yield_and_finish (self);
173
+ return Qnil;
174
+ }
175
+
176
+ static VALUE
177
+ cr_quartz_image_surface_get_image (VALUE self)
178
+ {
179
+ cairo_surface_t *surface;
180
+
181
+ surface = cairo_quartz_image_surface_get_image (_SELF);
182
+ if (!surface)
183
+ return Qnil;
184
+ rb_cairo_surface_check_status (surface);
185
+ return CRSURFACE2RVAL (surface);
186
+ }
187
+ #endif
188
+
189
+ void
190
+ Init_cairo_quartz_surface (void)
191
+ {
192
+ /* Quartz surface */
193
+ #ifdef RB_CAIRO_HAS_QUARTZ_SURFACE
194
+ rb_define_method (rb_cCairo_QuartzSurface, "initialize",
195
+ cr_quartz_surface_initialize, -1);
196
+ rb_define_method (rb_cCairo_QuartzSurface, "cg_context",
197
+ cr_quartz_surface_get_cg_context, 0);
198
+ #endif
199
+
200
+ /* Quartz image surface */
201
+ #ifdef RB_CAIRO_HAS_QUARTZ_IMAGE_SURFACE
202
+ rb_define_method (rb_cCairo_QuartzImageSurface, "initialize",
203
+ cr_quartz_image_surface_initialize, 1);
204
+ rb_define_method (rb_cCairo_QuartzImageSurface, "image",
205
+ cr_quartz_image_surface_get_image, 0);
206
+ #endif
207
+ }
data/lib/2.0/cairo.so CHANGED
Binary file
data/lib/2.1/cairo.so CHANGED
Binary file
data/lib/2.2/cairo.so CHANGED
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
@@ -17,7 +17,7 @@ old_library='libcairo-gobject.a'
17
17
  inherited_linker_flags=' -pthread'
18
18
 
19
19
  # Libraries that this one depends upon.
20
- dependency_libs=' -R/home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib -L/home/vagrant/rcairo.win64/vendor/local/lib /home/vagrant/rcairo.win64/vendor/local/lib/libcairo.la /home/vagrant/rcairo.win64/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo.win64/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo.win64/vendor/local/lib/libxml2.la /home/vagrant/rcairo.win64/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win64/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz -L/home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libffi.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libiconv.la -lpthread'
20
+ dependency_libs=' -R/home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib -L/home/vagrant/rcairo.win64/vendor/local/lib /home/vagrant/rcairo.win64/vendor/local/lib/libcairo.la -lpthread /home/vagrant/rcairo.win64/vendor/local/lib/libpixman-1.la /home/vagrant/rcairo.win64/vendor/local/lib/libfontconfig.la /home/vagrant/rcairo.win64/vendor/local/lib/libxml2.la /home/vagrant/rcairo.win64/vendor/local/lib/libfreetype.la /home/vagrant/rcairo.win64/vendor/local/lib/libpng16.la -lgdi32 -lmsimg32 -lz -L/home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libgobject-2.0.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libffi.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libglib-2.0.la -lws2_32 -lole32 -lwinmm -lshlwapi /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libintl.la /home/vagrant/ruby-gnome2.win64/glib2/vendor/local/lib/libiconv.la'
21
21
 
22
22
  # Names of additional weak libraries provided by this library
23
23
  weak_library_names=''
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cairo
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.14.2
4
+ version: 1.14.3
5
5
  platform: x64-mingw32
6
6
  authors:
7
7
  - Kouhei Sutou
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-06 00:00:00.000000000 Z
11
+ date: 2015-09-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pkg-config
@@ -115,6 +115,7 @@ files:
115
115
  - ext/cairo/rb_cairo_pattern.c
116
116
  - ext/cairo/rb_cairo_private.c
117
117
  - ext/cairo/rb_cairo_private.h
118
+ - ext/cairo/rb_cairo_quartz_surface.c
118
119
  - ext/cairo/rb_cairo_rectangle.c
119
120
  - ext/cairo/rb_cairo_region.c
120
121
  - ext/cairo/rb_cairo_scaled_font.c
@@ -751,28 +752,28 @@ signing_key:
751
752
  specification_version: 4
752
753
  summary: Ruby bindings for cairo
753
754
  test_files:
754
- - test/test_quartz_image_surface.rb
755
- - test/test_tee_surface.rb
756
- - test/test_font_options.rb
757
- - test/test_scaled_font.rb
755
+ - test/test_text_extents.rb
758
756
  - test/test_xml_surface.rb
759
- - test/test_context.rb
760
- - test/test_script_device.rb
761
- - test/test_text_to_glyphs_data.rb
762
- - test/test_font_face.rb
763
- - test/test_image_surface.rb
764
- - test/test_raster_source_pattern.rb
765
757
  - test/test_region.rb
766
- - test/cairo-test-utils.rb
767
- - test/test_surface.rb
758
+ - test/test_color.rb
759
+ - test/test_constants.rb
760
+ - test/test_raster_source_pattern.rb
761
+ - test/test_script_surface.rb
762
+ - test/test_xml_device.rb
768
763
  - test/run-test.rb
769
- - test/test_recording_surface.rb
764
+ - test/test_tee_surface.rb
770
765
  - test/test_paper.rb
771
- - test/test_font_extents.rb
772
- - test/test_text_extents.rb
773
- - test/test_xml_device.rb
766
+ - test/test_script_device.rb
767
+ - test/test_scaled_font.rb
768
+ - test/test_recording_surface.rb
774
769
  - test/test_exception.rb
775
- - test/test_color.rb
776
- - test/test_constants.rb
770
+ - test/test_font_extents.rb
771
+ - test/test_quartz_image_surface.rb
772
+ - test/cairo-test-utils.rb
773
+ - test/test_image_surface.rb
774
+ - test/test_surface.rb
775
+ - test/test_font_face.rb
776
+ - test/test_font_options.rb
777
+ - test/test_text_to_glyphs_data.rb
777
778
  - test/test_text_cluster.rb
778
- - test/test_script_surface.rb
779
+ - test/test_context.rb