Projects
openEuler:Mainline
libXft
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 10
View file
_service:tar_scm:libXft.spec
Changed
@@ -1,5 +1,5 @@ Name: libXft -Version: 2.3.7 +Version: 2.3.8 Release: 1 Summary: X FreeType library License: MIT @@ -57,6 +57,9 @@ %{_mandir}/man3/Xft*.3* %changelog +* Thu Jul 20 2023 zhangpan <zhangpan103@h-partners.com> - 2.3.8-1 +- update to 2.3.8 + * Fri Feb 03 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.3.7-1 - update to 2.3.7
View file
_service:tar_scm:libXft-2.3.7.tar.gz/ChangeLog -> _service:tar_scm:libXft-2.3.8.tar.gz/ChangeLog
Changed
@@ -1,3 +1,71 @@ +commit c532908f5fdd3aee9d88d9704aedbe3be82c7ce5 +Author: Matt Turner <mattst88@gmail.com> +Date: Mon Apr 17 15:23:49 2023 -0400 + + libXft 2.3.8 + + Signed-off-by: Matt Turner <mattst88@gmail.com> + +commit d587bbef21f5b6137508883f2be0e91fc5132a62 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Mar 4 10:44:45 2023 -0800 + + configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL + + AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008, + so it's time to rely on it. + + Clears autoconf warnings: + + configure.ac:39: warning: The macro `AC_PROG_LIBTOOL' is obsolete. + configure.ac:39: You should run autoupdate. + aclocal.m4:3465: AC_PROG_LIBTOOL is expanded from... + configure.ac:39: the top level + + libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS(m4)' to configure.ac, + libtoolize: and rerunning libtoolize and aclocal. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit c1f79c998b36d95778e433f396e19eff7402cf7a +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Wed Jan 18 19:17:43 2023 -0500 + + issue 18: Problems with rotated text (monospace font only) + + Updates for version 2.3.5 included improvements for font rotation. + One of the minus-signs was dropped, causing a change to the orientation + of strings. Restore the minus-sign. + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit 28b2983e684dbbfd5fa3636997fa671acb3703eb +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Sun Nov 27 17:26:51 2022 -0500 + + issue 17: libxft-2.3.7: Bold fonts in urxvt missing leftmost pixels + + Update for issue 16 replaced maximum advance with truncated offsets. + However, in some cases (e.g., server providing a fake bold version + of a font), the result may extend outside the bounding box for the + glyph. To work around this, use the minimum of old/new values. + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit 309c2da98a4c739bcdabc3a80610d86a40ce12e6 +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Sun Nov 20 13:56:15 2022 -0500 + + add check for missing glyph in XftFontCheckGlyph() + + This check is needed when updating the linked list of glyphs, since the + older/newer links are not set, causing an xterm crash for certain fonts + which have holes (e.g., Kochi Mincho). + + reported by Jeff Chua + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + commit 1463255cd4f537baabf8f2c65270e4924d4ed656 Author: Thomas E. Dickey <dickey@invisible-island.net> Date: Tue Nov 15 03:39:55 2022 -0500
View file
_service:tar_scm:libXft-2.3.7.tar.gz/Makefile.in -> _service:tar_scm:libXft-2.3.8.tar.gz/Makefile.in
Changed
@@ -111,7 +111,10 @@ host_triplet = @host@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
View file
_service:tar_scm:libXft-2.3.7.tar.gz/aclocal.m4 -> _service:tar_scm:libXft-2.3.8.tar.gz/aclocal.m4
Changed
@@ -20,9096 +20,8 @@ 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'.)) -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -m4_define(_LT_COPYING, dnl -# Copyright (C) 2014 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool 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 of of the License, or -# (at your option) any later version. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program or library that is built -# using GNU Libtool, you may include this file under the same -# distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 <http://www.gnu.org/licenses/>. -) - -# serial 59 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun(LT_PREREQ, -m4_if(m4_version_compare(m4_defn(LT_PACKAGE_VERSION), $1), -1, - m4_default($3, - m4_fatal(Libtool version $1 or higher is required, - 63)), - $2)) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun(_LT_CHECK_BUILDDIR, -case `pwd` in - *\ * | *\ *) - AC_MSG_WARN(Libtool does not cope well with whitespace in `pwd`) ;; -esac -) - - -# LT_INIT(OPTIONS) -# ------------------ -AC_DEFUN(LT_INIT, -AC_PREREQ(2.62)dnl We use AC_PATH_PROGS_FEATURE_CHECK -AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl -AC_BEFORE($0, LT_LANG)dnl -AC_BEFORE($0, LT_OUTPUT)dnl -AC_BEFORE($0, LTDL_INIT)dnl -m4_require(_LT_CHECK_BUILDDIR)dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid(^_?LT_A-Z_+$)dnl -m4_pattern_allow(^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$)dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE(LTOPTIONS_VERSION)dnl -AC_REQUIRE(LTSUGAR_VERSION)dnl -AC_REQUIRE(LTVERSION_VERSION)dnl -AC_REQUIRE(LTOBSOLETE_VERSION)dnl -m4_require(_LT_PROG_LTMAIN)dnl - -_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh}) - -dnl Parse OPTIONS -_LT_SET_OPTIONS($0, $1) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS=$ltmain - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define(LT_INIT) -)# LT_INIT - -# Old names: -AU_ALIAS(AC_PROG_LIBTOOL, LT_INIT) -AU_ALIAS(AM_PROG_LIBTOOL, LT_INIT) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN(AC_PROG_LIBTOOL, ) -dnl AC_DEFUN(AM_PROG_LIBTOOL, ) - - -# _LT_PREPARE_CC_BASENAME -# ----------------------- -m4_defun(_LT_PREPARE_CC_BASENAME, -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -func_cc_basename () -{ - for cc_temp in @S|@*""; do - case $cc_temp in - compile | *\\/compile | ccache | *\\/ccache ) ;; - distcc | *\\/distcc | purify | *\\/purify ) ;; - \-*) ;; - *) break;; - esac - done - func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -} -)# _LT_PREPARE_CC_BASENAME - - -# _LT_CC_BASENAME(CC) -# ------------------- -# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, -# but that macro is also expanded into generated libtool script, which -# arranges for $SED and $ECHO to be set by different means. -m4_defun(_LT_CC_BASENAME, -m4_require(_LT_PREPARE_CC_BASENAME)dnl -AC_REQUIRE(_LT_DECL_SED)dnl -AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl -func_cc_basename $1 -cc_basename=$func_cc_basename_result -) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after 'm4_require(_LT_FILEUTILS_DEFAULTS)'. -m4_defun(_LT_FILEUTILS_DEFAULTS, -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -)# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun(_LT_SETUP, -AC_REQUIRE(AC_CANONICAL_HOST)dnl -AC_REQUIRE(AC_CANONICAL_BUILD)dnl -AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl -AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl - -_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl -dnl -_LT_DECL(, host_alias, 0, The host system)dnl -_LT_DECL(, host, 0)dnl -_LT_DECL(, host_os, 0)dnl -dnl -_LT_DECL(, build_alias, 0, The build system)dnl -_LT_DECL(, build, 0)dnl -_LT_DECL(, build_os, 0)dnl -dnl -AC_REQUIRE(AC_PROG_CC)dnl -AC_REQUIRE(LT_PATH_LD)dnl -AC_REQUIRE(LT_PATH_NM)dnl -dnl -AC_REQUIRE(AC_PROG_LN_S)dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL(, LN_S, 1, Whether we need soft or hard links)dnl -dnl -AC_REQUIRE(LT_CMD_MAX_LEN)dnl -_LT_DECL(objext, ac_objext, 0, Object file suffix (normally "o"))dnl -_LT_DECL(, exeext, 0, Executable file suffix (normally ""))dnl -dnl -m4_require(_LT_FILEUTILS_DEFAULTS)dnl -m4_require(_LT_CHECK_SHELL_FEATURES)dnl -m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl -m4_require(_LT_CMD_RELOAD)dnl -m4_require(_LT_DECL_FILECMD)dnl -m4_require(_LT_CHECK_MAGIC_METHOD)dnl -m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl -m4_require(_LT_CMD_OLD_ARCHIVE)dnl -m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl -m4_require(_LT_WITH_SYSROOT)dnl -m4_require(_LT_CMD_TRUNCATE)dnl - -_LT_CONFIG_LIBTOOL_INIT( -# See if we are running on zsh, and set the options that allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}"; then
View file
_service:tar_scm:libXft-2.3.7.tar.gz/config.guess -> _service:tar_scm:libXft-2.3.8.tar.gz/config.guess
Changed
@@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-09' +timestamp='2022-09-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -966,6 +966,12 @@ GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:Mmanagarm:*:*|i?86:Mmanagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:Mmanagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; @@ -1036,7 +1042,7 @@ k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1151,16 +1157,27 @@ ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -1367,8 +1384,11 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE
View file
_service:tar_scm:libXft-2.3.7.tar.gz/config.sub -> _service:tar_scm:libXft-2.3.8.tar.gz/config.sub
Changed
@@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-03' +timestamp='2022-09-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -145,7 +145,7 @@ nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -1207,7 +1207,7 @@ | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m6800123460 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1341,6 +1341,10 @@ kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1754,7 +1758,7 @@ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* ) + | fiwix* | mlibc* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v4-9* | sco5v6*) @@ -1762,6 +1766,9 @@ ;; none) ;; + kernel* ) + # Restricted further below + ;; *) echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 exit 1 @@ -1772,16 +1779,26 @@ # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 exit 1 ;; + -kernel* ) + echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2 + exit 1 + ;; kfreebsd*-gnu* | kopensolaris*-gnu*) ;; vxworks-simlinux | vxworks-simwindows | vxworks-spe)
View file
_service:tar_scm:libXft-2.3.7.tar.gz/configure -> _service:tar_scm:libXft-2.3.8.tar.gz/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libXft 2.3.7. +# Generated by GNU Autoconf 2.71 for libXft 2.3.8. # # Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXft/issues>. # @@ -622,8 +622,8 @@ # Identity of this package. PACKAGE_NAME='libXft' PACKAGE_TARNAME='libXft' -PACKAGE_VERSION='2.3.7' -PACKAGE_STRING='libXft 2.3.7' +PACKAGE_VERSION='2.3.8' +PACKAGE_STRING='libXft 2.3.8' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libXft/issues' PACKAGE_URL='' @@ -1392,7 +1392,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 libXft 2.3.7 to adapt to many kinds of systems. +\`configure' configures libXft 2.3.8 to adapt to many kinds of systems. Usage: $0 OPTION... VAR=VALUE... @@ -1463,7 +1463,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXft 2.3.7:";; + short | recursive ) echo "Configuration of libXft 2.3.8:";; esac cat <<\_ACEOF @@ -1596,7 +1596,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXft configure 2.3.7 +libXft configure 2.3.8 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1748,7 +1748,7 @@ #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (void); below. */ #include <limits.h> #undef $2 @@ -1759,7 +1759,7 @@ #ifdef __cplusplus extern "C" #endif -char $2 (); +char $2 (void); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ @@ -1866,7 +1866,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXft $as_me 2.3.7, which was +It was created by libXft $as_me 2.3.8, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2152,9 +2152,7 @@ /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return pi; } @@ -2205,6 +2203,7 @@ extern int printf (const char *, ...); extern int dprintf (int, const char *, ...); extern void *malloc (size_t); +extern void free (void *); // Check varargs macros. These examples are taken from C99 6.10.3.5. // dprintf is used instead of fprintf to avoid needing to declare @@ -2625,6 +2624,7 @@ ac_config_headers="$ac_config_headers config.h" + # Initialize Automake am__api_version='1.16' @@ -3140,7 +3140,7 @@ # Define the identity of the package. PACKAGE='libXft' - VERSION='2.3.7' + VERSION='2.3.8' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -5373,6 +5373,11 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -5970,7 +5975,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$' else @@ -6894,8 +6899,11 @@ test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -7330,10 +7338,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) + powerpcle-*linux*|powerpc64le-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*linux*) + powerpc-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8830,6 +8838,10 @@ $RM -r conftest* +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -9076,12 +9088,6 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - # flang / f18. f95 an alias for gfortran or flang on Debian - flang* | f18* | f95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -9563,9 +9569,6 @@ openbsd* | bitrig*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -9801,7 +9804,6 @@ case $cc_basename in tcc*) - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -9822,7 +9824,7 @@
View file
_service:tar_scm:libXft-2.3.7.tar.gz/configure.ac -> _service:tar_scm:libXft-2.3.8.tar.gz/configure.ac
Changed
@@ -27,16 +27,17 @@ # version. This version number will be substituted into Xft.h # Please bump the minor library number at each release as well. # -AC_INIT(libXft, 2.3.7, +AC_INIT(libXft, 2.3.8, https://gitlab.freedesktop.org/xorg/lib/libXft/issues, libXft) AC_CONFIG_SRCDIR(Makefile.am) AC_CONFIG_HEADERS(config.h) +AC_CONFIG_MACRO_DIRS(m4) # Initialize Automake AM_INIT_AUTOMAKE(foreign dist-xz) # Initialize libtool -AC_PROG_LIBTOOL +LT_INIT # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef(XORG_MACROS_VERSION,
View file
_service:tar_scm:libXft-2.3.7.tar.gz/include/X11/Xft/Xft.h -> _service:tar_scm:libXft-2.3.8.tar.gz/include/X11/Xft/Xft.h
Changed
@@ -31,7 +31,7 @@ /* #undef will be substituted by configure */ #define XFT_MAJOR 2 #define XFT_MINOR 3 -#define XFT_REVISION 7 +#define XFT_REVISION 8 #define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION)) #define XftVersion XFT_VERSION
View file
_service:tar_scm:libXft-2.3.7.tar.gz/ltmain.sh -> _service:tar_scm:libXft-2.3.8.tar.gz/ltmain.sh
Changed
@@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.7 Debian-2.4.7-4" +VERSION=2.4.7 package_revision=2.4.7 @@ -430,7 +430,7 @@ # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='echo "${FUNCNAME0} $*" >&2' bash your-script-name +# debug_cmd='eval echo "${FUNCNAME0} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -1706,8 +1706,6 @@ { $debug_cmd - _G_rc_run_hooks=false - case " $hookable_fns " in *" $1 "*) ;; *) func_fatal_error "'$1' does not support hook functions." ;; @@ -2308,12 +2306,12 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.7-4 + version: $progname (GNU libtool) 2.4.7 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to <bug-libtool@gnu.org>. -GNU libtool home page: <http://www.gnu.org/s/libtool/>. +GNU libtool home page: <http://www.gnu.org/software/libtool/>. General help using GNU software: <http://www.gnu.org/gethelp/>." exit 0 } @@ -2512,8 +2510,6 @@ _G_rc_lt_options_prep=: - _G_rc_lt_options_prep=: - # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -7359,6 +7355,16 @@ *" $arg "*) ;; * ) func_append new_inherited_linker_flags " $arg" ;; esac + + # As we are forced to pass -nostdlib to g++ during linking, the option + # -pthread{,s} is not in effect; add the -lpthread to $deplist + # explicitly to link correctly. + if test "$tagname" = CXX -a x"$with_gcc" = xyes; then + case "$arg" in + -pthread*) func_append deplibs " -lpthread" ;; + esac + fi + continue ;; @@ -7561,13 +7567,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++ # -Wa,* Pass flags directly to the assembler + # -Werror, -Werror=* Report (specified) warnings as errors -64|-mips0-9|-r0-90-9*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t45*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Wa,*) + -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*) func_quote_arg pretty "$arg" arg=$func_quote_arg_result func_append compile_command " $arg" @@ -7860,10 +7865,7 @@ case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -8182,19 +8184,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -9118,9 +9120,6 @@ revision=$number_minor lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type '$version_type'" - ;; esac ;; no)
View file
_service:tar_scm:libXft-2.3.8.tar.gz/m4
Added
+(directory)
View file
_service:tar_scm:libXft-2.3.8.tar.gz/m4/libtool.m4
Added
@@ -0,0 +1,8418 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define(_LT_COPYING, dnl +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool 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 of of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. +# +# GNU Libtool 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 <http://www.gnu.org/licenses/>. +) + +# serial 59 LT_INIT + + +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun(LT_PREREQ, +m4_if(m4_version_compare(m4_defn(LT_PACKAGE_VERSION), $1), -1, + m4_default($3, + m4_fatal(Libtool version $1 or higher is required, + 63)), + $2)) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun(_LT_CHECK_BUILDDIR, +case `pwd` in + *\ * | *\ *) + AC_MSG_WARN(Libtool does not cope well with whitespace in `pwd`) ;; +esac +) + + +# LT_INIT(OPTIONS) +# ------------------ +AC_DEFUN(LT_INIT, +AC_PREREQ(2.62)dnl We use AC_PATH_PROGS_FEATURE_CHECK +AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl +AC_BEFORE($0, LT_LANG)dnl +AC_BEFORE($0, LT_OUTPUT)dnl +AC_BEFORE($0, LTDL_INIT)dnl +m4_require(_LT_CHECK_BUILDDIR)dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid(^_?LT_A-Z_+$)dnl +m4_pattern_allow(^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$)dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE(LTOPTIONS_VERSION)dnl +AC_REQUIRE(LTSUGAR_VERSION)dnl +AC_REQUIRE(LTVERSION_VERSION)dnl +AC_REQUIRE(LTOBSOLETE_VERSION)dnl +m4_require(_LT_PROG_LTMAIN)dnl + +_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh}) + +dnl Parse OPTIONS +_LT_SET_OPTIONS($0, $1) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS=$ltmain + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define(LT_INIT) +)# LT_INIT + +# Old names: +AU_ALIAS(AC_PROG_LIBTOOL, LT_INIT) +AU_ALIAS(AM_PROG_LIBTOOL, LT_INIT) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN(AC_PROG_LIBTOOL, ) +dnl AC_DEFUN(AM_PROG_LIBTOOL, ) + + +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun(_LT_PREPARE_CC_BASENAME, +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *\\/compile | ccache | *\\/ccache ) ;; + distcc | *\\/distcc | purify | *\\/purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +)# _LT_PREPARE_CC_BASENAME + + +# _LT_CC_BASENAME(CC) +# ------------------- +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. +m4_defun(_LT_CC_BASENAME, +m4_require(_LT_PREPARE_CC_BASENAME)dnl +AC_REQUIRE(_LT_DECL_SED)dnl +AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result +) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after 'm4_require(_LT_FILEUTILS_DEFAULTS)'. +m4_defun(_LT_FILEUTILS_DEFAULTS, +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +)# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun(_LT_SETUP, +AC_REQUIRE(AC_CANONICAL_HOST)dnl +AC_REQUIRE(AC_CANONICAL_BUILD)dnl +AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl +AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl + +_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl +dnl +_LT_DECL(, host_alias, 0, The host system)dnl +_LT_DECL(, host, 0)dnl +_LT_DECL(, host_os, 0)dnl +dnl +_LT_DECL(, build_alias, 0, The build system)dnl +_LT_DECL(, build, 0)dnl +_LT_DECL(, build_os, 0)dnl +dnl +AC_REQUIRE(AC_PROG_CC)dnl +AC_REQUIRE(LT_PATH_LD)dnl +AC_REQUIRE(LT_PATH_NM)dnl +dnl +AC_REQUIRE(AC_PROG_LN_S)dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL(, LN_S, 1, Whether we need soft or hard links)dnl +dnl +AC_REQUIRE(LT_CMD_MAX_LEN)dnl +_LT_DECL(objext, ac_objext, 0, Object file suffix (normally "o"))dnl +_LT_DECL(, exeext, 0, Executable file suffix (normally ""))dnl +dnl +m4_require(_LT_FILEUTILS_DEFAULTS)dnl +m4_require(_LT_CHECK_SHELL_FEATURES)dnl +m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl +m4_require(_LT_CMD_RELOAD)dnl +m4_require(_LT_DECL_FILECMD)dnl +m4_require(_LT_CHECK_MAGIC_METHOD)dnl +m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl +m4_require(_LT_CMD_OLD_ARCHIVE)dnl +m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl +m4_require(_LT_WITH_SYSROOT)dnl +m4_require(_LT_CMD_TRUNCATE)dnl + +_LT_CONFIG_LIBTOOL_INIT( +# See if we are running on zsh, and set the options that allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi +)
View file
_service:tar_scm:libXft-2.3.8.tar.gz/m4/ltoptions.m4
Added
@@ -0,0 +1,437 @@ +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 8 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN(LTOPTIONS_VERSION, m4_if(1)) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define(_LT_MANGLE_OPTION, +_LT_OPTION_m4_bpatsubst($1__$2, ^a-zA-Z0-9_, _)) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define(_LT_SET_OPTION, +m4_define(_LT_MANGLE_OPTION($1, $2))dnl +m4_ifdef(_LT_MANGLE_DEFUN($1, $2), + _LT_MANGLE_DEFUN($1, $2), + m4_warning(Unknown $1 option '$2'))dnl +) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, IF-NOT-SET) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define(_LT_IF_OPTION, +m4_ifdef(_LT_MANGLE_OPTION($1, $2), $3, $4)) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define(_LT_UNLESS_OPTIONS, +m4_foreach(_LT_Option, m4_split(m4_normalize($2)), + m4_ifdef(_LT_MANGLE_OPTION($1, _LT_Option), + m4_define($0_found)))dnl +m4_ifdef($0_found, m4_undefine($0_found), $3 +)dnl +) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun(_LT_SET_OPTIONS, +# Set options +m4_foreach(_LT_Option, m4_split(m4_normalize($2)), + _LT_SET_OPTION($1, _LT_Option)) + +m4_if($1,LT_INIT, + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS(LT_INIT, dlopen, enable_dlopen=no + ) + _LT_UNLESS_OPTIONS(LT_INIT, win32-dll, enable_win32_dll=no + ) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS(LT_INIT, shared disable-shared, _LT_ENABLE_SHARED) + _LT_UNLESS_OPTIONS(LT_INIT, static disable-static, _LT_ENABLE_STATIC) + _LT_UNLESS_OPTIONS(LT_INIT, pic-only no-pic, _LT_WITH_PIC) + _LT_UNLESS_OPTIONS(LT_INIT, fast-install disable-fast-install, + _LT_ENABLE_FAST_INSTALL) + _LT_UNLESS_OPTIONS(LT_INIT, aix-soname=aix aix-soname=both aix-soname=svr4, + _LT_WITH_AIX_SONAME(aix)) + ) +)# _LT_SET_OPTIONS + + +## --------------------------------- ## +## Macros to handle LT_INIT options. ## +## --------------------------------- ## + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define(_LT_MANGLE_DEFUN, +_LT_OPTION_DEFUN_m4_bpatsubst(m4_toupper($1__$2), ^A-Z0-9_, _)) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define(LT_OPTION_DEFINE, +m4_define(_LT_MANGLE_DEFUN($1, $2), $3)dnl +)# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE(LT_INIT, dlopen, enable_dlopen=yes +) + +AU_DEFUN(AC_LIBTOOL_DLOPEN, +_LT_SET_OPTION(LT_INIT, dlopen) +AC_DIAGNOSE(obsolete, +$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'dlopen' option into LT_INIT's first parameter.) +) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN(AC_LIBTOOL_DLOPEN, ) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE(LT_INIT, win32-dll, +enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL(, AS, 1, Assembler program)dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL(, DLLTOOL, 1, DLL creation program)dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL(, OBJDUMP, 1, Object dumper program)dnl +)# win32-dll + +AU_DEFUN(AC_LIBTOOL_WIN32_DLL, +AC_REQUIRE(AC_CANONICAL_HOST)dnl +_LT_SET_OPTION(LT_INIT, win32-dll) +AC_DIAGNOSE(obsolete, +$0: Remove this warning and the call to _LT_SET_OPTION when you +put the 'win32-dll' option into LT_INIT's first parameter.) +) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN(AC_LIBTOOL_WIN32_DLL, ) + + +# _LT_ENABLE_SHARED(DEFAULT) +# ---------------------------- +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. +m4_define(_LT_ENABLE_SHARED, +m4_define(_LT_ENABLE_SHARED_DEFAULT, m4_if($1, no, no, yes))dnl +AC_ARG_ENABLE(shared, + AS_HELP_STRING(--enable-shared@<:@=PKGS@:>@, + build shared libraries @<:@default=_LT_ENABLE_SHARED_DEFAULT@:>@), + p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS=$lt_save_ifs + ;; + esac, + enable_shared=_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL(build_libtool_libs, enable_shared, 0, + Whether or not to build shared libraries) +)# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE(LT_INIT, shared, _LT_ENABLE_SHARED(yes)) +LT_OPTION_DEFINE(LT_INIT, disable-shared, _LT_ENABLE_SHARED(no)) + +# Old names: +AC_DEFUN(AC_ENABLE_SHARED, +_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)shared) +)
View file
_service:tar_scm:libXft-2.3.8.tar.gz/m4/ltsugar.m4
Added
@@ -0,0 +1,124 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software +# Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN(LTSUGAR_VERSION, m4_if(0.1)) + + +# lt_join(SEP, ARG1, ARG2...) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define(lt_join, +m4_if($#, 1, , + $#, 2, $2, + m4_if($2, , , $2_)$0($1, m4_shift(m4_shift($@))))) +m4_define(_lt_join, +m4_if($#$2, 2, , + m4_if($2, , , $1$2)$0($1, m4_shift(m4_shift($@))))) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59, which quotes differently. +m4_define(lt_car, $1) +m4_define(lt_cdr, +m4_if($#, 0, m4_fatal($0: cannot be called without arguments), + $#, 1, , + m4_dquote(m4_shift($@)))) +m4_define(lt_unquote, $1) + + +# lt_append(MACRO-NAME, STRING, SEPARATOR) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define(lt_append, +m4_define($1, + m4_ifdef($1, m4_defn($1)$3)$2)) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, SUFFIX2...) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define(lt_combine, +m4_if(m4_eval($# > 3), 1, + m4_pushdef(_Lt_sep, m4_define(_Lt_sep, m4_defn(lt_car)))dnl +m4_foreach(_Lt_prefix, $2, + m4_foreach(_Lt_suffix, + m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@))))), + _Lt_sep($1)m4_defn(_Lt_prefix)$3m4_defn(_Lt_suffix))))) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, SEPARATOR, UNIQ, NOT-UNIQ) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define(lt_if_append_uniq, +m4_ifdef($1, + m4_if(m4_index($3m4_defn($1)$3, $3$2$3), -1, + lt_append($1, $2, $3)$4, + $5), + lt_append($1, $2, $3)$4)) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define(lt_dict_add, +m4_define($1($2), $3)) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define(lt_dict_add_subkey, +m4_define($1($2:$3), $4)) + + +# lt_dict_fetch(DICT, KEY, SUBKEY) +# ---------------------------------- +m4_define(lt_dict_fetch, +m4_ifval($3, + m4_ifdef($1($2:$3), m4_defn($1($2:$3))), + m4_ifdef($1($2), m4_defn($1($2))))) + + +# lt_if_dict_fetch(DICT, KEY, SUBKEY, VALUE, IF-TRUE, IF-FALSE) +# ----------------------------------------------------------------- +m4_define(lt_if_dict_fetch, +m4_if(lt_dict_fetch($1, $2, $3), $4, + $5, + $6)) + + +# lt_dict_filter(DICT, SUBKEY, VALUE, SEPARATOR, KEY, ...) +# -------------------------------------------------------------- +m4_define(lt_dict_filter, +m4_if($5, , , + lt_join(m4_quote(m4_default($4, , )), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car(m4_shiftn(4, $@)), + lt_if_dict_fetch($1, _Lt_key, $2, $3, _Lt_key )))))))dnl +)
View file
_service:tar_scm:libXft-2.3.8.tar.gz/m4/ltversion.m4
Added
@@ -0,0 +1,24 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# @configure_input@ + +# serial 4245 ltversion.m4 +# This file is part of GNU Libtool + +m4_define(LT_PACKAGE_VERSION, 2.4.7) +m4_define(LT_PACKAGE_REVISION, 2.4.7) + +AC_DEFUN(LTVERSION_VERSION, +macro_version='2.4.7' +macro_revision='2.4.7' +_LT_DECL(, macro_version, 0, Which release of libtool.m4 was used?) +_LT_DECL(, macro_revision, 0) +)
View file
_service:tar_scm:libXft-2.3.8.tar.gz/m4/lt~obsolete.m4
Added
@@ -0,0 +1,99 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN(LTOBSOLETE_VERSION, m4_if(1)) + +m4_ifndef(AC_LIBTOOL_LINKER_OPTION, AC_DEFUN(AC_LIBTOOL_LINKER_OPTION)) +m4_ifndef(AC_PROG_EGREP, AC_DEFUN(AC_PROG_EGREP)) +m4_ifndef(_LT_AC_PROG_ECHO_BACKSLASH, AC_DEFUN(_LT_AC_PROG_ECHO_BACKSLASH)) +m4_ifndef(_LT_AC_SHELL_INIT, AC_DEFUN(_LT_AC_SHELL_INIT)) +m4_ifndef(_LT_AC_SYS_LIBPATH_AIX, AC_DEFUN(_LT_AC_SYS_LIBPATH_AIX)) +m4_ifndef(_LT_PROG_LTMAIN, AC_DEFUN(_LT_PROG_LTMAIN)) +m4_ifndef(_LT_AC_TAGVAR, AC_DEFUN(_LT_AC_TAGVAR)) +m4_ifndef(AC_LTDL_ENABLE_INSTALL, AC_DEFUN(AC_LTDL_ENABLE_INSTALL)) +m4_ifndef(AC_LTDL_PREOPEN, AC_DEFUN(AC_LTDL_PREOPEN)) +m4_ifndef(_LT_AC_SYS_COMPILER, AC_DEFUN(_LT_AC_SYS_COMPILER)) +m4_ifndef(_LT_AC_LOCK, AC_DEFUN(_LT_AC_LOCK)) +m4_ifndef(AC_LIBTOOL_SYS_OLD_ARCHIVE, AC_DEFUN(AC_LIBTOOL_SYS_OLD_ARCHIVE)) +m4_ifndef(_LT_AC_TRY_DLOPEN_SELF, AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF)) +m4_ifndef(AC_LIBTOOL_PROG_CC_C_O, AC_DEFUN(AC_LIBTOOL_PROG_CC_C_O)) +m4_ifndef(AC_LIBTOOL_SYS_HARD_LINK_LOCKS, AC_DEFUN(AC_LIBTOOL_SYS_HARD_LINK_LOCKS)) +m4_ifndef(AC_LIBTOOL_OBJDIR, AC_DEFUN(AC_LIBTOOL_OBJDIR)) +m4_ifndef(AC_LTDL_OBJDIR, AC_DEFUN(AC_LTDL_OBJDIR)) +m4_ifndef(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH, AC_DEFUN(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH)) +m4_ifndef(AC_LIBTOOL_SYS_LIB_STRIP, AC_DEFUN(AC_LIBTOOL_SYS_LIB_STRIP)) +m4_ifndef(AC_PATH_MAGIC, AC_DEFUN(AC_PATH_MAGIC)) +m4_ifndef(AC_PROG_LD_GNU, AC_DEFUN(AC_PROG_LD_GNU)) +m4_ifndef(AC_PROG_LD_RELOAD_FLAG, AC_DEFUN(AC_PROG_LD_RELOAD_FLAG)) +m4_ifndef(AC_DEPLIBS_CHECK_METHOD, AC_DEFUN(AC_DEPLIBS_CHECK_METHOD)) +m4_ifndef(AC_LIBTOOL_PROG_COMPILER_NO_RTTI, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_NO_RTTI)) +m4_ifndef(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE, AC_DEFUN(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE)) +m4_ifndef(AC_LIBTOOL_PROG_COMPILER_PIC, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_PIC)) +m4_ifndef(AC_LIBTOOL_PROG_LD_SHLIBS, AC_DEFUN(AC_LIBTOOL_PROG_LD_SHLIBS)) +m4_ifndef(AC_LIBTOOL_POSTDEP_PREDEP, AC_DEFUN(AC_LIBTOOL_POSTDEP_PREDEP)) +m4_ifndef(LT_AC_PROG_EGREP, AC_DEFUN(LT_AC_PROG_EGREP)) +m4_ifndef(LT_AC_PROG_SED, AC_DEFUN(LT_AC_PROG_SED)) +m4_ifndef(_LT_CC_BASENAME, AC_DEFUN(_LT_CC_BASENAME)) +m4_ifndef(_LT_COMPILER_BOILERPLATE, AC_DEFUN(_LT_COMPILER_BOILERPLATE)) +m4_ifndef(_LT_LINKER_BOILERPLATE, AC_DEFUN(_LT_LINKER_BOILERPLATE)) +m4_ifndef(_AC_PROG_LIBTOOL, AC_DEFUN(_AC_PROG_LIBTOOL)) +m4_ifndef(AC_LIBTOOL_SETUP, AC_DEFUN(AC_LIBTOOL_SETUP)) +m4_ifndef(_LT_AC_CHECK_DLFCN, AC_DEFUN(_LT_AC_CHECK_DLFCN)) +m4_ifndef(AC_LIBTOOL_SYS_DYNAMIC_LINKER, AC_DEFUN(AC_LIBTOOL_SYS_DYNAMIC_LINKER)) +m4_ifndef(_LT_AC_TAGCONFIG, AC_DEFUN(_LT_AC_TAGCONFIG)) +m4_ifndef(AC_DISABLE_FAST_INSTALL, AC_DEFUN(AC_DISABLE_FAST_INSTALL)) +m4_ifndef(_LT_AC_LANG_CXX, AC_DEFUN(_LT_AC_LANG_CXX)) +m4_ifndef(_LT_AC_LANG_F77, AC_DEFUN(_LT_AC_LANG_F77)) +m4_ifndef(_LT_AC_LANG_GCJ, AC_DEFUN(_LT_AC_LANG_GCJ)) +m4_ifndef(AC_LIBTOOL_LANG_C_CONFIG, AC_DEFUN(AC_LIBTOOL_LANG_C_CONFIG)) +m4_ifndef(_LT_AC_LANG_C_CONFIG, AC_DEFUN(_LT_AC_LANG_C_CONFIG)) +m4_ifndef(AC_LIBTOOL_LANG_CXX_CONFIG, AC_DEFUN(AC_LIBTOOL_LANG_CXX_CONFIG)) +m4_ifndef(_LT_AC_LANG_CXX_CONFIG, AC_DEFUN(_LT_AC_LANG_CXX_CONFIG)) +m4_ifndef(AC_LIBTOOL_LANG_F77_CONFIG, AC_DEFUN(AC_LIBTOOL_LANG_F77_CONFIG)) +m4_ifndef(_LT_AC_LANG_F77_CONFIG, AC_DEFUN(_LT_AC_LANG_F77_CONFIG)) +m4_ifndef(AC_LIBTOOL_LANG_GCJ_CONFIG, AC_DEFUN(AC_LIBTOOL_LANG_GCJ_CONFIG)) +m4_ifndef(_LT_AC_LANG_GCJ_CONFIG, AC_DEFUN(_LT_AC_LANG_GCJ_CONFIG)) +m4_ifndef(AC_LIBTOOL_LANG_RC_CONFIG, AC_DEFUN(AC_LIBTOOL_LANG_RC_CONFIG)) +m4_ifndef(_LT_AC_LANG_RC_CONFIG, AC_DEFUN(_LT_AC_LANG_RC_CONFIG)) +m4_ifndef(AC_LIBTOOL_CONFIG, AC_DEFUN(AC_LIBTOOL_CONFIG)) +m4_ifndef(_LT_AC_FILE_LTDLL_C, AC_DEFUN(_LT_AC_FILE_LTDLL_C)) +m4_ifndef(_LT_REQUIRED_DARWIN_CHECKS, AC_DEFUN(_LT_REQUIRED_DARWIN_CHECKS)) +m4_ifndef(_LT_AC_PROG_CXXCPP, AC_DEFUN(_LT_AC_PROG_CXXCPP)) +m4_ifndef(_LT_PREPARE_SED_QUOTE_VARS, AC_DEFUN(_LT_PREPARE_SED_QUOTE_VARS)) +m4_ifndef(_LT_PROG_ECHO_BACKSLASH, AC_DEFUN(_LT_PROG_ECHO_BACKSLASH)) +m4_ifndef(_LT_PROG_F77, AC_DEFUN(_LT_PROG_F77)) +m4_ifndef(_LT_PROG_FC, AC_DEFUN(_LT_PROG_FC)) +m4_ifndef(_LT_PROG_CXX, AC_DEFUN(_LT_PROG_CXX))
View file
_service:tar_scm:libXft-2.3.7.tar.gz/man/Makefile.in -> _service:tar_scm:libXft-2.3.8.tar.gz/man/Makefile.in
Changed
@@ -90,7 +90,10 @@ host_triplet = @host@ subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
View file
_service:tar_scm:libXft-2.3.7.tar.gz/src/Makefile.in -> _service:tar_scm:libXft-2.3.8.tar.gz/src/Makefile.in
Changed
@@ -91,7 +91,10 @@ host_triplet = @host@ subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(libXftinclude_HEADERS) \
View file
_service:tar_scm:libXft-2.3.7.tar.gz/src/xftglyphs.c -> _service:tar_scm:libXft-2.3.8.tar.gz/src/xftglyphs.c
Changed
@@ -840,18 +840,22 @@ } FT_Vector_Transform(&vector, &font->info.matrix); xftg->metrics.xOff = (short)(TRUNC(ROUND(vector.x))); - xftg->metrics.yOff = (short)(TRUNC(ROUND(vector.y))); + xftg->metrics.yOff = (short)(-TRUNC(ROUND(vector.y))); } else { + short maximum_x = (short)(font->public.max_advance_width); + short maximum_y = (short)(-font->public.max_advance_width); + short trimmed_x = (short)(TRUNC(ROUND(glyphslot->advance.x))); + short trimmed_y = (short)(-TRUNC(ROUND(glyphslot->advance.y))); if (font->info.load_flags & FT_LOAD_VERTICAL_LAYOUT) { xftg->metrics.xOff = 0; - xftg->metrics.yOff = (short)(-TRUNC(ROUND(glyphslot->advance.y))); + xftg->metrics.yOff = min(maximum_y,trimmed_y); } else { - xftg->metrics.xOff = (short)(TRUNC(ROUND(glyphslot->advance.x))); + xftg->metrics.xOff = min(maximum_x,trimmed_x); xftg->metrics.yOff = 0; } } @@ -1245,8 +1249,11 @@ /* * Make unloading faster by moving newly-referenced glyphs to the front * of the list, leaving the less-used glyphs on the end. + * + * If the glyph is zero, the older/newer data may not have been set. */ - if (font->track_mem_usage + if (glyph != 0 + && font->track_mem_usage && font->total_inuse > 10 && font->newest != FT_UINT_MAX && font->newest != glyph)
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2