Hello community, here is the log from the commit of package harfbuzz for openSUSE:Factory checked in at 2013-04-14 10:15:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/harfbuzz (Old) and /work/SRC/openSUSE:Factory/.harfbuzz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "harfbuzz", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/harfbuzz/harfbuzz.changes 2013-03-25 20:30:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.harfbuzz.new/harfbuzz.changes 2013-04-14 10:15:26.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Apr 6 15:21:14 UTC 2013 - dims...@opensuse.org + +- Update to version 0.9.15: + + Build fixes. + + Fix crasher in graphite2 shaper. + + Fix Arabic mark width zeroing regression. + + Don't compose Hangul jamo into Unicode syllables. + +------------------------------------------------------------------- Old: ---- harfbuzz-0.9.14.tar.bz2 New: ---- harfbuzz-0.9.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ harfbuzz.spec ++++++ --- /var/tmp/diff_new_pack.MR6e4o/_old 2013-04-14 10:15:27.000000000 +0200 +++ /var/tmp/diff_new_pack.MR6e4o/_new 2013-04-14 10:15:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: harfbuzz -Version: 0.9.14 +Version: 0.9.15 Release: 0 # FIXME: graphite2 is not packaged / http://projects.palaso.org/projects/graphitedev Summary: An OpenType text shaping engine ++++++ harfbuzz-0.9.14.tar.bz2 -> harfbuzz-0.9.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/Makefile.in new/harfbuzz-0.9.15/Makefile.in --- old/harfbuzz-0.9.14/Makefile.in 2013-03-21 18:33:16.000000000 +0100 +++ new/harfbuzz-0.9.15/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -193,14 +193,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -278,7 +277,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/NEWS new/harfbuzz-0.9.15/NEWS --- old/harfbuzz-0.9.14/NEWS 2013-03-21 18:32:40.000000000 +0100 +++ new/harfbuzz-0.9.15/NEWS 2013-04-06 00:02:11.000000000 +0200 @@ -1,3 +1,13 @@ +Overview of changes leading to 0.9.15 +Thursday, April 05, 2013 +===================================== + +- Build fixes. +- Fix crasher in graphite2 shaper. +- Fix Arabic mark width zeroing regression. +- Don't compose Hangul jamo into Unicode syllables. + + Overview of changes leading to 0.9.14 Thursday, March 21, 2013 ===================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/config.h.in new/harfbuzz-0.9.15/config.h.in --- old/harfbuzz-0.9.14/config.h.in 2013-03-21 18:33:24.000000000 +0100 +++ new/harfbuzz-0.9.15/config.h.in 2013-04-06 00:02:44.000000000 +0200 @@ -33,9 +33,6 @@ /* Have Graphite library */ #undef HAVE_GRAPHITE2 -/* Have gthread2 library */ -#undef HAVE_GTHREAD - /* Have Old HarfBuzz backend */ #undef HAVE_HB_OLD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/configure new/harfbuzz-0.9.15/configure --- old/harfbuzz-0.9.14/configure 2013-03-21 18:33:16.000000000 +0100 +++ new/harfbuzz-0.9.15/configure 2013-04-06 00:02:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for HarfBuzz 0.9.14. +# Generated by GNU Autoconf 2.68 for HarfBuzz 0.9.15. # # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='HarfBuzz' PACKAGE_TARNAME='harfbuzz' -PACKAGE_VERSION='0.9.14' -PACKAGE_STRING='HarfBuzz 0.9.14' +PACKAGE_VERSION='0.9.15' +PACKAGE_STRING='HarfBuzz 0.9.15' PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz' PACKAGE_URL='http://harfbuzz.org/' @@ -639,7 +639,7 @@ ICU_LE_CFLAGS HAVE_ICU_FALSE HAVE_ICU_TRUE -icu_config +ICU_CONFIG ICU_LIBS ICU_CFLAGS HAVE_CAIRO_FT_FALSE @@ -655,10 +655,6 @@ GLIB_MKENUMS GOBJECT_LIBS GOBJECT_CFLAGS -HAVE_GTHREAD_FALSE -HAVE_GTHREAD_TRUE -GTHREAD_LIBS -GTHREAD_CFLAGS HAVE_GLIB_FALSE HAVE_GLIB_TRUE GLIB_LIBS @@ -833,8 +829,6 @@ PKG_CONFIG GLIB_CFLAGS GLIB_LIBS -GTHREAD_CFLAGS -GTHREAD_LIBS GOBJECT_CFLAGS GOBJECT_LIBS CAIRO_CFLAGS @@ -1391,7 +1385,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HarfBuzz 0.9.14 to adapt to many kinds of systems. +\`configure' configures HarfBuzz 0.9.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1461,7 +1455,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HarfBuzz 0.9.14:";; + short | recursive ) echo "Configuration of HarfBuzz 0.9.15:";; esac cat <<\_ACEOF @@ -1503,10 +1497,6 @@ PKG_CONFIG path to pkg-config utility GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config - GTHREAD_CFLAGS - C compiler flags for GTHREAD, overriding pkg-config - GTHREAD_LIBS - linker flags for GTHREAD, overriding pkg-config GOBJECT_CFLAGS C compiler flags for GOBJECT, overriding pkg-config GOBJECT_LIBS @@ -1599,7 +1589,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HarfBuzz configure 0.9.14 +HarfBuzz configure 0.9.15 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2143,7 +2133,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HarfBuzz $as_me 0.9.14, which was +It was created by HarfBuzz $as_me 0.9.15, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2964,7 +2954,7 @@ # Define the identity of the package. PACKAGE='harfbuzz' - VERSION='0.9.14' + VERSION='0.9.15' # Some tools Automake needs. @@ -16294,8 +16284,8 @@ HB_VERSION_MAJOR=0 HB_VERSION_MINOR=9 -HB_VERSION_MICRO=14 -HB_VERSION=0.9.14 +HB_VERSION_MICRO=15 +HB_VERSION=0.9.15 @@ -16306,7 +16296,7 @@ -HB_LIBTOOL_VERSION_INFO=914:0:914 +HB_LIBTOOL_VERSION_INFO=915:0:915 @@ -16942,91 +16932,6 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5 -$as_echo_n "checking for GTHREAD... " >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$GTHREAD_CFLAGS"; then - pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTHREAD_LIBS"; then - pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0"` - else - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GTHREAD_PKG_ERRORS" >&5 - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - have_gthread=false -elif test $pkg_failed = untried; then - have_gthread=false -else - GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS - GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_gthread=true -fi -if $have_gthread; then - -$as_echo "#define HAVE_GTHREAD 1" >>confdefs.h - -fi - if $have_gthread; then - HAVE_GTHREAD_TRUE= - HAVE_GTHREAD_FALSE='#' -else - HAVE_GTHREAD_TRUE='#' - HAVE_GTHREAD_FALSE= -fi - - - -pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT" >&5 $as_echo_n "checking for GOBJECT... " >&6; } @@ -17356,26 +17261,65 @@ have_icu=true fi if test "$have_icu" != "true"; then - # Extract the first word of "icu-config", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}icu-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ICU_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ICU_CONFIG"; then + ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ICU_CONFIG=$ac_cv_prog_ICU_CONFIG +if test -n "$ICU_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5 +$as_echo "$ICU_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_ICU_CONFIG"; then + ac_ct_ICU_CONFIG=$ICU_CONFIG + # Extract the first word of "icu-config", so it can be a program name with args. set dummy icu-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_icu_config+:} false; then : +if ${ac_cv_prog_ac_ct_ICU_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - case $icu_config in - [\\/]* | ?:[\\/]*) - ac_cv_path_icu_config="$icu_config" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ac_ct_ICU_CONFIG"; then + ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_icu_config="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_ac_ct_ICU_CONFIG="icu-config" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -17383,29 +17327,41 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_icu_config" && ac_cv_path_icu_config="no" - ;; -esac fi -icu_config=$ac_cv_path_icu_config -if test -n "$icu_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $icu_config" >&5 -$as_echo "$icu_config" >&6; } +fi +ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG +if test -n "$ac_ct_ICU_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5 +$as_echo "$ac_ct_ICU_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + if test "x$ac_ct_ICU_CONFIG" = x; then + ICU_CONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + ICU_CONFIG=$ac_ct_ICU_CONFIG + fi +else + ICU_CONFIG="$ac_cv_prog_ICU_CONFIG" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU by using icu-config fallback" >&5 $as_echo_n "checking for ICU by using icu-config fallback... " >&6; } - if test "$icu_config" != "no" && "$icu_config" --version >/dev/null; then + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then have_icu=true # We don't use --cflags as this gives us a lot of things that we don't # necessarily want, like debugging and optimization flags # See man (1) icu-config for more info. - ICU_CFLAGS=`$icu_config --cppflags` - ICU_LIBS=`$icu_config --ldflags-libsonly` + ICU_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly` { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -17504,26 +17460,65 @@ have_icu_le=true fi if test "$have_icu_le" != "true"; then - # Extract the first word of "icu-config", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}icu-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ICU_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ICU_CONFIG"; then + ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ICU_CONFIG=$ac_cv_prog_ICU_CONFIG +if test -n "$ICU_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5 +$as_echo "$ICU_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_ICU_CONFIG"; then + ac_ct_ICU_CONFIG=$ICU_CONFIG + # Extract the first word of "icu-config", so it can be a program name with args. set dummy icu-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_icu_config+:} false; then : +if ${ac_cv_prog_ac_ct_ICU_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - case $icu_config in - [\\/]* | ?:[\\/]*) - ac_cv_path_icu_config="$icu_config" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ac_ct_ICU_CONFIG"; then + ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_icu_config="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_ac_ct_ICU_CONFIG="icu-config" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -17531,29 +17526,41 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_icu_config" && ac_cv_path_icu_config="no" - ;; -esac fi -icu_config=$ac_cv_path_icu_config -if test -n "$icu_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $icu_config" >&5 -$as_echo "$icu_config" >&6; } +fi +ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG +if test -n "$ac_ct_ICU_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5 +$as_echo "$ac_ct_ICU_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + if test "x$ac_ct_ICU_CONFIG" = x; then + ICU_CONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + ICU_CONFIG=$ac_ct_ICU_CONFIG + fi +else + ICU_CONFIG="$ac_cv_prog_ICU_CONFIG" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU_LE by using icu-config fallback" >&5 $as_echo_n "checking for ICU_LE by using icu-config fallback... " >&6; } - if test "$icu_config" != "no" && "$icu_config" --version >/dev/null; then + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then have_icu_le=true # We don't use --cflags as this gives us a lot of things that we don't # necessarily want, like debugging and optimization flags # See man (1) icu-config for more info. - ICU_LE_CFLAGS=`$icu_config --cppflags` - ICU_LE_LIBS=`$icu_config --ldflags-libsonly --ldflags-layout` + ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout` { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -18161,10 +18168,6 @@ as_fn_error $? "conditional \"HAVE_GLIB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HAVE_GTHREAD_TRUE}" && test -z "${HAVE_GTHREAD_FALSE}"; then - as_fn_error $? "conditional \"HAVE_GTHREAD\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_GOBJECT_TRUE}" && test -z "${HAVE_GOBJECT_FALSE}"; then as_fn_error $? "conditional \"HAVE_GOBJECT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18610,7 +18613,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HarfBuzz $as_me 0.9.14, which was +This file was extended by HarfBuzz $as_me 0.9.15, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18677,7 +18680,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HarfBuzz config.status 0.9.14 +HarfBuzz config.status 0.9.15 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/configure.ac new/harfbuzz-0.9.15/configure.ac --- old/harfbuzz-0.9.14/configure.ac 2013-03-21 18:32:59.000000000 +0100 +++ new/harfbuzz-0.9.15/configure.ac 2013-04-06 00:00:01.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([HarfBuzz], - [0.9.14], + [0.9.15], [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz], [harfbuzz], [http://harfbuzz.org/]) @@ -142,12 +142,6 @@ fi AM_CONDITIONAL(HAVE_GLIB, $have_glib) -PKG_CHECK_MODULES(GTHREAD, gthread-2.0, have_gthread=true, have_gthread=false) -if $have_gthread; then - AC_DEFINE(HAVE_GTHREAD, 1, [Have gthread2 library]) -fi -AM_CONDITIONAL(HAVE_GTHREAD, $have_gthread) - PKG_CHECK_MODULES(GOBJECT, gobject-2.0 glib-2.0 >= 2.16, have_gobject=true, have_gobject=false) if $have_gobject; then AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library]) @@ -175,15 +169,15 @@ PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, have_icu=false) dnl Fallback to icu-config if ICU pkg-config files could not be found if test "$have_icu" != "true"; then - AC_PATH_PROG(icu_config, icu-config, no) + AC_CHECK_TOOL(ICU_CONFIG, icu-config, no) AC_MSG_CHECKING([for ICU by using icu-config fallback]) - if test "$icu_config" != "no" && "$icu_config" --version >/dev/null; then + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then have_icu=true # We don't use --cflags as this gives us a lot of things that we don't # necessarily want, like debugging and optimization flags # See man (1) icu-config for more info. - ICU_CFLAGS=`$icu_config --cppflags` - ICU_LIBS=`$icu_config --ldflags-libsonly` + ICU_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly` AC_SUBST(ICU_CFLAGS) AC_SUBST(ICU_LIBS) AC_MSG_RESULT([yes]) @@ -203,15 +197,15 @@ PKG_CHECK_MODULES(ICU_LE, icu-le icu-uc, have_icu_le=true, have_icu_le=false) dnl Fallback to icu-config if ICU pkg-config files could not be found if test "$have_icu_le" != "true"; then - AC_PATH_PROG(icu_config, icu-config, no) + AC_CHECK_TOOL(ICU_CONFIG, icu-config, no) AC_MSG_CHECKING([for ICU_LE by using icu-config fallback]) - if test "$icu_config" != "no" && "$icu_config" --version >/dev/null; then + if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then have_icu_le=true # We don't use --cflags as this gives us a lot of things that we don't # necessarily want, like debugging and optimization flags # See man (1) icu-config for more info. - ICU_LE_CFLAGS=`$icu_config --cppflags` - ICU_LE_LIBS=`$icu_config --ldflags-libsonly --ldflags-layout` + ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags` + ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout` AC_SUBST(ICU_LE_CFLAGS) AC_SUBST(ICU_LE_LIBS) AC_MSG_RESULT([yes]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/Makefile.in new/harfbuzz-0.9.15/src/Makefile.in --- old/harfbuzz-0.9.14/src/Makefile.in 2013-03-21 18:33:15.000000000 +0100 +++ new/harfbuzz-0.9.15/src/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -462,14 +462,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -547,7 +546,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/check-symbols.sh new/harfbuzz-0.9.15/src/check-symbols.sh --- old/harfbuzz-0.9.14/src/check-symbols.sh 2013-03-19 10:47:13.000000000 +0100 +++ new/harfbuzz-0.9.15/src/check-symbols.sh 2013-04-04 18:06:34.000000000 +0200 @@ -21,7 +21,7 @@ lib=`echo "$def" | sed 's/[.]def$//;s@.*/@@'` so=.libs/lib${lib}.so - EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>\| _fdata\>\| _ftext\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`" + EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`" if test -f "$so"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-atomic-private.hh new/harfbuzz-0.9.15/src/hb-atomic-private.hh --- old/harfbuzz-0.9.14/src/hb-atomic-private.hh 2013-03-19 12:04:53.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-atomic-private.hh 2013-04-04 21:01:42.000000000 +0200 @@ -47,6 +47,14 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#if defined(__MINGW32__) && !defined(MemoryBarrier) +static inline void _HBMemoryBarrier (void) { + long dummy = 0; + InterlockedExchange (&dummy, 1); +} +# define MemoryBarrier _HBMemoryBarrier +#endif + typedef LONG hb_atomic_int_t; #define hb_atomic_int_add(AI, V) InterlockedExchangeAdd (&(AI), (V)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-graphite2.cc new/harfbuzz-0.9.15/src/hb-graphite2.cc --- old/harfbuzz-0.9.14/src/hb-graphite2.cc 2013-03-19 10:47:13.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-graphite2.cc 2013-04-02 20:08:41.000000000 +0200 @@ -226,7 +226,7 @@ gr_font *grfont = HB_SHAPER_DATA_GET (font); const char *lang = hb_language_to_string (hb_buffer_get_language (buffer)); - const char *lang_end = strchr (lang, '-'); + const char *lang_end = lang ? strchr (lang, '-') : NULL; int lang_len = lang_end ? lang_end - lang : -1; gr_feature_val *feats = gr_face_featureval_for_lang (grface, lang ? hb_tag_from_string (lang, lang_len) : 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-icu-le/Makefile.in new/harfbuzz-0.9.15/src/hb-icu-le/Makefile.in --- old/harfbuzz-0.9.14/src/hb-icu-le/Makefile.in 2013-03-21 18:33:15.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-icu-le/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -151,14 +151,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -236,7 +235,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-old/Makefile.in new/harfbuzz-0.9.15/src/hb-old/Makefile.in --- old/harfbuzz-0.9.14/src/hb-old/Makefile.in 2013-03-21 18:33:16.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-old/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -161,14 +161,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -246,7 +245,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-ot-shape-complex-arabic.cc new/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic.cc --- old/harfbuzz-0.9.14/src/hb-ot-shape-complex-arabic.cc 2013-03-19 10:47:13.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic.cc 2013-04-04 20:22:54.000000000 +0200 @@ -352,6 +352,6 @@ NULL, /* decompose */ NULL, /* compose */ setup_masks_arabic, - HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE, + HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF, true, /* fallback_position */ }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-ot-shape-complex-default.cc new/harfbuzz-0.9.15/src/hb-ot-shape-complex-default.cc --- old/harfbuzz-0.9.14/src/hb-ot-shape-complex-default.cc 2013-03-19 10:47:13.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-ot-shape-complex-default.cc 2013-04-05 05:04:20.000000000 +0200 @@ -74,12 +74,6 @@ static hb_ot_shape_normalization_mode_t normalization_preference_default (const hb_segment_properties_t *props) { - switch ((hb_tag_t) props->script) - { - /* Unicode-1.1 additions */ - case HB_SCRIPT_HANGUL: - return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL; - } return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-ot-shape-complex-private.hh new/harfbuzz-0.9.15/src/hb-ot-shape-complex-private.hh --- old/harfbuzz-0.9.14/src/hb-ot-shape-complex-private.hh 2013-03-19 10:47:13.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-ot-shape-complex-private.hh 2013-04-05 18:38:44.000000000 +0200 @@ -185,6 +185,20 @@ return &_hb_ot_complex_shaper_thai; +#if 0 + /* Note: + * Currently we don't have a separate Hangul shaper. The default shaper handles + * Hangul by enabling jamo features. We may want to implement a separate shaper + * in the future. See this thread for details of what such a shaper would do: + * + * http://lists.freedesktop.org/archives/harfbuzz/2013-April/003070.html + */ + /* Unicode-1.1 additions */ + case HB_SCRIPT_HANGUL: + + return &_hb_ot_complex_shaper_hangul; +#endif + /* ^--- Add new shapers here */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-ot-shape-normalize-private.hh new/harfbuzz-0.9.15/src/hb-ot-shape-normalize-private.hh --- old/harfbuzz-0.9.14/src/hb-ot-shape-normalize-private.hh 2013-03-19 10:47:13.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-ot-shape-normalize-private.hh 2013-04-05 05:04:20.000000000 +0200 @@ -41,7 +41,6 @@ HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED, HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS, /* never composes base-to-base */ HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT, /* always fully decomposes and then recompose back */ - HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL, /* including base-to-base composition */ HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-ot-shape-normalize.cc new/harfbuzz-0.9.15/src/hb-ot-shape-normalize.cc --- old/harfbuzz-0.9.14/src/hb-ot-shape-normalize.cc 2013-03-19 10:47:13.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-ot-shape-normalize.cc 2013-04-05 05:04:20.000000000 +0200 @@ -170,7 +170,7 @@ } /* Returns 0 if didn't decompose, number of resulting characters otherwise. */ -static inline bool +static inline unsigned int decompose_compatibility (const hb_ot_shape_normalize_context_t *c, hb_codepoint_t u) { unsigned int len, i; @@ -191,7 +191,6 @@ return len; } -/* Returns true if recomposition may be benefitial. */ static inline void decompose_current_character (const hb_ot_shape_normalize_context_t *c, bool shortest) { @@ -231,7 +230,6 @@ } } -/* Returns true if recomposition may be benefitial. */ static inline void decompose_multi_char_cluster (const hb_ot_shape_normalize_context_t *c, unsigned int end) { @@ -353,12 +351,11 @@ while (buffer->idx < count) { hb_codepoint_t composed, glyph; - if (/* If mode is NOT COMPOSED_FULL (ie. it's COMPOSED_DIACRITICS), we don't try to - * compose a non-mark character with it's preceding starter. This is just an - * optimization to avoid trying to compose every two neighboring glyphs in most - * scripts. */ - (mode == HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL || - HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->cur()))) && + if (/* We don't try to compose a non-mark character with it's preceding starter. + * This is both an optimization to avoid trying to compose every two neighboring + * glyphs in most scripts AND a desired feature for Hangul. Apparently Hangul + * fonts are not designed to mix-and-match pre-composed syllables and Jamo. */ + HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->cur())) && /* If there's anything between the starter and this char, they should have CCC * smaller than this character's. */ (starter == buffer->out_len - 1 || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-ucdn/Makefile.in new/harfbuzz-0.9.15/src/hb-ucdn/Makefile.in --- old/harfbuzz-0.9.14/src/hb-ucdn/Makefile.in 2013-03-21 18:33:16.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-ucdn/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -132,14 +132,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -217,7 +216,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/src/hb-version.h new/harfbuzz-0.9.15/src/hb-version.h --- old/harfbuzz-0.9.14/src/hb-version.h 2013-03-21 18:33:23.000000000 +0100 +++ new/harfbuzz-0.9.15/src/hb-version.h 2013-04-06 00:02:43.000000000 +0200 @@ -38,9 +38,9 @@ #define HB_VERSION_MAJOR 0 #define HB_VERSION_MINOR 9 -#define HB_VERSION_MICRO 14 +#define HB_VERSION_MICRO 15 -#define HB_VERSION_STRING "0.9.14" +#define HB_VERSION_STRING "0.9.15" #define HB_VERSION_CHECK(major,minor,micro) \ ((major)*10000+(minor)*100+(micro) >= \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/test/Makefile.in new/harfbuzz-0.9.15/test/Makefile.in --- old/harfbuzz-0.9.14/test/Makefile.in 2013-03-21 18:33:16.000000000 +0100 +++ new/harfbuzz-0.9.15/test/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -143,14 +143,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -228,7 +227,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/test/api/Makefile.am new/harfbuzz-0.9.15/test/api/Makefile.am --- old/harfbuzz-0.9.14/test/api/Makefile.am 2013-03-19 12:04:53.000000000 +0100 +++ new/harfbuzz-0.9.15/test/api/Makefile.am 2013-03-21 21:26:02.000000000 +0100 @@ -7,8 +7,8 @@ MAINTAINERCLEANFILES = if HAVE_GLIB -AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) -LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) $(GTHREAD_LIBS) +AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) +LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) EXTRA_DIST += hb-test.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/test/api/Makefile.in new/harfbuzz-0.9.15/test/api/Makefile.in --- old/harfbuzz-0.9.14/test/api/Makefile.in 2013-03-21 18:33:16.000000000 +0100 +++ new/harfbuzz-0.9.15/test/api/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -83,7 +83,7 @@ am__DEPENDENCIES_1 = @HAVE_GLIB_TRUE@test_blob_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -92,19 +92,19 @@ test_buffer_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_buffer_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_c_SOURCES = test-c.c test_c_OBJECTS = test_c-test-c.$(OBJEXT) test_c_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_c_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_common_SOURCES = test-common.c test_common_OBJECTS = test-common.$(OBJEXT) test_common_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_common_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) am__test_cplusplus_SOURCES_DIST = test-cplusplus.cc @HAVE_GLIB_TRUE@am_test_cplusplus_OBJECTS = \ @HAVE_GLIB_TRUE@ test_cplusplus-test-cplusplus.$(OBJEXT) @@ -112,49 +112,49 @@ test_cplusplus_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_cplusplus_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_font_SOURCES = test-font.c test_font_OBJECTS = test-font.$(OBJEXT) test_font_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_font_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_object_SOURCES = test-object.c test_object_OBJECTS = test-object.$(OBJEXT) test_object_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_object_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_ot_tag_SOURCES = test-ot-tag.c test_ot_tag_OBJECTS = test-ot-tag.$(OBJEXT) test_ot_tag_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_ot_tag_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_set_SOURCES = test-set.c test_set_OBJECTS = test-set.$(OBJEXT) test_set_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_set_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_shape_SOURCES = test-shape.c test_shape_OBJECTS = test-shape.$(OBJEXT) test_shape_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_shape_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_unicode_SOURCES = test-unicode.c test_unicode_OBJECTS = test_unicode-test-unicode.$(OBJEXT) test_unicode_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_unicode_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) test_version_SOURCES = test-version.c test_version_OBJECTS = test-version.$(OBJEXT) test_version_LDADD = $(LDADD) @HAVE_GLIB_TRUE@test_version_DEPENDENCIES = \ @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ -@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +@HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -268,14 +268,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -353,7 +352,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -381,8 +379,8 @@ CLEANFILES = $(am__append_8) DISTCLEANFILES = MAINTAINERCLEANFILES = -@HAVE_GLIB_TRUE@AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS) -@HAVE_GLIB_TRUE@LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) $(GTHREAD_LIBS) +@HAVE_GLIB_TRUE@AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ -I$(top_builddir)/src/ $(GLIB_CFLAGS) +@HAVE_GLIB_TRUE@LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) # Tests for header compilation @HAVE_GLIB_TRUE@TEST_PROGS = test-blob test-buffer test-common \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/test/api/hb-test.h new/harfbuzz-0.9.15/test/api/hb-test.h --- old/harfbuzz-0.9.14/test/api/hb-test.h 2012-08-01 03:32:14.000000000 +0200 +++ new/harfbuzz-0.9.15/test/api/hb-test.h 2013-03-21 20:11:16.000000000 +0100 @@ -76,9 +76,6 @@ static inline void hb_test_init (int *argc, char ***argv) { -#if !GLIB_CHECK_VERSION(2,32,0) - g_thread_init (NULL); -#endif g_test_init (argc, argv, NULL); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/test/shaping/Makefile.in new/harfbuzz-0.9.15/test/shaping/Makefile.in --- old/harfbuzz-0.9.14/test/shaping/Makefile.in 2013-03-21 18:33:16.000000000 +0100 +++ new/harfbuzz-0.9.15/test/shaping/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -103,14 +103,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -188,7 +187,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/harfbuzz-0.9.14/util/Makefile.in new/harfbuzz-0.9.15/util/Makefile.in --- old/harfbuzz-0.9.14/util/Makefile.in 2013-03-21 18:33:16.000000000 +0100 +++ new/harfbuzz-0.9.15/util/Makefile.in 2013-04-06 00:02:37.000000000 +0200 @@ -199,14 +199,13 @@ GRAPHITE2_CFLAGS = @GRAPHITE2_CFLAGS@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ GREP = @GREP@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ HB_LIBTOOL_VERSION_INFO = @HB_LIBTOOL_VERSION_INFO@ HB_VERSION = @HB_VERSION@ HB_VERSION_MAJOR = @HB_VERSION_MAJOR@ HB_VERSION_MICRO = @HB_VERSION_MICRO@ HB_VERSION_MINOR = @HB_VERSION_MINOR@ ICU_CFLAGS = @ICU_CFLAGS@ +ICU_CONFIG = @ICU_CONFIG@ ICU_LE_CFLAGS = @ICU_LE_CFLAGS@ ICU_LE_LIBS = @ICU_LE_LIBS@ ICU_LIBS = @ICU_LIBS@ @@ -284,7 +283,6 @@ host_os = @host_os@ host_vendor = @host_vendor@ htmldir = @htmldir@ -icu_config = @icu_config@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
