Hello community,
here is the log from the commit of package pango for openSUSE:Factory checked
in at 2014-09-30 19:37:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pango (Old)
and /work/SRC/openSUSE:Factory/.pango.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pango"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pango/pango.changes 2014-09-10
17:01:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2014-09-30
19:38:06.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 22 18:48:08 UTC 2014 - zai...@opensuse.org
+
+- Update to version 1.36.8:
+ + Make tests not fail on build.gnome.org.
+
+-------------------------------------------------------------------
Old:
----
pango-1.36.7.tar.xz
New:
----
pango-1.36.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pango.spec ++++++
--- /var/tmp/diff_new_pack.1GzA6Z/_old 2014-09-30 19:38:07.000000000 +0200
+++ /var/tmp/diff_new_pack.1GzA6Z/_new 2014-09-30 19:38:07.000000000 +0200
@@ -20,7 +20,7 @@
%define pango_binary_version 1.8.0
Name: pango
-Version: 1.36.7
+Version: 1.36.8
Release: 0
Summary: Library for Layout and Rendering of Text
License: LGPL-2.1+
++++++ pango-1.36.7.tar.xz -> pango-1.36.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/ChangeLog new/pango-1.36.8/ChangeLog
--- old/pango-1.36.7/ChangeLog 2014-09-03 21:49:11.000000000 +0200
+++ new/pango-1.36.8/ChangeLog 2014-09-22 20:33:38.000000000 +0200
@@ -1,3 +1,64 @@
+commit e0a21abf52a0b7588b1aa3357818948816ed9103
+Author: Matthias Clasen <mcla...@redhat.com>
+Date: Mon Sep 22 14:29:40 2014 -0400
+
+ 1.36.8
+
+ NEWS | 4 ++++
+ configure.ac | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+commit bda622c386a0b04478a9116c6b9534c023ca2446
+Author: Matthias Clasen <mcla...@redhat.com>
+Date: Fri Sep 19 11:43:15 2014 -0400
+
+ Update expected test results
+
+ Update the expected output of the layout tests to the previous
+ change.
+
+ tests/layouts/valid-1.expected | 6 +++---
+ tests/layouts/valid-2.expected | 10 +++++-----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 2a8eed93477304317ccedfdea8ea46fb9779ee69
+Author: Matthias Clasen <mcla...@redhat.com>
+Date: Fri Sep 19 11:33:14 2014 -0400
+
+ Don't compare fonts in the layout test
+
+ For some reason (that I haven't been able to track down), this
+ fails in the installed tests on build.gnome.org.
+
+ tests/test-layout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 0d1945ed2c602e295e433ce7e9e1ecbc6600c76a
+Author: Matthias Clasen <mcla...@redhat.com>
+Date: Mon Sep 8 11:55:06 2014 -0400
+
+ Add some tests for PangoFontDescription
+
+ This just a small beginning, much more is needed here.
+
+ tests/Makefile.am | 2 ++
+ tests/test-font.c | 92
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 94 insertions(+)
+
+commit 7b36ee404c22495e33c66cc4d755671a16089bdf
+Author: Matthias Clasen <mcla...@redhat.com>
+Date: Sat Sep 6 14:31:43 2014 -0400
+
+ Try to fix the test on build.gnome.org
+
+ For some reason, the test-layout test does not show the
+ font size when run on build.gnome.org. Try harder to make
+ it use the Cantarell 11 font that I want it to use.
+
+ tests/test-layout.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
commit f7ffec46581ee8d45c7d9480168a167c86c766d3
Author: Matthias Clasen <mcla...@redhat.com>
Date: Wed Sep 3 15:47:46 2014 -0400
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/Makefile.in new/pango-1.36.8/Makefile.in
--- old/pango-1.36.7/Makefile.in 2014-09-03 21:47:55.000000000 +0200
+++ new/pango-1.36.8/Makefile.in 2014-09-22 20:30:18.000000000 +0200
@@ -95,8 +95,7 @@
$(srcdir)/pangoxft-uninstalled.pc.in \
$(srcdir)/pangocairo-uninstalled.pc.in \
$(srcdir)/pango-zip.sh.in $(srcdir)/config.h.win32.in COPYING \
- compile config.guess config.sub depcomp install-sh missing \
- ltmain.sh
+ compile config.guess config.sub install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/NEWS new/pango-1.36.8/NEWS
--- old/pango-1.36.7/NEWS 2014-09-03 21:47:29.000000000 +0200
+++ new/pango-1.36.8/NEWS 2014-09-22 20:29:15.000000000 +0200
@@ -1,3 +1,7 @@
+Overview of changes between 1.36.7 and 1.36.8
+=============================================
+- Make tests not fail on build.gnome.org
+
Overview of changes between 1.36.6 and 1.36.7
=============================================
- Add tests for pango markup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/config.guess
new/pango-1.36.8/config.guess
--- old/pango-1.36.7/config.guess 2014-09-03 21:27:14.000000000 +0200
+++ new/pango-1.36.8/config.guess 2014-09-22 20:30:18.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-11-29'
+timestamp='2014-03-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's,
,,g'`
;;
esac
@@ -826,7 +826,7 @@
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -969,10 +969,10 @@
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
@@ -1371,154 +1371,6 @@
exit ;;
esac
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
cat >&2 <<EOF
$0: unable to guess system type
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/config.h.win32
new/pango-1.36.8/config.h.win32
--- old/pango-1.36.7/config.h.win32 2014-09-03 21:48:00.000000000 +0200
+++ new/pango-1.36.8/config.h.win32 2014-09-22 20:30:23.000000000 +0200
@@ -118,7 +118,7 @@
#define PACKAGE_NAME "pango"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pango 1.36.7"
+#define PACKAGE_STRING "pango 1.36.8"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pango"
@@ -127,19 +127,19 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.36.7"
+#define PACKAGE_VERSION "1.36.8"
/* PANGO binary age */
-#define PANGO_BINARY_AGE 3607
+#define PANGO_BINARY_AGE 3608
/* PANGO interface age */
-#define PANGO_INTERFACE_AGE 7
+#define PANGO_INTERFACE_AGE 8
/* PANGO major version */
#define PANGO_VERSION_MAJOR 1
/* PANGO micro version */
-#define PANGO_VERSION_MICRO 7
+#define PANGO_VERSION_MICRO 8
/* PANGO minor version */
#define PANGO_VERSION_MINOR 36
@@ -151,4 +151,4 @@
/* #undef USE_LA_MODULES */
/* Version number of package */
-#define VERSION "1.36.7"
+#define VERSION "1.36.8"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/config.sub new/pango-1.36.8/config.sub
--- old/pango-1.36.7/config.sub 2014-09-03 21:27:14.000000000 +0200
+++ new/pango-1.36.8/config.sub 2014-09-22 20:30:18.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-10-01'
+timestamp='2014-07-28'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -283,8 +283,10 @@
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -296,8 +298,7 @@
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or1k | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -402,8 +403,10 @@
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +418,7 @@
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -824,6 +828,10 @@
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1369,14 +1377,14 @@
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems*
\
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* |
-tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1594,9 +1602,6 @@
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/configure new/pango-1.36.8/configure
--- old/pango-1.36.7/configure 2014-09-03 21:47:57.000000000 +0200
+++ new/pango-1.36.8/configure 2014-09-22 20:30:17.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pango 1.36.7.
+# Generated by GNU Autoconf 2.69 for pango 1.36.8.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pango>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='pango'
PACKAGE_TARNAME='pango'
-PACKAGE_VERSION='1.36.7'
-PACKAGE_STRING='pango 1.36.7'
+PACKAGE_VERSION='1.36.8'
+PACKAGE_STRING='pango 1.36.8'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pango'
PACKAGE_URL=''
@@ -1505,7 +1505,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 pango 1.36.7 to adapt to many kinds of systems.
+\`configure' configures pango 1.36.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1575,7 +1575,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pango 1.36.7:";;
+ short | recursive ) echo "Configuration of pango 1.36.8:";;
esac
cat <<\_ACEOF
@@ -1741,7 +1741,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pango configure 1.36.7
+pango configure 1.36.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2231,7 +2231,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pango $as_me 1.36.7, which was
+It was created by pango $as_me 1.36.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3097,7 +3097,7 @@
# Define the identity of the package.
PACKAGE='pango'
- VERSION='1.36.7'
+ VERSION='1.36.8'
cat >>confdefs.h <<_ACEOF
@@ -3234,11 +3234,11 @@
PANGO_VERSION_MAJOR=1
PANGO_VERSION_MINOR=36
-PANGO_VERSION_MICRO=7
-PANGO_VERSION=1.36.7
+PANGO_VERSION_MICRO=8
+PANGO_VERSION=1.36.8
PANGO_API_VERSION=1.0
-PANGO_INTERFACE_AGE=7
-PANGO_BINARY_AGE=3607
+PANGO_INTERFACE_AGE=8
+PANGO_BINARY_AGE=3608
PANGO_MODULE_VERSION=1.8.0
@@ -3254,10 +3254,10 @@
$as_echo "#define MODULE_VERSION \"1.8.0\"" >>confdefs.h
-$as_echo "#define PANGO_BINARY_AGE 3607" >>confdefs.h
+$as_echo "#define PANGO_BINARY_AGE 3608" >>confdefs.h
-$as_echo "#define PANGO_INTERFACE_AGE 7" >>confdefs.h
+$as_echo "#define PANGO_INTERFACE_AGE 8" >>confdefs.h
$as_echo "#define PANGO_VERSION_MAJOR 1" >>confdefs.h
@@ -3266,13 +3266,13 @@
$as_echo "#define PANGO_VERSION_MINOR 36" >>confdefs.h
-$as_echo "#define PANGO_VERSION_MICRO 7" >>confdefs.h
+$as_echo "#define PANGO_VERSION_MICRO 8" >>confdefs.h
-VERSION_INFO="3600:7:3600"
+VERSION_INFO="3600:8:3600"
PANGO_CURRENT_MINUS_AGE=0
@@ -16403,7 +16403,7 @@
Report bugs to <bug-libt...@gnu.org>."
lt_cl_version="\
-pango config.lt 1.36.7
+pango config.lt 1.36.8
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20891,7 +20891,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pango $as_me 1.36.7, which was
+This file was extended by pango $as_me 1.36.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20957,7 +20957,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pango config.status 1.36.7
+pango config.status 1.36.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/configure.ac
new/pango-1.36.8/configure.ac
--- old/pango-1.36.7/configure.ac 2014-09-03 21:47:41.000000000 +0200
+++ new/pango-1.36.8/configure.ac 2014-09-22 20:29:33.000000000 +0200
@@ -22,7 +22,7 @@
dnl The triplet
m4_define([pango_version_major], [1])
m4_define([pango_version_minor], [36])
-m4_define([pango_version_micro], [7])
+m4_define([pango_version_micro], [8])
m4_define([pango_version],
[pango_version_major.pango_version_minor.pango_version_micro])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/docs/html/api-index-full.html
new/pango-1.36.8/docs/html/api-index-full.html
--- old/pango-1.36.7/docs/html/api-index-full.html 2014-09-03
21:49:12.000000000 +0200
+++ new/pango-1.36.8/docs/html/api-index-full.html 2014-09-22
20:33:39.000000000 +0200
@@ -871,11 +871,11 @@
</dt>
<dd></dd>
<dt>
-<a class="link" href="pango-Fonts.html#PangoFont-struct"
title="PangoFont">PangoFont</a>, struct in <a class="link"
href="pango-Fonts.html" title="Fonts">Fonts</a>
+<a class="link" href="pango-Fonts.html#PANGO-FONT:CAPS"
title="PANGO_FONT()">PANGO_FONT</a>, macro in <a class="link"
href="pango-Fonts.html" title="Fonts">Fonts</a>
</dt>
<dd></dd>
<dt>
-<a class="link" href="pango-Fonts.html#PANGO-FONT:CAPS"
title="PANGO_FONT()">PANGO_FONT</a>, macro in <a class="link"
href="pango-Fonts.html" title="Fonts">Fonts</a>
+<a class="link" href="pango-Fonts.html#PangoFont-struct"
title="PangoFont">PangoFont</a>, struct in <a class="link"
href="pango-Fonts.html" title="Fonts">Fonts</a>
</dt>
<dd></dd>
<dt>
@@ -2703,19 +2703,19 @@
</dt>
<dd></dd>
<dt>
-<a class="link" href="pango-Version-Checking.html#PANGO-VERSION:CAPS"
title="PANGO_VERSION">PANGO_VERSION</a>, macro in <a class="link"
href="pango-Version-Checking.html" title="Version Checking">Version Checking</a>
+<a class="link" href="pango-Version-Checking.html#pango-version"
title="pango_version ()">pango_version</a>, function in <a class="link"
href="pango-Version-Checking.html" title="Version Checking">Version Checking</a>
</dt>
<dd></dd>
<dt>
-<a class="link" href="pango-Version-Checking.html#pango-version"
title="pango_version ()">pango_version</a>, function in <a class="link"
href="pango-Version-Checking.html" title="Version Checking">Version Checking</a>
+<a class="link" href="pango-Version-Checking.html#PANGO-VERSION:CAPS"
title="PANGO_VERSION">PANGO_VERSION</a>, macro in <a class="link"
href="pango-Version-Checking.html" title="Version Checking">Version Checking</a>
</dt>
<dd></dd>
<dt>
-<a class="link" href="pango-Version-Checking.html#pango-version-check"
title="pango_version_check ()">pango_version_check</a>, function in <a
class="link" href="pango-Version-Checking.html" title="Version
Checking">Version Checking</a>
+<a class="link" href="pango-Version-Checking.html#PANGO-VERSION-CHECK:CAPS"
title="PANGO_VERSION_CHECK()">PANGO_VERSION_CHECK</a>, macro in <a class="link"
href="pango-Version-Checking.html" title="Version Checking">Version Checking</a>
</dt>
<dd></dd>
<dt>
-<a class="link" href="pango-Version-Checking.html#PANGO-VERSION-CHECK:CAPS"
title="PANGO_VERSION_CHECK()">PANGO_VERSION_CHECK</a>, macro in <a class="link"
href="pango-Version-Checking.html" title="Version Checking">Version Checking</a>
+<a class="link" href="pango-Version-Checking.html#pango-version-check"
title="pango_version_check ()">pango_version_check</a>, function in <a
class="link" href="pango-Version-Checking.html" title="Version
Checking">Version Checking</a>
</dt>
<dd></dd>
<dt>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/docs/html/index.html
new/pango-1.36.8/docs/html/index.html
--- old/pango-1.36.7/docs/html/index.html 2014-09-03 21:49:12.000000000
+0200
+++ new/pango-1.36.8/docs/html/index.html 2014-09-22 20:33:39.000000000
+0200
@@ -14,7 +14,7 @@
<div class="titlepage">
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2"
cellspacing="0"><tr><th valign="middle"><p class="title">Pango Reference
Manual</p></th></tr></table></div>
-<div><p class="releaseinfo">for Pango 1.36.7
+<div><p class="releaseinfo">for Pango 1.36.8
</p></div>
</div>
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/docs/html/pango-Version-Checking.html
new/pango-1.36.8/docs/html/pango-Version-Checking.html
--- old/pango-1.36.7/docs/html/pango-Version-Checking.html 2014-09-03
21:49:12.000000000 +0200
+++ new/pango-1.36.8/docs/html/pango-Version-Checking.html 2014-09-22
20:33:39.000000000 +0200
@@ -305,14 +305,14 @@
<hr>
<div class="refsect2">
<a name="PANGO-VERSION-MICRO:CAPS"></a><h3>PANGO_VERSION_MICRO</h3>
-<pre class="programlisting">#define PANGO_VERSION_MICRO 7
+<pre class="programlisting">#define PANGO_VERSION_MICRO 8
</pre>
<p>The micro component of the version of Pango available at compile-time.</p>
</div>
<hr>
<div class="refsect2">
<a name="PANGO-VERSION-STRING:CAPS"></a><h3>PANGO_VERSION_STRING</h3>
-<pre class="programlisting">#define PANGO_VERSION_STRING "1.36.7"
+<pre class="programlisting">#define PANGO_VERSION_STRING "1.36.8"
</pre>
<p>A string literal containing the version of Pango available at
compile-time.</p>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/docs/pango-querymodules.1
new/pango-1.36.8/docs/pango-querymodules.1
--- old/pango-1.36.7/docs/pango-querymodules.1 2014-09-03 21:30:07.000000000
+0200
+++ new/pango-1.36.8/docs/pango-querymodules.1 2014-09-22 20:31:13.000000000
+0200
@@ -2,12 +2,12 @@
.\" Title: pango-querymodules
.\" Author: Owen Taylor
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 09/03/2014
+.\" Date: 09/22/2014
.\" Manual: User Commands
.\" Source: Pango
.\" Language: English
.\"
-.TH "PANGO\-QUERYMODULES" "1" "09/03/2014" "Pango" "User Commands"
+.TH "PANGO\-QUERYMODULES" "1" "09/22/2014" "Pango" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/docs/version.xml
new/pango-1.36.8/docs/version.xml
--- old/pango-1.36.7/docs/version.xml 2014-09-03 21:48:00.000000000 +0200
+++ new/pango-1.36.8/docs/version.xml 2014-09-22 20:30:23.000000000 +0200
@@ -1 +1 @@
-1.36.7
+1.36.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/pango/pango-features.h
new/pango-1.36.8/pango/pango-features.h
--- old/pango-1.36.7/pango/pango-features.h 2014-09-03 21:48:01.000000000
+0200
+++ new/pango-1.36.8/pango/pango-features.h 2014-09-22 20:30:23.000000000
+0200
@@ -4,9 +4,9 @@
#define PANGO_VERSION_MAJOR 1
#define PANGO_VERSION_MINOR 36
-#define PANGO_VERSION_MICRO 7
+#define PANGO_VERSION_MICRO 8
-#define PANGO_VERSION_STRING "1.36.7"
+#define PANGO_VERSION_STRING "1.36.8"
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/pango/pango.rc
new/pango-1.36.8/pango/pango.rc
--- old/pango-1.36.7/pango/pango.rc 2014-09-03 21:48:00.000000000 +0200
+++ new/pango-1.36.8/pango/pango.rc 2014-09-22 20:30:23.000000000 +0200
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,36,7,0
- PRODUCTVERSION 1,36,7,0
+ FILEVERSION 1,36,8,0
+ PRODUCTVERSION 1,36,8,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "Pango"
- VALUE "FileVersion", "1.36.7.0"
+ VALUE "FileVersion", "1.36.8.0"
VALUE "InternalName", "pango-1.0-0"
VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software."
VALUE "OriginalFilename", "pango-1.0-0.dll"
VALUE "ProductName", "Pango"
- VALUE "ProductVersion", "1.36.7"
+ VALUE "ProductVersion", "1.36.8"
END
END
BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/pango/pangocairo.rc
new/pango-1.36.8/pango/pangocairo.rc
--- old/pango-1.36.7/pango/pangocairo.rc 2014-09-03 21:48:00.000000000
+0200
+++ new/pango-1.36.8/pango/pangocairo.rc 2014-09-22 20:30:23.000000000
+0200
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,36,7,0
- PRODUCTVERSION 1,36,7,0
+ FILEVERSION 1,36,8,0
+ PRODUCTVERSION 1,36,8,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "PangoCairo"
- VALUE "FileVersion", "1.36.7.0"
+ VALUE "FileVersion", "1.36.8.0"
VALUE "InternalName", "pangocairo-1.0-0"
VALUE "LegalCopyright", "Copyright � 2010 Red Hat Software."
VALUE "OriginalFilename", "pangocairo-1.0-0.dll"
VALUE "ProductName", "PangoCairo"
- VALUE "ProductVersion", "1.36.7"
+ VALUE "ProductVersion", "1.36.8"
END
END
BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/pango/pangoft2.rc
new/pango-1.36.8/pango/pangoft2.rc
--- old/pango-1.36.7/pango/pangoft2.rc 2014-09-03 21:48:00.000000000 +0200
+++ new/pango-1.36.8/pango/pangoft2.rc 2014-09-22 20:30:23.000000000 +0200
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,36,7,0
- PRODUCTVERSION 1,36,7,0
+ FILEVERSION 1,36,8,0
+ PRODUCTVERSION 1,36,8,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "PangoFT2"
- VALUE "FileVersion", "1.36.7.0"
+ VALUE "FileVersion", "1.36.8.0"
VALUE "InternalName", "pangoft2-1.0-0"
VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software. Copyright �
2000 Tor Lillqvist"
VALUE "OriginalFilename", "pangoft2-1.0-0.dll"
VALUE "ProductName", "PangoFT2"
- VALUE "ProductVersion", "1.36.7"
+ VALUE "ProductVersion", "1.36.8"
END
END
BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/pango/pangowin32.rc
new/pango-1.36.8/pango/pangowin32.rc
--- old/pango-1.36.7/pango/pangowin32.rc 2014-09-03 21:48:00.000000000
+0200
+++ new/pango-1.36.8/pango/pangowin32.rc 2014-09-22 20:30:23.000000000
+0200
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,36,7,0
- PRODUCTVERSION 1,36,7,0
+ FILEVERSION 1,36,8,0
+ PRODUCTVERSION 1,36,8,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "PangoWin32"
- VALUE "FileVersion", "1.36.7.0"
+ VALUE "FileVersion", "1.36.8.0"
VALUE "InternalName", "pangowin32-1.0-0"
VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software. Copyright �
2000 Tor Lillqvist"
VALUE "OriginalFilename", "pangowin32-1.0-0.dll"
VALUE "ProductName", "PangoWin32"
- VALUE "ProductVersion", "1.36.7"
+ VALUE "ProductVersion", "1.36.8"
END
END
BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/pango/pangoxft.rc
new/pango-1.36.8/pango/pangoxft.rc
--- old/pango-1.36.7/pango/pangoxft.rc 2014-09-03 21:48:00.000000000 +0200
+++ new/pango-1.36.8/pango/pangoxft.rc 2014-09-22 20:30:23.000000000 +0200
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,36,7,0
- PRODUCTVERSION 1,36,7,0
+ FILEVERSION 1,36,8,0
+ PRODUCTVERSION 1,36,8,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "Red Hat Software"
VALUE "FileDescription", "Pangoxft"
- VALUE "FileVersion", "1.36.7.0"
+ VALUE "FileVersion", "1.36.8.0"
VALUE "InternalName", "pangoxft-1.0-0"
VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software."
VALUE "OriginalFilename", "pangoxft-1.0-0.dll"
VALUE "ProductName", "Pangoxft"
- VALUE "ProductVersion", "1.36.7"
+ VALUE "ProductVersion", "1.36.8"
END
END
BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/tests/Makefile.am
new/pango-1.36.8/tests/Makefile.am
--- old/pango-1.36.7/tests/Makefile.am 2014-08-31 02:18:22.000000000 +0200
+++ new/pango-1.36.8/tests/Makefile.am 2014-09-08 16:47:48.000000000 +0200
@@ -50,6 +50,7 @@
testscript \
markup-parse \
test-layout \
+ test-font \
$(NULL)
if HAVE_CAIRO
@@ -74,6 +75,7 @@
dump_boundaries_LDADD = $(TEST_PANGO_LIBS) $(GLIB_LIBS)
markup_parse_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
test_layout_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
+test_font_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
if HAVE_CXX
check_PROGRAMS += cxx-test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/tests/Makefile.in
new/pango-1.36.8/tests/Makefile.in
--- old/pango-1.36.7/tests/Makefile.in 2014-09-03 21:47:56.000000000 +0200
+++ new/pango-1.36.8/tests/Makefile.in 2014-09-22 20:30:19.000000000 +0200
@@ -85,8 +85,8 @@
@CROSS_COMPILING_FALSE@TESTS = $(check_PROGRAMS)
check_PROGRAMS = testboundaries$(EXEEXT) testboundaries_ucd$(EXEEXT) \
testcolor$(EXEEXT) testscript$(EXEEXT) markup-parse$(EXEEXT) \
- test-layout$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
- $(am__EXEEXT_3)
+ test-layout$(EXEEXT) test-font$(EXEEXT) $(am__EXEEXT_1) \
+ $(am__EXEEXT_2) $(am__EXEEXT_3)
@HAVE_CAIRO_TRUE@am__append_4 = testiter test-pangocairo-threads
@HAVE_FREETYPE_TRUE@am__append_5 = test-ot-tags
@HAVE_CXX_TRUE@am__append_6 = cxx-test
@@ -130,6 +130,9 @@
markup_parse_OBJECTS = markup-parse.$(OBJEXT)
markup_parse_DEPENDENCIES = $(TEST_PANGOCAIRO_LIBS) \
$(am__DEPENDENCIES_1)
+test_font_SOURCES = test-font.c
+test_font_OBJECTS = test-font.$(OBJEXT)
+test_font_DEPENDENCIES = $(TEST_PANGOCAIRO_LIBS) $(am__DEPENDENCIES_1)
test_layout_SOURCES = test-layout.c
test_layout_OBJECTS = test-layout.$(OBJEXT)
test_layout_DEPENDENCIES = $(TEST_PANGOCAIRO_LIBS) \
@@ -211,11 +214,11 @@
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(cxx_test_SOURCES) dump-boundaries.c gen-all-unicode.c \
- markup-parse.c test-layout.c test-ot-tags.c \
+ markup-parse.c test-font.c test-layout.c test-ot-tags.c \
test-pangocairo-threads.c testboundaries.c \
testboundaries_ucd.c testcolor.c testiter.c testscript.c
DIST_SOURCES = $(cxx_test_SOURCES) dump-boundaries.c gen-all-unicode.c \
- markup-parse.c test-layout.c test-ot-tags.c \
+ markup-parse.c test-font.c test-layout.c test-ot-tags.c \
test-pangocairo-threads.c testboundaries.c \
testboundaries_ucd.c testcolor.c testiter.c testscript.c
am__can_run_installinfo = \
@@ -656,6 +659,7 @@
dump_boundaries_LDADD = $(TEST_PANGO_LIBS) $(GLIB_LIBS)
markup_parse_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
test_layout_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
+test_font_LDADD = $(TEST_PANGOCAIRO_LIBS) $(GLIB_LIBS)
cxx_test_SOURCES = cxx-test.C
markup_tests = \
valid-1 valid-2 valid-3 valid-4 \
@@ -818,6 +822,10 @@
@rm -f markup-parse$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(markup_parse_OBJECTS) $(markup_parse_LDADD)
$(LIBS)
+test-font$(EXEEXT): $(test_font_OBJECTS) $(test_font_DEPENDENCIES)
$(EXTRA_test_font_DEPENDENCIES)
+ @rm -f test-font$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(test_font_OBJECTS) $(test_font_LDADD) $(LIBS)
+
test-layout$(EXEEXT): $(test_layout_OBJECTS) $(test_layout_DEPENDENCIES)
$(EXTRA_test_layout_DEPENDENCIES)
@rm -f test-layout$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_layout_OBJECTS) $(test_layout_LDADD) $(LIBS)
@@ -860,6 +868,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dump-boundaries.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen-all-unicode.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-parse.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-font.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-layout.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ot-tags.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/test-pangocairo-threads.Po@am__quote@
@@ -1196,6 +1205,13 @@
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS)
-- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-font.log: test-font$(EXEEXT)
+ @p='test-font$(EXEEXT)'; \
+ b='test-font'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS)
-- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
testiter.log: testiter$(EXEEXT)
@p='testiter$(EXEEXT)'; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/tests/layouts/valid-1.expected
new/pango-1.36.8/tests/layouts/valid-1.expected
--- old/pango-1.36.7/tests/layouts/valid-1.expected 2014-09-03
21:38:15.000000000 +0200
+++ new/pango-1.36.8/tests/layouts/valid-1.expected 2014-09-19
17:42:47.000000000 +0200
@@ -23,11 +23,11 @@
---
-i=1, index=0, chars=22, level=0, gravity=south, flags=0, font=Cantarell 11,
script=latin, language=c, 'This is a test of the '
-i=2, index=22, chars=11, level=0, gravity=south, flags=0, font=Cantarell 11,
script=latin, language=c, 'automatic e'
+i=1, index=0, chars=22, level=0, gravity=south, flags=0, font=OMITTED,
script=latin, language=c, 'This is a test of the '
+i=2, index=22, chars=11, level=0, gravity=south, flags=0, font=OMITTED,
script=latin, language=c, 'automatic e'
[22 41] foreground #00000000ffff
[22 41] underline 1
-i=3, index=33, chars=15, level=0, gravity=south, flags=2, font=Cantarell 11,
script=common, language=c, 'mergency brake!'
+i=3, index=33, chars=15, level=0, gravity=south, flags=2, font=OMITTED,
script=common, language=c, 'mergency brake!'
[0 2147483647] fallback 0
[22 41] foreground #00000000ffff
[22 41] underline 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/tests/layouts/valid-2.expected
new/pango-1.36.8/tests/layouts/valid-2.expected
--- old/pango-1.36.7/tests/layouts/valid-2.expected 2014-08-31
02:13:45.000000000 +0200
+++ new/pango-1.36.8/tests/layouts/valid-2.expected 2014-09-19
17:42:58.000000000 +0200
@@ -24,11 +24,11 @@
---
-i=1, index=0, chars=9, level=0, gravity=south, flags=0, font=Cantarell 11,
script=latin, language=c, 'test the '
-i=2, index=9, chars=4, level=0, gravity=south, flags=0, font=Cantarell Oblique
11, script=latin, language=c, 'blue'
-i=3, index=13, chars=7, level=0, gravity=south, flags=0, font=Cantarell 11,
script=latin, language=c, ' drink '
-i=4, index=20, chars=5, level=0, gravity=south, flags=0, font=Cantarell 11,
script=latin, language=c, 'after'
+i=1, index=0, chars=9, level=0, gravity=south, flags=0, font=OMITTED,
script=latin, language=c, 'test the '
+i=2, index=9, chars=4, level=0, gravity=south, flags=0, font=OMITTED,
script=latin, language=c, 'blue'
+i=3, index=13, chars=7, level=0, gravity=south, flags=0, font=OMITTED,
script=latin, language=c, ' drink '
+i=4, index=20, chars=5, level=0, gravity=south, flags=0, font=OMITTED,
script=latin, language=c, 'after'
[20 25] underline 1
-i=5, index=25, chars=7, level=0, gravity=south, flags=0, font=Cantarell 11,
script=latin, language=c, ' dinner'
+i=5, index=25, chars=7, level=0, gravity=south, flags=0, font=OMITTED,
script=latin, language=c, ' dinner'
i=6, index=32, no run, line end
i=7, index=33, no run, line end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/tests/test-font.c
new/pango-1.36.8/tests/test-font.c
--- old/pango-1.36.7/tests/test-font.c 1970-01-01 01:00:00.000000000 +0100
+++ new/pango-1.36.8/tests/test-font.c 2014-09-08 17:54:57.000000000 +0200
@@ -0,0 +1,92 @@
+/* Pango
+ * test-font.c: Test PangoFontDescription
+ *
+ * Copyright (C) 2014 Red Hat, Inc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <glib.h>
+#include <string.h>
+#include <locale.h>
+
+#include <pango/pangocairo.h>
+
+static void
+test_parse (void)
+{
+ PangoFontDescription *desc;
+
+ desc = pango_font_description_from_string ("Cantarell 14");
+
+ g_assert_cmpstr (pango_font_description_get_family (desc), ==, "Cantarell");
+ g_assert (!pango_font_description_get_size_is_absolute (desc));
+ g_assert_cmpint (pango_font_description_get_size (desc), ==, 14 *
PANGO_SCALE);
+ g_assert_cmpint (pango_font_description_get_style (desc), ==,
PANGO_STYLE_NORMAL);
+ g_assert_cmpint (pango_font_description_get_variant (desc), ==,
PANGO_VARIANT_NORMAL);
+ g_assert_cmpint (pango_font_description_get_weight (desc), ==,
PANGO_WEIGHT_NORMAL);
+ g_assert_cmpint (pango_font_description_get_stretch (desc), ==,
PANGO_STRETCH_NORMAL);
+ g_assert_cmpint (pango_font_description_get_gravity (desc), ==,
PANGO_GRAVITY_SOUTH);
+ g_assert_cmpint (pango_font_description_get_set_fields (desc), ==,
PANGO_FONT_MASK_FAMILY | PANGO_FONT_MASK_STYLE | PANGO_FONT_MASK_VARIANT |
PANGO_FONT_MASK_WEIGHT | PANGO_FONT_MASK_STRETCH | PANGO_FONT_MASK_SIZE);
+
+ pango_font_description_free (desc);
+
+ desc = pango_font_description_from_string ("Sans Bold Italic Condensed
22.5px");
+
+ g_assert_cmpstr (pango_font_description_get_family (desc), ==, "Sans");
+ g_assert (pango_font_description_get_size_is_absolute (desc));
+ g_assert_cmpint (pango_font_description_get_size (desc), ==, 225 *
PANGO_SCALE / 10);
+ g_assert_cmpint (pango_font_description_get_style (desc), ==,
PANGO_STYLE_ITALIC);
+ g_assert_cmpint (pango_font_description_get_variant (desc), ==,
PANGO_VARIANT_NORMAL);
+ g_assert_cmpint (pango_font_description_get_weight (desc), ==,
PANGO_WEIGHT_BOLD);
+ g_assert_cmpint (pango_font_description_get_stretch (desc), ==,
PANGO_STRETCH_CONDENSED);
+ g_assert_cmpint (pango_font_description_get_gravity (desc), ==,
PANGO_GRAVITY_SOUTH); g_assert_cmpint (pango_font_description_get_set_fields
(desc), ==, PANGO_FONT_MASK_FAMILY | PANGO_FONT_MASK_STYLE |
PANGO_FONT_MASK_VARIANT | PANGO_FONT_MASK_WEIGHT | PANGO_FONT_MASK_STRETCH |
PANGO_FONT_MASK_SIZE);
+
+ pango_font_description_free (desc);
+}
+
+static void
+test_roundtrip (void)
+{
+ PangoFontDescription *desc;
+ gchar *str;
+
+ desc = pango_font_description_from_string ("Cantarell 14");
+ str = pango_font_description_to_string (desc);
+ g_assert_cmpstr (str, ==, "Cantarell 14");
+ pango_font_description_free (desc);
+ g_free (str);
+
+ desc = pango_font_description_from_string ("Sans Bold Italic Condensed
22.5px");
+ str = pango_font_description_to_string (desc);
+ g_assert_cmpstr (str, ==, "Sans Bold Italic Condensed 22.5px");
+ pango_font_description_free (desc);
+ g_free (str);
+}
+
+int
+main (int argc, char *argv[])
+{
+ g_setenv ("LC_ALL", "C", TRUE);
+ setlocale (LC_ALL, "");
+
+ g_test_init (&argc, &argv, NULL);
+
+ g_test_add_func ("/pango/fontdescription/parse", test_parse);
+ g_test_add_func ("/pango/fontdescription/roundtrip", test_roundtrip);
+
+ return g_test_run ();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pango-1.36.7/tests/test-layout.c
new/pango-1.36.8/tests/test-layout.c
--- old/pango-1.36.7/tests/test-layout.c 2014-09-03 21:36:48.000000000
+0200
+++ new/pango-1.36.8/tests/test-layout.c 2014-09-19 17:42:25.000000000
+0200
@@ -326,7 +326,7 @@
i, index, item->num_chars,
item->analysis.level,
gravity_name (item->analysis.gravity),
item->analysis.flags,
- font,
+ "OMITTED", /* for some reason, this fails on
build.gnome.org, so leave it out */
script_name (item->analysis.script),
pango_language_to_string
(item->analysis.language),
char_str);
@@ -404,6 +404,7 @@
gint ellipsize_at = 0;
PangoEllipsizeMode ellipsize = PANGO_ELLIPSIZE_NONE;
PangoWrapMode wrap = PANGO_WRAP_WORD;
+ PangoFontDescription *desc;
if (!g_file_get_contents (filename, &contents, &length, &error))
{
@@ -420,6 +421,11 @@
parse_params (contents, &width, &ellipsize_at, &ellipsize, &wrap);
layout = pango_layout_new (context);
+
+ desc = pango_font_description_from_string ("Cantarell 11");
+ pango_layout_set_font_description (layout, desc);
+ pango_font_description_free (desc);
+
pango_layout_set_markup (layout, markup, length);
g_free (contents);
@@ -497,7 +503,6 @@
GError *error = NULL;
const gchar *name;
gchar *path;
- PangoFontDescription *desc;
g_setenv ("LC_ALL", "C", TRUE);
setlocale (LC_ALL, "");
@@ -505,9 +510,6 @@
g_test_init (&argc, &argv, NULL);
context = pango_font_map_create_context (pango_cairo_font_map_get_default
());
- desc = pango_font_description_from_string ("Cantarell 11");
- pango_context_set_font_description (context, desc);
- pango_font_description_free (desc);
/* allow to easily generate expected output for new test cases */
if (argc > 1)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
