Hello community, here is the log from the commit of package chafa for openSUSE:Leap:15.2 checked in at 2020-03-06 12:40:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/chafa (Old) and /work/SRC/openSUSE:Leap:15.2/.chafa.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chafa" Fri Mar 6 12:40:28 2020 rev:2 rq:781665 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/chafa/chafa.changes 2020-02-22 17:49:30.945416644 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.chafa.new.26092/chafa.changes 2020-03-06 12:43:55.726853910 +0100 @@ -1,0 +2,6 @@ +Wed Mar 4 06:39:45 UTC 2020 - Michael Vetter <[email protected]> + +- Update to 1.2.2: + * Fix #34 Cannot compile example + +------------------------------------------------------------------- Old: ---- chafa-1.2.1.tar.xz New: ---- chafa-1.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chafa.spec ++++++ --- /var/tmp/diff_new_pack.iffwmS/_old 2020-03-06 12:43:56.174854182 +0100 +++ /var/tmp/diff_new_pack.iffwmS/_new 2020-03-06 12:43:56.174854182 +0100 @@ -1,7 +1,7 @@ # # spec file for package chafa # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: chafa -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: Image-to-text converter for terminal License: LGPL-3.0-or-later @@ -91,13 +91,15 @@ %files -n libchafa0 %license COPYING.LESSER %{_libdir}/lib%{name}.so.0 -%{_libdir}/lib%{name}.so.0.1.1 +%{_libdir}/lib%{name}.so.0.2.0 %files devel %license COPYING.LESSER %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/lib%{name}.so +%dir %{_libdir}/chafa/ +%{_libdir}/chafa/include/ %files doc %doc AUTHORS ++++++ chafa-1.2.1.tar.xz -> chafa-1.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/NEWS new/chafa-1.2.2/NEWS --- old/chafa-1.2.1/NEWS 2019-08-15 03:45:28.000000000 +0200 +++ new/chafa-1.2.2/NEWS 2020-03-02 01:25:12.000000000 +0100 @@ -1,6 +1,15 @@ Chafa releases ============== +1.2.2 (2020-03-02) +------------------ + +This minor release fixes a bug causing builds linking with libchafa to +fail. + +* Bug fixes: + github#34 Cannot compile example (found by Petr Bílek). + 1.2.1 (2019-08-15) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/chafa/Makefile.am new/chafa-1.2.2/chafa/Makefile.am --- old/chafa-1.2.1/chafa/Makefile.am 2019-07-09 03:10:43.000000000 +0200 +++ new/chafa-1.2.2/chafa/Makefile.am 2020-03-02 01:25:12.000000000 +0100 @@ -1,12 +1,14 @@ SUBDIRS = smolscale +DISTCLEANFILES = +BUILT_SOURCES = ## --- Library --- lib_LTLIBRARIES = libchafa.la noinst_LTLIBRARIES = -libchafa_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -libchafa_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) -version-info 1:1:1 +libchafa_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -DCHAFA_COMPILATION +libchafa_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) -version-info 2:0:2 libchafa_la_LIBADD = $(GLIB_LIBS) smolscale/libsmolscale.la -lm libchafa_la_SOURCES = \ @@ -34,7 +36,7 @@ noinst_LTLIBRARIES += libchafa-mmx.la libchafa_la_LIBADD += libchafa-mmx.la libchafa_mmx_la_SOURCES = chafa-mmx.c -libchafa_mmx_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -mmmx +libchafa_mmx_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -mmmx -DCHAFA_COMPILATION libchafa_mmx_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) endif @@ -42,7 +44,7 @@ noinst_LTLIBRARIES += libchafa-sse41.la libchafa_la_LIBADD += libchafa-sse41.la libchafa_sse41_la_SOURCES = chafa-sse41.c -libchafa_sse41_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -msse4.1 +libchafa_sse41_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -msse4.1 -DCHAFA_COMPILATION libchafa_sse41_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) endif @@ -50,10 +52,26 @@ noinst_LTLIBRARIES += libchafa-popcnt.la libchafa_la_LIBADD += libchafa-popcnt.la libchafa_popcnt_la_SOURCES = chafa-popcnt.c -libchafa_popcnt_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -mpopcnt +libchafa_popcnt_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -mpopcnt -DCHAFA_COMPILATION libchafa_popcnt_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) endif +# Generate chafaconfig.h +# +# The timestamp of the stamp file is used to indicate if chafaconfig.h is +# up to date with respect to config.status. In the usual case, changes +# to config.status will not result in changes to chafaconfig.h, so we +# avoid touching its timestamp (so we don't rebuild the whole tree). + +DISTCLEANFILES += chafaconfig-stamp chafaconfig.h +BUILT_SOURCES += chafaconfig-stamp +configexecincludedir = $(libdir)/chafa/include +nodist_configexecinclude_HEADERS = chafaconfig.h +chafaconfig-stamp: ../config.status + $(AM_V_GEN) cd $(top_builddir) && \ + $(SHELL) ./config.status chafa/chafaconfig.h + @touch chafaconfig-stamp + ## -- General --- AM_CPPFLAGS = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/chafa/Makefile.in new/chafa-1.2.2/chafa/Makefile.in --- old/chafa-1.2.1/chafa/Makefile.in 2019-08-15 03:47:36.000000000 +0200 +++ new/chafa-1.2.2/chafa/Makefile.in 2020-03-02 01:25:39.000000000 +0100 @@ -107,7 +107,7 @@ $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = chafaconfig.h CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -136,7 +136,8 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(chafaincludedir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(chafaincludedir)" \ + "$(DESTDIR)$(configexecincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libchafa_mmx_la_LIBADD = am__libchafa_mmx_la_SOURCES_DIST = chafa-mmx.c @@ -245,7 +246,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -HEADERS = $(chafainclude_HEADERS) +HEADERS = $(chafainclude_HEADERS) $(nodist_configexecinclude_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -274,7 +275,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/chafaconfig.h.in \ + $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -444,10 +446,19 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = smolscale + +# Generate chafaconfig.h +# +# The timestamp of the stamp file is used to indicate if chafaconfig.h is +# up to date with respect to config.status. In the usual case, changes +# to config.status will not result in changes to chafaconfig.h, so we +# avoid touching its timestamp (so we don't rebuild the whole tree). +DISTCLEANFILES = chafaconfig-stamp chafaconfig.h +BUILT_SOURCES = chafaconfig-stamp lib_LTLIBRARIES = libchafa.la noinst_LTLIBRARIES = $(am__append_1) $(am__append_3) $(am__append_5) -libchafa_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -libchafa_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) -version-info 1:1:1 +libchafa_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -DCHAFA_COMPILATION +libchafa_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) -version-info 2:0:2 libchafa_la_LIBADD = $(GLIB_LIBS) smolscale/libsmolscale.la -lm \ $(am__append_2) $(am__append_4) $(am__append_6) libchafa_la_SOURCES = \ @@ -472,18 +483,21 @@ chafa-version-macros.h @HAVE_MMX_INTRINSICS_TRUE@libchafa_mmx_la_SOURCES = chafa-mmx.c -@HAVE_MMX_INTRINSICS_TRUE@libchafa_mmx_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -mmmx +@HAVE_MMX_INTRINSICS_TRUE@libchafa_mmx_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -mmmx -DCHAFA_COMPILATION @HAVE_MMX_INTRINSICS_TRUE@libchafa_mmx_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) @HAVE_SSE41_INTRINSICS_TRUE@libchafa_sse41_la_SOURCES = chafa-sse41.c -@HAVE_SSE41_INTRINSICS_TRUE@libchafa_sse41_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -msse4.1 +@HAVE_SSE41_INTRINSICS_TRUE@libchafa_sse41_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -msse4.1 -DCHAFA_COMPILATION @HAVE_SSE41_INTRINSICS_TRUE@libchafa_sse41_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) @HAVE_POPCNT_INTRINSICS_TRUE@libchafa_popcnt_la_SOURCES = chafa-popcnt.c -@HAVE_POPCNT_INTRINSICS_TRUE@libchafa_popcnt_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -mpopcnt +@HAVE_POPCNT_INTRINSICS_TRUE@libchafa_popcnt_la_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS) -mpopcnt -DCHAFA_COMPILATION @HAVE_POPCNT_INTRINSICS_TRUE@libchafa_popcnt_la_LDFLAGS = $(LIBCHAFA_LDFLAGS) +configexecincludedir = $(libdir)/chafa/include +nodist_configexecinclude_HEADERS = chafaconfig.h AM_CPPFLAGS = \ -I$(top_srcdir) -all: all-recursive +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -516,6 +530,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +chafaconfig.h: $(top_builddir)/config.status $(srcdir)/chafaconfig.h.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -715,6 +731,27 @@ @list='$(chafainclude_HEADERS)'; test -n "$(chafaincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(chafaincludedir)'; $(am__uninstall_files_from_dir) +install-nodist_configexecincludeHEADERS: $(nodist_configexecinclude_HEADERS) + @$(NORMAL_INSTALL) + @list='$(nodist_configexecinclude_HEADERS)'; test -n "$(configexecincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(configexecincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(configexecincludedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(configexecincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(configexecincludedir)" || exit $$?; \ + done + +uninstall-nodist_configexecincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_configexecinclude_HEADERS)'; test -n "$(configexecincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(configexecincludedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -874,14 +911,16 @@ fi; \ done check-am: all-am -check: check-recursive +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(chafaincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(chafaincludedir)" "$(DESTDIR)$(configexecincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-recursive +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -907,10 +946,12 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ @@ -949,7 +990,8 @@ install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-libLTLIBRARIES \ + install-nodist_configexecincludeHEADERS install-html: install-html-recursive @@ -998,9 +1040,11 @@ ps-am: -uninstall-am: uninstall-chafaincludeHEADERS uninstall-libLTLIBRARIES +uninstall-am: uninstall-chafaincludeHEADERS uninstall-libLTLIBRARIES \ + uninstall-nodist_configexecincludeHEADERS -.MAKE: $(am__recursive_targets) install-am install-strip +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles check check-am clean clean-generic \ @@ -1011,16 +1055,22 @@ install-chafaincludeHEADERS 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-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am \ - uninstall-chafaincludeHEADERS uninstall-libLTLIBRARIES + install-libLTLIBRARIES install-man \ + install-nodist_configexecincludeHEADERS install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-chafaincludeHEADERS uninstall-libLTLIBRARIES \ + uninstall-nodist_configexecincludeHEADERS .PRECIOUS: Makefile +chafaconfig-stamp: ../config.status + $(AM_V_GEN) cd $(top_builddir) && \ + $(SHELL) ./config.status chafa/chafaconfig.h + @touch chafaconfig-stamp # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/chafa/chafa-version-macros.h new/chafa-1.2.2/chafa/chafa-version-macros.h --- old/chafa-1.2.1/chafa/chafa-version-macros.h 2019-07-14 23:20:28.000000000 +0200 +++ new/chafa-1.2.2/chafa/chafa-version-macros.h 2020-03-02 01:25:12.000000000 +0100 @@ -24,6 +24,9 @@ # error "Only <chafa.h> can be included directly." #endif +/* Our current version is defined here */ +#include <chafaconfig.h> + G_BEGIN_DECLS /* Exported symbol versioning/visibility. Similar to the versioning macros @@ -65,6 +68,13 @@ * * Since: 1.2 */ + +/* Make sure all exportable symbols are made visible, even + * deprecated ones. */ +#ifdef CHAFA_COMPILATION +# define CHAFA_VERSION_MIN_REQUIRED (CHAFA_VERSION_1_0) +#endif + /* If the package sets CHAFA_VERSION_MIN_REQUIRED to some future * CHAFA_VERSION_X_Y value that we don't know about, it will compare as * 0 in preprocessor tests. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/chafa/chafaconfig.h.in new/chafa-1.2.2/chafa/chafaconfig.h.in --- old/chafa-1.2.1/chafa/chafaconfig.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/chafa-1.2.2/chafa/chafaconfig.h.in 2020-03-02 01:25:12.000000000 +0100 @@ -0,0 +1,16 @@ +/* chafaconfig.h + * + * This is a generated file. Please modify 'chafaconfig.h.in'. */ + +#ifndef __CHAFACONFIG_H__ +#define __CHAFACONFIG_H__ + +G_BEGIN_DECLS + +#define CHAFA_MAJOR_VERSION @CHAFA_MAJOR_VERSION@ +#define CHAFA_MINOR_VERSION @CHAFA_MINOR_VERSION@ +#define CHAFA_MICRO_VERSION @CHAFA_MICRO_VERSION@ + +G_END_DECLS + +#endif /* __CHAFACONFIG_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/chafa.pc.in new/chafa-1.2.2/chafa.pc.in --- old/chafa-1.2.1/chafa.pc.in 2018-05-03 16:14:53.000000000 +0200 +++ new/chafa-1.2.2/chafa.pc.in 2020-03-02 01:25:12.000000000 +0100 @@ -8,4 +8,4 @@ Requires: glib-2.0 Version: @VERSION@ Libs: -L${libdir} -lchafa -lm -Cflags: -I${includedir}/chafa +Cflags: -I${includedir}/chafa -I${libdir}/chafa/include diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/configure new/chafa-1.2.2/configure --- old/chafa-1.2.1/configure 2019-08-15 03:47:37.000000000 +0200 +++ new/chafa-1.2.2/configure 2020-03-02 01:25:39.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for chafa 1.2.1. +# Generated by GNU Autoconf 2.69 for chafa 1.2.2. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='chafa' PACKAGE_TARNAME='chafa' -PACKAGE_VERSION='1.2.1' -PACKAGE_STRING='chafa 1.2.1' +PACKAGE_VERSION='1.2.2' +PACKAGE_STRING='chafa 1.2.2' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1384,7 +1384,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 chafa 1.2.1 to adapt to many kinds of systems. +\`configure' configures chafa 1.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1454,7 +1454,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of chafa 1.2.1:";; + short | recursive ) echo "Configuration of chafa 1.2.2:";; esac cat <<\_ACEOF @@ -1591,7 +1591,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -chafa configure 1.2.1 +chafa configure 1.2.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1960,7 +1960,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by chafa $as_me 1.2.1, which was +It was created by chafa $as_me 1.2.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2823,7 +2823,7 @@ # Define the identity of the package. PACKAGE='chafa' - VERSION='1.2.1' + VERSION='1.2.2' cat >>confdefs.h <<_ACEOF @@ -2925,8 +2925,8 @@ CHAFA_MAJOR_VERSION=1 CHAFA_MINOR_VERSION=2 -CHAFA_MICRO_VERSION=1 -CHAFA_VERSION=1.2.1 +CHAFA_MICRO_VERSION=2 +CHAFA_VERSION=1.2.2 @@ -2940,7 +2940,7 @@ $as_echo "#define CHAFA_MINOR_VERSION 2" >>confdefs.h -$as_echo "#define CHAFA_MICRO_VERSION 1" >>confdefs.h +$as_echo "#define CHAFA_MICRO_VERSION 2" >>confdefs.h cat >>confdefs.h <<_ACEOF @@ -14735,7 +14735,7 @@ -ac_config_files="$ac_config_files Makefile chafa/Makefile chafa/smolscale/Makefile libnsgif/Makefile chafa.pc docs/Makefile docs/version.xml tools/Makefile tools/chafa/Makefile tools/fontgen/Makefile" +ac_config_files="$ac_config_files Makefile chafa/Makefile chafa/smolscale/Makefile chafa/chafaconfig.h libnsgif/Makefile chafa.pc docs/Makefile docs/version.xml tools/Makefile tools/chafa/Makefile tools/fontgen/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -15330,7 +15330,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by chafa $as_me 1.2.1, which was +This file was extended by chafa $as_me 1.2.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15396,7 +15396,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -chafa config.status 1.2.1 +chafa config.status 1.2.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15814,6 +15814,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "chafa/Makefile") CONFIG_FILES="$CONFIG_FILES chafa/Makefile" ;; "chafa/smolscale/Makefile") CONFIG_FILES="$CONFIG_FILES chafa/smolscale/Makefile" ;; + "chafa/chafaconfig.h") CONFIG_FILES="$CONFIG_FILES chafa/chafaconfig.h" ;; "libnsgif/Makefile") CONFIG_FILES="$CONFIG_FILES libnsgif/Makefile" ;; "chafa.pc") CONFIG_FILES="$CONFIG_FILES chafa.pc" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/configure.ac new/chafa-1.2.2/configure.ac --- old/chafa-1.2.1/configure.ac 2019-08-15 03:47:28.000000000 +0200 +++ new/chafa-1.2.2/configure.ac 2020-03-02 01:25:12.000000000 +0100 @@ -6,7 +6,7 @@ m4_define([chafa_major_version], [1]) m4_define([chafa_minor_version], [2]) -m4_define([chafa_micro_version], [1]) +m4_define([chafa_micro_version], [2]) m4_define([chafa_version], [chafa_major_version.chafa_minor_version.chafa_micro_version]) @@ -393,6 +393,7 @@ AC_OUTPUT(Makefile chafa/Makefile chafa/smolscale/Makefile + chafa/chafaconfig.h libnsgif/Makefile chafa.pc docs/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/docs/chafa.1 new/chafa-1.2.2/docs/chafa.1 --- old/chafa-1.2.1/docs/chafa.1 2019-08-15 03:47:50.000000000 +0200 +++ new/chafa-1.2.2/docs/chafa.1 2020-03-02 01:25:44.000000000 +0100 @@ -2,7 +2,7 @@ .\" Title: chafa .\" Author: Hans Petter Jansson .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 08/15/2019 +.\" Date: 03/01/2020 .\" Manual: User Commands .\" Source: chafa .\" Language: English diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/docs/html/chafa-ChafaCanvas.html new/chafa-1.2.2/docs/html/chafa-ChafaCanvas.html --- old/chafa-1.2.1/docs/html/chafa-ChafaCanvas.html 2019-08-15 03:47:55.000000000 +0200 +++ new/chafa-1.2.2/docs/html/chafa-ChafaCanvas.html 2020-03-02 01:25:46.000000000 +0100 @@ -130,7 +130,7 @@ <p>To create a new <a class="link" href="chafa-ChafaCanvas.html#ChafaCanvas" title="ChafaCanvas"><span class="type">ChafaCanvas</span></a>, use <a class="link" href="chafa-ChafaCanvas.html#chafa-canvas-new" title="chafa_canvas_new ()"><code class="function">chafa_canvas_new()</code></a>. If you want to specify any parameters, like the geometry, color space and so on, you must create a <a class="link" href="chafa-ChafaCanvasConfig.html#ChafaCanvasConfig" title="ChafaCanvasConfig"><span class="type">ChafaCanvasConfig</span></a> first.</p> -<p>You can draw an image to the canvas using <a href="chafa-ChafaCanvas.html#chafa-canvas-set-contents"><code class="function">chafa_canvas_set_contents()</code></a> +<p>You can draw an image to the canvas using <code class="function">chafa_canvas_set_contents()</code> and create an ANSI text representation of the canvas' current contents using <a class="link" href="chafa-ChafaCanvas.html#chafa-canvas-build-ansi" title="chafa_canvas_build_ansi ()"><code class="function">chafa_canvas_build_ansi()</code></a>.</p> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/docs/html/index.html new/chafa-1.2.2/docs/html/index.html --- old/chafa-1.2.1/docs/html/index.html 2019-08-15 03:47:55.000000000 +0200 +++ new/chafa-1.2.2/docs/html/index.html 2020-03-02 01:25:46.000000000 +0100 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Chafa Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - For Chafa version 1.2.1 + For Chafa version 1.2.2 . The latest version of this documentation can be found online at <a class="ulink" href="https://hpjansson.org/chafa/ref/index.html"; target="_top">https://hpjansson.org/chafa/ref/</a>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/tools/chafa/Makefile.am new/chafa-1.2.2/tools/chafa/Makefile.am --- old/chafa-1.2.1/tools/chafa/Makefile.am 2019-07-21 17:56:54.000000000 +0200 +++ new/chafa-1.2.2/tools/chafa/Makefile.am 2020-03-02 01:25:12.000000000 +0100 @@ -22,6 +22,9 @@ ## -- General --- +## Include $(top_builddir)/chafa to get generated chafaconfig.h. + AM_CPPFLAGS = \ -I$(top_srcdir)/chafa \ + -I$(top_builddir)/chafa \ -I$(top_srcdir)/libnsgif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chafa-1.2.1/tools/chafa/Makefile.in new/chafa-1.2.2/tools/chafa/Makefile.in --- old/chafa-1.2.1/tools/chafa/Makefile.in 2019-08-15 03:47:37.000000000 +0200 +++ new/chafa-1.2.2/tools/chafa/Makefile.in 2020-03-02 01:25:39.000000000 +0100 @@ -350,6 +350,7 @@ @WANT_TOOLS_TRUE@chafa_LDADD = $(GLIB_LIBS) $(MAGICKWAND_LIBS) $(top_builddir)/chafa/libchafa.la $(top_builddir)/libnsgif/libnsgif.la AM_CPPFLAGS = \ -I$(top_srcdir)/chafa \ + -I$(top_builddir)/chafa \ -I$(top_srcdir)/libnsgif all: all-am
