jcs.org / openbsd-xenocara
mirror of OpenBSD xenocara tree github.com/openbsd/xenocara
openbsd
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Update to libXft 2.3.3

matthieu 9563e10e c6568d85

+392 -158
+76
lib/libXft/ChangeLog
··· 1 + commit a266847d3c17dcdfcac719a1aa970ad54f4b545a 2 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 + Date: Sat Mar 16 11:03:38 2019 -0700 4 + 5 + libXft 2.3.3 6 + 7 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8 + 9 + commit fab5adf8fa3073862267e14aece1adf9eed0541c 10 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 11 + Date: Sat Mar 16 11:03:17 2019 -0700 12 + 13 + Add description of libXft to README.md 14 + 15 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 16 + 17 + commit b397ffb23f02389b6c6168e7826605789907d740 18 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 19 + Date: Fri Dec 7 19:42:33 2018 -0800 20 + 21 + Update configure.ac bug URL for gitlab migration 22 + 23 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 24 + 25 + commit bdfb2b0e0fbf02ae69fe6cb2fbe352c4231e5c54 26 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 27 + Date: Mon Nov 19 22:20:38 2018 -0800 28 + 29 + Update README for gitlab migration 30 + 31 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 32 + 33 + commit c418dc7594f98359ae10815f62ee3efc0a511cf8 34 + Author: Mihail Konev <k.mvc@ya.ru> 35 + Date: Thu Jan 26 13:52:49 2017 +1000 36 + 37 + autogen: add default patch prefix 38 + 39 + Signed-off-by: Mihail Konev <k.mvc@ya.ru> 40 + 41 + commit 6a12debafe35963d205e0dc78eb742ad898312b7 42 + Author: Emil Velikov <emil.l.velikov@gmail.com> 43 + Date: Mon Mar 9 12:00:52 2015 +0000 44 + 45 + autogen.sh: use quoted string variables 46 + 47 + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent 48 + fall-outs, when they contain space. 49 + 50 + Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> 51 + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 52 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 53 + 54 + commit 0d3402d1138afe9854452eb494acc649faa0dc9e 55 + Author: Peter Hutterer <peter.hutterer@who-t.net> 56 + Date: Tue Jan 24 10:32:07 2017 +1000 57 + 58 + autogen.sh: use exec instead of waiting for configure to finish 59 + 60 + Syncs the invocation of configure with the one from the server. 61 + 62 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 63 + Reviewed-by: Emil Velikov <emil.velikov@collabora.com> 64 + 65 + commit e8a83226bc10afb587f6f34daac44d2ef809c85e 66 + Author: Keith Packard <keithp@keithp.com> 67 + Date: Sun Oct 19 18:00:26 2014 -0500 68 + 69 + XftDrawSrcPicture: Use XRenderCreateSolidFill when available 70 + 71 + Instead of creating 1x1 pictures, use the solid pictures added in 72 + Render version 0.10 73 + 74 + Signed-off-by: Keith Packard <keithp@keithp.com> 75 + Reviewed-by: Adam Jackson <ajax@redhat.com> 76 + 1 77 commit 214f9b5306d833e2787c75fe41dfdc9228fcb738 2 78 Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 79 Date: Thu Jun 5 23:04:54 2014 -0700
+2
lib/libXft/Makefile.am
··· 35 35 $(CHANGELOG_CMD) 36 36 37 37 dist-hook: ChangeLog INSTALL 38 + 39 + EXTRA_DIST = README.md
+2 -1
lib/libXft/Makefile.in
··· 72 72 build_triplet = @build@ 73 73 host_triplet = @host@ 74 74 subdir = . 75 - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 75 + DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ 76 76 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 77 77 $(srcdir)/xft.pc.in $(top_srcdir)/configure \ 78 78 $(top_srcdir)/include/X11/Xft/Xft.h.in AUTHORS COPYING \ ··· 342 342 pkgconfigdir = $(libdir)/pkgconfig 343 343 pkgconfig_DATA = xft.pc 344 344 MAINTAINERCLEANFILES = ChangeLog INSTALL 345 + EXTRA_DIST = README.md 345 346 all: config.h 346 347 $(MAKE) $(AM_MAKEFLAGS) all-recursive 347 348
+7 -2
lib/libXft/NEWS
··· 1 1 Xft 2 2 X FreeType library 3 - Version 2.3.0 4 - 2012-03-07 3 + Version 2.3.3 4 + 2019-03-16 5 5 6 6 Xft version 2.1 was the first stand alone release of Xft, a library that 7 7 connects X applications with the FreeType font rasterization library. Xft 8 8 uses fontconfig to locate fonts so it has no configuration files. 9 + 10 + Version 2.3.3 11 + 12 + Use XRenderCreateSolidFill when available (Render version 0.10 or later) 13 + in XftDrawSrcPicture. 9 14 10 15 Version 2.3.2 11 16
+190 -90
lib/libXft/aclocal.m4
··· 5383 5383 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no 5384 5384 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes 5385 5385 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 5386 - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 5386 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-soname ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 5387 5387 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' 5388 5388 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' 5389 5389 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ··· 8606 8606 m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) 8607 8607 m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) 8608 8608 8609 - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 8610 - # serial 1 (pkg-config-0.24) 8611 - # 8612 - # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 8613 - # 8614 - # This program is free software; you can redistribute it and/or modify 8615 - # it under the terms of the GNU General Public License as published by 8616 - # the Free Software Foundation; either version 2 of the License, or 8617 - # (at your option) any later version. 8618 - # 8619 - # This program is distributed in the hope that it will be useful, but 8620 - # WITHOUT ANY WARRANTY; without even the implied warranty of 8621 - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 8622 - # General Public License for more details. 8623 - # 8624 - # You should have received a copy of the GNU General Public License 8625 - # along with this program; if not, write to the Free Software 8626 - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 8627 - # 8628 - # As a special exception to the GNU General Public License, if you 8629 - # distribute this file as part of a program that contains a 8630 - # configuration script generated by Autoconf, you may include it under 8631 - # the same distribution terms that you use for the rest of that program. 8609 + dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 8610 + dnl serial 11 (pkg-config-0.29.1) 8611 + dnl 8612 + dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 8613 + dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> 8614 + dnl 8615 + dnl This program is free software; you can redistribute it and/or modify 8616 + dnl it under the terms of the GNU General Public License as published by 8617 + dnl the Free Software Foundation; either version 2 of the License, or 8618 + dnl (at your option) any later version. 8619 + dnl 8620 + dnl This program is distributed in the hope that it will be useful, but 8621 + dnl WITHOUT ANY WARRANTY; without even the implied warranty of 8622 + dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 8623 + dnl General Public License for more details. 8624 + dnl 8625 + dnl You should have received a copy of the GNU General Public License 8626 + dnl along with this program; if not, write to the Free Software 8627 + dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 8628 + dnl 02111-1307, USA. 8629 + dnl 8630 + dnl As a special exception to the GNU General Public License, if you 8631 + dnl distribute this file as part of a program that contains a 8632 + dnl configuration script generated by Autoconf, you may include it under 8633 + dnl the same distribution terms that you use for the rest of that 8634 + dnl program. 8635 + 8636 + dnl PKG_PREREQ(MIN-VERSION) 8637 + dnl ----------------------- 8638 + dnl Since: 0.29 8639 + dnl 8640 + dnl Verify that the version of the pkg-config macros are at least 8641 + dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's 8642 + dnl installed version of pkg-config, this checks the developer's version 8643 + dnl of pkg.m4 when generating configure. 8644 + dnl 8645 + dnl To ensure that this macro is defined, also add: 8646 + dnl m4_ifndef([PKG_PREREQ], 8647 + dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) 8648 + dnl 8649 + dnl See the "Since" comment for each macro you use to see what version 8650 + dnl of the macros you require. 8651 + m4_defun([PKG_PREREQ], 8652 + [m4_define([PKG_MACROS_VERSION], [0.29.1]) 8653 + m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, 8654 + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) 8655 + ])dnl PKG_PREREQ 8632 8656 8633 - # PKG_PROG_PKG_CONFIG([MIN-VERSION]) 8634 - # ---------------------------------- 8657 + dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) 8658 + dnl ---------------------------------- 8659 + dnl Since: 0.16 8660 + dnl 8661 + dnl Search for the pkg-config tool and set the PKG_CONFIG variable to 8662 + dnl first found in the path. Checks that the version of pkg-config found 8663 + dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is 8664 + dnl used since that's the first version where most current features of 8665 + dnl pkg-config existed. 8635 8666 AC_DEFUN([PKG_PROG_PKG_CONFIG], 8636 8667 [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 8637 8668 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) ··· 8653 8684 PKG_CONFIG="" 8654 8685 fi 8655 8686 fi[]dnl 8656 - ])# PKG_PROG_PKG_CONFIG 8687 + ])dnl PKG_PROG_PKG_CONFIG 8657 8688 8658 - # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 8659 - # 8660 - # Check to see whether a particular set of modules exists. Similar 8661 - # to PKG_CHECK_MODULES(), but does not set variables or print errors. 8662 - # 8663 - # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 8664 - # only at the first occurence in configure.ac, so if the first place 8665 - # it's called might be skipped (such as if it is within an "if", you 8666 - # have to call PKG_CHECK_EXISTS manually 8667 - # -------------------------------------------------------------- 8689 + dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 8690 + dnl ------------------------------------------------------------------- 8691 + dnl Since: 0.18 8692 + dnl 8693 + dnl Check to see whether a particular set of modules exists. Similar to 8694 + dnl PKG_CHECK_MODULES(), but does not set variables or print errors. 8695 + dnl 8696 + dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 8697 + dnl only at the first occurence in configure.ac, so if the first place 8698 + dnl it's called might be skipped (such as if it is within an "if", you 8699 + dnl have to call PKG_CHECK_EXISTS manually 8668 8700 AC_DEFUN([PKG_CHECK_EXISTS], 8669 8701 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 8670 8702 if test -n "$PKG_CONFIG" && \ ··· 8674 8706 $3])dnl 8675 8707 fi]) 8676 8708 8677 - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 8678 - # --------------------------------------------- 8709 + dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 8710 + dnl --------------------------------------------- 8711 + dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting 8712 + dnl pkg_failed based on the result. 8679 8713 m4_define([_PKG_CONFIG], 8680 8714 [if test -n "$$1"; then 8681 8715 pkg_cv_[]$1="$$1" ··· 8687 8721 else 8688 8722 pkg_failed=untried 8689 8723 fi[]dnl 8690 - ])# _PKG_CONFIG 8724 + ])dnl _PKG_CONFIG 8691 8725 8692 - # _PKG_SHORT_ERRORS_SUPPORTED 8693 - # ----------------------------- 8726 + dnl _PKG_SHORT_ERRORS_SUPPORTED 8727 + dnl --------------------------- 8728 + dnl Internal check to see if pkg-config supports short errors. 8694 8729 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], 8695 8730 [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 8696 8731 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ··· 8698 8733 else 8699 8734 _pkg_short_errors_supported=no 8700 8735 fi[]dnl 8701 - ])# _PKG_SHORT_ERRORS_SUPPORTED 8736 + ])dnl _PKG_SHORT_ERRORS_SUPPORTED 8702 8737 8703 8738 8704 - # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 8705 - # [ACTION-IF-NOT-FOUND]) 8706 - # 8707 - # 8708 - # Note that if there is a possibility the first call to 8709 - # PKG_CHECK_MODULES might not happen, you should be sure to include an 8710 - # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 8711 - # 8712 - # 8713 - # -------------------------------------------------------------- 8739 + dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 8740 + dnl [ACTION-IF-NOT-FOUND]) 8741 + dnl -------------------------------------------------------------- 8742 + dnl Since: 0.4.0 8743 + dnl 8744 + dnl Note that if there is a possibility the first call to 8745 + dnl PKG_CHECK_MODULES might not happen, you should be sure to include an 8746 + dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac 8714 8747 AC_DEFUN([PKG_CHECK_MODULES], 8715 8748 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 8716 8749 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ··· 8764 8797 AC_MSG_RESULT([yes]) 8765 8798 $3 8766 8799 fi[]dnl 8767 - ])# PKG_CHECK_MODULES 8800 + ])dnl PKG_CHECK_MODULES 8768 8801 8769 8802 8770 - # PKG_INSTALLDIR(DIRECTORY) 8771 - # ------------------------- 8772 - # Substitutes the variable pkgconfigdir as the location where a module 8773 - # should install pkg-config .pc files. By default the directory is 8774 - # $libdir/pkgconfig, but the default can be changed by passing 8775 - # DIRECTORY. The user can override through the --with-pkgconfigdir 8776 - # parameter. 8803 + dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], 8804 + dnl [ACTION-IF-NOT-FOUND]) 8805 + dnl --------------------------------------------------------------------- 8806 + dnl Since: 0.29 8807 + dnl 8808 + dnl Checks for existence of MODULES and gathers its build flags with 8809 + dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags 8810 + dnl and VARIABLE-PREFIX_LIBS from --libs. 8811 + dnl 8812 + dnl Note that if there is a possibility the first call to 8813 + dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to 8814 + dnl include an explicit call to PKG_PROG_PKG_CONFIG in your 8815 + dnl configure.ac. 8816 + AC_DEFUN([PKG_CHECK_MODULES_STATIC], 8817 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 8818 + _save_PKG_CONFIG=$PKG_CONFIG 8819 + PKG_CONFIG="$PKG_CONFIG --static" 8820 + PKG_CHECK_MODULES($@) 8821 + PKG_CONFIG=$_save_PKG_CONFIG[]dnl 8822 + ])dnl PKG_CHECK_MODULES_STATIC 8823 + 8824 + 8825 + dnl PKG_INSTALLDIR([DIRECTORY]) 8826 + dnl ------------------------- 8827 + dnl Since: 0.27 8828 + dnl 8829 + dnl Substitutes the variable pkgconfigdir as the location where a module 8830 + dnl should install pkg-config .pc files. By default the directory is 8831 + dnl $libdir/pkgconfig, but the default can be changed by passing 8832 + dnl DIRECTORY. The user can override through the --with-pkgconfigdir 8833 + dnl parameter. 8777 8834 AC_DEFUN([PKG_INSTALLDIR], 8778 8835 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) 8779 8836 m4_pushdef([pkg_description], ··· 8784 8841 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) 8785 8842 m4_popdef([pkg_default]) 8786 8843 m4_popdef([pkg_description]) 8787 - ]) dnl PKG_INSTALLDIR 8844 + ])dnl PKG_INSTALLDIR 8788 8845 8789 8846 8790 - # PKG_NOARCH_INSTALLDIR(DIRECTORY) 8791 - # ------------------------- 8792 - # Substitutes the variable noarch_pkgconfigdir as the location where a 8793 - # module should install arch-independent pkg-config .pc files. By 8794 - # default the directory is $datadir/pkgconfig, but the default can be 8795 - # changed by passing DIRECTORY. The user can override through the 8796 - # --with-noarch-pkgconfigdir parameter. 8847 + dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) 8848 + dnl -------------------------------- 8849 + dnl Since: 0.27 8850 + dnl 8851 + dnl Substitutes the variable noarch_pkgconfigdir as the location where a 8852 + dnl module should install arch-independent pkg-config .pc files. By 8853 + dnl default the directory is $datadir/pkgconfig, but the default can be 8854 + dnl changed by passing DIRECTORY. The user can override through the 8855 + dnl --with-noarch-pkgconfigdir parameter. 8797 8856 AC_DEFUN([PKG_NOARCH_INSTALLDIR], 8798 8857 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) 8799 8858 m4_pushdef([pkg_description], ··· 8804 8863 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) 8805 8864 m4_popdef([pkg_default]) 8806 8865 m4_popdef([pkg_description]) 8807 - ]) dnl PKG_NOARCH_INSTALLDIR 8866 + ])dnl PKG_NOARCH_INSTALLDIR 8867 + 8868 + 8869 + dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, 8870 + dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) 8871 + dnl ------------------------------------------- 8872 + dnl Since: 0.28 8873 + dnl 8874 + dnl Retrieves the value of the pkg-config variable for the given module. 8875 + AC_DEFUN([PKG_CHECK_VAR], 8876 + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 8877 + AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl 8878 + 8879 + _PKG_CONFIG([$1], [variable="][$3]["], [$2]) 8880 + AS_VAR_COPY([$1], [pkg_cv_][$1]) 8881 + 8882 + AS_VAR_IF([$1], [""], [$5], [$4])dnl 8883 + ])dnl PKG_CHECK_VAR 8808 8884 8809 8885 # Copyright (C) 2002-2012 Free Software Foundation, Inc. 8810 8886 # ··· 9829 9905 9830 9906 dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. 9831 9907 dnl 9832 - dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. 9908 + dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 9833 9909 dnl 9834 9910 dnl Permission is hereby granted, free of charge, to any person obtaining a 9835 9911 dnl copy of this software and associated documentation files (the "Software"), ··· 9866 9942 # See the "minimum version" comment for each macro you use to see what 9867 9943 # version you require. 9868 9944 m4_defun([XORG_MACROS_VERSION],[ 9869 - m4_define([vers_have], [1.19.0]) 9945 + m4_define([vers_have], [1.19.2]) 9870 9946 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) 9871 9947 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) 9872 9948 m4_if(m4_cmp(maj_have, maj_needed), 0,, ··· 9943 10019 AC_DEFUN([XORG_MANPAGE_SECTIONS],[ 9944 10020 AC_REQUIRE([AC_CANONICAL_HOST]) 9945 10021 AC_REQUIRE([AC_PROG_SED]) 10022 + 10023 + case $host_os in 10024 + solaris*) 10025 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 10026 + # check for a man page file found in later versions that use 10027 + # traditional section numbers instead 10028 + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], 10029 + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) 10030 + ;; 10031 + *) SYSV_MAN_SECTIONS=false ;; 10032 + esac 9946 10033 9947 10034 if test x$APP_MAN_SUFFIX = x ; then 9948 10035 APP_MAN_SUFFIX=1 ··· 9959 10046 fi 9960 10047 9961 10048 if test x$FILE_MAN_SUFFIX = x ; then 9962 - case $host_os in 9963 - solaris*) FILE_MAN_SUFFIX=4 ;; 9964 - *) FILE_MAN_SUFFIX=5 ;; 10049 + case $SYSV_MAN_SECTIONS in 10050 + true) FILE_MAN_SUFFIX=4 ;; 10051 + *) FILE_MAN_SUFFIX=5 ;; 9965 10052 esac 9966 10053 fi 9967 10054 if test x$FILE_MAN_DIR = x ; then ··· 9969 10056 fi 9970 10057 9971 10058 if test x$MISC_MAN_SUFFIX = x ; then 9972 - case $host_os in 9973 - solaris*) MISC_MAN_SUFFIX=5 ;; 9974 - *) MISC_MAN_SUFFIX=7 ;; 10059 + case $SYSV_MAN_SECTIONS in 10060 + true) MISC_MAN_SUFFIX=5 ;; 10061 + *) MISC_MAN_SUFFIX=7 ;; 9975 10062 esac 9976 10063 fi 9977 10064 if test x$MISC_MAN_DIR = x ; then ··· 9979 10066 fi 9980 10067 9981 10068 if test x$DRIVER_MAN_SUFFIX = x ; then 9982 - case $host_os in 9983 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 9984 - *) DRIVER_MAN_SUFFIX=4 ;; 10069 + case $SYSV_MAN_SECTIONS in 10070 + true) DRIVER_MAN_SUFFIX=7 ;; 10071 + *) DRIVER_MAN_SUFFIX=4 ;; 9985 10072 esac 9986 10073 fi 9987 10074 if test x$DRIVER_MAN_DIR = x ; then ··· 9989 10076 fi 9990 10077 9991 10078 if test x$ADMIN_MAN_SUFFIX = x ; then 9992 - case $host_os in 9993 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 9994 - *) ADMIN_MAN_SUFFIX=8 ;; 10079 + case $SYSV_MAN_SECTIONS in 10080 + true) ADMIN_MAN_SUFFIX=1m ;; 10081 + *) ADMIN_MAN_SUFFIX=8 ;; 9995 10082 esac 9996 10083 fi 9997 10084 if test x$ADMIN_MAN_DIR = x ; then ··· 10252 10339 fi]) 10253 10340 10254 10341 # Test for the ability of xmlto to generate a text target 10342 + # 10343 + # NOTE: xmlto 0.0.27 or higher return a non-zero return code in the 10344 + # following test for empty XML docbook files. 10345 + # For compatibility reasons use the following empty XML docbook file and if 10346 + # it fails try it again with a non-empty XML file. 10255 10347 have_xmlto_text=no 10256 10348 cat > conftest.xml << "EOF" 10257 10349 EOF 10258 10350 AS_IF([test "$have_xmlto" = yes], 10259 10351 [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 10260 10352 [have_xmlto_text=yes], 10261 - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) 10353 + [# Try it again with a non-empty XML file. 10354 + cat > conftest.xml << "EOF" 10355 + <x></x> 10356 + EOF 10357 + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 10358 + [have_xmlto_text=yes], 10359 + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) 10262 10360 rm -f conftest.xml 10263 10361 AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) 10264 10362 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ··· 11654 11752 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 11655 11753 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 11656 11754 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 11657 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 11658 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 11755 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 11756 + touch \$(top_srcdir)/INSTALL; \ 11757 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 11659 11758 AC_SUBST([INSTALL_CMD]) 11660 11759 ]) # XORG_INSTALL 11661 11760 dnl Copyright 2005 Red Hat, Inc ··· 11716 11815 # 11717 11816 # 11718 11817 AC_DEFUN([XORG_CHANGELOG], [ 11719 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 11818 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 11720 11819 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 11721 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 11722 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 11820 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 11821 + touch \$(top_srcdir)/ChangeLog; \ 11822 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 11723 11823 AC_SUBST([CHANGELOG_CMD]) 11724 11824 ]) # XORG_CHANGELOG 11725 11825
+1 -1
lib/libXft/compile
··· 3 3 4 4 scriptversion=2012-10-14.11; # UTC 5 5 6 - # Copyright (C) 1999-2013 Free Software Foundation, Inc. 6 + # Copyright (C) 1999-2014 Free Software Foundation, Inc. 7 7 # Written by Tom Tromey <tromey@cygnus.com>. 8 8 # 9 9 # This program is free software; you can redistribute it and/or modify
+65 -33
lib/libXft/configure
··· 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 - # Generated by GNU Autoconf 2.69 for libXft 2.3.2. 3 + # Generated by GNU Autoconf 2.69 for libXft 2.3.3. 4 4 # 5 - # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 5 + # Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXft/issues>. 6 6 # 7 7 # 8 8 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. ··· 275 275 $as_echo "$0: be upgraded to zsh 4.3.4 or later." 276 276 else 277 277 $as_echo "$0: Please tell bug-autoconf@gnu.org and 278 - $0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg 278 + $0: https://gitlab.freedesktop.org/xorg/lib/libXft/issues 279 279 $0: about your system, including any error possibly output 280 280 $0: before this message. Then install a modern shell, or 281 281 $0: manually run the script under such a shell if you do ··· 591 591 # Identity of this package. 592 592 PACKAGE_NAME='libXft' 593 593 PACKAGE_TARNAME='libXft' 594 - PACKAGE_VERSION='2.3.2' 595 - PACKAGE_STRING='libXft 2.3.2' 596 - PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' 594 + PACKAGE_VERSION='2.3.3' 595 + PACKAGE_STRING='libXft 2.3.3' 596 + PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libXft/issues' 597 597 PACKAGE_URL='' 598 598 599 599 ac_unique_file="Makefile.am" ··· 1355 1355 # Omit some internal or obsolete options to make the list less imposing. 1356 1356 # This message is too long to be a string in the A/UX 3.1 sh. 1357 1357 cat <<_ACEOF 1358 - \`configure' configures libXft 2.3.2 to adapt to many kinds of systems. 1358 + \`configure' configures libXft 2.3.3 to adapt to many kinds of systems. 1359 1359 1360 1360 Usage: $0 [OPTION]... [VAR=VALUE]... 1361 1361 ··· 1425 1425 1426 1426 if test -n "$ac_init_help"; then 1427 1427 case $ac_init_help in 1428 - short | recursive ) echo "Configuration of libXft 2.3.2:";; 1428 + short | recursive ) echo "Configuration of libXft 2.3.3:";; 1429 1429 esac 1430 1430 cat <<\_ACEOF 1431 1431 ··· 1493 1493 Use these variables to override the choices made by `configure' or to help 1494 1494 it to find libraries and programs with nonstandard names/locations. 1495 1495 1496 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 1496 + Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXft/issues>. 1497 1497 _ACEOF 1498 1498 ac_status=$? 1499 1499 fi ··· 1556 1556 test -n "$ac_init_help" && exit $ac_status 1557 1557 if $ac_init_version; then 1558 1558 cat <<\_ACEOF 1559 - libXft configure 2.3.2 1559 + libXft configure 2.3.3 1560 1560 generated by GNU Autoconf 2.69 1561 1561 1562 1562 Copyright (C) 2012 Free Software Foundation, Inc. ··· 1880 1880 This file contains any messages produced by compilers while 1881 1881 running configure, to aid debugging if configure makes a mistake. 1882 1882 1883 - It was created by libXft $as_me 2.3.2, which was 1883 + It was created by libXft $as_me 2.3.3, which was 1884 1884 generated by GNU Autoconf 2.69. Invocation command line was 1885 1885 1886 1886 $ $0 $@ ··· 2709 2709 2710 2710 # Define the identity of the package. 2711 2711 PACKAGE='libXft' 2712 - VERSION='2.3.2' 2712 + VERSION='2.3.3' 2713 2713 2714 2714 2715 2715 cat >>confdefs.h <<_ACEOF ··· 9345 9345 hardcode_shlibpath_var=no 9346 9346 hardcode_direct_absolute=yes 9347 9347 if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then 9348 - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' 9348 + archive_cmds='$CC -shared $pic_flag ${wl}-soname ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 9349 9349 archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' 9350 9350 hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 9351 9351 export_dynamic_flag_spec='${wl}-E' ··· 17395 17395 17396 17396 17397 17397 17398 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 17398 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 17399 17399 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 17400 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 17401 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 17400 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 17401 + touch \$(top_srcdir)/ChangeLog; \ 17402 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 17402 17403 17403 17404 17404 17405 ··· 17406 17407 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 17407 17408 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 17408 17409 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 17409 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 17410 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 17410 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 17411 + touch \$(top_srcdir)/INSTALL; \ 17412 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 17411 17413 17412 17414 17413 17415 17414 17416 17415 17417 17416 17418 17419 + case $host_os in 17420 + solaris*) 17421 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 17422 + # check for a man page file found in later versions that use 17423 + # traditional section numbers instead 17424 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 17425 + $as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } 17426 + if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : 17427 + $as_echo_n "(cached) " >&6 17428 + else 17429 + test "$cross_compiling" = yes && 17430 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 17431 + if test -r "/usr/share/man/man7/attributes.7"; then 17432 + ac_cv_file__usr_share_man_man7_attributes_7=yes 17433 + else 17434 + ac_cv_file__usr_share_man_man7_attributes_7=no 17435 + fi 17436 + fi 17437 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 17438 + $as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } 17439 + if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : 17440 + SYSV_MAN_SECTIONS=false 17441 + else 17442 + SYSV_MAN_SECTIONS=true 17443 + fi 17444 + 17445 + ;; 17446 + *) SYSV_MAN_SECTIONS=false ;; 17447 + esac 17448 + 17417 17449 if test x$APP_MAN_SUFFIX = x ; then 17418 17450 APP_MAN_SUFFIX=1 17419 17451 fi ··· 17429 17461 fi 17430 17462 17431 17463 if test x$FILE_MAN_SUFFIX = x ; then 17432 - case $host_os in 17433 - solaris*) FILE_MAN_SUFFIX=4 ;; 17434 - *) FILE_MAN_SUFFIX=5 ;; 17464 + case $SYSV_MAN_SECTIONS in 17465 + true) FILE_MAN_SUFFIX=4 ;; 17466 + *) FILE_MAN_SUFFIX=5 ;; 17435 17467 esac 17436 17468 fi 17437 17469 if test x$FILE_MAN_DIR = x ; then ··· 17439 17471 fi 17440 17472 17441 17473 if test x$MISC_MAN_SUFFIX = x ; then 17442 - case $host_os in 17443 - solaris*) MISC_MAN_SUFFIX=5 ;; 17444 - *) MISC_MAN_SUFFIX=7 ;; 17474 + case $SYSV_MAN_SECTIONS in 17475 + true) MISC_MAN_SUFFIX=5 ;; 17476 + *) MISC_MAN_SUFFIX=7 ;; 17445 17477 esac 17446 17478 fi 17447 17479 if test x$MISC_MAN_DIR = x ; then ··· 17449 17481 fi 17450 17482 17451 17483 if test x$DRIVER_MAN_SUFFIX = x ; then 17452 - case $host_os in 17453 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 17454 - *) DRIVER_MAN_SUFFIX=4 ;; 17484 + case $SYSV_MAN_SECTIONS in 17485 + true) DRIVER_MAN_SUFFIX=7 ;; 17486 + *) DRIVER_MAN_SUFFIX=4 ;; 17455 17487 esac 17456 17488 fi 17457 17489 if test x$DRIVER_MAN_DIR = x ; then ··· 17459 17491 fi 17460 17492 17461 17493 if test x$ADMIN_MAN_SUFFIX = x ; then 17462 - case $host_os in 17463 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 17464 - *) ADMIN_MAN_SUFFIX=8 ;; 17494 + case $SYSV_MAN_SECTIONS in 17495 + true) ADMIN_MAN_SUFFIX=1m ;; 17496 + *) ADMIN_MAN_SUFFIX=8 ;; 17465 17497 esac 17466 17498 fi 17467 17499 if test x$ADMIN_MAN_DIR = x ; then ··· 18392 18424 # report actual input values of CONFIG_FILES etc. instead of their 18393 18425 # values after options handling. 18394 18426 ac_log=" 18395 - This file was extended by libXft $as_me 2.3.2, which was 18427 + This file was extended by libXft $as_me 2.3.3, which was 18396 18428 generated by GNU Autoconf 2.69. Invocation command line was 18397 18429 18398 18430 CONFIG_FILES = $CONFIG_FILES ··· 18452 18484 Configuration commands: 18453 18485 $config_commands 18454 18486 18455 - Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." 18487 + Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXft/issues>." 18456 18488 18457 18489 _ACEOF 18458 18490 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 18459 18491 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 18460 18492 ac_cs_version="\\ 18461 - libXft config.status 2.3.2 18493 + libXft config.status 2.3.3 18462 18494 configured by $0, generated by GNU Autoconf 2.69, 18463 18495 with options \\"\$ac_cs_config\\" 18464 18496
+2 -2
lib/libXft/configure.ac
··· 27 27 # version. This version number will be substituted into Xft.h 28 28 # Please bump the minor library number at each release as well. 29 29 # 30 - AC_INIT([libXft], [2.3.2], 31 - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXft]) 30 + AC_INIT([libXft], [2.3.3], 31 + [https://gitlab.freedesktop.org/xorg/lib/libXft/issues], [libXft]) 32 32 AC_CONFIG_SRCDIR([Makefile.am]) 33 33 AC_CONFIG_HEADERS([config.h]) 34 34
+4
lib/libXft/src/xftdpy.c
··· 106 106 if (major < 0 || (major == 0 && minor <= 2)) 107 107 info->use_free_glyphs = FcFalse; 108 108 109 + info->hasSolid = FcFalse; 110 + if (major > 0 || (major == 0 && minor >= 10)) 111 + info->hasSolid = FcTrue; 112 + 109 113 pf.type = PictTypeDirect; 110 114 pf.depth = 32; 111 115 pf.direct.redMask = 0xff;
+42 -29
lib/libXft/src/xftdraw.c
··· 333 333 * Pick one to replace at random 334 334 */ 335 335 i = (unsigned int) arc4random_uniform (XFT_NUM_SOLID_COLOR); 336 - /* 337 - * Recreate if it was for the wrong screen 338 - */ 339 - if (info->colors[i].screen != draw->screen && info->colors[i].pict) 340 - { 341 - XRenderFreePicture (dpy, info->colors[i].pict); 342 - info->colors[i].pict = 0; 343 - } 344 - /* 345 - * Create picture if necessary 346 - */ 347 - if (!info->colors[i].pict) 348 - { 349 - Pixmap pix; 350 - XRenderPictureAttributes pa; 336 + 337 + if (info->hasSolid) { 338 + /* 339 + * Free any existing entry 340 + */ 341 + if (info->colors[i].pict) 342 + XRenderFreePicture (dpy, info->colors[i].pict); 343 + /* 344 + * Create picture 345 + */ 346 + info->colors[i].pict = XRenderCreateSolidFill (draw->dpy, &color->color); 347 + } else { 348 + if (info->colors[i].screen != draw->screen && info->colors[i].pict) 349 + { 350 + XRenderFreePicture (dpy, info->colors[i].pict); 351 + info->colors[i].pict = 0; 352 + } 353 + /* 354 + * Create picture if necessary 355 + */ 356 + if (!info->colors[i].pict) 357 + { 358 + Pixmap pix; 359 + XRenderPictureAttributes pa; 351 360 352 - pix = XCreatePixmap (dpy, RootWindow (dpy, draw->screen), 1, 1, 353 - info->solidFormat->depth); 354 - pa.repeat = True; 355 - info->colors[i].pict = XRenderCreatePicture (draw->dpy, 356 - pix, 357 - info->solidFormat, 358 - CPRepeat, &pa); 359 - XFreePixmap (dpy, pix); 361 + pix = XCreatePixmap (dpy, RootWindow (dpy, draw->screen), 1, 1, 362 + info->solidFormat->depth); 363 + pa.repeat = True; 364 + info->colors[i].pict = XRenderCreatePicture (draw->dpy, 365 + pix, 366 + info->solidFormat, 367 + CPRepeat, &pa); 368 + XFreePixmap (dpy, pix); 369 + } 370 + /* 371 + * Set to the new color 372 + */ 373 + info->colors[i].color = color->color; 374 + info->colors[i].screen = draw->screen; 375 + XRenderFillRectangle (dpy, PictOpSrc, 376 + info->colors[i].pict, 377 + &color->color, 0, 0, 1, 1); 360 378 } 361 - /* 362 - * Set to the new color 363 - */ 364 379 info->colors[i].color = color->color; 365 380 info->colors[i].screen = draw->screen; 366 - XRenderFillRectangle (dpy, PictOpSrc, 367 - info->colors[i].pict, 368 - &color->color, 0, 0, 1, 1); 381 + 369 382 return info->colors[i].pict; 370 383 } 371 384
+1
lib/libXft/src/xftint.h
··· 245 245 XExtCodes *codes; 246 246 FcPattern *defaults; 247 247 FcBool hasRender; 248 + FcBool hasSolid; 248 249 XftFont *fonts; 249 250 XRenderPictFormat *solidFormat; 250 251 unsigned long glyph_memory;