pango 3.1.0-x64-mingw32 → 3.1.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2903f89f3660a9da848734f1b2e5d8d07e4c20bd
-  data.tar.gz: 5952f73f0801d48a706052eaf847cf72b21056cd
+  metadata.gz: 47b7b16a50b31ec114660d7220904f4cae1dab87
+  data.tar.gz: 8a2281ebd64a185e0991c1f0d27f91260f04fde0
 SHA512:
-  metadata.gz: c621a8f204cca5f40047c203aeea8f14344a2c8da54ab75e31ffbca0cbee990ae969c657ee9c2cba6f692da0ceafdf6eb32238b27c92bdbd1fc4b2540512bd4a
-  data.tar.gz: b41667a58a11d6ba041f70a313642c91b8e6bfd935c088c1cf9f9fe358ec15bdbcec4caa95ef9f3ec9a4932af58746a661a7d4cb947465481ca86300d8baf4c2
+  metadata.gz: 03b3bb92263f23a3df8801a54916a467461c0df3708e081a9b6bcd8c1284dfc2e0f7c04ef8c216bd957ebb1bb39128ed25e579560cd12eac115434818fe3bd91
+  data.tar.gz: 4cd4b0ea636251809b6bb4cd97abfc91a1e7939afb9cd12e3bf1bda15c4556a697087a2eb29feb01d128dcc9a64c6e959bbe626059b0fc3fc31ff3b90d09f446

data/Rakefile

