cairo 1.12.2-x86-mingw32 → 1.12.3-x86-mingw32

data/NEWS

@@ -1,5 +1,20 @@
-Release 1.12.2 (2012-06-03) Kouhei Sutou <kou@cozmixng.org>)
-============================================================
+Release 1.12.3 (2012-12-04) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
+
+Improvements
+------------
+
+  * Supported Ruby 2.0.0.
+    [Reported by tmtms]
+  * Supported auto native package install by Homebrew and MacPorts.
+
+Thanks
+------
+
+  * tmtms
+
+Release 1.12.2 (2012-06-03) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
 
 Improvements
 ------------
@@ -21,8 +36,8 @@ Thanks
   * Cédric Boutillier
   * Mamoru Tasaka
 
-Release 1.12.1 (2012-03-31) Kouhei Sutou <kou@cozmixng.org>)
-============================================================
+Release 1.12.1 (2012-03-31) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
 
 Improvements
 ------------
@@ -40,8 +55,8 @@ Thanks
 
   * Eric C.
 
-Release 1.12.0 (2012-03-25) Kouhei Sutou <kou@cozmixng.org>)
-============================================================
+Release 1.12.0 (2012-03-25) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
 
 Improvements
 ------------
@@ -68,8 +83,8 @@ Thanks
 
   * Vasily Fedoseyev
 
-Release 1.10.2 (2011-11-20) Kouhei Sutou <kou@cozmixng.org>)
-============================================================
+Release 1.10.2 (2011-11-20) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
 
 Fixes
 -----
@@ -81,8 +96,8 @@ Thanks
 
   * Will Bryant
 
-Release 1.10.1 (2011-10-12) Kouhei Sutou <kou@cozmixng.org>)
-============================================================
+Release 1.10.1 (2011-10-12) Kouhei Sutou <kou@cozmixng.org>
+===========================================================
 
 Features
 --------
@@ -106,7 +121,7 @@ Thanks
   * Matt Bramlage
   * Nikolai Weibull
 
-Release 1.10.0 (2010-09-12) Kouhei Sutou <kou@cozmixng.org>)
+Release 1.10.0 (2010-09-12) Kouhei Sutou <kou@cozmixng.org>
 ===========================================================
 
 Features
@@ -114,8 +129,8 @@ Features
 
   * Support cairo 1.10.0.
 
-Release 1.8.5 (2010-08-28) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.8.5 (2010-08-28) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Fixes
 -----
@@ -129,8 +144,8 @@ Thanks
   * OBATA Akio
   * Masaya TARUI
 
-Release 1.8.3 (2010-08-26) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.8.3 (2010-08-26) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
@@ -145,24 +160,24 @@ Thanks
   * Tasuku SUENAGA
   * kimura wataru
 
-Release 1.8.1 (2009-12-13) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.8.1 (2009-12-13) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
   * Support cairo 1.8.8.
   * Improve auto .pc detection.
 
-Release 1.8.0 (2008-09-26) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.8.0 (2008-09-26) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
   * Support cairo 1.8.0.
   * Resupport cairo 1.2.x. (reported by Yusuke ENDOH)
 
-Release 1.7.0 (2008-08-17) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.7.0 (2008-08-17) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
@@ -174,8 +189,8 @@ Features
   * Resupport ruby 1.9. (suggested by Paul van Tilburg)
   * Fix README. (suggested by Davide Rambaldi)
 
-Release 1.6.3 (2008-07-19) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.6.3 (2008-07-19) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
@@ -184,8 +199,8 @@ Features
   * Improve building on MacOS X. (suggested by Carsten Bormann)
   * Fix install location of cairo.so. (suggested by OBATA Akio)
 
-Release 1.6.2 (2008-06-14) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.6.2 (2008-06-14) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
@@ -194,8 +209,8 @@ Features
   * Fix build failure with old Ruby.
   * Fix build failure with Ruby 1.9.
 
-Release 1.6.1 (2008-04-24) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.6.1 (2008-04-24) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
@@ -203,8 +218,8 @@ Features
   * Support PKG_CONFIG_LIBDIR. (thanks to OBATA Akio)
   * Support RubyGems for mswin32.
 
