Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libXft for openSUSE:Factory checked in at 2025-04-22 17:25:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXft (Old) and /work/SRC/openSUSE:Factory/.libXft.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXft" Tue Apr 22 17:25:42 2025 rev:19 rq:1271163 version:2.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/libXft/libXft.changes 2023-04-20 15:14:01.377832858 +0200 +++ /work/SRC/openSUSE:Factory/.libXft.new.30101/libXft.changes 2025-04-22 17:25:58.025249598 +0200 @@ -1,0 +2,15 @@ +Mon Apr 21 11:24:07 UTC 2025 - Stefan Dirsch <sndir...@suse.com> + +- Update to version 2.3.9 + * Remove support for building with pre-X11R7 versions of X + * Remove support for building with pre-C89 versions of C + * Require xproto >= 7.0.22 for _X_UNUSED + * meson: Add option to build with meson + * fix potential buffer overrun in _XftGlyphDefault + * issue 19: Problem loading "SourceCodePro-Regular" font in Fedora + * build-fix for older versions of freetype2: FT_HAS_SVG was added + late in 2021 + * issue 21: remove redundant/out-of-place prototype for XftNameUnparse + * manpage formatting-fixes + +------------------------------------------------------------------- @@ -4 +19 @@ -- Updat to version 2.3.8 +- Update to version 2.3.8 Old: ---- libXft-2.3.8.tar.xz New: ---- libXft-2.3.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXft.spec ++++++ --- /var/tmp/diff_new_pack.20c4Pp/_old 2025-04-22 17:25:58.549271589 +0200 +++ /var/tmp/diff_new_pack.20c4Pp/_new 2025-04-22 17:25:58.549271589 +0200 @@ -1,7 +1,7 @@ # # spec file for package libXft # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libXft %define lname libXft2 -Version: 2.3.8 +Version: 2.3.9 Release: 0 Summary: X FreeType library License: MIT ++++++ libXft-2.3.8.tar.xz -> libXft-2.3.9.tar.xz ++++++ ++++ 2407 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/libXft-2.3.8/ChangeLog new/libXft-2.3.9/ChangeLog --- old/libXft-2.3.8/ChangeLog 2023-04-17 21:32:10.000000000 +0200 +++ new/libXft-2.3.9/ChangeLog 2025-04-20 17:10:49.000000000 +0200 @@ -1,3 +1,112 @@ +commit f4805c8645914cbdcfd42e71051ba3f8fc664ef5 +Author: Thomas E. Dickey <dic...@invisible-island.net> +Date: Sun Apr 20 10:55:00 2025 -0400 + + libXft 2.3.9 + + Signed-off-by: Thomas E. Dickey <dic...@invisible-island.net> + +commit 518aaa65d549414eb883041470c5df2c8576482f +Author: Thomas E. Dickey <dic...@invisible-island.net> +Date: Sun Apr 20 10:30:07 2025 -0400 + + libXft 2.3.9 + + Signed-off-by: Thomas E. Dickey <dic...@invisible-island.net> + +commit 53d103562593be70680ca54d03db8c779de7e330 +Author: Thomas E. Dickey <dic...@invisible-island.net> +Date: Wed Apr 16 20:05:22 2025 -0400 + + manpage formatting-fixes + + Signed-off-by: Thomas E. Dickey <dic...@invisible-island.net> + +commit a074c10e1b396d26e729080ce50a18f6a22de6ad +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Feb 21 11:15:56 2025 -0800 + + meson: Add option to build with meson + + Also updates the gitlab CI config to test both build types + and compare the generated output/installed files. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxft/-/merge_requests/33> + +commit e787bf2f9e3a9eafc36eb668d060f8fed1283a44 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Aug 18 10:32:33 2024 -0700 + + Require xproto >= 7.0.22 for _X_UNUSED + + Since _X_UNUSED is only used in source code, not exported headers, + the version requirement is only set in configure.ac, not xft.pc. + + Fixes: 4dadf0e ("quiet unused-parameter warnings with _X_UNUSED") + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxft/-/merge_requests/32> + +commit 7cf945b13ee80a7c108e674559e5eb7013ce5d36 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Aug 18 09:46:21 2024 -0700 + + Remove support for building with pre-C89 versions of C + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxft/-/merge_requests/32> + +commit ded7011adeff9ca9d32c9dc69cc33a54cc7d97cb +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Aug 18 09:43:09 2024 -0700 + + Remove support for building with pre-X11R7 versions of X + + Other parts of the code already required later versions of X, so this + is just cleaning out #ifdef cases that can never be hit anymore. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxft/-/merge_requests/32> + +commit fc54d4238a5a6db180f6090a535d173f88060117 +Author: Peter Harris <pharr...@rocketsoftware.com> +Date: Thu Aug 15 10:55:18 2024 -0400 + + fix potential buffer overrun in _XftGlyphDefault + + Initialize `nmissing` so that XftFontCheckGlyph does not write past the end + of the `missing` array if a glyph is missing. + + Signed-off-by: Peter Harris <pharr...@rocketsoftware.com> + +commit e736f48ba2fd4263ca6f692e27916a914447af4e +Author: Thomas E. Dickey <dic...@invisible-island.net> +Date: Sat Apr 6 20:36:17 2024 -0400 + + issue 21: remove redundant/out-of-place prototype for XftNameUnparse + + Signed-off-by: Thomas E. Dickey <dic...@invisible-island.net> + +commit 4e4210c86019b42c3819cc18b59f86752fcd8b13 +Author: Thomas E. Dickey <dic...@invisible-island.net> +Date: Mon May 1 04:04:37 2023 -0400 + + build-fix for older versions of freetype2: FT_HAS_SVG was added late in 2021 + +commit be61145144f61674d1c3e6130fabf3a63d9c6529 +Author: Thomas E. Dickey <dic...@invisible-island.net> +Date: Sun Apr 30 20:19:04 2023 -0400 + + issue 19: Problem loading "SourceCodePro-Regular" font in Fedora + + Ignore face flag FT_FACE_FLAG_COLOR if FT_FACE_FLAG_SVG is set, + allowing adobe-source-code-pro font to work. + + This bug was introduced by a change in freetype2 #1151, + 62bc04f4c5b4369cc493ff24b1de27aabd79e0c6 + + Signed-off-by: Thomas E. Dickey <dic...@invisible-island.net> + commit c532908f5fdd3aee9d88d9704aedbe3be82c7ce5 Author: Matt Turner <matts...@gmail.com> Date: Mon Apr 17 15:23:49 2023 -0400 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/libXft-2.3.8/Makefile.am new/libXft-2.3.9/Makefile.am --- old/libXft-2.3.8/Makefile.am 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/Makefile.am 2025-04-20 17:10:40.000000000 +0200 @@ -36,4 +36,4 @@ dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build meson.options 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/libXft-2.3.8/configure.ac new/libXft-2.3.9/configure.ac --- old/libXft-2.3.8/configure.ac 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/configure.ac 2025-04-20 17:10:40.000000000 +0200 @@ -27,7 +27,7 @@ # 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.8], +AC_INIT([libXft], [2.3.9], [https://gitlab.freedesktop.org/xorg/lib/libXft/issues], [libXft]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -64,7 +64,7 @@ # # Check for Xrender # -PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2 x11) +PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2 x11 xproto >= 7.0.22) # Check freetype configuration PKG_CHECK_MODULES(FREETYPE, freetype2 >= 2.1.6) 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/libXft-2.3.8/include/X11/Xft/Xft.h new/libXft-2.3.9/include/X11/Xft/Xft.h --- old/libXft-2.3.8/include/X11/Xft/Xft.h 2023-04-17 21:32:10.000000000 +0200 +++ new/libXft-2.3.9/include/X11/Xft/Xft.h 2025-04-20 17:10:49.000000000 +0200 @@ -31,7 +31,7 @@ /* #undef will be substituted by configure */ #define XFT_MAJOR 2 #define XFT_MINOR 3 -#define XFT_REVISION 8 +#define XFT_REVISION 9 #define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION)) #define XftVersion XFT_VERSION @@ -43,10 +43,6 @@ #include <X11/extensions/Xrender.h> #include <X11/Xfuncproto.h> -/* #include <X11/Xosdefs.h>*/ -#ifndef _X_SENTINEL -# define _X_SENTINEL(x) -#endif #ifndef _XFT_NO_COMPAT_ #include <X11/Xft/XftCompat.h> 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/libXft-2.3.8/include/X11/Xft/Xft.h.in new/libXft-2.3.9/include/X11/Xft/Xft.h.in --- old/libXft-2.3.8/include/X11/Xft/Xft.h.in 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/include/X11/Xft/Xft.h.in 2025-04-20 17:10:40.000000000 +0200 @@ -42,10 +42,6 @@ #include <X11/extensions/Xrender.h> #include <X11/Xfuncproto.h> -/* #include <X11/Xosdefs.h>*/ -#ifndef _X_SENTINEL -# define _X_SENTINEL(x) -#endif #ifndef _XFT_NO_COMPAT_ #include <X11/Xft/XftCompat.h> 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/libXft-2.3.8/include/X11/Xft/XftCompat.h new/libXft-2.3.9/include/X11/Xft/XftCompat.h --- old/libXft-2.3.8/include/X11/Xft/XftCompat.h 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/include/X11/Xft/XftCompat.h 2025-04-20 17:10:40.000000000 +0200 @@ -153,11 +153,4 @@ #define XftConfigSubstitute(p) FcConfigSubstitute (0, p, FcMatchPattern) -_XFUNCPROTOBEGIN - -FcBool -XftNameUnparse (XftPattern *pat, char *dest, int len); - -_XFUNCPROTOEND - #endif /* _XFTCOMPAT_H_ */ 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/libXft-2.3.8/m4/libtool.m4 new/libXft-2.3.9/m4/libtool.m4 --- old/libXft-2.3.8/m4/libtool.m4 2023-04-17 21:32:04.000000000 +0200 +++ new/libXft-2.3.9/m4/libtool.m4 2025-04-20 17:10:43.000000000 +0200 @@ -730,7 +730,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -1415,10 +1414,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*|powerpc64le-*linux*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*linux*|powerpc64-*linux*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1719,11 +1718,6 @@ 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. @@ -2661,11 +2655,11 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' @@ -2691,14 +2685,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' @@ -2710,12 +2697,6 @@ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -2925,6 +2906,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3584,7 +3577,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) 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 @@ -4090,7 +4083,8 @@ if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -4462,7 +4456,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4730,6 +4724,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -4974,6 +4974,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5036,6 +5039,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5271,6 +5277,7 @@ case $cc_basename in tcc*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -5291,7 +5298,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5812,6 +5819,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5829,11 +5837,12 @@ # Fabrice Bellard et al's Tiny C Compiler _LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6460,7 +6469,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -6836,7 +6845,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6901,7 +6910,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7240,7 +7249,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -7324,7 +7333,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7335,7 +7344,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' 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/libXft-2.3.8/man/Xft.man new/libXft-2.3.9/man/Xft.man --- old/libXft-2.3.8/man/Xft.man 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/man/Xft.man 2025-04-20 17:10:40.000000000 +0200 @@ -1,5 +1,5 @@ '\" t -.\" Copyright © 2022 Thomas E. Dickey +.\" Copyright © 2022,2025 Thomas E. Dickey .\" Copyright © 2000 Keith Packard .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -25,9 +25,8 @@ .el .ta 0.5i 1.0i 1.5i 2.0i .. .de PS -.sp .ns -.TP \\$1 +.TP .na .nf .ie n .ta 0.8i 3.0i @@ -64,13 +63,22 @@ .ie n .IP \(bu 4 .el .IP \(bu 2 .. -.ie \n(.g .ds `` \(lq -.el .ds `` `` -.ie \n(.g .ds '' \(rq -.el .ds '' '' +.ie \n(.g \{\ +.ds `` \(lq +.ds '' \(rq +.\} +.el \{\ +.ie t .ds `` `` +.el .ds `` "" +.ie t .ds '' '' +.el .ds '' "" +.\} .TH Xft __libmansuffix__ __vendorversion__ "X Version 11" .SH NAME -Xft \- X FreeType interface library +Xft \- +X FreeType interface library +.SH SYNOPSIS +.B #include <X11/Xft/Xft.h> .SH DESCRIPTION .B Xft is a simple library which draws text and graphics: @@ -83,8 +91,6 @@ displays the converted font data using the X Rendering Extension. .PP This manual page barely scratches the surface of this library. -.SH "HEADER FILE" -.B #include <X11/Xft/Xft.h> .SH CONSTANTS .TP .B XFT_MAJOR @@ -131,7 +137,7 @@ .SH "DATA TYPES" Xft datatypes follow a naming convention, prefixing all names with \*(``Xft\*('' -.SS From Xlib... +.SS "From Xlib..." Xlib datatypes do not follow a naming convention. They are documented in .IR "Xlib \- C Language Interface" . @@ -175,7 +181,7 @@ .B Visual Declared in \fI<X11/Xutil.h>\fP, this structure contains information about the possible color mapping. -.SS From XRender... +.SS "From XRender..." The X Render Extension library datatypes are inspired by Xlib, but lack the corresponding documentation. @@ -192,7 +198,7 @@ Picture, XGlyphInfo, XRenderColor. -.SS From Fontconfig... +.SS "From Fontconfig..." Fontconfig datatypes follow a naming convention, prefixing all names with \*(``Fc\*('' which are documented in .IR "Fontconfig Developers Reference" . @@ -208,7 +214,7 @@ FcFontSet, FcPattern, and FcResult. -.SS From FreeType 2... +.SS "From FreeType 2..." FreeType 2 datatypes follow a naming convention, prefixing all names with \*(``FT_\*('' which are documented in .IR "FreeType API Reference" . @@ -253,7 +259,7 @@ .BR XftFontOpenPattern (). .BR XftFontCopy () is used to duplicate -.BR XftFont s, +.BR XftFont "s," and .BR XftFontClose () is used to mark an @@ -577,7 +583,7 @@ This is the maximum number of unreferenced fonts (default: 16). .TP 5 -XFT_TRACK_MEM_USAGE +XFT_TRACK_MEM_USAGE (trackmemusage). When true, .B Xft @@ -666,6 +672,7 @@ (default: result from .BR XftDefaultHasRender ()). .RE +.sp .PS \fBFcBool\fP \fBXftInit\fP ( \fB_Xconst char\fP *\fIconfig\fP); @@ -736,7 +743,6 @@ This opens the \*(``charter\*('' font at 12 points. The point size is automatically converted to the correct pixel size based on the resolution of the monitor. -.PP .PS \fBXftFont\fP *\fBXftFontOpenName\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -750,7 +756,6 @@ the Fontconfig library's .BR FcNameParse () function). -.PP .PS \fBXftFont\fP *\fBXftFontOpenXlfd\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -765,7 +770,6 @@ and uses the .BR XftXlfdParse () function. -.PP .PS \fBFcPattern\fP *\fBXftFontMatch\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -895,7 +899,6 @@ .IR font , storing them in .IR extents . -.PP .PS \fBvoid\fP \fBXftTextExtents16\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -915,7 +918,6 @@ .IR font , storing them in .IR extents . -.PP .PS \fBvoid\fP \fBXftTextExtents32\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -935,7 +937,6 @@ .IR font , storing them in .IR extents . -.PP .PS \fBvoid\fP \fBXftTextExtentsUtf8\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -955,7 +956,6 @@ .IR font , storing them in .IR extents . -.PP .PS \fBvoid\fR \fBXftTextExtentsUtf16\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -980,7 +980,6 @@ .I string must be specified in .IR endian . -.PP .PS \fBvoid\fP \fBXftGlyphExtents\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -1093,7 +1092,7 @@ .BR XAllocColor () succeeds .BR XftColorAllocValue () -stores that pixel value in the +stores that pixel value in the .B XRenderColor referenced by .I result @@ -1105,6 +1104,7 @@ .BR XftColorAllocValue () returns False and does not modify the result. .RE +.sp .PS \fBvoid\fP \fBXftColorFree\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -1142,7 +1142,6 @@ .I colormap on .IR display . -.PP .PS \fBXftDraw\fP *\fBXftDrawCreateBitmap\fP ( \fBDisplay\fP *\fIdpy\fB,\fR @@ -1152,7 +1151,6 @@ behaves as .BR XftDrawCreate (), except that it uses an X pixmap of color depth 1 instead of an X drawable. -.PP .PS \fBXftDraw *\fP \fBXftDrawCreateAlpha\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -1165,7 +1163,6 @@ except that it uses an X pixmap of color depth .I depth instead of an X drawable. -.PP .PS \fBvoid\fP \fBXftDrawChange\fP ( \fBXftDraw\fP *\fIdraw\fP, @@ -1178,7 +1175,6 @@ .I draw from its current value to .IR drawable . -.PP .PS \fBDisplay\fP *\fBXftDrawDisplay\fP ( \fBXftDraw\fP *\fIdraw\fP); @@ -1188,7 +1184,6 @@ .B Xft draw object .IR draw . -.PP .PS \fBDrawable\fP \fBXftDrawDrawable\fP ( \fBXftDraw\fP *\fIdraw\fP); @@ -1198,7 +1193,6 @@ .B Xft draw object .IR draw . -.PP .PS \fBColormap\fP \fBXftDrawColormap\fP ( \fBXftDraw\fP *\fIdraw\fP); @@ -1208,7 +1202,6 @@ .B Xft draw object .IR draw . -.PP .PS \fBVisual\fR *\fBXftDrawVisual\fP ( \fBXftDraw\fP *\fIdraw\fP); @@ -1218,7 +1211,6 @@ .B Xft draw object .IR draw . -.PP .PS \fBPicture\fP \fBXftDrawPicture\fP ( \fBXftDraw\fP *\fIdraw\fP); @@ -1229,9 +1221,8 @@ draw object .IR draw . .IP -If the the X server does not support the X Rendering Extension, 0 is +If the X server does not support the X Rendering Extension, 0 is returned. -.PP .PS \fBPicture\fP \fBXftDrawSrcPicture\fP ( \fBXftDraw\fP *\fIdraw\fP, @@ -1508,6 +1499,7 @@ .B Xft provides an analogous feature using Xlib. .RE +.sp .PS \fBvoid\fP \fBXftGlyphFontSpecRender\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -1569,7 +1561,7 @@ parameters are used as described in the documentation for the X Render library. .RE .\" ************************************************************************* -.SS Manipulating patterns +.SS "Manipulating patterns" .PS \fBFcFontSet\fP *\fBXftListFonts\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -1628,7 +1620,7 @@ otherwise it returns .BR FcFalse . .\" ************************************************************************* -.SS Manipulating Font data +.SS "Manipulating Font data" .PS \fBvoid\fP \fBXftFontLoadGlyphs\fP ( \fBDisplay\fP *\fIdpy\fP, @@ -1745,11 +1737,11 @@ .TP 5 4 shows details about the -.B XRenderPictFormat +.B XRenderPictFormat which will be used. .TP 5 8 -shows the string which +shows the string which .BR XftDrawString8 () will draw. .TP 5 @@ -1800,7 +1792,7 @@ .TP .B XftFontSet contains a list of -.BR XftPattern s. +.BR XftPattern "s." Internally, .B Xft uses this data structure to hold sets of fonts. @@ -1810,9 +1802,9 @@ .TP .B XftObjectSet holds a set of names and is used to specify which fields from fonts are -placed in the the list of returned patterns when listing fonts. +placed in the list of returned patterns when listing fonts. .\" .SS "Xft 1.x Functions" -.SH AUTHOR +.SH AUTHORS Keith Packard .br Thomas E. Dickey (performance improvements) 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/libXft-2.3.8/meson.build new/libXft-2.3.9/meson.build --- old/libXft-2.3.8/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/libXft-2.3.9/meson.build 2025-04-20 17:10:40.000000000 +0200 @@ -0,0 +1,249 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2025, Oracle and/or its affiliates. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +# +# This is the package version number, not the shared library +# version. This version number will be substituted into Xft.h +# Please bump the minor library number at each release as well. +# +project( + 'libXft', + 'c', + version: '2.3.9', + license: 'HPND-sell-variant', + license_files: 'COPYING', + meson_version: '>= 1.1.0', +) + +# Replacement for XORG_DEFAULT_OPTIONS +cc = meson.get_compiler('c') +if cc.has_argument('-fno-strict-aliasing') + add_project_arguments('-fno-strict-aliasing', language: 'c') +endif + +# Make builds reproducible instead of embedding build paths due to use +# of __FILE__ in the assert() macro +fs = import('fs') +source_prefix_path = fs.relative_to( + meson.project_source_root(), + meson.project_build_root() +) +macro_prefix_map = '-fmacro-prefix-map=' + source_prefix_path + '/src/=' +if cc.has_argument(macro_prefix_map) + add_project_arguments(macro_prefix_map, language: 'c') +endif + +prog_sed = find_program('sed') + +# Set library version for Xft.h from package version set above +xft_version = meson.project_version() +xft_vers_components = xft_version.split('.') +xft_vers_conf = configuration_data() +xft_vers_conf.set('XFT_MAJOR', xft_vers_components[0], + description: 'Major version of Xft') +xft_vers_conf.set('XFT_MINOR', xft_vers_components[1], + description: 'Minor version of Xft') +xft_vers_conf.set('XFT_REVISION', xft_vers_components[2], + description: 'Micro revision of Xft') +# Temporary solution to allow building with either autoconf or meson +# during the transition period - can be replaced by configure_file() +# and use of '#mesondefine' when configure.ac is removed. +xft_h = custom_target( + input: 'include/X11/Xft/Xft.h.in', + output: 'Xft.h', + command: [ + prog_sed, + '-e', f's/#undef XFT_MAJOR/#define XFT_MAJOR @0@/'.format(xft_vers_conf.get('XFT_MAJOR')), + '-e', f's/#undef XFT_MINOR/#define XFT_MINOR @0@/'.format(xft_vers_conf.get('XFT_MINOR')), + '-e', f's/#undef XFT_REVISION/#define XFT_REVISION @0@/'.format(xft_vers_conf.get('XFT_REVISION')), + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('prefix') / get_option('includedir') / 'X11/Xft' +) + + +# Check for Xrender +dep_xrender = dependency('xrender', required: true, version: '>= 0.8.2') +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.22') + +# Check freetype configuration +dep_freetype = dependency('freetype2', required: true, version: '>= 2.1.6') + +# Check fontconfig configuration +dep_fontconfig = dependency('fontconfig', required: true, version: '>= 2.5.92') + +libXft_sources = [ + 'src/xftcolor.c', + 'src/xftcore.c', + 'src/xftdbg.c', + 'src/xftdpy.c', + 'src/xftdraw.c', + 'src/xftextent.c', + 'src/xftfont.c', + 'src/xftfreetype.c', + 'src/xftglyphs.c', + 'src/xftinit.c', + 'src/xftlist.c', + 'src/xftname.c', + 'src/xftrender.c', + 'src/xftstr.c', + 'src/xftswap.c', + 'src/xftxlfd.c' +] + +lib = library( + 'Xft', + libXft_sources, + include_directories: 'include/X11/Xft', + dependencies: [dep_fontconfig, dep_freetype, dep_xrender, dep_libx11, + dep_xproto], + sources: xft_h, + version: xft_version, + install: true, +) + +install_headers( + 'include/X11/Xft/XftCompat.h', + subdir: 'X11/Xft', +) + +pkg = import('pkgconfig') +pkg.generate( + name: 'Xft', + description: 'X FreeType library', + filebase: 'xft', + libraries: '-L${libdir} -lXft', + requires: ['xproto'], + requires_private: ['xrender', 'fontconfig', 'freetype2'], + url: 'https://gitlab.freedesktop.org/xorg/lib/libxft/' +) + +lib_man_suffix = get_option('lib_man_suffix') + +custom_target( + input: 'man/Xft.man', + output: f'Xft.@lib_man_suffix@', + command: [ + prog_sed, + '-e', f's/__libmansuffix__/@lib_man_suffix@/g', + '-e', 's/__vendorversion__/"libXft @0@" "X Version 11"/'.format(meson.project_version()), + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('prefix') / get_option('mandir') / f'man@lib_man_suffix@', +) + +shadow_man_pages = [ + 'XftCharExists', + 'XftCharFontSpecRender', + 'XftCharIndex', + 'XftCharSpecRender', + 'XftColorAllocName', + 'XftColorAllocValue', + 'XftColorFree', + 'XftDefaultHasRender', + 'XftDefaultSet', + 'XftDefaultSubstitute', + 'XftDrawChange', + 'XftDrawCharFontSpec', + 'XftDrawCharSpec', + 'XftDrawColormap', + 'XftDrawCreate', + 'XftDrawCreateAlpha', + 'XftDrawCreateBitmap', + 'XftDrawDestroy', + 'XftDrawDisplay', + 'XftDrawDrawable', + 'XftDrawGlyphFontSpec', + 'XftDrawGlyphSpec', + 'XftDrawGlyphs', + 'XftDrawPicture', + 'XftDrawRect', + 'XftDrawSetClip', + 'XftDrawSetClipRectangles', + 'XftDrawSetSubwindowMode', + 'XftDrawSrcPicture', + 'XftDrawString16', + 'XftDrawString32', + 'XftDrawString8', + 'XftDrawStringUtf16', + 'XftDrawStringUtf8', + 'XftDrawVisual', + 'XftFontCheckGlyph', + 'XftFontClose', + 'XftFontCopy', + 'XftFontInfoCreate', + 'XftFontInfoDestroy', + 'XftFontInfoEqual', + 'XftFontInfoHash', + 'XftFontLoadGlyphs', + 'XftFontMatch', + 'XftFontOpen', + 'XftFontOpenInfo', + 'XftFontOpenName', + 'XftFontOpenPattern', + 'XftFontOpenXlfd', + 'XftFontUnloadGlyphs', + 'XftGetVersion', + 'XftGlyphExtents', + 'XftGlyphFontSpecRender', + 'XftGlyphRender', + 'XftGlyphSpecRender', + 'XftInit', + 'XftInitFtLibrary', + 'XftListFonts', + 'XftLockFace', + 'XftNameParse', + 'XftNameUnparse', + 'XftTextExtents16', + 'XftTextExtents32', + 'XftTextExtents8', + 'XftTextExtentsUtf16', + 'XftTextExtentsUtf8', + 'XftTextRender16', + 'XftTextRender16BE', + 'XftTextRender16LE', + 'XftTextRender32', + 'XftTextRender32BE', + 'XftTextRender32LE', + 'XftTextRender8', + 'XftTextRenderUtf16', + 'XftTextRenderUtf8', + 'XftUnlockFace', + 'XftXlfdParse' +] + +foreach man: shadow_man_pages + custom_target( + output: f'@man@.@lib_man_suffix@', + command: ['echo', f'.so man@lib_man_suffix@/Xft.@lib_man_suffix@'], + capture: true, + install: true, + install_dir: get_option('prefix') / get_option('mandir') / f'man@lib_man_suffix@', + ) +endforeach 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/libXft-2.3.8/meson.options new/libXft-2.3.9/meson.options --- old/libXft-2.3.8/meson.options 1970-01-01 01:00:00.000000000 +0100 +++ new/libXft-2.3.9/meson.options 2025-04-20 17:10:40.000000000 +0200 @@ -0,0 +1,2 @@ +option('lib_man_suffix', type : 'string', value : '3', + description : 'Suffix for library man pages') 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/libXft-2.3.8/src/xftcore.c new/libXft-2.3.9/src/xftcore.c --- old/libXft-2.3.8/src/xftcore.c 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/src/xftcore.c 2025-04-20 17:10:40.000000000 +0200 @@ -923,7 +923,7 @@ { XftFontInt *font = (XftFontInt *) public; FT_UInt missing[XFT_NMISSING]; - int nmissing; + int nmissing = 0; FcBool glyphs_loaded = FcFalse; if (XftFontCheckGlyph (dpy, public, FcTrue, 0, missing, &nmissing)) 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/libXft-2.3.8/src/xftfreetype.c new/libXft-2.3.9/src/xftfreetype.c --- old/libXft-2.3.8/src/xftfreetype.c 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/src/xftfreetype.c 2025-04-20 17:10:40.000000000 +0200 @@ -849,7 +849,11 @@ if (!(face->face_flags & FT_FACE_FLAG_SCALABLE)) antialias = FcFalse; +#ifdef FT_HAS_SVG + color = (FT_HAS_COLOR(face) && !FT_HAS_SVG(face)) ? FcTrue : FcFalse; +#else color = FT_HAS_COLOR(face) ? FcTrue : FcFalse; +#endif /* * Find the appropriate picture format 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/libXft-2.3.8/src/xftint.h new/libXft-2.3.9/src/xftint.h --- old/libXft-2.3.8/src/xftint.h 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/src/xftint.h 2025-04-20 17:10:40.000000000 +0200 @@ -34,22 +34,11 @@ #ifdef HAVE_CONFIG_H #include "config.h" -#else /* X monolithic tree */ -#define HAVE_STDLIB_H 1 /* assumed since all ANSI C platforms require it */ -#include <X11/Xosdefs.h> /* get string.h or strings.h as appropriate */ #endif #include <stdio.h> -#if HAVE_STDLIB_H #include <stdlib.h> -#endif -#if HAVE_STRING_H #include <string.h> -#else -#if HAVE_STRINGS_H -#include <strings.h> -#endif -#endif #include <ctype.h> #include <assert.h> @@ -62,14 +51,6 @@ #include <fontconfig/fcprivate.h> #include <fontconfig/fcfreetype.h> -/* Added to <X11/Xfuncproto.h> in X11R6.9 and later */ -#ifndef _X_HIDDEN -# define _X_HIDDEN /**/ -#endif -#ifndef _X_EXPORT -# define _X_EXPORT /**/ -#endif - typedef struct _XftMatcher { char *object; double (*compare) (char *object, FcValue value1, FcValue value2); 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/libXft-2.3.8/xft.pc.in new/libXft-2.3.9/xft.pc.in --- old/libXft-2.3.8/xft.pc.in 2023-04-17 21:32:01.000000000 +0200 +++ new/libXft-2.3.9/xft.pc.in 2025-04-20 17:10:40.000000000 +0200 @@ -1,12 +1,13 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@ includedir=@includedir@ +libdir=@libdir@ Name: Xft Description: X FreeType library +URL: https://gitlab.freedesktop.org/xorg/lib/libxft/ Version: @VERSION@ Requires: xproto Requires.private: xrender, fontconfig, freetype2 -Cflags: -I${includedir} Libs: -L${libdir} -lXft +Cflags: -I${includedir}
