[DRE-commits] [ruby-cairo] 03/13: New upstream version 1.14.1

[Daisuke Higuchi]

This is an automated email from the git hooks/post-receive script.

dai pushed a commit to branch master
in repository ruby-cairo.

commit d94cb7f8a164c70b4c4b3347393d89645598006f
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Wed Oct 26 12:41:36 2016 +0900

    New upstream version 1.14.1
---
 .dir-locals.el         |  3 +++
 NEWS                   | 12 ++++++++++++
 Rakefile               | 18 ++++++++++++++----
 build/build-windows.sh |  2 +-
 ext/cairo/rb_cairo.h   |  2 +-
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000..5a5e53b
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,3 @@
+((sh-mode .  ((indent-tabs-mode . nil)
+              (sh-indentation   . 2)
+              (sh-basic-offset  . 2))))
diff --git a/NEWS b/NEWS
index 004d6fd..92a790a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Release 1.14.1 (2014-12-23) Kouhei Sutou <kou at cozmixng.org>
+===========================================================
+
+Windows users must upgrade. Non Windows users doesn't need to
+upgrade.
+
+Improvements
+------------
+
+ * Upgraded bundled libraries for Windows. libpng is upgraded to
+   1.6.16 from 1.6.14. libpng 1.6.14 has vulnerability.
+
 Release 1.14.0 (2014-11-24) Kouhei Sutou <kou at cozmixng.org>
 ===========================================================
 
diff --git a/Rakefile b/Rakefile
index d325f18..7af9004 100644
--- a/Rakefile
+++ b/Rakefile
@@ -450,16 +450,16 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "libpng",
-      :version => "1.6.14",
-      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.14",
+      :version => "1.6.16",
+      :download_base_url => "http://sourceforge.net/projects/libpng/files/libpng16/1.6.16",
       :windows => {
         :built_file => "bin/libpng16-16.dll",
       },
     },
     {
       :name => "freetype",
-      :version => "2.5.3",
-      :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.3",
+      :version => "2.5.4",
+      :download_base_url => "http://sourceforge.net/projects/freetype/files/freetype2/2.5.4",
       :compression_method => "bz2",
       :windows => {
         :built_file => "bin/libfreetype-6.dll",
@@ -609,6 +609,16 @@ file "Makefile" => ["extconf.rb", "ext/cairo/extconf.rb"] do
   ruby("extconf.rb")
 end
 
+namespace :make do
+  namespace :debug_flags do
+    task :reset do
+      ENV["MAKE"] ||= "make debugflags="
+    end
+  end
+end
+
+task :cross => "make:debug_flags:reset"
+
 desc "Configure"
 task :configure => "Makefile"
 
diff --git a/build/build-windows.sh b/build/build-windows.sh
index 4d0e257..090b41a 100755
--- a/build/build-windows.sh
+++ b/build/build-windows.sh
@@ -101,4 +101,4 @@ run rake windows:build
 run rake cross compile native gem
 
 run mkdir -p /vagrant/pkg
-run cp */pkg/*.gem /vagrant/pkg/
+run cp pkg/*.gem /vagrant/pkg/
diff --git a/ext/cairo/rb_cairo.h b/ext/cairo/rb_cairo.h
index a9e05a3..7791454 100644
--- a/ext/cairo/rb_cairo.h
+++ b/ext/cairo/rb_cairo.h
@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 14
-#define RB_CAIRO_VERSION_MICRO 0
+#define RB_CAIRO_VERSION_MICRO 1
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-cairo.git