-Release 1.6.0 (2008-04-11) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.6.0 (2008-04-11) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
@@ -217,8 +232,8 @@ Features
     * Improve size specification of Cairo::PSSurface,
       Cairo::PDFSurface, Cairo::SVGSurface.
 
-Release 1.5.1 (2008-01-11) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.5.1 (2008-01-11) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Features
 --------
@@ -231,8 +246,8 @@ Features
     * Cairo::WIN32Surface is still available for backward compatibility but
       don't use in newly written code.
 
-Release 1.5.0 (2007-05-27) Kouhei Sutou <kou@cozmixng.org>)
-===========================================================
+Release 1.5.0 (2007-05-27) Kouhei Sutou <kou@cozmixng.org>
+==========================================================
 
 Many API improvement.
 

data/README.rdoc

@@ -111,7 +111,10 @@ http://cairographics.org/cgi-bin/mailman/listinfo/cairo
 * Masayas TARUI:
   * Windows support.
 * Stefan Salewski: reports a bug.
-* Mamoru Tasaka: reports a bug.
+* Mamoru Tasaka: reports bugs.
 * Nikolai Weibull: reports problems.
 * Will Bryant: reports a bug.
 * Vasily Fedoseyev: fixes a bug.
+* Eric C.: reports a bug.
+* Cédric Boutillier: reports a bug.
+* tmtms: reports a bug.

data/Rakefile

@@ -27,11 +27,7 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar_gz = true
 end
 
-document_task = Packnga::DocumentTask.new(spec) do |t|
-  t.yard do |yard_task|
-    yard_task.files += FileList["ext/**/*.c"]
-    # yard_task.options += ["--markup", "textile"]
-  end
+Packnga::DocumentTask.new(spec) do |task|
 end
 
 Packnga::ReleaseTask.new(spec) do |task|
@@ -58,12 +54,12 @@ task 'cross' => "download_windows_binaries"
 def download_windows_binaries(binary_dir)
   base_url = "http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/"
   dependencies = [
-                  ["cairo", "1.10.2-1"],
-                  ["libpng", "1.4.3-1"],
+                  ["cairo", "1.10.2-2"],
+                  ["libpng", "1.4.12-1"],
                   ["zlib", "1.2.5-2"],
-                  ["expat", "2.0.1-1"],
+                  ["expat", "2.1.0-1"],
                   ["fontconfig", "2.8.0-2"],
-                  ["freetype", "2.4.2-1"],
+                  ["freetype", "2.4.10-1"],
                  ]
   dependencies.each do |name, version|
     ["", "-dev"].each do |suffix|

data/ext/cairo/depend

@@ -1,2 +1,3 @@
-install-so:
+install-so: install-headers
+install-headers:
 	$(INSTALL_DATA) $(srcdir)/rb_cairo.h $(RUBYARCHDIR)

data/ext/cairo/extconf.rb

@@ -186,7 +186,9 @@ end
 
 unless required_pkg_config_package([package, major, minor, micro],
                                    :debian => "libcairo2-dev",
-                                   :redhat => "cairo-devel")
+                                   :redhat => "cairo-devel",
+                                   :homebrew => "cairo",
+                                   :macports => "cairo")
   exit(false)
 end
 

data/ext/cairo/rb_cairo.h

@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 12
-#define RB_CAIRO_VERSION_MICRO 2
+#define RB_CAIRO_VERSION_MICRO 3
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/vendor/local/bin/freetype-config

@@ -72,7 +72,7 @@ while test $# -gt 0 ; do
     echo_exec_prefix=yes
     ;;
   --version)
-    echo 12.0.6
+    echo 15.0.9
     exit 0
     ;;
   --ftversion)
@@ -144,7 +144,7 @@ if test "$echo_libs" = "yes" ; then
   if test "$enable_shared" = "yes" ; then
     eval "rpath=\"$hardcode_libdir_flag_spec\""
   fi
