Projects
openEuler:Mainline
libXfont2
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 2
View file
_service:tar_scm:libXfont2.spec
Changed
@@ -1,10 +1,13 @@ Name: libXfont2 -Version: 2.0.5 +Version: 2.0.6 Release: 1 Summary: X.Org X11 libXfont2 runtime library License: MIT URL: https://xorg.freedesktop.org/ -Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.gz +%ifarch sw_64 +Patch1: libXfont2-2.0.5-sw.patch +%endif BuildRequires: autoconf automake libtool pkgconfig(fontsproto) freetype-devel BuildRequires: xorg-x11-util-macros libfontenc-devel xorg-x11-xtrans-devel @@ -60,6 +63,15 @@ %doc README.md %changelog +* Fri Feb 03 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.0.6-1 +- update to 2.0.6 + +* Fri Nov 11 2022 wuzx<wuzx1226@qq.com> - 2.0.5-3 +- Add sw64 architecture + +* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.0.5-2 +- Rebuild for next release + * Sat Nov 27 2021 dongyuzhen <dongyuzhen@huawei.com> - 2.0.5-1 - update to 2.0.5
View file
_service:tar_scm:libXfont2-2.0.5-sw.patch
Added
@@ -0,0 +1,11 @@ +diff -Naur libXfont2-2.0.5.org/src/util/fontxlfd.c libXfont2-2.0.5.sw/src/util/fontxlfd.c +--- libXfont2-2.0.5.org/src/util/fontxlfd.c 2022-02-26 07:10:25.040000000 +0000 ++++ libXfont2-2.0.5.sw/src/util/fontxlfd.c 2022-02-26 07:11:03.520000000 +0000 +@@ -197,6 +197,7 @@ + #if defined(i386) || defined(__i386__) || \ + defined(ia64) || defined(__ia64__) || \ + defined(__alpha__) || defined(__alpha) || \ ++ defined(__sw_64__) || defined(__sw_64) || \ + defined(__hppa__) || \ + defined(__amd64__) || defined(__amd64) || \ + defined(sgi)
View file
_service
Changed
@@ -2,7 +2,7 @@ <service name="tar_scm"> <param name="scm">git</param> <param name="url">git@gitee.com:src-openeuler/libXfont2.git</param> - <param name="revision">2ba3dc6d33228d406b8a1b195b248768e6254fb2</param> + <param name="revision">master</param> <param name="exclude">*</param> <param name="extract">*</param> </service>
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/ChangeLog -> _service:tar_scm:libXfont2-2.0.6.tar.gz/ChangeLog
Changed
@@ -1,3 +1,84 @@ +commit d54aaf2483df6a1f98fadc09004157e657b7f73e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Aug 26 16:22:15 2022 -0700 + + libXfont2 2.0.6 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit efb287223612e9225e5089bed76e348c236b15f0 +Author: Peter Harris <pharris@opentext.com> +Date: Thu Mar 25 15:56:31 2021 -0400 + + Fix buffer overrun in FontFileMakeDir on WIN32 + + When dirName is "" (eg. when called by BuiltinReadDirectory), + FontFileMakeDir would read after the string when WIN32 is defined. + + Fix the overrun issue by checking the location of the found : + before adding two. + + Signed-off-by: Peter Harris <pharris@opentext.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 3c8fdf6e35bed077a5614b4094770e668c96b9e9 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 21 17:37:32 2022 -0700 + + Fix comments to reflect removal of OS/2 support + + Commit 6c29007756301 removed OS/2 support from the code, + but missed updating the comments to match. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 8e3d94c867741319bf75b47266176cf677218641 +Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Mon Jun 20 23:32:52 2022 -0700 + + Correct fsCreateACReq length + + Regressed-in: 6972ea08ee5b2ef1cfbdc2fcaf14f06bbd391561 + Fixes: https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues/13 + Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> + +commit 5cb3b8809b9f141a2cf8a4e00a8387c75dc6bc10 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Jun 20 12:30:41 2022 -0700 + + configure: Use pkg-config to handle zlib dependency if possible + + Preserves fallback for systems like darwin without zlib.pc + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 12bed78985af1da2d1f4954a3491ee497a878b23 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Apr 6 14:37:42 2022 -0700 + + Fix spelling/wording issues + + Found by using: + codespell --builtin clear,rare,usage,informal,code,names + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f83ea5e953c6904578a458e2c2bc2e1d5ae3cb47 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Apr 6 14:14:21 2022 -0700 + + Build xz tarballs instead of bzip2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit a6aee4c9a41a95a0509f654beca27009671731b3 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Wed Apr 6 14:10:16 2022 -0700 + + gitlab CI: add a basic build test + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + commit 3a4f68284c5aeea77789af1fe395cac35efc8562 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sun Aug 1 17:36:43 2021 -0700
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/Makefile.am -> _service:tar_scm:libXfont2-2.0.6.tar.gz/Makefile.am
Changed
@@ -66,7 +66,7 @@ libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined -libXfont2_la_LIBADD = $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) $(LTLIBOBJS) +libXfont2_la_LIBADD = $(ZLIB_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) $(LTLIBOBJS) if XFONT_FONTFILE libXfont2_la_SOURCES += \
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/Makefile.in -> _service:tar_scm:libXfont2-2.0.6.tar.gz/Makefile.in
Changed
@@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. @@ -227,8 +227,8 @@ am__dirstamp = $(am__leading_dot)dirstamp @XFONT_FREETYPE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) libXfont2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(LTLIBOBJS) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(LTLIBOBJS) $(am__DEPENDENCIES_2) am__libXfont2_la_SOURCES_DIST = src/stubs/atom.c \ src/stubs/libxfontstubs.c src/util/fontaccel.c \ src/util/fontnames.c src/util/fontutil.c src/util/fontxlfd.c \ @@ -482,9 +482,9 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best -DIST_TARGETS = dist-bzip2 dist-gzip +DIST_TARGETS = dist-xz dist-gzip # Exists only to be overridden by the user if desired. AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print @@ -527,6 +527,7 @@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FOP = @FOP@ @@ -591,7 +592,10 @@ XORG_SGML_PATH = @XORG_SGML_PATH@ XSL_STYLESHEET = @XSL_STYLESHEET@ X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ Z_LIBS = @Z_LIBS@ +Z_REQUIRES = @Z_REQUIRES@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -683,8 +687,8 @@ $(am__append_9) $(am__append_10) $(am__append_11) \ $(am__append_12) libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined -libXfont2_la_LIBADD = $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) \ - $(LTLIBOBJS) $(am__append_4) +libXfont2_la_LIBADD = $(ZLIB_LIBS) $(Z_LIBS) $(MATH_LIBS) \ + $(XFONT_LIBS) $(LTLIBOBJS) $(am__append_4) # Test utilities EXTRA_DIST = src/builtins/buildfont README.md test/utils/README @@ -1303,6 +1307,7 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -1310,7 +1315,6 @@ dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir)
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/README.md -> _service:tar_scm:libXfont2-2.0.6.tar.gz/README.md
Changed
@@ -52,7 +52,7 @@ - Font services: - * xfs font servers - allows retreiving fonts as a client of an xfs server. + * xfs font servers - allows retrieving fonts as a client of an xfs server. Enabled by default, disable via --disable-fc (font client). If enabled, you can also use the standard libxtrans flags to @@ -74,7 +74,7 @@ https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/lib/libXfont
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/aclocal.m4 -> _service:tar_scm:libXfont2-2.0.6.tar.gz/aclocal.m4
Changed
@@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16.4 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- # Copyright (C) 1996-2021 Free Software Foundation, Inc. @@ -35,7 +35,7 @@ am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if($1, 1.16.4, , +m4_if($1, 1.16.5, , AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl ) @@ -51,7 +51,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION, -AM_AUTOMAKE_VERSION(1.16.4)dnl +AM_AUTOMAKE_VERSION(1.16.5)dnl m4_ifndef(AC_AUTOCONF_VERSION, m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION))) @@ -428,6 +428,10 @@ # release and drop the old call support. AC_DEFUN(AM_INIT_AUTOMAKE, AC_PREREQ(2.65)dnl +m4_ifdef(_$0_ALREADY_INIT, + m4_fatal($0 expanded multiple times +m4_defn(_$0_ALREADY_INIT)), + m4_define(_$0_ALREADY_INIT, m4_expansion_stack))dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow(^AM_A-Z+FLAGS$)dnl @@ -3516,7 +3520,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# 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 @@ -3547,7 +3552,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -3697,6 +3702,7 @@ 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 @@ -3735,8 +3741,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -4288,7 +4294,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -4550,8 +4556,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -4575,17 +4581,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin91*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.012,.*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.012,*|,*powerpc*-darwin5-8*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -4634,12 +4635,12 @@ output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if($1, CXX, if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ,) else @@ -4753,7 +4754,8 @@ # _LT_WITH_SYSROOT # ---------------- AC_DEFUN(_LT_WITH_SYSROOT, -AC_MSG_CHECKING(for sysroot) +m4_require(_LT_DECL_SED)dnl +AC_MSG_CHECKING(for sysroot) AC_ARG_WITH(sysroot, AS_HELP_STRING(--with-sysroot@<:@=DIR@:>@, Search for dependent libraries within DIR (or the compiler's sysroot @@ -4770,7 +4772,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -4800,7 +4802,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -4817,7 +4819,7 @@ echo '#line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -4829,7 +4831,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -4851,7 +4853,7 @@ echo '#line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -4859,7 +4861,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -4867,7 +4869,7 @@ emul="${emul}ltsmip" ;;
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/config.sub -> _service:tar_scm:libXfont2-2.0.6.tar.gz/config.sub
Changed
@@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-07-03' +timestamp='2021-08-14' # 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 @@ -121,9 +121,11 @@ # Split fields of configuration type # shellcheck disable=SC2162 +saved_IFS=$IFS IFS="-" read field1 field2 field3 field4 <<EOF $1 EOF +IFS=$saved_IFS # Separate into logical components for further validation case $1 in @@ -172,6 +174,10 @@ basic_machine=$field1 basic_os=$field2 ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; # Manufacturers dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ | att* | 7300* | 3300* | delta* | motorola* | sun234* \ @@ -931,9 +937,11 @@ *-*) # shellcheck disable=SC2162 + saved_IFS=$IFS IFS="-" read cpu vendor <<EOF $basic_machine EOF + IFS=$saved_IFS ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -1313,9 +1321,11 @@ ;; *-*) # shellcheck disable=SC2162 + saved_IFS=$IFS IFS="-" read kernel os <<EOF $basic_os EOF + IFS=$saved_IFS ;; # Default OS when just kernel was specified nto*) @@ -1697,7 +1707,7 @@ # Now, validate our (potentially fixed-up) OS. case $os in # Sometimes we do "kernel-libc", so those need to count as OSes. - musl* | newlib* | uclibc*) + musl* | newlib* | relibc* | uclibc*) ;; # Likewise for "kernel-abi" eabi* | gnueabi*) @@ -1738,7 +1748,7 @@ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v4-9* | sco5v6*) @@ -1755,11 +1765,12 @@ # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. case $kernel-$os in - linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -uclibc* ) + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/configure -> _service:tar_scm:libXfont2-2.0.6.tar.gz/configure
Changed
@@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libXfont2 2.0.5. +# Generated by GNU Autoconf 2.71 for libXfont2 2.0.6. # -# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXfont/issues>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues>. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -276,7 +276,7 @@ printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and -$0: https://gitlab.freedesktop.org/xorg/lib/libXfont/issues +$0: https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -682,9 +682,9 @@ # Identity of this package. PACKAGE_NAME='libXfont2' PACKAGE_TARNAME='libXfont2' -PACKAGE_VERSION='2.0.5' -PACKAGE_STRING='libXfont2 2.0.5' -PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libXfont/issues' +PACKAGE_VERSION='2.0.6' +PACKAGE_STRING='libXfont2 2.0.6' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -747,6 +747,9 @@ Z_LIBS X_BZIP2_FONT_COMPRESSION_FALSE X_BZIP2_FONT_COMPRESSION_TRUE +Z_REQUIRES +ZLIB_LIBS +ZLIB_CFLAGS X_GZIP_FONT_COMPRESSION FREETYPE_REQUIRES ft_config @@ -804,6 +807,7 @@ AR DLLTOOL OBJDUMP +FILECMD LN_S NM ac_ct_DUMPBIN @@ -955,6 +959,8 @@ FOP FREETYPE_CFLAGS FREETYPE_LIBS +ZLIB_CFLAGS +ZLIB_LIBS XFONT_CFLAGS XFONT_LIBS' @@ -1505,7 +1511,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 libXfont2 2.0.5 to adapt to many kinds of systems. +\`configure' configures libXfont2 2.0.6 to adapt to many kinds of systems. Usage: $0 OPTION... VAR=VALUE... @@ -1576,7 +1582,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXfont2 2.0.5:";; + short | recursive ) echo "Configuration of libXfont2 2.0.6:";; esac cat <<\_ACEOF @@ -1656,6 +1662,8 @@ C compiler flags for FREETYPE, overriding pkg-config FREETYPE_LIBS linker flags for FREETYPE, overriding pkg-config + ZLIB_CFLAGS C compiler flags for ZLIB, overriding pkg-config + ZLIB_LIBS linker flags for ZLIB, overriding pkg-config XFONT_CFLAGS C compiler flags for XFONT, overriding pkg-config XFONT_LIBS linker flags for XFONT, overriding pkg-config @@ -1663,7 +1671,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXfont/issues>. +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues>. _ACEOF ac_status=$? fi @@ -1727,7 +1735,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXfont2 configure 2.0.5 +libXfont2 configure 2.0.6 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2114,7 +2122,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXfont2 $as_me 2.0.5, which was +It was created by libXfont2 $as_me 2.0.6, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3390,7 +3398,7 @@ # Define the identity of the package. PACKAGE='libXfont2' - VERSION='2.0.5' + VERSION='2.0.6' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -4927,8 +4935,8 @@ -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7' +macro_revision='2.4.7' @@ -5556,13 +5564,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -5700,7 +5708,7 @@ fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -5804,7 +5812,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5847,7 +5855,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.* //'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.* //'` else lt_cv_sys_max_cmd_len=32768 fi @@ -6053,6 +6061,114 @@ if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;;
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/configure.ac -> _service:tar_scm:libXfont2-2.0.6.tar.gz/configure.ac
Changed
@@ -21,13 +21,13 @@ # Initialize Autoconf AC_PREREQ(2.60) -AC_INIT(libXfont2, 2.0.5, - https://gitlab.freedesktop.org/xorg/lib/libXfont/issues, libXfont2) +AC_INIT(libXfont2, 2.0.6, + https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues, libXfont2) AC_CONFIG_SRCDIR(Makefile.am) AC_CONFIG_HEADERS(config.h) # Initialize Automake -AM_INIT_AUTOMAKE(foreign dist-bzip2 subdir-objects) +AM_INIT_AUTOMAKE(foreign dist-xz subdir-objects) # Set common system defines for POSIX extensions, such as _GNU_SOURCE # Must be called before any macros that run the compiler (like @@ -128,7 +128,12 @@ AC_DEFINE(X_GZIP_FONT_COMPRESSION,1,Support gzip for bitmap fonts) X_GZIP_FONT_COMPRESSION=1 AC_SUBST(X_GZIP_FONT_COMPRESSION) -AC_CHECK_LIB(z, gzopen, Z_LIBS=-lz, AC_MSG_ERROR(*** zlib is required)) +PKG_CHECK_MODULES(ZLIB, zlib, Z_REQUIRES=zlib, Z_REQUIRES="") +if test "x$Z_REQUIRES" = "x"; then + AC_CHECK_LIB(z, gzopen, Z_LIBS=-lz, + AC_MSG_ERROR(*** zlib is required)) +fi +AC_SUBST(Z_REQUIRES) AC_ARG_WITH(bzip2, AS_HELP_STRING(--with-bzip2,
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/doc/Makefile.in -> _service:tar_scm:libXfont2-2.0.6.tar.gz/doc/Makefile.in
Changed
@@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. @@ -178,6 +178,7 @@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FOP = @FOP@ @@ -242,7 +243,10 @@ XORG_SGML_PATH = @XORG_SGML_PATH@ XSL_STYLESHEET = @XSL_STYLESHEET@ X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@ +ZLIB_CFLAGS = @ZLIB_CFLAGS@ +ZLIB_LIBS = @ZLIB_LIBS@ Z_LIBS = @Z_LIBS@ +Z_REQUIRES = @Z_REQUIRES@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/doc/fontlib.xml -> _service:tar_scm:libXfont2-2.0.6.tar.gz/doc/fontlib.xml
Changed
@@ -176,7 +176,7 @@ bitmap-font specific interfaces which those applications use, instead of the more general interfaces used by the X and font servers, which are unaware of the source of the font data. - These routines will be refered to as the bitmap font access + These routines will be referred to as the bitmap font access methods. </para>
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/ltmain.sh -> _service:tar_scm:libXfont2-2.0.6.tar.gz/ltmain.sh
Changed
@@ -1,12 +1,12 @@ -#! /bin/sh +#! /usr/bin/env sh ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2014-01-03.01 +## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.4.6 +# libtool (GNU libtool) 2.4.7 # Provide generalized library-building support services. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 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. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 -package_revision=2.4.6 +VERSION=2.4.7 +package_revision=2.4.7 ## ------ ## @@ -64,34 +64,25 @@ # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-01-20.17; # UTC +scriptversion=2019-02-19.15; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# Copyright (C) 2004-2015 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. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNES 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/>. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2004-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# <https://opensource.org/license/MIT>, and GPL version 2 or later +# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# Please report bugs or propose patches to gary@gnu.org. +# Please report bugs or propose patches to: +# <https://github.com/gnulib-modules/bootstrap/issues> ## ------ ## @@ -139,9 +130,12 @@ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# These NLS vars are set unconditionally (bootstrap issue #24). Unset those +# in case the environment reset is needed later and the $save_* variant is not +# defined (see the code above). +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL # Make sure IFS has a sensible default sp=' ' @@ -159,6 +153,26 @@ fi +# func_unset VAR +# -------------- +# Portably unset VAR. +# In some shells, an 'unset VAR' statement leaves a non-zero return +# status if VAR is already unset, which might be problematic if the +# statement is used at the end of a function (thus poisoning its return +# value) or when 'set -e' is active (causing even a spurious abort of +# the script in this case). +func_unset () +{ + { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } +} + + +# Make sure CDPATH doesn't cause `cd` commands to output the target dir. +func_unset CDPATH + +# Make sure ${,E,F}GREP behave sanely. +func_unset GREP_OPTIONS + ## ------------------------- ## ## Locate command utilities. ## @@ -259,7 +273,7 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" rm -f conftest.sed SED=$func_path_progs_result } @@ -295,7 +309,7 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" GREP=$func_path_progs_result } @@ -360,6 +374,35 @@ s/\\(^$_G_bs\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g s/\n//g" +# require_check_ifs_backslash +# --------------------------- +# Check if we can use backslash as IFS='\' separator, and set +# $check_ifs_backshlash_broken to ':' or 'false'. +require_check_ifs_backslash=func_require_check_ifs_backslash +func_require_check_ifs_backslash () +{ + _G_save_IFS=$IFS + IFS='\' + _G_check_ifs_backshlash='a\\b' + for _G_i in $_G_check_ifs_backshlash + do + case $_G_i in + a) + check_ifs_backshlash_broken=false + ;; + '') + break + ;; + *) + check_ifs_backshlash_broken=: + break + ;; + esac + done + IFS=$_G_save_IFS + require_check_ifs_backslash=: +} + ## ----------------- ## ## Global variables. ## @@ -580,16 +623,16 @@ { $debug_cmd - func_quote_for_eval "$2" - eval "$1+=\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1+=\\ \$func_quote_arg_result" }' else func_append_quoted () { $debug_cmd - func_quote_for_eval "$2" - eval "$1=\$$1\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1=\$$1\\ \$func_quote_arg_result" } fi @@ -1091,85 +1134,203 @@ } -# func_quote_for_eval ARG...
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/FreeType/ftfuncs.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/FreeType/ftfuncs.c
Changed
@@ -94,7 +94,7 @@ /* bits */ NULL }; #endif -/* The propery names for all the XLFD properties. */ +/* The property names for all the XLFD properties. */ static const char *xlfd_props = { "FOUNDRY", @@ -1562,7 +1562,7 @@ /* Add the font properties, including the Font name, the XLFD properties, some strings from the font, and various typographical data. We only provide data readily available in the tables in the - font for now, altough FIGURE_WIDTH would be a good idea as it is + font for now, although FIGURE_WIDTH would be a good idea as it is used by Xaw. */ static int @@ -2413,7 +2413,7 @@ goto quit; } } - /* doube striking */ + /* double striking */ if (SPropRecValList_search_record(&listPropRecVal, &contRecValue, "DoubleStrike")) {
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/FreeType/xttcap.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/FreeType/xttcap.c
Changed
@@ -393,7 +393,7 @@ /* End of Line */ break; if (isspace(c)) { - /* convine multiple spaces */ + /* combine multiple spaces */ if (!flHead) /* except space at the head of line */ flSpace = True;
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/bitmap/bdfread.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/bitmap/bdfread.c
Changed
@@ -677,7 +677,7 @@ case 2: /* - * Possibilites include: valid quoted string with no white space + * Possibilities include: valid quoted string with no white space * valid integer value invalid value */ if (secondbuf0 == '"') { @@ -698,7 +698,7 @@ case 3: /* - * Possibilites include: valid quoted string with some white space + * Possibilities include: valid quoted string with some white space * invalid value (reject even if second string is integer) */ if (secondbuf0 == '"') {
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/bitmap/pcfread.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/bitmap/pcfread.c
Changed
@@ -197,7 +197,7 @@ } /* - * Position the file to the begining of the specified table + * Position the file to the beginning of the specified table * in the font file */ static Bool
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/bitmap/snfstr.h -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/bitmap/snfstr.h
Changed
@@ -67,7 +67,7 @@ * 1) The XFONTINFO structure * hand-padded to a two-short boundary. * maxbounds.byteoffset is the total number of bytes in the - * glpyh array + * glyph array * maxbounds.bitOffset is thetotal width of the unpadded font * * 2) The XCHARINFO array
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/fc/fserve.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/fc/fserve.c
Changed
@@ -179,7 +179,7 @@ * the font server, and a block record to be stored in the fpe's list * of outstanding requests. the FS block handler also sticks the * proper set of fd's into the select mask. when data is ready to be - * read in, the FS wakup handler will be hit. this will read the + * read in, the FS wakeup handler will be hit. this will read the * data off the wire into the proper block record, and then signal the * client that caused the block so that it can restart. it will then * call the access function again, which will realize that the data has @@ -536,7 +536,7 @@ /* * When a request is aborted due to a font server failure, - * signal any depending clients to restart their dependant + * signal any depending clients to restart their dependent * requests */ static void @@ -2857,7 +2857,7 @@ authorizations = padding; authlen = 4; } - crac.length = (sizeof (fsCreateACReq) + authlen) >> 2; + crac.length = (sizeof (fsCreateACReq) + authlen + 3) >> 2; crac.acid = cur->acid; _fs_add_req_log(conn, FS_CreateAC); _fs_write(conn, (char *) &crac, sizeof (fsCreateACReq));
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/fontfile/decompress.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/fontfile/decompress.c
Changed
@@ -16,7 +16,7 @@ * from this software without specific prior written permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ /*
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/fontfile/dirfile.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/fontfile/dirfile.c
Changed
@@ -83,7 +83,7 @@ #if !defined(WIN32) if ((ptr = strchr(directory, ':'))) { #else - /* OS/2 and WIN32 path might start with a drive letter, don't clip this */ + /* WIN32 path might start with a drive letter, don't clip this */ if ((ptr = strchr(directory+2, ':'))) { #endif strncpy(dir_path, directory, ptr - directory); @@ -249,7 +249,7 @@ * * alias font-name * - * To imbed white-space in an alias name, enclose it like "font name" + * To embed white-space in an alias name, enclose it like "font name" * in double quotes. \ escapes and character, so * "font name \"With Double Quotes\" \\ and \\ back-slashes" * works just fine.
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/fontfile/fontdir.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/fontfile/fontdir.c
Changed
@@ -112,11 +112,12 @@ const char *attrib; int attriblen; -#if !defined(WIN32) attrib = strchr(dirName, ':'); -#else - /* OS/2 uses the colon in the drive letter descriptor, skip this */ - attrib = strchr(dirName+2, ':'); +#if defined(WIN32) + if (attrib && attrib - dirName == 1) { + /* WIN32 uses the colon in the drive letter descriptor, skip this */ + attrib = strchr(dirName + 2, ':'); + } #endif if (attrib) { dirlen = attrib - dirName;
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/fontfile/fontfile.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/fontfile/fontfile.c
Changed
@@ -75,8 +75,8 @@ { #ifndef NCD #if defined(WIN32) - /* OS/2 uses D:/... as a path name for fonts, so accept this as a valid - * path if it starts with a letter and a colon. Same applies for WIN32 + /* WIN32 uses D:/... as a path name for fonts, so accept this as a valid + * path if it starts with a letter and a colon. */ if (isalpha(*name) && name1==':') return TRUE;
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/src/util/utilbitmap.c -> _service:tar_scm:libXfont2-2.0.6.tar.gz/src/util/utilbitmap.c
Changed
@@ -34,7 +34,7 @@ #include "libxfontint.h" #include <X11/fonts/fontmisc.h> -/* Utility functions for reformating font bitmaps */ +/* Utility functions for reformatting font bitmaps */ static const unsigned char _reverse_byte0x100 = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
View file
_service:tar_scm:libXfont2-2.0.5.tar.bz2/xfont2.pc.in -> _service:tar_scm:libXfont2-2.0.6.tar.gz/xfont2.pc.in
Changed
@@ -7,7 +7,7 @@ Description: X font Library version 2 Version: @VERSION@ Requires: xproto fontsproto -Requires.private: fontenc @FREETYPE_REQUIRES@ +Requires.private: fontenc @FREETYPE_REQUIRES@ @Z_REQUIRES@ Cflags: -I${includedir} Libs: -L${libdir} -lXfont2 Libs.private: @Z_LIBS@ -lm
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