@@ -29,15 +29,20 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   package.external_packages = [
     {
       :name => "icu",
-      :download_base_url => "http://download.icu-project.org/files/icu4c/57.1",
-      :label => "gobject-introspection",
+      :download_site => :icu,
+      :label => "ICU",
+      :version => "58.2",
       :base_name => "icu",
-      :archive_base_name => "icu4c-57_1-src.tgz",
+      :archive_base_name => lambda do |package|
+        archive_base_name_version = package.version.gsub(".", "_")
+        "icu4c-#{archive_base_name_version}-src.tgz"
+      end,
       :compression_method => "gz",
       :base_dir_in_package => "source",
       :windows => {
         :configure_args => [
           "--with-cross-build=#{package.package.tmp_dir}/native/icu/icu/source",
+          "CPPFLAGS=-DU_USE_STRTOD_L=0",
         ],
         :built_file => "bin/icu-config",
       },
@@ -50,7 +55,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "harfbuzz",
       :download_site => :freedesktop,
       :label => "HarfBuzz",
-      :version => "1.3.3",
+      :version => "1.4.1",
       :compression_method => "bz2",
       :windows => {
         :configure_args => [

data/ext/pango/rbpangolayoutline.c

@@ -58,11 +58,15 @@ rg_index_to_x(VALUE self, VALUE index, VALUE trailing)
 static VALUE
 rg_x_to_index(VALUE self, VALUE x_pos)
 {
-    int index, trailing;
+    int index = 0;
+    int trailing = 0;
 
     gboolean ret = pango_layout_line_x_to_index(_SELF(self), NUM2INT(x_pos),
                                                 &index, &trailing);
-    return rb_ary_new3(CBOOL2RVAL(ret), INT2NUM(index), INT2NUM(trailing));
+    return rb_ary_new_from_args(3,
+                                CBOOL2RVAL(ret),
+                                INT2NUM(index),
+                                INT2NUM(trailing));
 }
 
 static VALUE

data/sample/layout.rb

@@ -14,7 +14,7 @@ require 'pp'
 puts
 puts "Start----------"
 puts
-str = File.read("sample.txt")
+str = File.read(File.join(__dir__, "sample.txt"))
 context = Gdk::Pango.context
 context.base_dir = Pango::Context::DIRECTION_LTR
 context.language = Pango::Language.new("ja_JP")

data/vendor/local/bin/icu-config

@@ -2,6 +2,8 @@
 ## -*-sh-*-
 #set -x
 # BEGIN of icu-config-top
+# Copyright (C) 2016 and later: Unicode, Inc. and others.
+# License & terms of use: http://www.unicode.org/copyright.html
 #******************************************************************************
 #   Copyright (C) 1999-2013, International Business Machines
 #   Corporation and others.  All Rights Reserved.
@@ -23,6 +25,8 @@ loaddefs()
 {
 
 # Following from ./config/mh-mingw64
+# Copyright (C) 2016 and later: Unicode, Inc. and others.
+# License & terms of use: http://www.unicode.org/copyright.html
 ## -*-makefile-*-
 #******************************************************************************
 #   Copyright (C) 1999-2014, International Business Machines
@@ -60,8 +64,8 @@ datadir="${datarootdir}"
 sbindir="${exec_prefix}/sbin"
 
 # about the ICU version
-VERSION="57.1"
-UNICODE_VERSION="8.0"
+VERSION="58.2"
+UNICODE_VERSION="9.0"
 
 # The prefix for ICU libraries, normally 'icu'
 ICUPREFIX="icu"
@@ -114,7 +118,6 @@ esac
 DATA_STUBNAME="data"
 COMMON_STUBNAME="uc"
 I18N_STUBNAME="i18n"
-LAYOUT_STUBNAME="le"
 LAYOUTEX_STUBNAME="lx"
 IO_STUBNAME="io"
 TOOLUTIL_STUBNAME="tu"
@@ -126,7 +129,6 @@ CTESTFW_STUBNAME="test"
 # 2. link with ${ICULIBS}
 # 3. optionally, add one or more of:
 #    - ${ICULIBS_I18N}    - i18n library, formatting, etc.
-#    - ${ICULIBS_LAYOUT}  - ICU layout library. 
 #    - ${ICULIBS_ICUIO}   - ICU stdio equivalent library
 
 ICULIBS_COMMON="-l${ICUPREFIX}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
@@ -136,7 +138,6 @@ ICULIBS_TOOLUTIL="-l${ICUPREFIX}tu${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
 ICULIBS_CTESTFW="-l${ICUPREFIX}ctestfw${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
 ICULIBS_ICUIO="-l${ICUPREFIX}io${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
 ICULIBS_OBSOLETE="-l${ICUPREFIX}obsolete${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
-ICULIBS_LAYOUT="-l${ICUPREFIX}le${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
 ICULIBS_LAYOUTEX="-l${ICUPREFIX}lx${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
 ICULIBS_BASE="-L${libdir}"
 
@@ -211,7 +212,7 @@ CPPFLAGS="-I${prefix}/include"
 CXXFLAGS="--std=c++0x"
 CXX="x86_64-w64-mingw32-g++"
 DEFAULT_MODE="dll"
-DEFS="-DPACKAGE_NAME=\"ICU\" -DPACKAGE_TARNAME=\"International\ Components\ for\ Unicode\" -DPACKAGE_VERSION=\"57.1\" -DPACKAGE_STRING=\"ICU\ 57.1\" -DPACKAGE_BUGREPORT=\"http://icu-project.org/bugs\" -DPACKAGE_URL=\"http://icu-project.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DHAVE_LIBM=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LIBPTHREAD=1 -DHAVE_INTTYPES_H=1 -DHAVE_DIRENT_H=1 -DHAVE_WCHAR_H=1 -DSIZEOF_WCHAR_T=2 "
+DEFS="-DPACKAGE_NAME=\"ICU\" -DPACKAGE_TARNAME=\"International\ Components\ for\ Unicode\" -DPACKAGE_VERSION=\"58.1\" -DPACKAGE_STRING=\"ICU\ 58.1\" -DPACKAGE_BUGREPORT=\"http://icu-project.org/bugs\" -DPACKAGE_URL=\"http://icu-project.org\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DHAVE_LIBM=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_LIBPTHREAD=1 -DHAVE_INTTYPES_H=1 -DHAVE_DIRENT_H=1 -DHAVE_WCHAR_H=1 -DSIZEOF_WCHAR_T=2 "
 # use a consistent INSTALL 
 INSTALL="${SHELL} ${pkgdatadir}/install-sh -c"
 INSTALL_DATA="${INSTALL} -m 644"
@@ -220,8 +221,8 @@ INSTALL_SCRIPT="${INSTALL}"
 LDFLAGS="${RPATHLDFLAGS}"
 LIBS="-lpthread -lm  "
 LIB_M=""
-LIB_VERSION="57.1"
-LIB_VERSION_MAJOR="57"
+LIB_VERSION="58.2"
+LIB_VERSION_MAJOR="58"
 MKINSTALLDIRS="${SHELL} ${pkgdatadir}/mkinstalldirs"
 RANLIB="x86_64-w64-mingw32-ranlib"
 RMV="rm -rf"
@@ -249,7 +250,7 @@ INSTALL_L="${INSTALL_DATA}"
 
 # The basename of the ICU data file (i.e. icudt21b )
 ICUDATA_CHAR="l"
-ICUDATA_NAME="icudt57l"
+ICUDATA_NAME="icudt58l"
 
 # Defaults for pkgdata's mode and directories
 # The default data dir changes depending on what packaging mode 
@@ -289,6 +290,8 @@ GENCCODE_ASSEMBLY=""
 # parseable. The mh fragment is only included if this does not occur.
 
 ## -*-makefile-*-
+## Copyright (C) 2016 and later: Unicode, Inc. and others.
+## License & terms of use: http://www.unicode.org/copyright.html
 ## Cygwin64/MinGW64 specific setup
 ## Copyright (c) 2012-2014, International Business Machines Corporation and
 ## others. All Rights Reserved.
@@ -408,6 +411,8 @@ PKGDATA_DEFS="-DU_MAKE=\"${MAKE}\""
 
 ## -*-sh-*-
 ## BEGIN of icu-config-bottom.
+## Copyright (C) 2016 and later: Unicode, Inc. and others.
+## License & terms of use: http://www.unicode.org/copyright.html
 ## Copyright (c) 2002-2013, International Business Machines Corporation and
 ## others. All Rights Reserved.
 
@@ -452,7 +457,6 @@ allflags()
     echo "  --invoke               Print commands to invoke an ICU program"
     echo "  --invoke=<prog>        Print commands to invoke an ICU program named <prog> (ex: genrb)"
     echo "  --ldflags              Print -L search path and -l libraries to link with ICU [LDFLAGS].  This is for the data, uc (common), and i18n libraries only.  "
-    echo "  --ldflags-layout       Print ICU layout engine link directive. Use in addition to --ldflags"
     echo "  --ldflags-libsonly     Same as --ldflags, but only the -l directives"
     echo "  --ldflags-searchpath   Print only -L (search path) directive"
     echo "  --ldflags-system       Print only system libs ICU links with (-lpthread, -lm)"
@@ -687,7 +691,8 @@ do
 	    ;;
 
 	--ldflags-layout)
-	    echo $ECHO_N "${ICULIBS_LAYOUT} ${ICULIBS_LAYOUTEX} ${ECHO_C}"
+            echo ${ME}: ERROR: the old layout engine has been removed. use HarfBuzz.
+            exit 1
 	    ;;
 
 	--ldflags-searchpath)

data/vendor/local/include/harfbuzz/hb-font.h

@@ -604,6 +604,11 @@ hb_font_get_ppem (hb_font_t *font,
 		  unsigned int *y_ppem);
 
 
+HB_EXTERN void
+hb_font_set_var_coords_normalized (hb_font_t *font,
+				   int *coords, /* XXX 2.14 normalized */
+				   unsigned int coords_length);
+
 HB_END_DECLS
 
 #endif /* HB_FONT_H */

data/vendor/local/include/harfbuzz/hb-glib.h

@@ -46,9 +46,10 @@ hb_glib_script_from_script (hb_script_t script);
 HB_EXTERN hb_unicode_funcs_t *
 hb_glib_get_unicode_funcs (void);
 
+#if GLIB_CHECK_VERSION(2,31,10)
 HB_EXTERN hb_blob_t *
 hb_glib_blob_create (GBytes *gbytes);
-
+#endif
 
 HB_END_DECLS
 

data/vendor/local/include/harfbuzz/hb-ot-layout.h

@@ -95,6 +95,7 @@ hb_ot_layout_get_ligature_carets (hb_font_t      *font,
 #define HB_OT_LAYOUT_NO_SCRIPT_INDEX		0xFFFFu
 #define HB_OT_LAYOUT_NO_FEATURE_INDEX		0xFFFFu
 #define HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX	0xFFFFu
+#define HB_OT_LAYOUT_NO_VARIATIONS_INDEX	0xFFFFFFFFu
 
 HB_EXTERN unsigned int
 hb_ot_layout_table_get_script_tags (hb_face_t    *face,
@@ -236,6 +237,24 @@ Xhb_ot_layout_lookup_enumerate_sequences (hb_face_t    *face,
 					 void         *user_data);
 #endif
 
+/* Variations support */
+
+HB_EXTERN hb_bool_t
+hb_ot_layout_table_find_feature_variations (hb_face_t    *face,
+					    hb_tag_t      table_tag,
+					    const int    *coords,
+					    unsigned int  num_coords,
+					    unsigned int *variations_index /* out */);
+
+HB_EXTERN unsigned int
+hb_ot_layout_feature_with_variations_get_lookups (hb_face_t    *face,
+						  hb_tag_t      table_tag,
+						  unsigned int  feature_index,
+						  unsigned int  variations_index,
+						  unsigned int  start_offset,
+						  unsigned int *lookup_count /* IN/OUT */,
+						  unsigned int *lookup_indexes /* OUT */);
+
 
 /*
  * GSUB

data/vendor/local/include/harfbuzz/hb-shape-plan.h

@@ -52,6 +52,25 @@ hb_shape_plan_create_cached (hb_face_t                     *face,
 			     unsigned int                   num_user_features,
 			     const char * const            *shaper_list);
 
+HB_EXTERN hb_shape_plan_t *
+hb_shape_plan_create2 (hb_face_t                     *face,
+		       const hb_segment_properties_t *props,
+		       const hb_feature_t            *user_features,
+		       unsigned int                   num_user_features,
+		       const int                     *coords,
+		       unsigned int                   num_coords,
+		       const char * const            *shaper_list);
+
+HB_EXTERN hb_shape_plan_t *
+hb_shape_plan_create_cached2 (hb_face_t                     *face,
+			      const hb_segment_properties_t *props,
+			      const hb_feature_t            *user_features,
+			      unsigned int                   num_user_features,
+			      const int                     *coords,
+			      unsigned int                   num_coords,
+			      const char * const            *shaper_list);
+
+
 HB_EXTERN hb_shape_plan_t *
 hb_shape_plan_get_empty (void);
 

data/vendor/local/include/harfbuzz/hb-version.h

@@ -37,10 +37,10 @@ HB_BEGIN_DECLS
 
 
 #define HB_VERSION_MAJOR 1
-#define HB_VERSION_MINOR 3
-#define HB_VERSION_MICRO 3
+#define HB_VERSION_MINOR 4
+#define HB_VERSION_MICRO 1
 
-#define HB_VERSION_STRING "1.3.3"
+#define HB_VERSION_STRING "1.4.1"
 
 #define HB_VERSION_ATLEAST(major,minor,micro) \
 	((major)*10000+(minor)*100+(micro) <= \

data/vendor/local/include/unicode/alphaindex.h

@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 *

data/vendor/local/include/unicode/appendable.h

@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 *   Copyright (C) 2011-2012, International Business Machines

data/vendor/local/include/unicode/basictz.h

@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 * Copyright (C) 2007-2013, International Business Machines Corporation and

data/vendor/local/include/unicode/brkiter.h

@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 ********************************************************************************
 *   Copyright (C) 1997-2016, International Business Machines
@@ -168,6 +170,11 @@ public:
     /**
      * Change the text over which this operates. The text boundary is
      * reset to the start.
+     *
+     * The BreakIterator will retain a reference to the supplied string.
+     * The caller must not modify or delete the text while the BreakIterator
+     * retains the reference.
+     *
      * @param text The UnicodeString used to change the text.
      * @stable ICU 2.0
      */

data/vendor/local/include/unicode/bytestream.h

@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 // Copyright (C) 2009-2012, International Business Machines
 // Corporation and others. All Rights Reserved.
 //

data/vendor/local/include/unicode/bytestrie.h

@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 *   Copyright (C) 2010-2012, International Business Machines
@@ -306,7 +308,7 @@ public:
          * @return The NUL-terminated byte sequence for the last successful next().
          * @stable ICU 4.8
          */
-        const StringPiece &getString() const { return sp_; }
+        StringPiece getString() const;
         /**
          * @return The value for the last successful next().
          * @stable ICU 4.8
@@ -325,7 +327,6 @@ public:
         int32_t initialRemainingMatchLength_;
 
         CharString *str_;
-        StringPiece sp_;
         int32_t maxLength_;
         int32_t value_;
 

data/vendor/local/include/unicode/bytestriebuilder.h

@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 *   Copyright (C) 2010-2016, International Business Machines
@@ -29,7 +31,6 @@ U_NAMESPACE_BEGIN
 
 class BytesTrieElement;
 class CharString;
-
 /**
  * Builder class for BytesTrie.
  *
@@ -65,7 +66,7 @@ public:
      * @return *this
      * @stable ICU 4.8
      */
-    BytesTrieBuilder &add(const StringPiece &s, int32_t value, UErrorCode &errorCode);
+    BytesTrieBuilder &add(StringPiece s, int32_t value, UErrorCode &errorCode);
 
     /**
      * Builds a BytesTrie for the add()ed data.
@@ -141,7 +142,6 @@ private:
     virtual int32_t getMinLinearMatch() const { return BytesTrie::kMinLinearMatch; }
     virtual int32_t getMaxLinearMatchLength() const { return BytesTrie::kMaxLinearMatchLength; }
 
-    // don't use #ifndef U_HIDE_INTERNAL_API with private class members
     /**
      * @internal
      */
@@ -153,7 +153,7 @@ private:
     private:
         const char *s;
     };
-
+    
     // don't use #ifndef U_HIDE_INTERNAL_API with private class members or virtual methods.
     virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length,
                                         Node *nextNode) const;