Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wxsvg for openSUSE:Factory checked in at 2022-04-16 00:15:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxsvg (Old) and /work/SRC/openSUSE:Factory/.wxsvg.new.1941 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxsvg" Sat Apr 16 00:15:43 2022 rev:8 rq:970355 version:1.5.23 Changes: -------- --- /work/SRC/openSUSE:Factory/wxsvg/wxsvg.changes 2022-03-06 18:15:52.691826837 +0100 +++ /work/SRC/openSUSE:Factory/.wxsvg.new.1941/wxsvg.changes 2022-04-16 00:16:02.581792808 +0200 @@ -1,0 +2,7 @@ +Thu Apr 14 12:34:37 UTC 2022 - Ferdinand Thiessen <[email protected]> + +- Update to version 1.5.23 + * wxSVGTextElement: added support of text-decoration "underline" + and "line-through" + +------------------------------------------------------------------- Old: ---- wxsvg-1.5.22.tar.bz2 New: ---- wxsvg-1.5.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxsvg.spec ++++++ --- /var/tmp/diff_new_pack.mP7HsO/_old 2022-04-16 00:16:03.185793614 +0200 +++ /var/tmp/diff_new_pack.mP7HsO/_new 2022-04-16 00:16:03.189793619 +0200 @@ -20,7 +20,7 @@ %define sover 3 Name: wxsvg -Version: 1.5.22 +Version: 1.5.23 Release: 0 Summary: Library to create, manipulate and render SVG files License: LGPL-2.1-or-later WITH WxWindows-exception-3.1 ++++++ wxsvg-1.5.22.tar.bz2 -> wxsvg-1.5.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/ChangeLog new/wxsvg-1.5.23/ChangeLog --- old/wxsvg-1.5.22/ChangeLog 2019-12-27 20:33:24.000000000 +0100 +++ new/wxsvg-1.5.23/ChangeLog 2021-11-02 17:31:39.000000000 +0100 @@ -1,3 +1,8 @@ +Version 1.5.23 <2021-11-02> +--------------------------- + + * wxSVGTextElement: added support of text-decoration "underline" and "line-through" + Version 1.5.22 <2019-12-27> --------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/Makefile.in new/wxsvg-1.5.23/Makefile.in --- old/wxsvg-1.5.22/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -230,6 +230,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -647,6 +649,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -689,6 +695,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -704,7 +712,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -869,18 +877,18 @@ am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-pkgconfigDATA + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-libtool distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkgconfigDATA install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-pkgconfigDATA .PRECIOUS: Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/aclocal.m4 new/wxsvg-1.5.23/aclocal.m4 --- old/wxsvg-1.5.22/aclocal.m4 2019-12-27 20:33:28.000000000 +0100 +++ new/wxsvg-1.5.23/aclocal.m4 2021-11-02 17:31:41.000000000 +0100 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,9 +20,9 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright ?? 2004 Scott James Remnant <[email protected]>. dnl Copyright ?? 2012-2015 Dan Nicholson <[email protected]> dnl @@ -63,7 +63,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -195,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -296,7 +296,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -311,7 +311,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -327,14 +327,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -386,7 +386,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -417,7 +417,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -608,7 +608,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -647,7 +647,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -674,7 +676,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -871,7 +873,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -892,7 +894,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -914,7 +916,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -949,7 +951,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -992,7 +994,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1013,12 +1015,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -1031,7 +1028,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1060,7 +1057,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1107,7 +1104,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1126,7 +1123,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1207,7 +1204,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1267,7 +1264,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1295,7 +1292,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1314,7 +1311,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/compile new/wxsvg-1.5.23/compile --- old/wxsvg-1.5.22/compile 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/compile 2021-11-02 17:31:42.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/configure new/wxsvg-1.5.23/configure --- old/wxsvg-1.5.22/configure 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/configure 2021-11-02 17:31:43.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wxsvg 1.5.22. +# Generated by GNU Autoconf 2.69 for wxsvg 1.5.23. # # Report bugs to <http://wxsvg.sourceforge.net/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='wxsvg' PACKAGE_TARNAME='wxsvg' -PACKAGE_VERSION='1.5.22' -PACKAGE_STRING='wxsvg 1.5.22' +PACKAGE_VERSION='1.5.23' +PACKAGE_STRING='wxsvg 1.5.23' PACKAGE_BUGREPORT='http://wxsvg.sourceforge.net/' PACKAGE_URL='' @@ -1394,7 +1394,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxsvg 1.5.22 to adapt to many kinds of systems. +\`configure' configures wxsvg 1.5.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1465,7 +1465,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxsvg 1.5.22:";; + short | recursive ) echo "Configuration of wxsvg 1.5.23:";; esac cat <<\_ACEOF @@ -1612,7 +1612,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxsvg configure 1.5.22 +wxsvg configure 1.5.23 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2133,7 +2133,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxsvg $as_me 1.5.22, which was +It was created by wxsvg $as_me 1.5.23, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2687,12 +2687,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -2997,7 +2992,7 @@ # Define the identity of the package. PACKAGE='wxsvg' - VERSION='1.5.22' + VERSION='1.5.23' cat >>confdefs.h <<_ACEOF @@ -3122,7 +3117,7 @@ # 4. If any interfaces have been added since the last public release, then increment age. # 5. If any interfaces have been removed since the last public release then set age to 0. -LIBRARY_VERSION=15:6:12 # current:revision:age -> libwxsvg.so.(C-A).(A).(R) +LIBRARY_VERSION=15:7:12 # current:revision:age -> libwxsvg.so.(C-A).(A).(R) # options @@ -6569,7 +6564,7 @@ fi : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} @@ -8291,8 +8286,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -8324,11 +8319,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + 10.0,*86*-darwin8*|10.0,*-darwin[912]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[012][,.]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -16347,8 +16342,8 @@ # check for cairo pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 -$as_echo_n "checking for CAIRO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo" >&5 +$as_echo_n "checking for cairo... " >&6; } if test -n "$CAIRO_CFLAGS"; then pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" @@ -16388,7 +16383,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -16415,7 +16410,7 @@ and CAIRO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -16452,8 +16447,8 @@ pango) pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5 -$as_echo_n "checking for PANGO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pangocairo" >&5 +$as_echo_n "checking for pangocairo... " >&6; } if test -n "$PANGO_CFLAGS"; then pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS" @@ -16493,7 +16488,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -16520,7 +16515,7 @@ and PANGO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -16902,8 +16897,8 @@ # check expat pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXPAT" >&5 -$as_echo_n "checking for EXPAT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat" >&5 +$as_echo_n "checking for expat... " >&6; } if test -n "$EXPAT_CFLAGS"; then pkg_cv_EXPAT_CFLAGS="$EXPAT_CFLAGS" @@ -16943,7 +16938,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -16970,7 +16965,7 @@ and EXPAT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -16997,8 +16992,8 @@ # check libexif pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEXIF" >&5 -$as_echo_n "checking for LIBEXIF... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexif" >&5 +$as_echo_n "checking for libexif... " >&6; } if test -n "$LIBEXIF_CFLAGS"; then pkg_cv_LIBEXIF_CFLAGS="$LIBEXIF_CFLAGS" @@ -17038,7 +17033,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -17056,7 +17051,7 @@ as_fn_error $? "*** missing libexif ***" "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "*** missing libexif ***" "$LINENO" 5 else @@ -17079,8 +17074,8 @@ if test x$enable_libav = xyes; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBAV" >&5 -$as_echo_n "checking for LIBAV... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" >&5 +$as_echo_n "checking for libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale... " >&6; } if test -n "$LIBAV_CFLAGS"; then pkg_cv_LIBAV_CFLAGS="$LIBAV_CFLAGS" @@ -17120,7 +17115,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -17147,7 +17142,7 @@ and LIBAV_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -17778,7 +17773,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxsvg $as_me 1.5.22, which was +This file was extended by wxsvg $as_me 1.5.23, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17835,7 +17830,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxsvg config.status 1.5.22 +wxsvg config.status 1.5.23 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18857,7 +18852,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/configure.ac new/wxsvg-1.5.23/configure.ac --- old/wxsvg-1.5.22/configure.ac 2019-12-27 20:33:24.000000000 +0100 +++ new/wxsvg-1.5.23/configure.ac 2021-11-02 17:31:39.000000000 +0100 @@ -2,7 +2,7 @@ # initialization AC_PREREQ(2.59) -AC_INIT([wxsvg], [1.5.22], [http://wxsvg.sourceforge.net/]) +AC_INIT([wxsvg], [1.5.23], [http://wxsvg.sourceforge.net/]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE(foreign) AM_MAINTAINER_MODE @@ -15,7 +15,7 @@ # 4. If any interfaces have been added since the last public release, then increment age. # 5. If any interfaces have been removed since the last public release then set age to 0. -LIBRARY_VERSION=15:6:12 # current:revision:age -> libwxsvg.so.(C-A).(A).(R) +LIBRARY_VERSION=15:7:12 # current:revision:age -> libwxsvg.so.(C-A).(A).(R) AC_SUBST(LIBRARY_VERSION) # options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/depcomp new/wxsvg-1.5.23/depcomp --- old/wxsvg-1.5.22/depcomp 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/depcomp 2021-11-02 17:31:42.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/include/Makefile.in new/wxsvg-1.5.23/include/Makefile.in --- old/wxsvg-1.5.22/include/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/include/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/include/wxSVG/Makefile.in new/wxsvg-1.5.23/include/wxSVG/Makefile.in --- old/wxsvg-1.5.22/include/wxSVG/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/include/wxSVG/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/include/wxSVG/SVGCanvasItem.h new/wxsvg-1.5.23/include/wxSVG/SVGCanvasItem.h --- old/wxsvg-1.5.22/include/wxSVG/SVGCanvasItem.h 2019-12-27 20:33:24.000000000 +0100 +++ new/wxsvg-1.5.23/include/wxSVG/SVGCanvasItem.h 2021-11-02 17:31:39.000000000 +0100 @@ -102,6 +102,7 @@ /** character */ struct wxSVGCanvasTextChar { wxSVGCanvasPath* path; + wxSVGCanvasPath* decorationPath; wxSVGRect bbox; }; WX_DECLARE_OBJARRAY(wxSVGCanvasTextChar, wxSVGCanvasTextCharList); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/include/wxSVGXML/Makefile.in new/wxsvg-1.5.23/include/wxSVGXML/Makefile.in --- old/wxsvg-1.5.22/include/wxSVGXML/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/include/wxSVGXML/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/ltmain.sh new/wxsvg-1.5.23/ltmain.sh --- old/wxsvg-1.5.22/ltmain.sh 2019-12-27 20:33:25.000000000 +0100 +++ new/wxsvg-1.5.23/ltmain.sh 2021-11-02 17:31:40.000000000 +0100 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-11" +VERSION="2.4.6 Debian-2.4.6-15" package_revision=2.4.6 @@ -387,7 +387,7 @@ # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -2141,7 +2141,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-11 + version: $progname $scriptversion Debian-2.4.6-15 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -7368,10 +7368,12 @@ # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer # -fuse-ld=* Linker select flags for GCC + # -static-* direct GCC to link specific libraries statically + # -fcilkplus Cilk Plus language extension features for C/C++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*) + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/m4/libtool.m4 new/wxsvg-1.5.23/m4/libtool.m4 --- old/wxsvg-1.5.22/m4/libtool.m4 2019-12-27 20:33:25.000000000 +0100 +++ new/wxsvg-1.5.23/m4/libtool.m4 2021-11-02 17:31:40.000000000 +0100 @@ -1041,8 +1041,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1071,11 +1071,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -1492,7 +1492,7 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/missing new/wxsvg-1.5.23/missing --- old/wxsvg-1.5.22/missing 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/missing 2021-11-02 17:31:42.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/src/Makefile.in new/wxsvg-1.5.23/src/Makefile.in --- old/wxsvg-1.5.22/src/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/src/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/src/SVGCanvas.cpp new/wxsvg-1.5.23/src/SVGCanvas.cpp --- old/wxsvg-1.5.22/src/SVGCanvas.cpp 2019-12-27 20:33:24.000000000 +0100 +++ new/wxsvg-1.5.23/src/SVGCanvas.cpp 2021-11-02 17:31:39.000000000 +0100 @@ -121,8 +121,17 @@ wxSVGCanvasTextChunk& chunk = canvasText.m_chunks[i]; chunk.style.SetFillRule(wxCSS_VALUE_EVENODD); wxSVGMatrix pathMatrix = matrix.Multiply(chunk.matrix); - for (unsigned int j=0; j<chunk.chars.Count(); j++) + for (unsigned int j=0; j<chunk.chars.Count(); j++) { DrawItem(*chunk.chars[j].path, pathMatrix, chunk.style, svgElem); + if (chunk.chars[j].decorationPath != NULL) { + wxCSSStyleDeclaration decoStyle; + decoStyle.SetStroke(chunk.style.GetFill()); + decoStyle.SetStrokeWidth(chunk.style.GetFontSize() > 0 ? chunk.style.GetFontSize()/15 : 1); + if (chunk.style.GetFontWeight() == wxCSS_VALUE_BOLD) + decoStyle.SetStrokeWidth(decoStyle.GetStrokeWidth()*1.5); + DrawItem(*chunk.chars[j].decorationPath, pathMatrix, decoStyle, svgElem); + } + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/src/SVGCanvasItem.cpp new/wxsvg-1.5.23/src/SVGCanvasItem.cpp --- old/wxsvg-1.5.22/src/SVGCanvasItem.cpp 2019-12-27 20:33:24.000000000 +0100 +++ new/wxsvg-1.5.23/src/SVGCanvasItem.cpp 2021-11-02 17:31:39.000000000 +0100 @@ -1005,9 +1005,13 @@ } wxSVGCanvasText::~wxSVGCanvasText() { - for (unsigned int i = 0; i < m_chunks.Count(); i++) - for (unsigned int j = 0; j < m_chunks[i].chars.Count(); j++) + for (unsigned int i = 0; i < m_chunks.Count(); i++) { + for (unsigned int j = 0; j < m_chunks[i].chars.Count(); j++) { delete m_chunks[i].chars[j].path; + if (m_chunks[i].chars[j].decorationPath != NULL) + delete m_chunks[i].chars[j].decorationPath; + } + } } void wxSVGCanvasText::Init(wxSVGTextElement& element, const wxCSSStyleDeclaration& style, wxSVGMatrix* matrix) { @@ -1106,6 +1110,7 @@ void wxSVGCanvasText::BeginChar(wxSVGMatrix* matrix) { m_char = new wxSVGCanvasTextChar; m_char->path = m_canvas->CreateCanvasPath(matrix); + m_char->decorationPath = NULL; m_chunks[m_chunks.GetCount() - 1].chars.Add(m_char); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/src/cairo/Makefile.in new/wxsvg-1.5.23/src/cairo/Makefile.in --- old/wxsvg-1.5.22/src/cairo/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/src/cairo/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/src/cairo/SVGCanvasTextCairo.cpp new/wxsvg-1.5.23/src/cairo/SVGCanvasTextCairo.cpp --- old/wxsvg-1.5.22/src/cairo/SVGCanvasTextCairo.cpp 2019-12-27 20:33:24.000000000 +0100 +++ new/wxsvg-1.5.23/src/cairo/SVGCanvasTextCairo.cpp 2021-11-02 17:31:39.000000000 +0100 @@ -37,7 +37,7 @@ #if defined(__WXMSW__) || defined(__WXMAC__) int size = (int) style.GetFontSize(); - int fstyle = style.GetFontStyle() == wxCSS_VALUE_ITALIC ? wxFONTSTYLE_ITALIC + wxFontStyle fstyle = style.GetFontStyle() == wxCSS_VALUE_ITALIC ? wxFONTSTYLE_ITALIC : (style.GetFontStyle() == wxCSS_VALUE_OBLIQUE ? wxFONTSTYLE_SLANT : wxFONTSTYLE_NORMAL); wxFontWeight weight = style.GetFontWeight() == wxCSS_VALUE_BOLD ? wxFONTWEIGHT_BOLD : style.GetFontWeight() == wxCSS_VALUE_BOLDER ? wxFONTWEIGHT_MAX @@ -84,6 +84,16 @@ m_char->path->MoveTo(m_tx + x, m_ty + y); cairo_text_path(cr, (const char*) token.utf8_str()); + // decoration + if (style.GetTextDecoration() == wxCSS_VALUE_UNDERLINE + || style.GetTextDecoration() == wxCSS_VALUE_LINE_THROUGH) { + m_char->decorationPath = m_canvas->CreateCanvasPath(matrix); + if (style.GetTextDecoration() == wxCSS_VALUE_UNDERLINE) + m_char->decorationPath->MoveTo(m_tx + x, m_ty + y + fextents.height/10); + else + m_char->decorationPath->MoveTo(m_tx + x, m_ty + y - extents.height/2); + } + if (x_advance < extents.x_advance) x_advance = extents.x_advance; if (width < extents.width) @@ -91,6 +101,12 @@ height += fextents.height; if (tokenzr.HasMoreTokens()) y += fextents.height; + + // decoration + if (style.GetTextDecoration() == wxCSS_VALUE_UNDERLINE + || style.GetTextDecoration() == wxCSS_VALUE_LINE_THROUGH) { + m_char->decorationPath->LineTo(extents.width, 0, true); + } } // set bbox @@ -126,18 +142,31 @@ m_char->path->MoveTo(m_tx, m_ty - ((double)baseline / PANGO_SCALE)); pango_cairo_layout_path(cr, layout); - // set bbox and increase current position (m_tx) + // get size int lwidth, lheight; pango_layout_get_size(layout, &lwidth, &lheight); double width = ((double)lwidth / PANGO_SCALE); double height = ((double)lheight / PANGO_SCALE); + + // decoration + if (style.GetTextDecoration() == wxCSS_VALUE_UNDERLINE + || style.GetTextDecoration() == wxCSS_VALUE_LINE_THROUGH) { + m_char->decorationPath = m_canvas->CreateCanvasPath(matrix); + if (style.GetTextDecoration() == wxCSS_VALUE_UNDERLINE) + m_char->decorationPath->MoveTo(m_tx, m_ty + height/10); + else + m_char->decorationPath->MoveTo(m_tx, m_ty - ((double)baseline / PANGO_SCALE / 2) + height/10); + m_char->decorationPath->LineTo(width, 0, true); + } + + // set bbox and increase current position (m_tx) m_char->bbox = wxSVGRect(m_tx, m_ty, width, height); if (style.GetTextAnchor() == wxCSS_VALUE_MIDDLE || style.GetTextAnchor() == wxCSS_VALUE_END) { wxSVGRect bbox = m_char->path->GetResultBBox(style); m_tx += width > bbox.GetWidth() ? width : bbox.GetWidth(); } else m_tx += width; - + g_object_unref(layout); pango_font_description_free(font); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/src/skia/Makefile.in new/wxsvg-1.5.23/src/skia/Makefile.in --- old/wxsvg-1.5.22/src/skia/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/src/skia/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/src/svgxml/Makefile.in new/wxsvg-1.5.23/src/svgxml/Makefile.in --- old/wxsvg-1.5.22/src/svgxml/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/src/svgxml/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wxsvg-1.5.22/svgview/Makefile.in new/wxsvg-1.5.23/svgview/Makefile.in --- old/wxsvg-1.5.22/svgview/Makefile.in 2019-12-27 20:33:29.000000000 +0100 +++ new/wxsvg-1.5.23/svgview/Makefile.in 2021-11-02 17:31:42.000000000 +0100 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it,
