Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2018-04-19 15:25:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pango (Old) and /work/SRC/openSUSE:Factory/.pango.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pango" Thu Apr 19 15:25:02 2018 rev:115 rq:596165 version:1.42.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pango/pango.changes 2018-03-14 19:29:08.538288983 +0100 +++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2018-04-19 15:25:03.753879959 +0200 @@ -1,0 +2,9 @@ +Sat Apr 7 15:20:39 UTC 2018 - bjorn....@gmail.com + +- Update to version 1.42.1: + + Fix meson build, in particular on Windows (bgo#783274, + bgo#795012). + + Add an Emoji font family on Windows, using Segoe UI + (bgo#794705). + +------------------------------------------------------------------- Old: ---- pango-1.42.0.tar.xz New: ---- pango-1.42.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.UVGLpv/_old 2018-04-19 15:25:04.505849448 +0200 +++ /var/tmp/diff_new_pack.UVGLpv/_new 2018-04-19 15:25:04.509849286 +0200 @@ -17,13 +17,13 @@ Name: pango -Version: 1.42.0 +Version: 1.42.1 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ URL: http://www.pango.org/ -Source: http://download.gnome.org/sources/pango/1.42/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/pango/1.42/%{name}-%{version}.tar.xz Source2: macros.pango Source99: baselibs.conf BuildRequires: gcc-c++ ++++++ pango-1.42.0.tar.xz -> pango-1.42.1.tar.xz ++++++ ++++ 1971 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.42.0/ChangeLog new/pango-1.42.1/ChangeLog --- old/pango-1.42.0/ChangeLog 2018-03-12 17:15:27.000000000 +0100 +++ new/pango-1.42.1/ChangeLog 2018-04-07 12:17:15.000000000 +0200 @@ -1,170 +1,243 @@ -commit d4f3370336a40907f528a41e75a55fe4f50c1a11 +commit 46f8583c87c45b304ac98d06005c49df67d53b07 Author: Matthias Clasen <mcla...@redhat.com> -Date: Mon Mar 12 16:02:24 2018 +0000 +Date: Sat Apr 7 10:08:56 2018 +0000 - 1.42.0 + 1.42.1 - NEWS | 4 ++++ - configure.ac | 4 ++-- - 2 files changed, 6 insertions(+), 2 deletions(-) + NEWS | 9 +++++++-- + configure.ac | 2 +- + meson.build | 2 +- + 3 files changed, 9 insertions(+), 4 deletions(-) -commit 505eeb7b89cce51ec1226de399c4e772433d3cb6 -Author: Khaled Hosny <khaledho...@eglug.org> -Date: Sat Feb 17 12:12:04 2018 +0200 +commit 34a7c7a7cd165997dd6d4ae7b1f90472e0844118 +Author: Christoph Reiter <reiter.christ...@gmail.com> +Date: Thu Apr 5 22:04:43 2018 +0200 - Update README a bit + meson: don't use quotes in help2man options to work around a MinGW + Python bug - Fix FontConfig casing, remove a dead link and outdated sections. + For some reason MinGW Python (the one running meson) mangles arguments + for this case (even adding a space makes it work). Since quotes + are not needed here just drop them. - README | 38 ++++---------------------------------- - 1 file changed, 4 insertions(+), 34 deletions(-) + Python issue filed upstream: + https://github.com/Alexpux/MINGW-packages/issues/3548 -commit bd2fd257f9f6f7ce095caa6c5c0e4332ef3cba75 -Author: Matthias Clasen <mcla...@redhat.com> -Date: Tue Feb 13 14:38:22 2018 -0500 + https://bugzilla.gnome.org/show_bug.cgi?id=795012 - 1.41.1 + pango-view/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) - NEWS | 7 +++++++ - configure.ac | 2 +- - meson.build | 2 +- - 3 files changed, 9 insertions(+), 2 deletions(-) +commit 6fcae8644b9231edba93d795963a39e3a9612a7e +Author: Christoph Reiter <reiter.christ...@gmail.com> +Date: Thu Apr 5 21:31:23 2018 +0200 -commit 0f75002573abfe6494efec5973d07d23167da579 -Author: Michael Catanzaro <mcatanz...@igalia.com> -Date: Mon Feb 12 12:19:41 2018 -0600 + win32: remove redundant function declarations - Disable -Werror=undef + The meson build uses -Werror=redundant-decls and fails. - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + https://bugzilla.gnome.org/show_bug.cgi?id=795012 -commit f553ec30390caddbbfb44336a48a51b63ba9e9f1 -Author: Emmanuele Bassi <eba...@gnome.org> -Date: Mon Feb 12 12:23:42 2018 +0000 - - meson: Update rules for introspection - - Building introspection should not be gated on cross-compilation: it's - perfectly acceptable to use an helper binary to run the introspection - scanner when cross-compiling — in fact, it's what projects like - Yocto - do. Instead, we should have an option to disable the introspection - generation explicitly. - - Additionally, when building introspection data for ancillary Pango - libraries, like PangoCairo or PangoXft, we should depend on the GIR - target, instead of adding an `--include-uninstalled` extra argument - for - the introspection scanner; this allows building Pango as a sub-project - of another project, and lets Meson deal with the appropriate paths and - arguments when invoking the scanner. - - meson.build | 2 +- - meson_options.txt | 4 + - pango/meson.build | 314 - +++++++++++++++++++++++++++++------------------------- - 3 files changed, 176 insertions(+), 144 deletions(-) + pango/pangowin32-shape.c | 2 -- + pango/pangowin32.c | 5 ----- + 2 files changed, 7 deletions(-) -commit b0a75495df58d71d8809c223b6a327f1bc90c844 -Author: Khaled Hosny <khaledho...@eglug.org> -Date: Tue Nov 14 15:55:14 2017 +0200 +commit b136f150b4e230db7901af0d88d3c91a3a4c9e7c +Author: Chun-wei Fan <fanchun...@src.gnome.org> +Date: Fri Mar 30 16:31:53 2018 +0800 - Use the new FriBiDi API when available + pangowin32-fontmap.c: Add an Emoji font family - pango/pango-bidi-type.c | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) + Add an Emoji font family that maps to the following fonts in this + order + (by fallback): + Segoe UI Emoji + Segoe UI Symbol + Segoe UI -commit 526c9b586a32ebee2e269ecd41652b215cd21274 -Author: Khaled Hosny <khaledho...@eglug.org> -Date: Tue Nov 14 15:12:23 2017 +0200 + This will enable Emoji to be displayed correctly in GTK+ apps (without + the use of FontConfig) on Windows Vista and later, providing that one + of the aforementioned fonts are installed. + + Note that this only enables Emoji display (*not* colored ones) as + achieving colored Emoji requires PangoWin32 and Cairo to be ported to + Direct2D and DirectWrite from Uniscribe and GDI, as Uniscribe and GDI + does not support colored Emoji. - Avoid converting to UTF-32 for FriBiDi + https://bugzilla.gnome.org/show_bug.cgi?id=794705 - Can’t tell if this is any faster, but does not look like a complex - thing to do, so why not. + pango/pangowin32-fontmap.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) - pango/pango-bidi-type.c | 64 - ++++++++++++++++++++++++------------------------- - 1 file changed, 31 insertions(+), 33 deletions(-) +commit 08649ce12fb7ea41928a17f05fa1916cbe44361c +Author: Chun-wei Fan <fanchun...@src.gnome.org> +Date: Mon Mar 19 20:54:23 2018 +0800 + + tests/markup-parse.c: Fix build on Visual Studio + + Visual Studio does not ship with a unistd.h, so include the proper + header on Windows when unistd.h is not found on Windows. + + tests/markup-parse.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 18fb749d658e86edad8145a3032c4b6e3be48d72 +Author: Chun-wei Fan <fanchun...@src.gnome.org> +Date: Fri Aug 18 17:56:44 2017 +0800 + + build: Add fallbacks for finding non-GNOME deps on MSVC + + Many of Pango's dependencies do not support a build system for Visual + Studio that would generate the pkg-config files for them, so we + need to + try to look for them using cc.has_header() and cc.find_library() for + them, namely for Cairo, FreeType, FontConfig and HarfBuzz as + fallbacks. + + For Cairo, things are more complicated as there are multiple build + options and configurations for it, so we need to check for those + that we + need after we find the Cairo headers and libraries by: + + -Including the respective headers (for cairo-win32.h, cairo-ps.h, + cairo-pdf.h, cairo-quartz.h and cairo-xlib.h, since these features + must have been enabled when Cairo is built and installed in order for + those headers to be succesfully included) + -For pangocairo with FreeType support, we need to check whether the + FontConfig support is built into Cairo as well, as FontConfig support + is actually required in Cairo for this. + -For Cairo/PNG output surface support, check whether Cairo is + built with + PNG output surface support. + + We also need to update how pangocairo.pc and pangoft2 are generated: + -On builds where pkg-config files can be found for cairo, freetype, + fontconfig and/or harfbuzz: + Generate it with "Requires: pango <depedencies>" as before, otherwise + for MSVC builds where we find these libraries manually, we don't put + these packages under "Requires:..." or "Requires.private:...", but + instead put them under "Libs:", linking to each dep as -l<.lib file + name> + + This is so that pangocairo.pc and pangooft2.pc can be correctly + used by + items that need to make use of it, such as g-ir-scanner. + + https://bugzilla.gnome.org/show_bug.cgi?id=783274 + + configure.ac | 19 +++++++ + meson.build | 147 + ++++++++++++++++++++++++++++++++++++++++++++++++++++--- + pangocairo.pc.in | 4 +- + pangoft2.pc.in | 6 +-- + 4 files changed, 164 insertions(+), 12 deletions(-) + +commit 55afeeca8031ba74cbcdf569500334ebef6b61e0 +Author: Chun-wei Fan <fanchun...@src.gnome.org> +Date: Wed May 31 17:17:17 2017 +0800 + + meson: Check for HarfBuzz and FontConfig for PangoFT2 + + It is possible that we can have the following situations, at least on + Windows: + -FreeType present, FontConfig missing + -Cairo-FT present, with no FontConfig support. + + As gen-script-for-lang requires FontConfig, and PangoFT2 depends on + HarfBuzz, FontConfig and Freetype, we need to check for them before we + build PangoFT2, and so that we could include PangoFT2 support in + PangoCairo. + + The tests and pango-view have an optional dependency on PangoFT2, + so we + need to also check whether we built PangoFT2 before we try to build + things related to PangoFT2. + + For the tools, since gen-script-for-lang.c depends on FontConfig, + check + for it as well before we build it. + + https://bugzilla.gnome.org/show_bug.cgi?id=783274 + + docs/meson.build | 2 +- + meson.build | 19 +++++++++++++++---- + pango-view/meson.build | 4 ++-- + pango/meson.build | 2 +- + tests/meson.build | 2 +- + tools/meson.build | 12 +++++++----- + 6 files changed, 27 insertions(+), 14 deletions(-) -commit 0a71013dfc3a5199f0632bb99410523949bf49d7 +commit ec8251d9728d0691365249eec4c681218e379819 Author: Khaled Hosny <khaledho...@eglug.org> -Date: Mon Nov 13 15:27:37 2017 +0200 +Date: Tue Mar 27 18:04:51 2018 +0200 - Drop now unused mini-fribidi + Update version number in meson.build as well - Makefile.am | 1 - - configure.ac | 1 - - docs/Makefile.am | 1 - - docs/meson.build | 1 - - pango/mini-fribidi/Makefile.am | 32 - - pango/mini-fribidi/README | 23 - - pango/mini-fribidi/fribidi.c | 967 ----- - pango/mini-fribidi/fribidi.h | 56 - - pango/mini-fribidi/fribidi.patch | 1369 ------ - pango/mini-fribidi/fribidi_char_type.c | 75 - - pango/mini-fribidi/fribidi_config.h | 33 - - pango/mini-fribidi/fribidi_tab_char_type_2.i | 5884 - -------------------------- - pango/mini-fribidi/fribidi_types.c | 86 - - pango/mini-fribidi/fribidi_types.h | 313 -- - pango/mini-fribidi/fribidi_types.i | 21 - - pango/mini-fribidi/meson.build | 17 - - 16 files changed, 8880 deletions(-) + Follow up of commit d4f3370336a40907f528a41e75a55fe4f50c1a11. + Maintaining two build systems is tricky! -commit 5e8cb02bec01e4a9b0ddff173889043d9db65fbc + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68cc13d04ed9d89609727f4448e5d2e08dd6626c Author: Khaled Hosny <khaledho...@eglug.org> -Date: Mon Nov 13 15:25:35 2017 +0200 +Date: Mon Mar 26 12:00:32 2018 +0200 - Switch to using external FriBiDi + Add fribidi dependency to pango.pc - configure.ac | 4 ++++ - meson.build | 4 ++++ - pango/Makefile.am | 14 ++++--------- - pango/meson.build | 4 +--- - pango/pango-bidi-type.c | 54 - +++++++++++++++++++++++++++++++++++-------------- - 5 files changed, 52 insertions(+), 28 deletions(-) + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=794570 -commit 1addea2febecb9e3511329b985d5566de6d8369e -Author: Philip Withnall <withn...@endlessm.com> -Date: Tue Jan 9 11:05:29 2018 +0000 + pango.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) - build: Only enable freetype if fontconfig is also available +commit 3dfe2b9a5c8ac5ae37c210ba050f3720189cebb7 +Author: Patrick Griffis <tingp...@tingping.se> +Date: Fri Mar 9 15:03:28 2018 +0000 - This changes meson.build to match what configure.ac already does. The - code doesn’t have separate conditions for whether fontconfig and - freetype are available: if freetype compilation is enabled, it assumes - that fontconfig is also available. + Fix view-cairo on Windows - Previously, systems with freetype available, but no fontconfig, would - fail to compile Pango due to trying to link against non-existent - fontconfig symbols. + pango-view/viewer-cairo.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) - Signed-off-by: Philip Withnall <withn...@endlessm.com> +commit dd4f26d4e01cde141feed16ddad1f9d522812514 +Author: Khaled Hosny <khaledho...@eglug.org> +Date: Wed Mar 14 00:41:07 2018 +0200 - https://bugzilla.gnome.org/show_bug.cgi?id=792363 + Drop mention of long gone files - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + docs/Makefile.am | 2 -- + docs/meson.build | 1 - + 2 files changed, 3 deletions(-) -commit 4120b76eed6daeec38d844ecf819977899f4edd7 +commit 248669f3ba716a990fb164e32d69ef81185a8ac3 +Author: Khaled Hosny <khaledho...@eglug.org> +Date: Wed Mar 14 00:15:38 2018 +0200 + + Modules are long gone + + HACKING | 4 ---- + README | 3 --- + docs/Makefile.am | 1 - + docs/meson.build | 1 - + 4 files changed, 9 deletions(-) + +commit d4f3370336a40907f528a41e75a55fe4f50c1a11 Author: Matthias Clasen <mcla...@redhat.com> -Date: Mon Jan 8 22:01:17 2018 -0500 +Date: Mon Mar 12 16:02:24 2018 +0000 - 1.41.0 + 1.42.0 - NEWS | 6 ++++++ - 1 file changed, 6 insertions(+) + NEWS | 4 ++++ + configure.ac | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) -commit 3ccf578a2d39350d19af12bceaf700cb6b178436 -Author: Christian Hergert <cherg...@redhat.com> -Date: Thu Jan 4 23:11:44 2018 -0800 +commit 505eeb7b89cce51ec1226de399c4e772433d3cb6 +Author: Khaled Hosny <khaledho...@eglug.org> +Date: Sat Feb 17 12:12:04 2018 +0200 - fontmap: fix warnings from recent g_object_ref() changes + Update README a bit - https://bugzilla.gnome.org/show_bug.cgi?id=792231 + Fix FontConfig casing, remove a dead link and outdated sections. - pango/pangofc-fontmap.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + README | 38 ++++---------------------------------- + 1 file changed, 4 insertions(+), 34 deletions(-) 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.42.0/HACKING new/pango-1.42.1/HACKING --- old/pango-1.42.0/HACKING 2016-10-22 07:00:52.000000000 +0200 +++ new/pango-1.42.1/HACKING 2018-04-07 12:00:40.000000000 +0200 @@ -1,10 +1,6 @@ Formatting ========== -All parts of Pango other than modules should use the following formatting -style; for modules, it is up to the discretion of the module -author / maintainer, though they are encouraged to follow the following. - The Pango formatting style is basically the GNU style of formatting (see http://www.gnu.org/prep/standards.html), with a few additions. In brief overview: 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.42.0/NEWS new/pango-1.42.1/NEWS --- old/pango-1.42.0/NEWS 2018-03-12 17:02:00.000000000 +0100 +++ new/pango-1.42.1/NEWS 2018-04-07 12:08:48.000000000 +0200 @@ -1,3 +1,8 @@ +Overview of changes in 1.42.1 +============================= +- Fix meson build, in particular on Windows (#783274, #795012) +- Add an Emoji font family on Windows, using Segoe UI (#794705) + Overview of changes in 1.42.0 ============================= - No changes @@ -42,7 +47,7 @@ - Apply gravity across spans in markup (#784243) - Support variation selectors for shaping - CoreText: Rely on CGFont for scaling (#782393) -- Fix grapheme breaks and backspacing for Emoji +U- Fix grapheme breaks and backspacing for Emoji Overview of changes between 1.40.8 and 1.40.9 ============================================= @@ -140,7 +145,7 @@ ============================================= - Don't use hb_glib_get_unicode_funcs - Warning fixes - +I Overview of changes between 1.37.0 and 1.37.1 ============================================= - Add attributes for OpenType font features (#738505) 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.42.0/README new/pango-1.42.1/README --- old/pango-1.42.0/README 2018-03-12 17:01:23.000000000 +0100 +++ new/pango-1.42.1/README 2018-04-07 12:00:40.000000000 +0200 @@ -23,9 +23,6 @@ provides a complete solution with high quality text handling and graphics rendering. -Dynamically loaded modules then handle text layout for particular -combinations of script and font backend. - As well as the low level layout rendering routines, Pango includes PangoLayout, a high level driver for laying out entire blocks of text, and routines to assist in editing internationalized text. 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.42.0/config.h.win32 new/pango-1.42.1/config.h.win32 --- old/pango-1.42.0/config.h.win32 2018-03-12 17:09:25.000000000 +0100 +++ new/pango-1.42.1/config.h.win32 2018-04-07 12:14:20.000000000 +0200 @@ -113,7 +113,7 @@ #define PACKAGE_NAME "pango" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pango 1.42.0" +#define PACKAGE_STRING "pango 1.42.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pango" @@ -122,19 +122,19 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.42.0" +#define PACKAGE_VERSION "1.42.1" /* PANGO binary age */ -#define PANGO_BINARY_AGE 4200 +#define PANGO_BINARY_AGE 4201 /* PANGO interface age */ -#define PANGO_INTERFACE_AGE 0 +#define PANGO_INTERFACE_AGE 1 /* PANGO major version */ #define PANGO_VERSION_MAJOR 1 /* PANGO micro version */ -#define PANGO_VERSION_MICRO 0 +#define PANGO_VERSION_MICRO 1 /* PANGO minor version */ #define PANGO_VERSION_MINOR 42 @@ -143,7 +143,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.42.0" +#define VERSION "1.42.1" /* defines how to decorate public symbols while building */ #ifdef _MSC_VER 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.42.0/configure.ac new/pango-1.42.1/configure.ac --- old/pango-1.42.0/configure.ac 2018-03-12 17:02:15.000000000 +0100 +++ new/pango-1.42.1/configure.ac 2018-04-07 12:06:35.000000000 +0200 @@ -22,7 +22,7 @@ dnl The triplet m4_define([pango_version_major], [1]) m4_define([pango_version_minor], [42]) -m4_define([pango_version_micro], [0]) +m4_define([pango_version_micro], [1]) m4_define([pango_version], [pango_version_major.pango_version_minor.pango_version_micro]) @@ -423,6 +423,25 @@ AC_SUBST(PKGCONFIG_CAIRO_REQUIRES) fi +# To compensate for Meson builds on MSVC where pkg-config files may well not be +# available for cairo, harfbuzz, freetype2 and fontconfig +CAIRO_PC="cairo" +FREETYPE2_PC="freetype2" +FONTCONFIG_PC="fontconfig" +HARFBUZZ_PC="harfbuzz" +AC_SUBST(CAIRO_PC) +AC_SUBST(FREETYPE2_PC) +AC_SUBST(FONTCONFIG_PC) +AC_SUBST(HARFBUZZ_PC) +CAIRO_LIB= +FREETYPE2_LIB= +FONTCONFIG_LIB= +HARFBUZZ_LIB= +AC_SUBST(CAIRO_LIB) +AC_SUBST(FREETYPE2_LIB) +AC_SUBST(FONTCONFIG_LIB) +AC_SUBST(HARFBUZZ_LIB) + AM_CONDITIONAL(HAVE_CAIRO, $have_cairo) AM_CONDITIONAL(HAVE_CAIRO_PNG, $have_cairo_png) AM_CONDITIONAL(HAVE_CAIRO_PS, $have_cairo_ps) 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.42.0/docs/Makefile.am new/pango-1.42.1/docs/Makefile.am --- old/pango-1.42.0/docs/Makefile.am 2018-03-12 17:01:23.000000000 +0100 +++ new/pango-1.42.1/docs/Makefile.am 2018-04-07 12:00:40.000000000 +0200 @@ -21,9 +21,6 @@ # Headers to ignore IGNORE_HFILES= \ - ftglue.h \ - opentype \ - modules.h \ pangoatsui-private.h \ pangocairo-private.h \ pangocairo-fc.h \ 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.42.0/docs/html/index.html new/pango-1.42.1/docs/html/index.html --- old/pango-1.42.0/docs/html/index.html 2018-03-12 17:15:30.000000000 +0100 +++ new/pango-1.42.1/docs/html/index.html 2018-04-07 12:17:18.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.42.0 +<div><p class="releaseinfo">for Pango 1.42.1 </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.42.0/docs/html/pango-Version-Checking.html new/pango-1.42.1/docs/html/pango-Version-Checking.html --- old/pango-1.42.0/docs/html/pango-Version-Checking.html 2018-03-12 17:15:30.000000000 +0100 +++ new/pango-1.42.1/docs/html/pango-Version-Checking.html 2018-04-07 12:17:18.000000000 +0200 @@ -387,14 +387,14 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-MICRO:CAPS"></a><h3>PANGO_VERSION_MICRO</h3> -<pre class="programlisting">#define PANGO_VERSION_MICRO 0 +<pre class="programlisting">#define PANGO_VERSION_MICRO 1 </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.42.0" +<pre class="programlisting">#define PANGO_VERSION_STRING "1.42.1" </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' --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.42.0/docs/meson.build new/pango-1.42.1/docs/meson.build --- old/pango-1.42.0/docs/meson.build 2018-03-12 17:01:23.000000000 +0100 +++ new/pango-1.42.1/docs/meson.build 2018-04-07 12:00:40.000000000 +0200 @@ -7,8 +7,6 @@ configuration: version_xml_conf) private_headers = [ - 'ftglue.h', - 'modules.h', 'pangoatsui-private.h', 'pangocairo-private.h', 'pangocairo-fc.h', @@ -61,7 +59,7 @@ docdeps = [ libpango_dep ] -if freetype_dep.found() +if build_pangoft2 docdeps += libpangoft2_dep 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.42.0/docs/version.xml new/pango-1.42.1/docs/version.xml --- old/pango-1.42.0/docs/version.xml 2018-03-12 17:09:24.000000000 +0100 +++ new/pango-1.42.1/docs/version.xml 2018-04-07 12:14:20.000000000 +0200 @@ -1 +1 @@ -1.42.0 +1.42.1 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.42.0/meson.build new/pango-1.42.1/meson.build --- old/pango-1.42.0/meson.build 2018-03-12 17:01:23.000000000 +0100 +++ new/pango-1.42.1/meson.build 2018-04-07 12:06:28.000000000 +0200 @@ -1,5 +1,5 @@ project('pango', 'c', 'cpp', - version: '1.41.1', + version: '1.42.1', license: 'LGPLv2.1+', default_options: [ 'buildtype=debugoptimized', @@ -218,13 +218,52 @@ pango_deps += thai_dep endif +# These are for the various .pc files so that things will link +# properly, depending on whether we have the pkg-config files +# for those non-GNOME dependencies, or when we find them manually +# for MSVC builds, as their MSVC build systems do not generate +# pkg-config files for them +cairo_pc = '' +cairo_lib = '' +harfbuzz_pc='' +freetype2_pc='' +fontconfig_pc='' +harfbuzz_lib='' +freetype2_lib='' +fontconfig_lib='' + harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req_version, required: false) if harfbuzz_dep.found() + harfbuzz_pc = 'harfbuzz' +else + if cc.get_id() == 'msvc' and cc.has_header('hb.h') + # The CMake build files for HarfBuzz (which is used for MSVC builds) do not + # generate pkg-config files, so look for harfbuzz.lib + harfbuzz_dep = cc.find_library('harfbuzz', required: false) + if harfbuzz_dep.found() + harfbuzz_lib = '-lharfbuzz' + endif + endif +endif +if harfbuzz_dep.found() pango_deps += harfbuzz_dep endif fontconfig_dep = dependency('fontconfig', version: fontconfig_req_version, required: false) if fontconfig_dep.found() + fontconfig_pc = 'fontconfig' +else + if cc.get_id() == 'msvc' and cc.has_header('fontconfig/fontconfig.h') + # Look for the Visual Studio-style import library if FontConfig's .pc file cannot be + # found on Visual Studio + fontconfig_dep = cc.find_library('fontconfig', required: false) + if fontconfig_dep.found() + fontconfig_lib = '-lfontconfig' + endif + endif +endif + +if fontconfig_dep.found() pango_deps += fontconfig_dep if cc.has_function('FcWeightFromOpenTypeDouble', dependencies: fontconfig_dep) @@ -235,7 +274,25 @@ # The first version of freetype with a pkg-config file is 2.1.5 # We require both fontconfig and freetype if we are to have either. freetype_dep = dependency('freetype2', required: false) -if freetype_dep.found() and fontconfig_dep.found() + +if freetype_dep.found() + freetype2_pc = 'freetype2' +else + if cc.get_id() == 'msvc' and cc.has_header('ft2build.h') + foreach ft2_lib: ['freetype', 'freetypemt'] + if not freetype_dep.found() + freetype_dep = cc.find_library(ft2_lib, required: false) + if freetype_dep.found() + freetype2_lib = '-l@0@'.format(ft2_lib) + endif + endif + endforeach + endif +endif + +# To build pangoft2, we need HarfBuzz, FontConfig and FreeType +build_pangoft2 = harfbuzz_dep.found() and fontconfig_dep.found() and freetype_dep.found() +if build_pangoft2 pango_conf.set('HAVE_FREETYPE', 1) pango_deps += freetype_dep endif @@ -260,26 +317,46 @@ endif endif +cairo_pkgconfig_found = false cairo_dep = dependency('cairo', version: cairo_req_version, required: false) + if cairo_dep.found() + cairo_pkgconfig_found = true +else + if cc.get_id() == 'msvc' and cc.has_header('cairo.h') + cairo_dep = cc.find_library('cairo', required: false) + endif +endif + +pango_font_backends = [] +pango_cairo_backends = [] + +if cairo_pkgconfig_found # Check the following Cairo font backends # - dependency # - version # - define # - backend name + # Note that Cairo can be built with FreeType but without FontConfig + cairo_font_backends = [ [ 'cairo-ft', cairo_req_version, 'HAVE_CAIRO_FREETYPE', 'freetype', ], [ 'cairo-win32', cairo_req_version, 'HAVE_CAIRO_WIN32', 'win32', ], [ 'cairo-quartz', cairo_req_version, 'HAVE_CAIRO_QUARTZ', 'quartz', ], ] - pango_font_backends = [] - foreach b: cairo_font_backends dep = dependency(b[0], version: b[1], required: false) if dep.found() - pango_conf.set(b[2], 1) - pango_font_backends += b[3] + if b[0] == 'cairo-ft' + if build_pangoft2 + pango_conf.set(b[2], 1) + pango_font_backends += b[3] + endif + else + pango_conf.set(b[2], 1) + pango_font_backends += b[3] + endif endif endforeach @@ -299,8 +376,6 @@ [ 'cairo-xlib', cairo_req_version, 'HAVE_CAIRO_XLIB', 'xlib', ], ] - pango_cairo_backends = [] - foreach b: cairo_surface_backends dep = dependency(b[0], version: b[1], required: false) if dep.found() @@ -309,17 +384,78 @@ endif endforeach + # This is to set up pangocairo.pc so that things that refer to + # it will link correctly + cairo_pc = 'cairo' +elif (cc.get_id() == 'msvc' and cairo_dep.found()) + # Fallback: Look for Cairo items manually + # We need to check for headers for some + cairo_headers = [ 'win32', 'quartz', 'ps', 'pdf', 'xlib' ] + + foreach header : cairo_headers + if cc.has_header('cairo-@0@.h'.format(header)) + pango_conf.set('HAVE_CAIRO_@0@'.format(header.underscorify().to_upper()), 1) + if header == 'win32' or header == 'quartz' + pango_font_backends += header + else + pango_cairo_backends += header + endif + endif + endforeach + + # Other cairo features that we need to check for symbols + # Note that Cairo with FreeType support can be without FontConfig + # support, so we must check for FontConfig support in Cairo + if cc.links('''#include <cairo-ft.h> + int main() { + FcPattern *p = NULL; + cairo_ft_font_face_create_for_pattern (p); + return 0; + }''', + dependencies: cairo_dep, + name : 'Cairo is built with FreeType and FontConfig support') + if build_pangoft2 + pango_conf.set('HAVE_CAIRO_FREETYPE', 1) + pango_font_backends += 'freetype' + endif + endif + + if pango_font_backends.length() == 0 + error('No Cairo font backends found') + endif + + # Check for Cairo's libpng output surface support + if cc.links('''#include <cairo.h> + #include <stdio.h> + int main() { + cairo_surface_t *s = NULL; + const char *f = "abc.png"; + cairo_surface_write_to_png (s, f); + return 0; + }''', + dependencies: cairo_dep, + name : 'Cairo is built with PNG output surface support') + pango_conf.set('HAVE_CAIRO_PNG', 1) + pango_cairo_backends += 'png' + endif + + # This is to set up pangocairo.pc so that things that refer to + # it will link correctly, when we don't have pkg-config files for cairo + cairo_lib = '-lcairo' +endif + +if cairo_dep.found() pango_conf.set('HAVE_CAIRO', 1) pango_deps += cairo_dep - pangocairo_requires = [] + pangocairo_requires = '' if pango_font_backends.contains('freetype') - pangocairo_requires += 'pangoft2' + pangocairo_requires += 'pangoft2 ' endif if pango_font_backends.contains('win32') - pangocairo_requires += 'pangowin32' + pangocairo_requires += 'pangowin32 ' endif endif @@ -332,11 +468,19 @@ pkgconf.set('VERSION', meson.project_version()) pkgconf.set('PANGO_API_VERSION', pango_api_version) pkgconf.set('PKGCONFIG_CAIRO_REQUIRES', pangocairo_requires) +pkgconf.set('CAIRO_PC', cairo_pc) +pkgconf.set('CAIRO_LIB', cairo_lib) +pkgconf.set('FREETYPE2_PC', freetype2_pc) +pkgconf.set('FREETYPE2_LIB', freetype2_lib) +pkgconf.set('FONTCONFIG_PC', fontconfig_pc) +pkgconf.set('FONTCONFIG_LIB', fontconfig_lib) +pkgconf.set('HARFBUZZ_PC', harfbuzz_pc) +pkgconf.set('HARFBUZZ_LIB', harfbuzz_lib) pkgconf_files = [ [ 'pango.pc' ], [ 'pangowin32.pc', host_system == 'windows' ], - [ 'pangoft2.pc', freetype_dep.found() ], + [ 'pangoft2.pc', build_pangoft2 ], [ 'pangoxft.pc', xft_dep.found() ], [ 'pangocairo.pc', cairo_dep.found() ], ] 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.42.0/pango/meson.build new/pango-1.42.1/pango/meson.build --- old/pango-1.42.0/pango/meson.build 2018-03-12 17:01:23.000000000 +0100 +++ new/pango-1.42.1/pango/meson.build 2018-04-07 12:00:40.000000000 +0200 @@ -154,7 +154,7 @@ ) # FreeType -if freetype_dep.found() +if build_pangoft2 pangoft2_headers = [ 'pango-ot.h', 'pangofc-font.h', 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.42.0/pango/pango-enum-types.c new/pango-1.42.1/pango/pango-enum-types.c --- old/pango-1.42.0/pango/pango-enum-types.c 2018-03-12 17:09:49.000000000 +0100 +++ new/pango-1.42.1/pango/pango-enum-types.c 2018-04-07 12:14:25.000000000 +0200 @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ +/* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */ #include "config.h" 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.42.0/pango/pango-enum-types.h new/pango-1.42.1/pango/pango-enum-types.h --- old/pango-1.42.0/pango/pango-enum-types.h 2018-03-12 17:09:49.000000000 +0100 +++ new/pango-1.42.1/pango/pango-enum-types.h 2018-04-07 12:14:25.000000000 +0200 @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ +/* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */ #ifndef __PANGO_ENUM_TYPES_H__ #define __PANGO_ENUM_TYPES_H__ 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.42.0/pango/pango-features.h new/pango-1.42.1/pango/pango-features.h --- old/pango-1.42.0/pango/pango-features.h 2018-03-12 17:08:46.000000000 +0100 +++ new/pango-1.42.1/pango/pango-features.h 2018-04-07 12:11:33.000000000 +0200 @@ -4,9 +4,9 @@ #define PANGO_VERSION_MAJOR 1 #define PANGO_VERSION_MINOR 42 -#define PANGO_VERSION_MICRO 0 +#define PANGO_VERSION_MICRO 1 -#define PANGO_VERSION_STRING "1.42.0" +#define PANGO_VERSION_STRING "1.42.1" #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.42.0/pango/pango.rc new/pango-1.42.1/pango/pango.rc --- old/pango-1.42.0/pango/pango.rc 2018-03-12 17:09:24.000000000 +0100 +++ new/pango-1.42.1/pango/pango.rc 2018-04-07 12:14:19.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,0,0 - PRODUCTVERSION 1,42,0,0 + FILEVERSION 1,42,1,0 + PRODUCTVERSION 1,42,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pango" - VALUE "FileVersion", "1.42.0.0" + VALUE "FileVersion", "1.42.1.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.42.0" + VALUE "ProductVersion", "1.42.1" 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.42.0/pango/pangocairo.rc new/pango-1.42.1/pango/pangocairo.rc --- old/pango-1.42.0/pango/pangocairo.rc 2018-03-12 17:09:24.000000000 +0100 +++ new/pango-1.42.1/pango/pangocairo.rc 2018-04-07 12:14:20.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,0,0 - PRODUCTVERSION 1,42,0,0 + FILEVERSION 1,42,1,0 + PRODUCTVERSION 1,42,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoCairo" - VALUE "FileVersion", "1.42.0.0" + VALUE "FileVersion", "1.42.1.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.42.0" + VALUE "ProductVersion", "1.42.1" 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.42.0/pango/pangoft2.rc new/pango-1.42.1/pango/pangoft2.rc --- old/pango-1.42.0/pango/pangoft2.rc 2018-03-12 17:09:24.000000000 +0100 +++ new/pango-1.42.1/pango/pangoft2.rc 2018-04-07 12:14:19.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,0,0 - PRODUCTVERSION 1,42,0,0 + FILEVERSION 1,42,1,0 + PRODUCTVERSION 1,42,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoFT2" - VALUE "FileVersion", "1.42.0.0" + VALUE "FileVersion", "1.42.1.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.42.0" + VALUE "ProductVersion", "1.42.1" 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.42.0/pango/pangowin32-fontmap.c new/pango-1.42.1/pango/pangowin32-fontmap.c --- old/pango-1.42.0/pango/pangowin32-fontmap.c 2016-10-22 07:00:40.000000000 +0200 +++ new/pango-1.42.1/pango/pangowin32-fontmap.c 2018-04-07 12:00:40.000000000 +0200 @@ -462,7 +462,8 @@ "sans-serif = \"dejavu sans,tahoma,arial unicode ms,lucida sans unicode,browallia new,mingliu,simhei,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"", "serif = \"dejavu serif,georgia,angsana new,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"", "mono = \"dejavu sans mono,courier new,lucida console,courier monothai,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"", - "monospace = \"dejavu sans mono,courier new,lucida console,courier monothai,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"" + "monospace = \"dejavu sans mono,courier new,lucida console,courier monothai,mingliu,simsun,gulimche,ms gothic,sylfaen,kartika,latha,mangal,raavi\"", + "emoji = \"segoe ui emoji,segoe ui symbol,segoe ui\"", }; static void 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.42.0/pango/pangowin32-shape.c new/pango-1.42.1/pango/pangowin32-shape.c --- old/pango-1.42.0/pango/pangowin32-shape.c 2016-10-22 07:00:39.000000000 +0200 +++ new/pango-1.42.1/pango/pangowin32-shape.c 2018-04-07 12:00:40.000000000 +0200 @@ -31,8 +31,6 @@ #include "pangowin32-private.h" -extern HFONT _pango_win32_font_get_hfont (PangoFont *font); - #include "pango-utils.h" #include "pango-impl-utils.h" 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.42.0/pango/pangowin32.c new/pango-1.42.1/pango/pangowin32.c --- old/pango-1.42.0/pango/pangowin32.c 2017-04-08 03:54:29.000000000 +0200 +++ new/pango-1.42.1/pango/pangowin32.c 2018-04-07 12:00:40.000000000 +0200 @@ -54,11 +54,6 @@ static void pango_win32_font_dispose (GObject *object); static void pango_win32_font_finalize (GObject *object); -static gboolean pango_win32_font_real_select_font (PangoFont *font, - HDC hdc); -static void pango_win32_font_real_done_font (PangoFont *font); -static double pango_win32_font_real_get_metrics_factor (PangoFont *font); - static PangoFontDescription *pango_win32_font_describe (PangoFont *font); static PangoFontDescription *pango_win32_font_describe_absolute (PangoFont *font); static PangoCoverage *pango_win32_font_get_coverage (PangoFont *font, 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.42.0/pango/pangowin32.rc new/pango-1.42.1/pango/pangowin32.rc --- old/pango-1.42.0/pango/pangowin32.rc 2018-03-12 17:09:24.000000000 +0100 +++ new/pango-1.42.1/pango/pangowin32.rc 2018-04-07 12:14:19.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,0,0 - PRODUCTVERSION 1,42,0,0 + FILEVERSION 1,42,1,0 + PRODUCTVERSION 1,42,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoWin32" - VALUE "FileVersion", "1.42.0.0" + VALUE "FileVersion", "1.42.1.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.42.0" + VALUE "ProductVersion", "1.42.1" 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.42.0/pango/pangoxft.rc new/pango-1.42.1/pango/pangoxft.rc --- old/pango-1.42.0/pango/pangoxft.rc 2018-03-12 17:09:24.000000000 +0100 +++ new/pango-1.42.1/pango/pangoxft.rc 2018-04-07 12:14:20.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,42,0,0 - PRODUCTVERSION 1,42,0,0 + FILEVERSION 1,42,1,0 + PRODUCTVERSION 1,42,1,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pangoxft" - VALUE "FileVersion", "1.42.0.0" + VALUE "FileVersion", "1.42.1.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.42.0" + VALUE "ProductVersion", "1.42.1" 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.42.0/pango-view/meson.build new/pango-1.42.1/pango-view/meson.build --- old/pango-1.42.0/pango-view/meson.build 2017-05-22 20:22:38.000000000 +0200 +++ new/pango-1.42.1/pango-view/meson.build 2018-04-07 12:00:40.000000000 +0200 @@ -9,12 +9,12 @@ libpango_dep, ] -if freetype_dep.found() +if build_pangoft2 pango_view_sources += 'viewer-pangoft2.c' pango_view_deps += libpangoft2_dep endif -if xft_dep.found() +if xft_dep.found() and build_pangoft2 pango_view_sources += [ 'viewer-pangoxft.c', 'viewer-x.c', @@ -44,8 +44,8 @@ help2man_opts = [ '--no-info', '--section=1', - '--help-option="--help-all"', - '--name="Pango text viewer"', + '--help-option=--help-all', + '--name=Pango text viewer', ] custom_target('pango-view.1', 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.42.0/pango-view/viewer-cairo.c new/pango-1.42.1/pango-view/viewer-cairo.c --- old/pango-1.42.0/pango-view/viewer-cairo.c 2016-10-22 07:00:02.000000000 +0200 +++ new/pango-1.42.1/pango-view/viewer-cairo.c 2018-04-07 12:00:40.000000000 +0200 @@ -34,8 +34,6 @@ #include "viewer-x.h" #include <cairo-xlib.h> - - static cairo_surface_t * cairo_x_view_iface_create_surface (gpointer instance, gpointer surface, @@ -229,18 +227,18 @@ if (0) ; #ifdef CAIRO_HAS_SVG_SURFACE - else if (0 == strcasecmp (extension, "svg")) + else if (0 == g_ascii_strcasecmp (extension, "svg")) constructor = cairo_svg_surface_create; #endif #ifdef CAIRO_HAS_PDF_SURFACE - else if (0 == strcasecmp (extension, "pdf")) + else if (0 == g_ascii_strcasecmp (extension, "pdf")) constructor = cairo_pdf_surface_create; #endif #ifdef CAIRO_HAS_PS_SURFACE - else if (0 == strcasecmp (extension, "ps")) + else if (0 == g_ascii_strcasecmp (extension, "ps")) constructor = cairo_ps_surface_create; #ifdef HAS_EPS - else if (0 == strcasecmp (extension, "eps")) + else if (0 == g_ascii_strcasecmp (extension, "eps")) constructor = _cairo_eps_surface_create; #endif #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.42.0/pango.pc.in new/pango-1.42.1/pango.pc.in --- old/pango-1.42.0/pango.pc.in 2016-10-22 07:00:03.000000000 +0200 +++ new/pango-1.42.1/pango.pc.in 2018-04-07 12:00:40.000000000 +0200 @@ -6,7 +6,7 @@ Name: Pango Description: Internationalized text handling Version: @VERSION@ -Requires: glib-2.0 gobject-2.0 +Requires: glib-2.0 gobject-2.0 fribidi Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ Libs.private: -lm Cflags: -I${includedir}/pango-1.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.42.0/pangocairo.pc.in new/pango-1.42.1/pangocairo.pc.in --- old/pango-1.42.0/pangocairo.pc.in 2016-10-22 07:00:36.000000000 +0200 +++ new/pango-1.42.1/pangocairo.pc.in 2018-04-07 12:00:40.000000000 +0200 @@ -6,7 +6,7 @@ Name: Pango Cairo Description: Cairo rendering support for Pango Version: @VERSION@ -Requires: pango cairo +Requires: pango @CAIRO_PC@ Requires.private: @PKGCONFIG_CAIRO_REQUIRES@ -Libs: -L${libdir} -lpangocairo-@PANGO_API_VERSION@ +Libs: -L${libdir} -lpangocairo-@PANGO_API_VERSION@ @CAIRO_LIB@ Cflags: -I${includedir}/pango-1.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.42.0/pangoft2.pc.in new/pango-1.42.1/pangoft2.pc.in --- old/pango-1.42.0/pangoft2.pc.in 2016-10-22 07:00:57.000000000 +0200 +++ new/pango-1.42.1/pangoft2.pc.in 2018-04-07 12:00:40.000000000 +0200 @@ -6,7 +6,7 @@ Name: Pango FT2 and Pango Fc Description: Freetype 2.0 and fontconfig font support for Pango Version: @VERSION@ -Requires: pango freetype2 fontconfig -Requires.private: harfbuzz -Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ +Requires: pango @FREETYPE2_PC@ @FONTCONFIG_PC@ +Requires.private: @HARFBUZZ_PC@ +Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @FREETYPE2_LIB@ @FONTCONFIG_LIB@ @HARFBUZZ_LIB@ Cflags: -I${includedir}/pango-1.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.42.0/tests/markup-parse.c new/pango-1.42.1/tests/markup-parse.c --- old/pango-1.42.0/tests/markup-parse.c 2018-01-03 18:48:10.000000000 +0100 +++ new/pango-1.42.1/tests/markup-parse.c 2018-04-07 12:00:40.000000000 +0200 @@ -21,7 +21,13 @@ #include <glib.h> #include <string.h> -#include <unistd.h> + +#ifdef G_OS_WIN32 +# include <io.h> +#else +# include <unistd.h> +#endif + #include <locale.h> #include <pango/pangocairo.h> 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.42.0/tests/meson.build new/pango-1.42.1/tests/meson.build --- old/pango-1.42.0/tests/meson.build 2017-05-22 20:22:38.000000000 +0200 +++ new/pango-1.42.1/tests/meson.build 2018-04-07 12:00:40.000000000 +0200 @@ -24,7 +24,7 @@ [ 'cxx-test', [ 'cxx-test.cpp' ] ], ] -if freetype_dep.found() +if build_pangoft2 test_cflags += '-DHAVE_FREETYPE' tests += [ [ 'test-ot-tags', [ 'test-ot-tags.c' ], [ libpangoft2_dep ] ], 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.42.0/tools/meson.build new/pango-1.42.1/tools/meson.build --- old/pango-1.42.0/tools/meson.build 2017-05-22 20:22:38.000000000 +0200 +++ new/pango-1.42.1/tools/meson.build 2018-04-07 12:00:40.000000000 +0200 @@ -1,5 +1,7 @@ -executable('gen-script-for-lang', 'gen-script-for-lang.c', - dependencies: pango_deps + [ libpango_dep ], - c_args: common_cflags + pango_debug_cflags + [ '-DPANGO_DISABLE_DEPRECATED' ], - include_directories: root_inc, - install: false) +if fontconfig_dep.found() + executable('gen-script-for-lang', 'gen-script-for-lang.c', + dependencies: pango_deps + [ libpango_dep ], + c_args: common_cflags + pango_debug_cflags + [ '-DPANGO_DISABLE_DEPRECATED' ], + include_directories: root_inc, + install: false) +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.42.0/win32/vs10/pango-version-paths.props new/pango-1.42.1/win32/vs10/pango-version-paths.props --- old/pango-1.42.0/win32/vs10/pango-version-paths.props 2018-03-12 17:09:25.000000000 +0100 +++ new/pango-1.42.1/win32/vs10/pango-version-paths.props 2018-04-07 12:14:20.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>10</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>0</PangoMicroVersion> + <PangoMicroVersion>1</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.42.0/win32/vs11/pango-version-paths.props new/pango-1.42.1/win32/vs11/pango-version-paths.props --- old/pango-1.42.0/win32/vs11/pango-version-paths.props 2018-03-12 17:15:31.000000000 +0100 +++ new/pango-1.42.1/win32/vs11/pango-version-paths.props 2018-04-07 12:17:20.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>11</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>0</PangoMicroVersion> + <PangoMicroVersion>1</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.42.0/win32/vs12/pango-version-paths.props new/pango-1.42.1/win32/vs12/pango-version-paths.props --- old/pango-1.42.0/win32/vs12/pango-version-paths.props 2018-03-12 17:15:32.000000000 +0100 +++ new/pango-1.42.1/win32/vs12/pango-version-paths.props 2018-04-07 12:17:20.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>12</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>0</PangoMicroVersion> + <PangoMicroVersion>1</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.42.0/win32/vs14/pango-version-paths.props new/pango-1.42.1/win32/vs14/pango-version-paths.props --- old/pango-1.42.0/win32/vs14/pango-version-paths.props 2018-03-12 17:15:32.000000000 +0100 +++ new/pango-1.42.1/win32/vs14/pango-version-paths.props 2018-04-07 12:17:21.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>14</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>0</PangoMicroVersion> + <PangoMicroVersion>1</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.42.0/win32/vs15/pango-version-paths.props new/pango-1.42.1/win32/vs15/pango-version-paths.props --- old/pango-1.42.0/win32/vs15/pango-version-paths.props 2018-03-12 17:15:33.000000000 +0100 +++ new/pango-1.42.1/win32/vs15/pango-version-paths.props 2018-04-07 12:17:21.000000000 +0200 @@ -4,7 +4,7 @@ <VSVer>15</VSVer> <PangoMajorVersion>1</PangoMajorVersion> <PangoMinorVersion>42</PangoMinorVersion> - <PangoMicroVersion>0</PangoMicroVersion> + <PangoMicroVersion>1</PangoMicroVersion> <ApiVersion>1.0</ApiVersion> <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <CopyDir>$(GlibEtcInstallRoot)</CopyDir> 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.42.0/win32/vs9/pango-version-paths.vsprops new/pango-1.42.1/win32/vs9/pango-version-paths.vsprops --- old/pango-1.42.0/win32/vs9/pango-version-paths.vsprops 2018-03-12 17:09:25.000000000 +0100 +++ new/pango-1.42.1/win32/vs9/pango-version-paths.vsprops 2018-04-07 12:14:20.000000000 +0200 @@ -18,7 +18,7 @@ /> <UserMacro Name="PangoMicroVersion" - Value="0" + Value="1" /> <UserMacro Name="ApiVersion"
