Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libwmf for openSUSE:Factory checked in at 2023-04-30 16:07:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwmf (Old) and /work/SRC/openSUSE:Factory/.libwmf.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libwmf" Sun Apr 30 16:07:31 2023 rev:39 rq:1083619 version:0.2.13 Changes: -------- --- /work/SRC/openSUSE:Factory/libwmf/libwmf.changes 2021-05-20 19:24:20.782118192 +0200 +++ /work/SRC/openSUSE:Factory/.libwmf.new.1533/libwmf.changes 2023-04-30 16:07:35.828087161 +0200 @@ -1,0 +2,6 @@ +Thu Apr 27 22:40:59 UTC 2023 - Dirk M��ller <dmueller@suse.com> + +- update to 0.2.13: + * new release with various fixes + +------------------------------------------------------------------- Old: ---- v0.2.12.tar.gz New: ---- v0.2.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwmf.spec ++++++ --- /var/tmp/diff_new_pack.vZZ7Yb/_old 2023-04-30 16:07:37.552097678 +0200 +++ /var/tmp/diff_new_pack.vZZ7Yb/_new 2023-04-30 16:07:37.556097703 +0200 @@ -1,7 +1,7 @@ # # spec file for package libwmf # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{!?make_build:%global make_build make %{?_smp_mflags}} %define lname libwmf-0_2-7 Name: libwmf -Version: 0.2.12 +Version: 0.2.13 Release: 0 Summary: Utilities for Displaying and Converting Metafile Images License: LGPL-2.1-or-later ++++++ v0.2.12.tar.gz -> v0.2.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwmf-0.2.12/ChangeLog new/libwmf-0.2.13/ChangeLog --- old/libwmf-0.2.12/ChangeLog 2019-02-01 18:51:32.000000000 +0100 +++ new/libwmf-0.2.13/ChangeLog 2023-04-17 13:39:47.000000000 +0200 @@ -1,3 +1,6 @@ +v. 0.2.13 + * new release with various fixes + v. 0.2.12 * fix abi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwmf-0.2.12/README new/libwmf-0.2.13/README --- old/libwmf-0.2.12/README 2019-02-01 18:51:32.000000000 +0100 +++ new/libwmf-0.2.13/README 2023-04-17 13:39:47.000000000 +0200 @@ -1,3 +1,9 @@ +libwmf-0.2.13 Release Notes +--------------------------- + +- https://github.com/caolanm/libwmf/issues/2 +- https://github.com/caolanm/libwmf/issues/4 + libwmf-0.2.12 Release Notes --------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwmf-0.2.12/configure new/libwmf-0.2.13/configure --- old/libwmf-0.2.12/configure 2019-02-01 18:51:32.000000000 +0100 +++ new/libwmf-0.2.13/configure 2023-04-17 13:39:47.000000000 +0200 @@ -2384,13 +2384,13 @@ # WMF_MAJOR_VERSION=0 WMF_MINOR_VERSION=2 -WMF_MICRO_VERSION=12 +WMF_MICRO_VERSION=13 -WMF_INTERFACE_AGE=4 -WMF_BINARY_AGE=5 +WMF_INTERFACE_AGE=5 +WMF_BINARY_AGE=6 -WMFLITE_INTERFACE_AGE=5 -WMFLITE_BINARY_AGE=5 +WMFLITE_INTERFACE_AGE=6 +WMFLITE_BINARY_AGE=6 LIBWMF_VERSION=$WMF_MAJOR_VERSION.$WMF_MINOR_VERSION.$WMF_MICRO_VERSION LIBWMF_RELEASE=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwmf-0.2.12/configure.ac new/libwmf-0.2.13/configure.ac --- old/libwmf-0.2.12/configure.ac 2019-02-01 18:51:32.000000000 +0100 +++ new/libwmf-0.2.13/configure.ac 2023-04-17 13:39:47.000000000 +0200 @@ -16,13 +16,13 @@ # WMF_MAJOR_VERSION=0 WMF_MINOR_VERSION=2 -WMF_MICRO_VERSION=12 +WMF_MICRO_VERSION=13 -WMF_INTERFACE_AGE=4 -WMF_BINARY_AGE=5 +WMF_INTERFACE_AGE=5 +WMF_BINARY_AGE=6 -WMFLITE_INTERFACE_AGE=5 -WMFLITE_BINARY_AGE=5 +WMFLITE_INTERFACE_AGE=6 +WMFLITE_BINARY_AGE=6 dnl spec file substitutions LIBWMF_VERSION=$WMF_MAJOR_VERSION.$WMF_MINOR_VERSION.$WMF_MICRO_VERSION @@ -146,7 +146,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS(time.h) AC_CHECK_HEADER(unistd.h,[ - AC_DEFINE(HAVE_UNISTD_H) + AC_DEFINE([HAVE_UNISTD_H], [], [Header unistd.h is available]) GD_DEFS="$GD_DEFS -DHAVE_UNISTD_H" ]) @@ -174,13 +174,13 @@ if [ test "x$check_for_vsnprintf" = "xyes" ]; then AC_CHECK_FUNC(_vsnprintf,[ - AC_DEFINE(HAVE_VSNPRINTF) - AC_DEFINE(vsnprintf,_vsnprintf) + AC_DEFINE([HAVE_VSNPRINTF], [], [Function _vsnprintf is available]) + AC_DEFINE([vsnprintf], [_vsnprintf], [Use _vsnprintf instead of vsnprintf]) ],[ dnl Hmm. On the off-chance, check for vsnprintf in libdb. dnl This should, hopefully, solve the problem with Tru64 4.x dnl which is incompatible with trio (the latter's fault). AC_CHECK_LIB(db,vsnprintf,[ - AC_DEFINE(HAVE_VSNPRINTF) + AC_DEFINE([HAVE_VSNPRINTF], [], [Function vsnprintf is available]) WMF_LIBFLAGS="$WMF_LIBFLAGS -ldb" ],[ require_trio=yes ]) @@ -192,8 +192,8 @@ if [ test "x$check_for_snprintf" = "xyes" ]; then AC_CHECK_FUNC(_snprintf,[ - AC_DEFINE(HAVE_SNPRINTF) - AC_DEFINE(snprintf,_snprintf) + AC_DEFINE([HAVE_SNPRINTF], [], [Function _snprintf is available]) + AC_DEFINE([snprintf], [_snprintf], [Use _snprintf instead of snprintf]) ]) fi @@ -204,7 +204,7 @@ AC_MSG_CHECKING(for vfscanf in stdio.h) AC_EGREP_HEADER(vfscanf,stdio.h,[ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_VFSCANF) + AC_DEFINE([HAVE_VFSCANF], [], [Function vfscanf is available]) ],[ AC_MSG_RESULT(no) ]) fi @@ -235,7 +235,7 @@ fi # $LIBWMF_BUILDSTYLE = lite if [ test $libwmf_layers = no ]; then - AC_DEFINE(WITHOUT_LAYERS,1) + AC_DEFINE([WITHOUT_LAYERS], [1], [Don't use layers]) fi AM_CONDITIONAL(LIBWMF_OPT_MODULES,[ test $libwmf_layers = modules ]) @@ -361,9 +361,9 @@ fi if test $libwmf_xml = expat; then - AC_DEFINE(HAVE_EXPAT) + AC_DEFINE([HAVE_EXPAT], [], [Use expat as libwmf_xml]) elif test $libwmf_xml = libxml2; then - AC_DEFINE(HAVE_LIBXML2) + AC_DEFINE([HAVE_LIBXML2], [], [Use libxml2 as libwmf_xml]) else libwmf_xml=none WMF_XML_CFLAGS="" @@ -418,15 +418,10 @@ CPPFLAGS="$freetype_cflags $CPPFLAGS" LDFLAGS="$LDFLAGS $freetype_libs" -AC_CHECK_LIB(freetype,FT_Init_FreeType,[ - WMF_FT_LDFLAGS="$freetype_libs" -],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) -]) -AC_CHECK_HEADER(ft2build.h,[ - WMF_FT_CFLAGS="$freetype_cflags" - WMF_FT_CONFIG_CFLAGS="$freetype_cflags" -],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) -]) +PKG_CHECK_MODULES(FT2, freetype2) +WMF_FT_LDFLAGS=$FT2_LIBS +WMF_FT_CFLAGS=$FT2_CFLAGS +WMF_FT_CONFIG_CFLAGS=$FT2_CFLAGS GD_DEFS="$GD_DEFS -DHAVE_LIBFREETYPE" @@ -524,7 +519,7 @@ ],[ AC_MSG_ERROR(* * * unable to find "png.h" which is required by libwmf * * *) ]) -AC_DEFINE(HAVE_LIBPNG) +AC_DEFINE([HAVE_LIBPNG], [], [Library libpng is available]) GD_DEFS="$GD_DEFS -DHAVE_LIBPNG" fi # $LIBWMF_BUILDSTYLE = heavy @@ -567,7 +562,7 @@ else WMF_JPEG_LDFLAGS="-ljpeg" fi - AC_DEFINE(HAVE_LIBJPEG) + AC_DEFINE([HAVE_LIBJPEG], [], [Library libjpeg is available]) GD_DEFS="$GD_DEFS -DHAVE_LIBJPEG" libwmf_gd_jpeg=yes ]) @@ -649,7 +644,7 @@ fi if [ test "x$libwmf_gd" != "xnone" ]; then - AC_DEFINE(HAVE_GD,1) + AC_DEFINE([HAVE_GD], [1], [Library gd is available]) build_gd_layer=yes else build_gd_layer=no @@ -711,7 +706,7 @@ else WMF_PLOT_LDFLAGS="$LIBPLOT_LIBS" fi - AC_DEFINE(HAVE_LIBPLOT) + AC_DEFINE([HAVE_LIBPLOT], [], [Library libplot is available]) libwmf_plot=maybe else AC_MSG_ERROR(* * * sorry - unable to link against libplot * * *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwmf-0.2.12/src/font.c new/libwmf-0.2.13/src/font.c --- old/libwmf-0.2.12/src/font.c 2019-02-01 18:51:32.000000000 +0100 +++ new/libwmf-0.2.13/src/font.c 2023-04-17 13:39:47.000000000 +0200 @@ -1503,6 +1503,8 @@ aalias = ipa_font_gs_alias (&(font_data->GS),FI->alias+1); + if (!aalias) return 0; + if (aalias[0] != '(') { WMF_DEBUG (API,"font lookup is too complicated! Giving up..."); return (0); @@ -1683,7 +1685,10 @@ } #ifdef _WIN32 - metrics = remap_font_file_name (API,metrics); + if (metrics) + { + metrics = remap_font_file_name (API,metrics); + } #endif if (metrics) { if (stat (metrics,&stat_buf)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwmf-0.2.12/src/io-wmf.c new/libwmf-0.2.13/src/io-wmf.c --- old/libwmf-0.2.12/src/io-wmf.c 2019-02-01 18:51:32.000000000 +0100 +++ new/libwmf-0.2.13/src/io-wmf.c 2023-04-17 13:39:47.000000000 +0200 @@ -135,6 +135,8 @@ flags = WMF_OPT_IGNORE_NONFATAL | WMF_OPT_FUNCTION; api_options.function = wmf_gd_function; + api_options.argc = 0; + api_options.argv = NULL; err = wmf_api_create (&API, flags, &api_options); if (err != wmf_E_None) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwmf-0.2.12/src/ipa/xgd/device.h new/libwmf-0.2.13/src/ipa/xgd/device.h --- old/libwmf-0.2.12/src/ipa/xgd/device.h 2019-02-01 18:51:32.000000000 +0100 +++ new/libwmf-0.2.13/src/ipa/xgd/device.h 2023-04-17 13:39:47.000000000 +0200 @@ -21,7 +21,7 @@ */ static void wmf_gd_device_open (wmfAPI* API) { -#ifndef HAVE_LIBPNG +#if !defined(HAVE_LIBPNG) || !defined(HAVE_LIBJPEG) wmf_gd_t* ddata = WMF_GD_GetData (API); #endif
participants (1)
-
Source-Sync