-  libs="-lfreetype  "
+  libs="-lfreetype   "
   if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
     echo -L${SYSROOT}$libdir $libs
   else

data/vendor/local/include/expat.h

@@ -742,6 +742,29 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
 XMLPARSEAPI(int)
 XML_GetIdAttributeIndex(XML_Parser parser);
 
+#ifdef XML_ATTR_INFO
+/* Source file byte offsets for the start and end of attribute names and values.
+   The value indices are exclusive of surrounding quotes; thus in a UTF-8 source
+   file an attribute value of "blah" will yield:
+   info->valueEnd - info->valueStart = 4 bytes.
+*/
+typedef struct {
+  XML_Index  nameStart;  /* Offset to beginning of the attribute name. */
+  XML_Index  nameEnd;    /* Offset after the attribute name's last byte. */
+  XML_Index  valueStart; /* Offset to beginning of the attribute value. */
+  XML_Index  valueEnd;   /* Offset after the attribute value's last byte. */
+} XML_AttrInfo;
+
+/* Returns an array of XML_AttrInfo structures for the attribute/value pairs
+   passed in last call to the XML_StartElementHandler that were specified
+   in the start-tag rather than defaulted. Each attribute/value pair counts
+   as 1; thus the number of entries in the array is
+   XML_GetSpecifiedAttributeCount(parser) / 2.
+*/
+XMLPARSEAPI(const XML_AttrInfo *)
+XML_GetAttributeInfo(XML_Parser parser);
+#endif
+
 /* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
    detected.  The last call to XML_Parse must have isFinal true; len
    may be zero for this call (or any other).
@@ -883,6 +906,15 @@ XMLPARSEAPI(int)
 XML_SetParamEntityParsing(XML_Parser parser,
                           enum XML_ParamEntityParsing parsing);
 
+/* Sets the hash salt to use for internal hash calculations.
+   Helps in preventing DoS attacks based on predicting hash
+   function behavior. This must be called before parsing is started.
+   Returns 1 if successful, 0 when called after parsing has started.
+*/
+XMLPARSEAPI(int)
+XML_SetHashSalt(XML_Parser parser,
+                unsigned long hash_salt);
+
 /* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
    XML_GetErrorCode returns information about the error.
 */
@@ -984,7 +1016,8 @@ enum XML_FeatureEnum {
   XML_FEATURE_SIZEOF_XML_CHAR,
   XML_FEATURE_SIZEOF_XML_LCHAR,
   XML_FEATURE_NS,
-  XML_FEATURE_LARGE_SIZE
+  XML_FEATURE_LARGE_SIZE,
+  XML_FEATURE_ATTR_INFO
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1004,8 +1037,8 @@ XML_GetFeatureList(void);
    change to major or minor version.
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 0
-#define XML_MICRO_VERSION 1
+#define XML_MINOR_VERSION 1
+#define XML_MICRO_VERSION 0
 
 #ifdef __cplusplus
 }

data/vendor/local/include/freetype2/freetype/config/ftconfig.h

@@ -5,7 +5,7 @@
 /*                                                                         */
 /*    UNIX-specific configuration file (specification only).               */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by       */
+/*  Copyright 1996-2004, 2006-2009, 2011 by                                */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -118,10 +118,6 @@ FT_BEGIN_HEADER
 #endif /* !FT_USE_AUTOCONF_SIZEOF_TYPES */
 
 
-  /* Preferred alignment of data */
-#define FT_ALIGNMENT  8
-
-
   /* FT_UNUSED is a macro used to indicate that a given parameter is not  */
   /* used -- this is only used to get rid of unpleasant compiler warnings */
 #ifndef FT_UNUSED
@@ -147,15 +143,17 @@ FT_BEGIN_HEADER
   /*   This is the only necessary change, so it is defined here instead    */
   /*   providing a new configuration file.                                 */
   /*                                                                       */
-#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
-    ( defined( __MWERKS__ ) && defined( macintosh )        )
+#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
   /* no Carbon frameworks for 64bit 10.4.x */
