Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xorg-x11-fonts for openSUSE:Factory checked in at 2023-03-01 16:13:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-fonts (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-fonts.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-fonts" Wed Mar 1 16:13:47 2023 rev:58 rq:1068242 version:7.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-fonts/xorg-x11-fonts.changes 2022-12-10 21:17:37.937487710 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-fonts.new.31432/xorg-x11-fonts.changes 2023-03-01 16:13:55.850562188 +0100 @@ -1,0 +2,52 @@ +Tue Feb 28 18:19:38 UTC 2023 - Stefan Dirsch <sndirsch@suse.com> + +- encodings-1.0.7 + font-adobe-75dpi-1.0.4 + font-adobe-utopia-100dpi-1.0.5 + font-adobe-utopia-75dpi-1.0.5 + font-adobe-utopia-type1-1.0.5 + font-alias-1.0.5 + font-arabic-misc-1.0.4 + font-bh-100dpi-1.0.4 + font-bh-75dpi-1.0.4 + font-bh-lucidatypewriter-100dpi-1.0.4 + font-bh-lucidatypewriter-75dpi-1.0.4 + font-bh-ttf-1.0.4 + font-bh-type1-1.0.4 + font-bitstream-100dpi-1.0.4 + font-bitstream-75dpi-1.0.4 + font-bitstream-type1-1.0.4 + font-cronyx-cyrillic-1.0.4 + font-cursor-misc-1.0.4 + font-daewoo-misc-1.0.4 + font-dec-misc-1.0.4 + font-ibm-type1-1.0.4 + font-isas-misc-1.0.4 + font-jis-misc-1.0.4 + font-micro-misc-1.0.4 + font-misc-cyrillic-1.0.4 + font-misc-ethiopic-1.0.5 + font-misc-meltho-1.0.4 + font-misc-misc-1.1.3 + font-mutt-misc-1.0.4 + font-schumacher-misc-1.1.3 + font-screen-cyrillic-1.0.5 + font-sony-misc-1.0.4 + font-sun-misc-1.0.4 + font-winitzki-cyrillic-1.0.4 + font-xfree86-type1-1.0.5 + * These releases bundle up the last twelve years worth of build + system improvements, including making the configure script + more efficient and using the -n flag to gzip to improve build + reproducibility. + +------------------------------------------------------------------- +Mon Feb 27 20:51:32 UTC 2023 - Stefan Dirsch <sndirsch@suse.com> + +- font-adobe-100dpi 1.0.4 + * This release bundles up the last twelve years worth of build + system improvements, including making the configure script + more efficient and using the -n flag to gzip to improve build + reproducibility. + +------------------------------------------------------------------- Old: ---- encodings-1.0.6.tar.xz font-adobe-100dpi-1.0.3.tar.bz2 font-adobe-75dpi-1.0.3.tar.bz2 font-adobe-utopia-100dpi-1.0.4.tar.bz2 font-adobe-utopia-75dpi-1.0.4.tar.bz2 font-adobe-utopia-type1-1.0.4.tar.bz2 font-alias-1.0.4.tar.bz2 font-arabic-misc-1.0.3.tar.bz2 font-bh-100dpi-1.0.3.tar.bz2 font-bh-75dpi-1.0.3.tar.bz2 font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 font-bh-ttf-1.0.3.tar.bz2 font-bh-type1-1.0.3.tar.bz2 font-bitstream-100dpi-1.0.3.tar.bz2 font-bitstream-75dpi-1.0.3.tar.bz2 font-bitstream-type1-1.0.3.tar.bz2 font-cronyx-cyrillic-1.0.3.tar.bz2 font-cursor-misc-1.0.3.tar.bz2 font-daewoo-misc-1.0.3.tar.bz2 font-dec-misc-1.0.3.tar.bz2 font-ibm-type1-1.0.3.tar.bz2 font-isas-misc-1.0.3.tar.bz2 font-jis-misc-1.0.3.tar.bz2 font-micro-misc-1.0.3.tar.bz2 font-misc-cyrillic-1.0.3.tar.bz2 font-misc-ethiopic-1.0.4.tar.bz2 font-misc-meltho-1.0.3.tar.bz2 font-misc-misc-1.1.2.tar.bz2 font-mutt-misc-1.0.3.tar.bz2 font-schumacher-misc-1.1.2.tar.bz2 font-screen-cyrillic-1.0.4.tar.bz2 font-sony-misc-1.0.3.tar.bz2 font-sun-misc-1.0.3.tar.bz2 font-winitzki-cyrillic-1.0.3.tar.bz2 font-xfree86-type1-1.0.4.tar.bz2 New: ---- encodings-1.0.7.tar.xz font-adobe-100dpi-1.0.4.tar.xz font-adobe-75dpi-1.0.4.tar.xz font-adobe-utopia-100dpi-1.0.5.tar.xz font-adobe-utopia-75dpi-1.0.5.tar.xz font-adobe-utopia-type1-1.0.5.tar.xz font-alias-1.0.5.tar.xz font-arabic-misc-1.0.4.tar.xz font-bh-100dpi-1.0.4.tar.xz font-bh-75dpi-1.0.4.tar.xz font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz font-bh-ttf-1.0.4.tar.xz font-bh-type1-1.0.4.tar.xz font-bitstream-100dpi-1.0.4.tar.xz font-bitstream-75dpi-1.0.4.tar.xz font-bitstream-type1-1.0.4.tar.xz font-cronyx-cyrillic-1.0.4.tar.xz font-cursor-misc-1.0.4.tar.xz font-daewoo-misc-1.0.4.tar.xz font-dec-misc-1.0.4.tar.xz font-ibm-type1-1.0.4.tar.xz font-isas-misc-1.0.4.tar.xz font-jis-misc-1.0.4.tar.xz font-micro-misc-1.0.4.tar.xz font-misc-cyrillic-1.0.4.tar.xz font-misc-ethiopic-1.0.5.tar.xz font-misc-meltho-1.0.4.tar.xz font-misc-misc-1.1.3.tar.xz font-mutt-misc-1.0.4.tar.xz font-schumacher-misc-1.1.3.tar.xz font-screen-cyrillic-1.0.5.tar.xz font-sony-misc-1.0.4.tar.xz font-sun-misc-1.0.4.tar.xz font-winitzki-cyrillic-1.0.4.tar.xz font-xfree86-type1-1.0.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts.spec ++++++ --- /var/tmp/diff_new_pack.viAn3n/_old 2023-03-01 16:13:57.994573274 +0100 +++ /var/tmp/diff_new_pack.viAn3n/_new 2023-03-01 16:13:58.038573502 +0100 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 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 @@ -33,42 +33,42 @@ Summary: X.Org fonts License: MIT Group: System/X11/Fonts -Source0: http://xorg.freedesktop.org/archive/individual/font/font-adobe-100dpi-1.0.3.... -Source1: http://xorg.freedesktop.org/archive/individual/font/font-adobe-75dpi-1.0.3.t... -Source2: http://xorg.freedesktop.org/archive/individual/font/font-arabic-misc-1.0.3.t... -Source3: http://xorg.freedesktop.org/archive/individual/font/font-bh-100dpi-1.0.3.tar... -Source4: http://xorg.freedesktop.org/archive/individual/font/font-bh-75dpi-1.0.3.tar.... -Source5: http://xorg.freedesktop.org/archive/individual/font/font-bh-lucidatypewriter... -Source6: http://xorg.freedesktop.org/archive/individual/font/font-bh-lucidatypewriter... -Source7: http://xorg.freedesktop.org/archive/individual/font/font-bh-ttf-1.0.3.tar.bz... -Source8: http://xorg.freedesktop.org/archive/individual/font/font-bh-type1-1.0.3.tar.... -Source9: http://xorg.freedesktop.org/archive/individual/font/font-bitstream-100dpi-1.... -Source10: http://xorg.freedesktop.org/archive/individual/font/font-bitstream-75dpi-1.0... -Source12: http://xorg.freedesktop.org/archive/individual/font/font-bitstream-type1-1.0... -Source13: http://xorg.freedesktop.org/archive/individual/font/font-cronyx-cyrillic-1.0... -Source14: http://xorg.freedesktop.org/archive/individual/font/font-cursor-misc-1.0.3.t... -Source15: http://xorg.freedesktop.org/archive/individual/font/font-daewoo-misc-1.0.3.t... -Source16: http://xorg.freedesktop.org/archive/individual/font/font-dec-misc-1.0.3.tar.... -Source17: http://xorg.freedesktop.org/archive/individual/font/font-ibm-type1-1.0.3.tar... -Source18: http://xorg.freedesktop.org/archive/individual/font/font-isas-misc-1.0.3.tar... -Source19: http://xorg.freedesktop.org/archive/individual/font/font-jis-misc-1.0.3.tar.... -Source20: http://xorg.freedesktop.org/archive/individual/font/font-micro-misc-1.0.3.ta... -Source21: http://xorg.freedesktop.org/archive/individual/font/font-misc-cyrillic-1.0.3... -Source22: http://xorg.freedesktop.org/archive/individual/font/font-misc-ethiopic-1.0.4... -Source23: http://xorg.freedesktop.org/archive/individual/font/font-misc-meltho-1.0.3.t... -Source24: http://xorg.freedesktop.org/archive/individual/font/font-misc-misc-1.1.2.tar... -Source25: http://xorg.freedesktop.org/archive/individual/font/font-mutt-misc-1.0.3.tar... -Source26: http://xorg.freedesktop.org/archive/individual/font/font-schumacher-misc-1.1... -Source27: http://xorg.freedesktop.org/archive/individual/font/font-screen-cyrillic-1.0... -Source28: http://xorg.freedesktop.org/archive/individual/font/font-sony-misc-1.0.3.tar... -Source29: http://xorg.freedesktop.org/archive/individual/font/font-sun-misc-1.0.3.tar.... -Source30: http://xorg.freedesktop.org/archive/individual/font/font-winitzki-cyrillic-1... -Source31: http://xorg.freedesktop.org/archive/individual/font/font-xfree86-type1-1.0.4... -Source32: http://xorg.freedesktop.org/archive/individual/font/encodings-1.0.6.tar.xz -Source33: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-100dpi... -Source34: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-75dpi-... -Source35: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-type1-... -Source36: http://xorg.freedesktop.org/archive/individual/font/font-alias-1.0.4.tar.bz2 +Source0: http://xorg.freedesktop.org/archive/individual/font/font-adobe-100dpi-1.0.4.... +Source1: http://xorg.freedesktop.org/archive/individual/font/font-adobe-75dpi-1.0.4.t... +Source2: http://xorg.freedesktop.org/archive/individual/font/font-arabic-misc-1.0.4.t... +Source3: http://xorg.freedesktop.org/archive/individual/font/font-bh-100dpi-1.0.4.tar... +Source4: http://xorg.freedesktop.org/archive/individual/font/font-bh-75dpi-1.0.4.tar.... +Source5: http://xorg.freedesktop.org/archive/individual/font/font-bh-lucidatypewriter... +Source6: http://xorg.freedesktop.org/archive/individual/font/font-bh-lucidatypewriter... +Source7: http://xorg.freedesktop.org/archive/individual/font/font-bh-ttf-1.0.4.tar.xz +Source8: http://xorg.freedesktop.org/archive/individual/font/font-bh-type1-1.0.4.tar.... +Source9: http://xorg.freedesktop.org/archive/individual/font/font-bitstream-100dpi-1.... +Source10: http://xorg.freedesktop.org/archive/individual/font/font-bitstream-75dpi-1.0... +Source12: http://xorg.freedesktop.org/archive/individual/font/font-bitstream-type1-1.0... +Source13: http://xorg.freedesktop.org/archive/individual/font/font-cronyx-cyrillic-1.0... +Source14: http://xorg.freedesktop.org/archive/individual/font/font-cursor-misc-1.0.4.t... +Source15: http://xorg.freedesktop.org/archive/individual/font/font-daewoo-misc-1.0.4.t... +Source16: http://xorg.freedesktop.org/archive/individual/font/font-dec-misc-1.0.4.tar.... +Source17: http://xorg.freedesktop.org/archive/individual/font/font-ibm-type1-1.0.4.tar... +Source18: http://xorg.freedesktop.org/archive/individual/font/font-isas-misc-1.0.4.tar... +Source19: http://xorg.freedesktop.org/archive/individual/font/font-jis-misc-1.0.4.tar.... +Source20: http://xorg.freedesktop.org/archive/individual/font/font-micro-misc-1.0.4.ta... +Source21: http://xorg.freedesktop.org/archive/individual/font/font-misc-cyrillic-1.0.4... +Source22: http://xorg.freedesktop.org/archive/individual/font/font-misc-ethiopic-1.0.5... +Source23: http://xorg.freedesktop.org/archive/individual/font/font-misc-meltho-1.0.4.t... +Source24: http://xorg.freedesktop.org/archive/individual/font/font-misc-misc-1.1.3.tar... +Source25: http://xorg.freedesktop.org/archive/individual/font/font-mutt-misc-1.0.4.tar... +Source26: http://xorg.freedesktop.org/archive/individual/font/font-schumacher-misc-1.1... +Source27: http://xorg.freedesktop.org/archive/individual/font/font-screen-cyrillic-1.0... +Source28: http://xorg.freedesktop.org/archive/individual/font/font-sony-misc-1.0.4.tar... +Source29: http://xorg.freedesktop.org/archive/individual/font/font-sun-misc-1.0.4.tar.... +Source30: http://xorg.freedesktop.org/archive/individual/font/font-winitzki-cyrillic-1... +Source31: http://xorg.freedesktop.org/archive/individual/font/font-xfree86-type1-1.0.5... +Source32: http://xorg.freedesktop.org/archive/individual/font/encodings-1.0.7.tar.xz +Source33: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-100dpi... +Source34: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-75dpi-... +Source35: http://xorg.freedesktop.org/archive/individual/font/font-adobe-utopia-type1-... +Source36: http://xorg.freedesktop.org/archive/individual/font/font-alias-1.0.5.tar.xz Source100: README.converted %if "%{flavor}" == "converted" Source1000: https://pwu.fedorapeople.org/fonts/convertbitmap/convertfont.py @@ -140,11 +140,11 @@ %prep %setup -T -D -c %if "%{flavor}" != "converted" -for i in $RPM_SOURCE_DIR/*.tar.{bz2,xz}; do tar xf $i; done +for i in $RPM_SOURCE_DIR/*.tar.xz; do tar xf $i; done %else cp %{SOURCE100} . -tar xjf %{SOURCE0} -tar xjf %{SOURCE1} +tar xf %{SOURCE0} +tar xf %{SOURCE1} %endif %build ++++++ encodings-1.0.6.tar.xz -> encodings-1.0.7.tar.xz ++++++ ++++ 10020 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/encodings-1.0.6/ChangeLog new/encodings-1.0.7/ChangeLog --- old/encodings-1.0.6/ChangeLog 2022-07-12 20:17:03.000000000 +0200 +++ new/encodings-1.0.7/ChangeLog 2023-02-28 01:18:09.000000000 +0100 @@ -1,3 +1,61 @@ +commit 61b7e8126a5f57bf4649ce128c78b1266bd5ce3c +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Feb 27 16:14:27 2023 -0800 + + font-encodings 1.0.7 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit b37ac72744d42a27d22741b5b1220c8a597b655b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Feb 22 13:01:54 2023 -0800 + + configure: Add COMPRESS_FLAGS to pass options to compression command + + By default, set to -n for gzip to stop recording timestamps and + improve build reproducibility. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit e40356cf6bcbea6966d5a2c98ca767e07b3e7aa8 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Feb 15 16:13:33 2023 -0800 + + Switch to XORG_DEFAULT_NOCODE_OPTIONS + + Stop running all sorts of compiler tests we don't need since there + is no code in this module to compile. Requires xorg-macros 1.20. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 439ad387be655b0198ddd2b54bd036044263b438 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Feb 6 17:19:20 2023 -0800 + + configure: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + This silences autoconf warnings: + + configure.ac:24: warning: The macro `AC_HELP_STRING' is obsolete. + configure.ac:24: You should run autoupdate. + ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... + configure.ac:24: the top level + + configure.ac:32: warning: The macro `AC_HELP_STRING' is obsolete. + configure.ac:32: You should run autoupdate. + ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... + configure.ac:32: the top level + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit c3be3e246042f017b86d72fa96ed4ca35858ed3a +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Jul 28 17:30:21 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + commit 4834eadad2edb9838a1a58679323a6bbf286ed97 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Tue Jul 12 11:09:05 2022 -0700 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/encodings-1.0.6/Makefile.am new/encodings-1.0.7/Makefile.am --- old/encodings-1.0.6/Makefile.am 2022-07-12 20:16:55.000000000 +0200 +++ new/encodings-1.0.7/Makefile.am 2023-02-28 01:18:05.000000000 +0100 @@ -55,7 +55,7 @@ SUFFIXES = .enc .enc.gz .enc.enc.gz: - $(AM_V_GEN)$(GZIP) -c < $< > $@ + $(AM_V_GEN)$(GZIP) $(COMPRESS_FLAGS) -c < $< > $@ encodings.dir: $(DATA_FILES) $(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . -e large . 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/encodings-1.0.6/compile new/encodings-1.0.7/compile --- old/encodings-1.0.6/compile 2022-07-12 20:16:58.000000000 +0200 +++ new/encodings-1.0.7/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,348 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2018-03-07.03; # UTC - -# Copyright (C) 1999-2021 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey@cygnus.com>. -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN* | MSYS*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to <bug-automake@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" -# time-stamp-end: "; # UTC" -# End: 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/encodings-1.0.6/configure.ac new/encodings-1.0.7/configure.ac --- old/encodings-1.0.6/configure.ac 2022-07-12 20:16:55.000000000 +0200 +++ new/encodings-1.0.7/configure.ac 2023-02-28 01:18:05.000000000 +0100 @@ -1,15 +1,13 @@ AC_PREREQ([2.60]) -AC_INIT([encodings], [1.0.6], - [https://gitlab.freedesktop.org/xorg/font/encodings/issues]) +AC_INIT([encodings], [1.0.7], + [https://gitlab.freedesktop.org/xorg/font/encodings/-/issues]) AM_INIT_AUTOMAKE([foreign dist-xz]) -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros 1.20 or later: XORG_DEFAULT_NOCODE_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) -XORG_DEFAULT_OPTIONS - -AC_PROG_INSTALL + [m4_fatal([must install xorg-macros 1.20 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.20) +XORG_DEFAULT_NOCODE_OPTIONS # Require X.Org's font util macros 1.2 or later m4_ifndef([XORG_FONT_MACROS_VERSION], @@ -23,7 +21,7 @@ AC_MSG_CHECKING([if small encodings should be compressed]) AC_ARG_ENABLE(gzip-small-encodings, - AC_HELP_STRING([--disable-gzip-small-encodings], + AS_HELP_STRING([--disable-gzip-small-encodings], [Disable compression of small encoding files]), [GZIP_SMALL="$enableval"], [GZIP_SMALL="yes"]) AM_CONDITIONAL(GZIP_SMALL, [test x$GZIP_SMALL = xyes]) @@ -31,7 +29,7 @@ AC_MSG_CHECKING([if large encodings should be compressed]) AC_ARG_ENABLE(gzip-large-encodings, - AC_HELP_STRING([--disable-gzip-large-encodings], + AS_HELP_STRING([--disable-gzip-large-encodings], [Disable compression of large encoding files]), [GZIP_LARGE="$enableval"], [GZIP_LARGE="yes"]) AM_CONDITIONAL(GZIP_LARGE, [test x$GZIP_LARGE = xyes]) @@ -44,6 +42,8 @@ if [[ -z $GZIP ]]; then AC_MSG_ERROR([gzip is needed to compress font encodings]) fi + COMPRESS_FLAGS="${COMPRESS_FLAGS--n}" + AC_SUBST([COMPRESS_FLAGS]) fi XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings]) 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/encodings-1.0.6/large/Makefile.am new/encodings-1.0.7/large/Makefile.am --- old/encodings-1.0.6/large/Makefile.am 2022-07-12 20:16:55.000000000 +0200 +++ new/encodings-1.0.7/large/Makefile.am 2023-02-28 01:18:05.000000000 +0100 @@ -34,7 +34,7 @@ SUFFIXES = .enc .enc.gz .enc.enc.gz: - $(AM_V_GEN)$(GZIP) -c < $< > $@ + $(AM_V_GEN)$(GZIP) $(COMPRESS_FLAGS) -c < $< > $@ encodings.dir: $(DATA_FILES) $(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . .