Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2013-06-28 18:54:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-05-16 11:22:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2013-06-28 18:54:58.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jun 22 13:44:01 UTC 2013 - zaitor@opensuse.org + +- Update to version 1.35.0: + + Requires cairo 1.12.10. + + Add a --with-cairo option. + + Handle invalid utf8 better (bgo#700577). + + Install some tests. + + Don't change fonts for space (bgo#701652). + +------------------------------------------------------------------- Old: ---- pango-1.34.1.tar.xz New: ---- pango-1.35.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.bSMkgS/_old 2013-06-28 18:54:59.000000000 +0200 +++ /var/tmp/diff_new_pack.bSMkgS/_new 2013-06-28 18:54:59.000000000 +0200 @@ -20,20 +20,20 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.34.1 +Version: 1.35.0 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ Group: System/Libraries Url: http://www.pango.org/ -Source: http://download.gnome.org/sources/pango/1.34/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/pango/1.35/%{name}-%{version}.tar.xz Source1: README.SuSE Source2: macros.pango Source99: baselibs.conf BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: pkg-config -BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(cairo) >= 1.12.10 BuildRequires: pkgconfig(fontconfig) >= 2.10.91 BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glib-2.0) >= 2.33.12 ++++++ pango-1.34.1.tar.xz -> pango-1.35.0.tar.xz ++++++ ++++ 3872 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/ChangeLog new/pango-1.35.0/ChangeLog --- old/pango-1.34.1/ChangeLog 2013-05-13 18:45:13.000000000 +0200 +++ new/pango-1.35.0/ChangeLog 2013-06-21 15:11:08.000000000 +0200 @@ -1,3 +1,99 @@ +commit 8ac9fc7faeff8908448e9da09a43873e2e0fe376 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Fri Jun 7 21:10:44 2013 -0400 + + Avoid hard-dep on bleeding-edge GLib + + If new test api is not available, do without it. In this + case, the tests won't work installed, but they should still + work uninstalled and in distcheck. + + tests/Makefile.am | 1 + + tests/testboundaries.c | 5 +++++ + tests/testboundaries_ucd.c | 16 ++++++++++++++++ + 3 files changed, 22 insertions(+) + +commit d489ad061d70526fc5f5cdae2273e9deabea6a17 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Thu Jun 6 19:57:55 2013 -0400 + + Don't change fonts just for space characters + + Back in the days we used to always use the font from surrounding runs + for any space characters. I changed that when I found that rendering + MathML results in hexboxes when a font doesn't have the space + characters + needed... + + Forward to these days: HarfBuzz will silently compatibility-decompose + any space character to the ASCII space. And looks like it's important + for Mongolian to not break runs around NNBSP. As such, go back + to never + choosing a font just for space characters. + + Seems to work, though more testing is needed. + + Bug 701652 - wrong shaped classic Mongolian word suffixes + + pango/pango-context.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit e17b595e3bacfb7333bab6fcd1c62d05e7228936 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Fri May 31 18:02:03 2013 -0400 + + Make tests installable + + This ensures that tests are run continuously on ostree.gnome.org. + + configure.ac | 13 +++++++++- + tests/Makefile.am | 34 +++++++++++++++++++----- + tests/test-ot-tags.c | 8 +++--- + tests/testboundaries.c | 26 ++++++++++--------- + tests/testboundaries_ucd.c | 65 + +++++++++++++++++++++++++++++++++------------- + tests/testcolor.c | 23 +++++++++------- + tests/testiter.c | 17 ++++++++---- + tests/testscript.c | 6 ++--- + 8 files changed, 133 insertions(+), 59 deletions(-) + +commit 6c16dfe8ad012a2551d0270a0325574e9ce3cef7 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Mon May 27 17:24:04 2013 -0400 + + Bug 700577 - Support invalid UTF-8 chars in + pango_find_paragraph_boundary() + + pango/break.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe8d5ce6975bda30839413f71ab3e192a582300b +Author: Colin Walters <walters@verbum.org> +Date: Fri May 24 18:04:49 2013 +0100 + + build: Add --with(out)-cairo configure option + + Some builders (e.g. GNOME and jhbuild) hard depend on pangocairo, + and we really don't want to emit a build of pango without support + for it. So jhbuild can specify --with-cairo, and we'll get + a hard error. + + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 49712d6381f25fe3785694fea7804988c1067a24 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed May 15 14:40:45 2013 -0400 + + Require cairo >= 1.12.10 + + Needed for threadsafety bug fixes. + + Bug 700247 - test-pangocairo-threads segfaults + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 0e3dfe8b6ce6f9ddd68ba150906d1d711ad1433c Author: Matthias Clasen <mclasen@redhat.com> Date: Mon May 13 11:34:10 2013 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/INSTALL new/pango-1.35.0/INSTALL --- old/pango-1.34.1/INSTALL 2013-05-13 17:34:49.000000000 +0200 +++ new/pango-1.35.0/INSTALL 2013-06-21 15:00:48.000000000 +0200 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/NEWS new/pango-1.35.0/NEWS --- old/pango-1.34.1/NEWS 2013-05-13 17:34:06.000000000 +0200 +++ new/pango-1.35.0/NEWS 2013-06-21 15:00:08.000000000 +0200 @@ -1,3 +1,11 @@ +Overview of changes between 1.34 and 1.35.0 +=========================================== +- Requires cairo 1.12.10 +- Add a --with-cairo option +- Handle invalid utf8 better (#700577) +- Install some tests +- Don't change fonts for space (#701652) + Overview of changes between 1.34.0 and 1.34.1 ============================================= - 96238 - PangoAttrFilterFunc vs pango_attr_list_filter docs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/config.h.win32 new/pango-1.35.0/config.h.win32 --- old/pango-1.34.1/config.h.win32 2013-05-13 17:35:03.000000000 +0200 +++ new/pango-1.35.0/config.h.win32 2013-06-21 15:00:55.000000000 +0200 @@ -121,7 +121,7 @@ #define PACKAGE_NAME "pango" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pango 1.34.1" +#define PACKAGE_STRING "pango 1.35.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pango" @@ -130,22 +130,22 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.34.1" +#define PACKAGE_VERSION "1.35.0" /* PANGO binary age */ -#define PANGO_BINARY_AGE 3401 +#define PANGO_BINARY_AGE 3500 /* PANGO interface age */ -#define PANGO_INTERFACE_AGE 1 +#define PANGO_INTERFACE_AGE 0 /* PANGO major version */ #define PANGO_VERSION_MAJOR 1 /* PANGO micro version */ -#define PANGO_VERSION_MICRO 1 +#define PANGO_VERSION_MICRO 0 /* PANGO minor version */ -#define PANGO_VERSION_MINOR 34 +#define PANGO_VERSION_MINOR 35 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -154,4 +154,4 @@ /* #undef USE_LA_MODULES */ /* Version number of package */ -#define VERSION "1.34.1" +#define VERSION "1.35.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/configure.ac new/pango-1.35.0/configure.ac --- old/pango-1.34.1/configure.ac 2013-05-13 17:31:52.000000000 +0200 +++ new/pango-1.35.0/configure.ac 2013-06-21 14:55:47.000000000 +0200 @@ -21,8 +21,8 @@ dnl The triplet m4_define([pango_version_major], [1]) -m4_define([pango_version_minor], [34]) -m4_define([pango_version_micro], [1]) +m4_define([pango_version_minor], [35]) +m4_define([pango_version_micro], [0]) m4_define([pango_version], [pango_version_major.pango_version_minor.pango_version_micro]) @@ -353,9 +353,14 @@ have_cairo_freetype=false have_cairo_win32=false have_cairo_quartz=false -cairo_required=1.7.6 +cairo_required=1.12.10 -PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no])) +AC_ARG_WITH(cairo, + AS_HELP_STRING([--without-cairo], [Do not use cairo]), + :, with_cairo=auto) +AS_IF([test x$with_cairo != xno], [ + PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no])) +]) if $have_cairo ; then pango_save_libs=$LIBS @@ -397,6 +402,9 @@ if $have_cairo ; then AC_MSG_RESULT([$cairo_font_backends]) else + if test x${with_cairo} != xauto; then + AC_MSG_ERROR([cairo support requested, but not present]) + fi AC_MSG_RESULT([none]) AC_MSG_NOTICE([Disabling cairo support]) fi @@ -670,6 +678,17 @@ fi dnl ******************************************************** +dnl * Installed test * +dnl ******************************************************** + +AC_ARG_ENABLE(installed_tests, + AS_HELP_STRING([--enable-installed-tests], + [Install test programs (default: no)]),, + [enable_installed_tests=no]) +AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes) + + +dnl ******************************************************** dnl * See whether we need to load our modules as .la files * dnl ******************************************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/docs/html/index.html new/pango-1.35.0/docs/html/index.html --- old/pango-1.34.1/docs/html/index.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/index.html 2013-06-21 15:11:10.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.34.1 +<div><p class="releaseinfo">for Pango 1.35.0 </p></div> </div> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/docs/html/pango-Fonts.html new/pango-1.35.0/docs/html/pango-Fonts.html --- old/pango-1.34.1/docs/html/pango-Fonts.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/pango-Fonts.html 2013-06-21 15:11:10.000000000 +0200 @@ -2774,7 +2774,7 @@ If you are using Pango as part of a higher-level system, that system may have it's own way of create a <a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a>. For instance, the GTK+ toolkit has, among others, -<a href="http://library.gnome.org/devel/gdk3/gdk2-Pango-Interaction.html#gdk-pango-context-get-for-screen"><code class="function">gdk_pango_context_get_for_screen()</code></a>, and +<a href="http://developer.gnome.org/gdk2/gdk3-Pango-Interaction.html#gdk-pango-context-get-for-screen"><code class="function">gdk_pango_context_get_for_screen()</code></a>, and <a href="http://developer.gnome.org/gtk2/GtkWidget.html#gtk-widget-get-pango-context"><code class="function">gtk_widget_get_pango_context()</code></a>. Use those instead. </p> <div class="variablelist"><table border="0" class="variablelist"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/docs/html/pango-Scripts-and-Languages.html new/pango-1.35.0/docs/html/pango-Scripts-and-Languages.html --- old/pango-1.34.1/docs/html/pango-Scripts-and-Languages.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/pango-Scripts-and-Languages.html 2013-06-21 15:11:10.000000000 +0200 @@ -1160,7 +1160,7 @@ <p> Your application should call <code class="literal">setlocale(LC_ALL, "");</code> for the user settings to take effect. Gtk+ does this in its initialization -functions automatically (by calling <a href="http://library.gnome.org/devel/gtk3/gtk2-General.html#gtk-set-locale"><code class="function">gtk_set_locale()</code></a>). +functions automatically (by calling <code class="function">gtk_set_locale()</code>). See <code class="literal">man setlocale</code> for more details. </p> <div class="variablelist"><table border="0" class="variablelist"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/docs/html/pango-Text-Processing.html new/pango-1.35.0/docs/html/pango-Text-Processing.html --- old/pango-1.34.1/docs/html/pango-Text-Processing.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/pango-Text-Processing.html 2013-06-21 15:11:10.000000000 +0200 @@ -563,7 +563,7 @@ If you are using Pango as part of a higher-level system, that system may have it's own way of create a <a class="link" href="pango-Text-Processing.html#PangoContext"><span class="type">PangoContext</span></a>. For instance, the GTK+ toolkit has, among others, -<a href="http://library.gnome.org/devel/gdk3/gdk2-Pango-Interaction.html#gdk-pango-context-get-for-screen"><code class="function">gdk_pango_context_get_for_screen()</code></a>, and +<a href="http://developer.gnome.org/gdk2/gdk3-Pango-Interaction.html#gdk-pango-context-get-for-screen"><code class="function">gdk_pango_context_get_for_screen()</code></a>, and <a href="http://developer.gnome.org/gtk2/GtkWidget.html#gtk-widget-get-pango-context"><code class="function">gtk_widget_get_pango_context()</code></a>. Use those instead. </p> <div class="variablelist"><table border="0" class="variablelist"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/docs/html/pango-Version-Checking.html new/pango-1.35.0/docs/html/pango-Version-Checking.html --- old/pango-1.34.1/docs/html/pango-Version-Checking.html 2013-05-13 18:45:22.000000000 +0200 +++ new/pango-1.35.0/docs/html/pango-Version-Checking.html 2013-06-21 15:11:10.000000000 +0200 @@ -117,7 +117,7 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-MINOR:CAPS"></a><h3>PANGO_VERSION_MINOR</h3> -<pre class="programlisting">#define PANGO_VERSION_MINOR 34 +<pre class="programlisting">#define PANGO_VERSION_MINOR 35 </pre> <p> The minor component of the version of Pango available at compile-time. @@ -126,7 +126,7 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-MICRO:CAPS"></a><h3>PANGO_VERSION_MICRO</h3> -<pre class="programlisting">#define PANGO_VERSION_MICRO 1 +<pre class="programlisting">#define PANGO_VERSION_MICRO 0 </pre> <p> The micro component of the version of Pango available at compile-time. @@ -135,7 +135,7 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-STRING:CAPS"></a><h3>PANGO_VERSION_STRING</h3> -<pre class="programlisting">#define PANGO_VERSION_STRING "1.34.1" +<pre class="programlisting">#define PANGO_VERSION_STRING "1.35.0" </pre> <p> A string literal containing the version of Pango available at compile-time. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/docs/pango-querymodules.1 new/pango-1.35.0/docs/pango-querymodules.1 --- old/pango-1.34.1/docs/pango-querymodules.1 2013-05-13 17:35:58.000000000 +0200 +++ new/pango-1.35.0/docs/pango-querymodules.1 2013-06-21 15:01:51.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: pango-querymodules .\" Author: Owen Taylor .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 05/13/2013 +.\" Date: 06/21/2013 .\" Manual: User Commands .\" Source: Pango .\" Language: English .\" -.TH "PANGO\-QUERYMODULES" "1" "05/13/2013" "Pango" "User Commands" +.TH "PANGO\-QUERYMODULES" "1" "06/21/2013" "Pango" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/docs/version.xml new/pango-1.35.0/docs/version.xml --- old/pango-1.34.1/docs/version.xml 2013-05-13 17:35:03.000000000 +0200 +++ new/pango-1.35.0/docs/version.xml 2013-06-21 15:00:55.000000000 +0200 @@ -1 +1 @@ -1.34.1 +1.35.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/gtk-doc.make new/pango-1.35.0/gtk-doc.make --- old/pango-1.34.1/gtk-doc.make 2013-05-07 16:35:55.000000000 +0200 +++ new/pango-1.35.0/gtk-doc.make 2013-05-27 19:50:19.000000000 +0200 @@ -84,7 +84,7 @@ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango/break.c new/pango-1.35.0/pango/break.c --- old/pango-1.34.1/pango/break.c 2013-05-07 16:45:33.000000000 +0200 +++ new/pango-1.35.0/pango/break.c 2013-06-01 00:03:53.000000000 +0200 @@ -1747,7 +1747,7 @@ prev_sep = 0; - while (p != end) + while (p < end) { if (prev_sep == '\n' || prev_sep == PARAGRAPH_SEPARATOR_STRING[0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango/pango-context.c new/pango-1.35.0/pango/pango-context.c --- old/pango-1.34.1/pango/pango-context.c 2013-01-03 14:12:47.000000000 +0100 +++ new/pango-1.35.0/pango/pango-context.c 2013-06-08 02:59:54.000000000 +0200 @@ -1447,17 +1447,17 @@ PangoFont *font; /* We don't want space characters to affect font selection; in general, - * it's always wrong to select a font just to render a space. But until - * we have a better solution, choosing a font for spaces seems to work - * better. However, all fonts are assumed to cover ASCII space, so that - * one is an exception. See bug #355987. + * it's always wrong to select a font just to render a space. + * We assume that all fonts have the ASCII space, and for other space + * characters if they don't, HarfBuzz will compatibility-decompose them + * to ASCII space... + * See bugs #355987 and #701652. * * The exception of PrivateUse and Unassigned characters is necessary * to be able to render any of them. (for private or being encoded * scripts, etc.) (Recent glib returns true in isprint for PrivateUse.) */ - if (wc == 0x0020 || - G_UNLIKELY (!g_unichar_isprint (wc) && + if (G_UNLIKELY (!g_unichar_isgraph (wc) && g_unichar_type (wc) != G_UNICODE_PRIVATE_USE && g_unichar_type (wc) != G_UNICODE_UNASSIGNED)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango/pango-features.h new/pango-1.35.0/pango/pango-features.h --- old/pango-1.34.1/pango/pango-features.h 2013-05-13 17:35:05.000000000 +0200 +++ new/pango-1.35.0/pango/pango-features.h 2013-06-21 15:00:55.000000000 +0200 @@ -3,10 +3,10 @@ #define PANGO_FEATURES_H #define PANGO_VERSION_MAJOR 1 -#define PANGO_VERSION_MINOR 34 -#define PANGO_VERSION_MICRO 1 +#define PANGO_VERSION_MINOR 35 +#define PANGO_VERSION_MICRO 0 -#define PANGO_VERSION_STRING "1.34.1" +#define PANGO_VERSION_STRING "1.35.0" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango/pango.rc new/pango-1.35.0/pango/pango.rc --- old/pango-1.34.1/pango/pango.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pango.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pango" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.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.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango/pangocairo.rc new/pango-1.35.0/pango/pangocairo.rc --- old/pango-1.34.1/pango/pangocairo.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pangocairo.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoCairo" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.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.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango/pangoft2.rc new/pango-1.35.0/pango/pangoft2.rc --- old/pango-1.34.1/pango/pangoft2.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pangoft2.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoFT2" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.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.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango/pangowin32.rc new/pango-1.35.0/pango/pangowin32.rc --- old/pango-1.34.1/pango/pangowin32.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pangowin32.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoWin32" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.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.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango/pangoxft.rc new/pango-1.35.0/pango/pangoxft.rc --- old/pango-1.34.1/pango/pangoxft.rc 2013-05-13 17:35:02.000000000 +0200 +++ new/pango-1.35.0/pango/pangoxft.rc 2013-06-21 15:00:54.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,34,1,0 - PRODUCTVERSION 1,34,1,0 + FILEVERSION 1,35,0,0 + PRODUCTVERSION 1,35,0,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pangoxft" - VALUE "FileVersion", "1.34.1.0" + VALUE "FileVersion", "1.35.0.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.34.1" + VALUE "ProductVersion", "1.35.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/pango-view/pango-view.1.in new/pango-1.35.0/pango-view/pango-view.1.in --- old/pango-1.34.1/pango-view/pango-view.1.in 2013-05-13 17:35:55.000000000 +0200 +++ new/pango-1.35.0/pango-view/pango-view.1.in 2013-06-21 15:01:49.000000000 +0200 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.41.1. -.TH PANGO-VIEW "1" "May 2013" "pango-view (pango) 1.34.1" "User Commands" +.TH PANGO-VIEW "1" "June 2013" "pango-view (pango) 1.35.0" "User Commands" .SH NAME pango-view \- Pango text viewer .SH DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/tests/Makefile.am new/pango-1.35.0/tests/Makefile.am --- old/pango-1.34.1/tests/Makefile.am 2013-01-10 12:20:09.000000000 +0100 +++ new/pango-1.35.0/tests/Makefile.am 2013-06-08 03:06:32.000000000 +0200 @@ -7,7 +7,8 @@ CLEANFILES = pangorc DISTCLEANFILES = all-unicode.txt -INCLUDES = \ +AM_CPPFLAGS = \ + -DSRCDIR=\"$(srcdir)\" \ -I$(top_srcdir) \ $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ @@ -17,23 +18,23 @@ $(X_CFLAGS) if HAVE_XFT -INCLUDES += -DHAVE_X +AM_CPPFLAGS += -DHAVE_X endif if HAVE_XFT -INCLUDES += -DHAVE_XFT +AM_CPPFLAGS += -DHAVE_XFT endif if HAVE_FREETYPE -INCLUDES += -DHAVE_FREETYPE +AM_CPPFLAGS += -DHAVE_FREETYPE endif if HAVE_WIN32 -INCLUDES += -DHAVE_WIN32 +AM_CPPFLAGS += -DHAVE_WIN32 endif if CROSS_COMPILING -TESTS= +TESTS = else -TESTS=$(check_PROGRAMS) +TESTS = $(check_PROGRAMS) endif TESTS_ENVIRONMENT = \ @@ -78,4 +79,24 @@ noinst_PROGRAMS = $(check_PROGRAMS) gen-all-unicode dump-boundaries +if BUILDOPT_INSTALL_TESTS +insttestdir=$(pkglibexecdir)/installed-tests +insttest_PROGRAMS = $(check_PROGRAMS) + +testdatadir = $(insttestdir) +testdata_DATA = \ + all-unicode.txt \ + boundaries.utf8 \ + GraphemeBreakTest.txt + +testmetadir = $(datadir)/installed-tests/$(PACKAGE) +testmeta_DATA = $(check_PROGRAMS:=.test) + +%.test: %$(EXEEXT) Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'Exec=$(pkglibexecdir)/installed-tests/$<' >> $@.tmp; \ + mv $@.tmp $@) +endif + -include $(top_srcdir)/git.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/tests/test-ot-tags.c new/pango-1.35.0/tests/test-ot-tags.c --- old/pango-1.34.1/tests/test-ot-tags.c 2013-01-08 03:07:01.000000000 +0100 +++ new/pango-1.35.0/tests/test-ot-tags.c 2013-06-01 00:03:53.000000000 +0200 @@ -124,12 +124,12 @@ int main (int argc, char **argv) { - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); + g_test_init (&argc, &argv, NULL); - test_script_tags (); - test_language_tags (); + g_test_add_func ("/tags/script", test_script_tags); + g_test_add_func ("/tags/language", test_language_tags); - return 0; + return g_test_run (); } G_GNUC_END_IGNORE_DEPRECATIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/tests/testboundaries.c new/pango-1.35.0/tests/testboundaries.c --- old/pango-1.34.1/tests/testboundaries.c 2013-03-05 02:24:34.000000000 +0100 +++ new/pango-1.35.0/tests/testboundaries.c 2013-06-08 03:07:19.000000000 +0200 @@ -24,6 +24,7 @@ #include <stdio.h> #include <unistd.h> +#include <glib.h> #include <pango/pango.h> #define CHFORMAT "%0#6x" @@ -311,20 +312,18 @@ g_free (attrs); } -int -main (int argc, char *argv[]) +static void +test_boundaries (void) { gchar *text; - const gchar *srcdir; const gchar *filename; +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "boundaries.utf8", NULL); +#else + filename = SRCDIR "/boundaries.utf8"; +#endif - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); - - srcdir = getenv ("srcdir"); - if (!srcdir) - srcdir = "."; - - filename = g_strdup_printf ("%s/boundaries.utf8", srcdir); + g_print ("sample file: %s\n", filename); if (!g_file_get_contents (filename, &text, NULL, NULL)) fail ("Couldn't open sample text file"); @@ -334,7 +333,15 @@ g_free (text); printf ("testboundaries passed\n"); +} + +int +main (int argc, char *argv[]) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/text/boundaries", test_boundaries); - return 0; + return g_test_run (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/tests/testboundaries_ucd.c new/pango-1.35.0/tests/testboundaries_ucd.c --- old/pango-1.34.1/tests/testboundaries_ucd.c 2012-12-07 03:43:25.000000000 +0100 +++ new/pango-1.35.0/tests/testboundaries_ucd.c 2013-06-08 03:09:44.000000000 +0200 @@ -215,7 +215,7 @@ } static void -do_test (gchar *filename, +do_test (const gchar *filename, AttrBits bits, gboolean fixup_broken_linebreaktest) { @@ -322,43 +322,88 @@ g_io_channel_unref (channel); if (error) g_error_free (error); - g_free (filename); + + g_assert (!failed); } -gint -main (gint argc, - gchar **argv) +static void +test_grapheme_break (void) { - gchar *srcdir; - gchar *filename; + const gchar *filename; AttrBits bits; - setlocale (LC_ALL, ""); - - srcdir = getenv ("srcdir"); - if (!srcdir) - srcdir = "."; - - filename = g_strdup_printf ("%s/GraphemeBreakTest.txt", srcdir); +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "GraphemeBreakTest.txt", NULL); +#else + filename = SRCDIR "/GraphemeBreakTest.txt"; +#endif bits.bits = 0; bits.attr.is_cursor_position = 1; do_test (filename, bits, FALSE); +} - filename = g_strdup_printf ("%s/WordBreakTest.txt", srcdir); +static void +test_word_break (void) +{ + const gchar *filename; + AttrBits bits; + +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "WordBreakTest.txt", NULL); +#else + filename = SRCDIR "/WordBreakTest.txt"; +#endif bits.bits = 0; bits.attr.is_word_boundary = 1; do_test (filename, bits, FALSE); +} - filename = g_strdup_printf ("%s/SentenceBreakTest.txt", srcdir); +static void +test_sentence_break (void) +{ + const gchar *filename; + AttrBits bits; + +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "SentenceBreakTest.txt", NULL); +#else + filename = SRCDIR "/SentenceBreakTest.txt"; +#endif bits.bits = 0; bits.attr.is_sentence_boundary = 1; do_test (filename, bits, FALSE); +} + +static void +test_line_break (void) +{ + const gchar *filename; + AttrBits bits; - filename = g_strdup_printf ("%s/LineBreakTest.txt", srcdir); +#if GLIB_CHECK_VERSION(2, 37, 2) + filename = g_test_get_filename (G_TEST_DIST, "LineBreakTest.txt", NULL); +#else + filename = SRCDIR "/LineBreakTest.txt"; +#endif bits.bits = 0; bits.attr.is_line_break = 1; bits.attr.is_mandatory_break = 1; do_test (filename, bits, TRUE); +} + + +gint +main (gint argc, + gchar **argv) +{ + setlocale (LC_ALL, ""); + + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/text/break/grapheme", test_grapheme_break); + g_test_add_func ("/text/break/word", test_word_break); + g_test_add_func ("/text/break/sentence", test_sentence_break); + g_test_add_func ("/text/break/line", test_line_break); - exit (failed); + return g_test_run (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/tests/testcolor.c new/pango-1.35.0/tests/testcolor.c --- old/pango-1.34.1/tests/testcolor.c 2011-08-16 03:11:08.000000000 +0200 +++ new/pango-1.35.0/tests/testcolor.c 2013-06-01 00:03:53.000000000 +0200 @@ -30,7 +30,7 @@ guint16 blue; } ColorSpec; -static gboolean test_color (ColorSpec *spec) +static gboolean test_one_color (ColorSpec *spec) { PangoColor color; gboolean accepted; @@ -78,17 +78,22 @@ { NULL, 0, 0, 0, 0 } }; -int -main (int argc, char *argv[]) +static void +test_color (void) { - gboolean success; ColorSpec *spec; - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); - - success = TRUE; for (spec = specs; spec->spec; spec++) - success &= test_color (spec); + g_assert (test_one_color (spec)); + +} + +int +main (int argc, char *argv[]) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/color/parse", test_color); - return !success; + return g_test_run (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/tests/testiter.c new/pango-1.35.0/tests/testiter.c --- old/pango-1.34.1/tests/testiter.c 2013-01-08 03:07:02.000000000 +0100 +++ new/pango-1.35.0/tests/testiter.c 2013-06-01 00:03:53.000000000 +0200 @@ -207,16 +207,14 @@ pango_layout_iter_free (iter); } -int -main (int argc, char *argv[]) +static void +test_layout_iter (void) { const char **ptext; PangoFontMap *fontmap; PangoContext *context; PangoLayout *layout; - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); - fontmap = pango_cairo_font_map_get_default (); context = pango_font_map_create_context (fontmap); @@ -236,5 +234,14 @@ } g_object_unref (layout); - return 0; +} + +int +main (int argc, char *argv[]) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/layout/iter", test_layout_iter); + + return g_test_run (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pango-1.34.1/tests/testscript.c new/pango-1.35.0/tests/testscript.c --- old/pango-1.34.1/tests/testscript.c 2011-08-16 03:11:08.000000000 +0200 +++ new/pango-1.35.0/tests/testscript.c 2013-06-01 00:03:53.000000000 +0200 @@ -222,9 +222,9 @@ int main (int argc, char **argv) { - g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE); + g_test_init (&argc, &argv, NULL); - test_script_iter (); + g_test_add_func ("/script/iter", test_script_iter); - return 0; + return g_test_run (); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org