cairo 1.8.3 → 1.8.4

data/NEWS

@@ -1,3 +1,17 @@
+Release 1.8.4 (2010-08-27) Kouhei Sutou <kou@cozmixng.org>)
+===========================================================
+
+Fixes
+-----
+  * Fix build system. (patch by kimura watasu and suggested by OBATA Akio)
+  * Fix Windows gem. (reported by Dominic Sisneros)
+
+Thanks
+------
+  * Dominic Sisneros
+  * kimura wataru
+  * OBATA Akio
+
 Release 1.8.3 (2010-08-26) Kouhei Sutou <kou@cozmixng.org>)
 ===========================================================
 

data/Rakefile

@@ -91,10 +91,9 @@ project.spec.dependencies.delete_if {|dependency| dependency.name == "hoe"}
 
 Rake::ExtensionTask.new("cairo", project.spec) do |ext|
   ext.cross_compile = true
-  ext.cross_platform = 'x86-mingw32'
 end
 
-if /mswin32/ =~ project.spec.platform.to_s
+task :add_win32_binaries do
   cairo_win32_dir = File.join(base_dir, "vendor", "local")
   cairo_files = []
   Find.find(cairo_win32_dir) do |f|
@@ -102,6 +101,7 @@ if /mswin32/ =~ project.spec.platform.to_s
   end
   project.spec.files += cairo_files
 end
+task :cross => :add_win32_binaries
 
 # fix Hoe's incorrect guess.
 project.spec.executables.clear

data/doc/doc.css

@@ -0,0 +1,91 @@
+body
+{
+  background-color: white;
+  margin: 1em;
+}
+
+h1
+{
+  background-image: url(rcairo-title.png);
+  background-repeat: no-repeat;
+  background-position: right top;
+  padding-top: 50px;
+}
+
+h2
+{
+  border-top: solid 1px black;
+  padding-top: 0.5em;
+}
+
+body > ul > li
+{
+  line-height: 150%;
+}
+
+code
+{
+  font: monospace;
+  font-style: italic;
+}
+
+dt
+{
+  margin-bottom: 1em;
+  margin: 1.5em;
+}
+
+dt code
+{
+  font-weight: bold;
+  padding: 0.5em;
+  background: #eeeeee;
+  border: solid 1px #aaaaaa;
+}
+
+dd
+{
+  margin-bottom: 2em;
+  line-height: 150%;
+  padding: 1em;
+  padding-top: 0em;
+  border-bottom: 1px solid #ffaaaa;
+  border-right: 2px solid #ffaaaa;
+}
+
+pre
+{
+  background: #ffeeee;
+  border: solid 1px #ffaaaa;
+  padding: 0.5em;
+  margin-left: 1em;
+  font: monospace;
+}
+
+em
+{
+  color: #cb2327;
+  font-weight: bold;
+}
+
+div.header,
+div.footer
+{
+  background: #ffeeee;
+  border: solid 1px #ffaaaa;
+}
+
+div.header ul,
+div.footer ul
+{
+  padding-left: 1em;
+}
+
+div.header ul li,
+div.footer ul li
+{
+  display: inline;
+  background: #eeeeee;
+  border: solid 1px #aaaaaa;
+  padding: 0.5em 1em;
+}

data/ext/cairo/rb_cairo.c

@@ -76,7 +76,7 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (8), INT2FIX (3), Qnil));
+                                INT2FIX (1), INT2FIX (8), INT2FIX (4), Qnil));
 
   rb_define_module_function (rb_mCairo, "satisfied_version?",
                              rb_cairo_satisfied_version, -1);

data/extconf.rb

@@ -13,7 +13,7 @@ ruby = File.join(RbConfig::CONFIG['bindir'],
                  RbConfig::CONFIG["EXEEXT"])
 
 Dir.chdir(ext_dir.to_s) do
-  system(ruby, "extconf.rb")
+  system(ruby, "extconf.rb", *ARGV) || exit(false)
 end
 
 create_makefile("cairo")
@@ -22,24 +22,24 @@ FileUtils.mv("Makefile", "Makefile.lib")
 File.open("Makefile", "w") do |makefile|
   makefile.puts(<<-EOM)
 all:
-	$(MAKE) $(MAKEFLAGS) -C ext/cairo
-	$(MAKE) $(MAKEFLAGS) -f Makefile.lib
+	(cd ext/cairo && $(MAKE))
+	$(MAKE) -f Makefile.lib
 
 install:
-	$(MAKE) $(MAKEFLAGS) -C ext/cairo install
-	$(MAKE) $(MAKEFLAGS) -f Makefile.lib install
+	(cd ext/cairo && $(MAKE) install)
+	$(MAKE) -f Makefile.lib install
 
 site-install:
-	$(MAKE) $(MAKEFLAGS) -C ext/cairo site-install
-	$(MAKE) $(MAKEFLAGS) -f Makefile.lib site-install
+	(cd ext/cairo && $(MAKE) site-install)
+	$(MAKE) -f Makefile.lib site-install
 
 clean:
-	$(MAKE) $(MAKEFLAGS) -C ext/cairo clean
-	$(MAKE) $(MAKEFLAGS) -f Makefile.lib clean
+	(cd ext/cairo && $(MAKE) clean)
+	$(MAKE) -f Makefile.lib clean
 
 distclean:
-	$(MAKE) $(MAKEFLAGS) -C ext/cairo distclean
-	$(MAKE) $(MAKEFLAGS) -f Makefile.lib distclean
+	(cd ext/cairo && $(MAKE) distclean)
+	$(MAKE) -f Makefile.lib distclean
 	@rm -f Makefile.lib
 EOM
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cairo
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: false
   segments: 
   - 1
   - 8
-  - 3
-  version: 1.8.3
+  - 4
+  version: 1.8.4
 platform: ruby
 authors: 
 - Evan Marin
@@ -18,25 +18,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +09:00
+date: 2010-08-28 00:00:00 +09:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id001
+dependencies: []
+
 description: Ruby bindings for cairo
 email: 
 - cairo@cairographics.org
@@ -52,6 +37,7 @@ files:
 - GPL
 - NEWS
 - Rakefile
+- doc/doc.css
 - ext/cairo/cairo.def
 - ext/cairo/extconf.rb
 - ext/cairo/rb_cairo.c