+  /* AvailabilityMacros.h is available since Mac OS X 10.2,        */
+  /* so guess the system version by maximum errno before inclusion */
+#include <errno.h>
+#ifdef ECANCELED /* defined since 10.2 */
 #include "AvailabilityMacros.h"
+#endif
 #if defined( __LP64__ ) && \
     ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
-#define DARWIN_NO_CARBON 1
-#else
-#define FT_MACINTOSH 1
+#undef FT_MACINTOSH
 #endif
 
 #elif defined( __SC__ ) || defined( __MRC__ )
@@ -287,11 +285,42 @@ FT_BEGIN_HEADER
   /* Provide assembler fragments for performance-critical functions. */
   /* These must be defined `static __inline__' with GCC.             */
 
+#if defined( __CC_ARM ) || defined( __ARMCC__ )  /* RVCT */
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
+
+  /* documentation is in freetype.h */
+
+  static __inline FT_Int32
+  FT_MulFix_arm( FT_Int32  a,
+                 FT_Int32  b )
+  {
+    register FT_Int32  t, t2;
+
+
+    __asm
+    {
+      smull t2, t,  b,  a           /* (lo=t2,hi=t) = a*b */
+      mov   a,  t,  asr #31         /* a   = (hi >> 31) */
+      add   a,  a,  #0x8000         /* a  += 0x8000 */
+      adds  t2, t2, a               /* t2 += a */
+      adc   t,  t,  #0              /* t  += carry */
+      mov   a,  t2, lsr #16         /* a   = t2 >> 16 */
+      orr   a,  a,  t,  lsl #16     /* a  |= t << 16 */
+    }
+    return a;
+  }
+
+#endif /* __CC_ARM || __ARMCC__ */
+
+
 #ifdef __GNUC__
 
-#if defined( __arm__ ) && !defined( __thumb__ )
+#if defined( __arm__ ) && !defined( __thumb__ )    && \
+    !( defined( __CC_ARM ) || defined( __ARMCC__ ) )
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_arm
 
+  /* documentation is in freetype.h */
+
   static __inline__ FT_Int32
   FT_MulFix_arm( FT_Int32  a,
                  FT_Int32  b )
@@ -312,11 +341,13 @@ FT_BEGIN_HEADER
     return a;
   }
 
-#endif /* __arm__ && !__thumb__ */
+#endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */
 
 #if defined( __i386__ )
 #define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
 
+  /* documentation is in freetype.h */
+
   static __inline__ FT_Int32
   FT_MulFix_i386( FT_Int32  a,
                   FT_Int32  b )
@@ -334,9 +365,9 @@ FT_BEGIN_HEADER
       "shrl  $16, %%eax\n"
       "shll  $16, %%edx\n"
       "addl  %%edx, %%eax\n"
-      : "=a"(result), "+d"(b)
-      : "a"(a)
-      : "%ecx" );
+      : "=a"(result), "=d"(b)
+      : "a"(a), "d"(b)
+      : "%ecx", "cc" );
     return result;
   }
 
@@ -344,6 +375,43 @@ FT_BEGIN_HEADER
 
 #endif /* __GNUC__ */
 
+
+#ifdef _MSC_VER /* Visual C++ */
+
+#ifdef _M_IX86
+
+#define FT_MULFIX_ASSEMBLER  FT_MulFix_i386
+
+  /* documentation is in freetype.h */
+
+  static __inline FT_Int32
+  FT_MulFix_i386( FT_Int32  a,
+                  FT_Int32  b )
+  {
+    register FT_Int32  result;
+
+    __asm
+    {
+      mov eax, a
+      mov edx, b
+      imul edx
+      mov ecx, edx
+      sar ecx, 31
+      add ecx, 8000h
+      add eax, ecx
+      adc edx, 0
+      shr eax, 16
+      shl edx, 16
+      add eax, edx
+      mov result, eax
+    }
+    return result;
+  }
+
+#endif /* _M_IX86 */
+
+#endif /* _MSC_VER */
+
 #endif /* !FT_CONFIG_OPTION_NO_ASSEMBLER */