[pkgsrc/trunk]: pkgsrc/x11/libX11 Update libX11 to 1.1.3:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/libX11 Update libX11 to 1.1.3:
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:09:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4948ab9d10c
branches:  trunk
changeset: 531760:c4948ab9d10c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Aug 05 22:39:38 2007 +0000

description:
Update libX11 to 1.1.3:
- man page fixes
- reset hostname when setting it internally for consistency
- fix XGetMotionEvents argument order
- locking fixes

diffstat:

 x11/libX11/Makefile         |    4 +-
 x11/libX11/distinfo         |   18 +-
 x11/libX11/patches/patch-ac |   28 +-
 x11/libX11/patches/patch-ad |    4 +-
 x11/libX11/patches/patch-ae |  342 ++------------------------------
 x11/libX11/patches/patch-af |   10 +-
 x11/libX11/patches/patch-ag |  459 +-------------------------------------------
 7 files changed, 59 insertions(+), 806 deletions(-)

diffs (truncated from 1017 to 300 lines):

diff -r 5390733e5a9f -r c4948ab9d10c x11/libX11/Makefile
--- a/x11/libX11/Makefile       Sun Aug 05 22:06:11 2007 +0000
+++ b/x11/libX11/Makefile       Sun Aug 05 22:39:38 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2007/08/01 16:50:24 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/08/05 22:39:38 joerg Exp $
 #
 
-DISTNAME=              libX11-1.1.2
+DISTNAME=              libX11-1.1.3
 CATEGORIES=            x11 devel
 MASTER_SITES=          http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=          .tar.bz2
diff -r 5390733e5a9f -r c4948ab9d10c x11/libX11/distinfo
--- a/x11/libX11/distinfo       Sun Aug 05 22:06:11 2007 +0000
+++ b/x11/libX11/distinfo       Sun Aug 05 22:39:38 2007 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2007/08/01 16:46:16 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/08/05 22:39:38 joerg Exp $
 
-SHA1 (libX11-1.1.2.tar.bz2) = 7190d36389eb7903831cd9541d919f55ac5098e9
-RMD160 (libX11-1.1.2.tar.bz2) = c722e1eaa04a3d753660496d4e527b695c68db38
-Size (libX11-1.1.2.tar.bz2) = 1523644 bytes
+SHA1 (libX11-1.1.3.tar.bz2) = 235f69172b262f874d2a2d7bd17e8197aea5b767
+RMD160 (libX11-1.1.3.tar.bz2) = fcb8d5d31befa0ae227210dc7274c17b30c37fad
+Size (libX11-1.1.3.tar.bz2) = 1526958 bytes
 SHA1 (patch-aa) = 7c1905781ca9467adfb45e2cad9b710533bbcd17
 SHA1 (patch-ab) = 000f81dd5d21cbabf38e91b5066e8f1ce43ff957
-SHA1 (patch-ac) = ee92c9dd48a60b5597260f6bd1a02eddc1cc26a7
-SHA1 (patch-ad) = 30497b3fe22bc2ed477449afa79bf98076031e61
-SHA1 (patch-ae) = c59b6f63b95814285e8d6c8bcf32fb8755930bd0
-SHA1 (patch-af) = 20531d93e19e61c2eb08612f976083f36b460a9e
-SHA1 (patch-ag) = d7a92f25a84a8d2240fe0a38206c8d78f076106b
+SHA1 (patch-ac) = 9b3bea367661efeef337f8b9ae62d5f430a2204e
+SHA1 (patch-ad) = 58645e734f48334ce5cbf62f5870d087d95194ee
+SHA1 (patch-ae) = 124c47038ac2c12dd37f3f63606396b9ed976822
+SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
+SHA1 (patch-ag) = 0d1cf4804049fd3640d627ddfbab7b717f20b445
diff -r 5390733e5a9f -r c4948ab9d10c x11/libX11/patches/patch-ac
--- a/x11/libX11/patches/patch-ac       Sun Aug 05 22:06:11 2007 +0000
+++ b/x11/libX11/patches/patch-ac       Sun Aug 05 22:39:38 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2007/08/01 16:48:41 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2007/08/05 22:39:38 joerg Exp $
 
---- configure.orig     2007-06-04 06:44:39.000000000 +0200
+--- configure.orig     2007-08-06 00:08:02.000000000 +0200
 +++ configure
-@@ -924,6 +924,8 @@ XKB_FALSE
+@@ -926,6 +926,8 @@ XKB_FALSE
  XKBPROTO_CFLAGS
  XKBPROTO_LIBS
  XKBPROTO_REQUIRES
@@ -11,11 +11,11 @@
  LINT
  LINT_FLAGS
  LINT_TRUE
-@@ -23199,6 +23201,17 @@ fi
+@@ -23423,6 +23425,15 @@ else
+ fi
  
  
- 
-+if  test $cross_compiling = yes ; then
++ if  test $cross_compiling = yes ; then
 +  CROSS_COMPILING_TRUE=
 +  CROSS_COMPILING_FALSE='#'
 +else
@@ -24,12 +24,10 @@
 +fi
 +
 +
-+
-+
+ 
+ 
  for ac_header in stdlib.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -24299,6 +24312,13 @@ echo "$as_me: error: conditional \"XKB\"
+@@ -24523,6 +24534,13 @@ echo "$as_me: error: conditional \"XKB\"
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -43,7 +41,7 @@
  if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -25112,6 +25132,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
+@@ -25339,6 +25357,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
  XKBPROTO_CFLAGS!$XKBPROTO_CFLAGS$ac_delim
  XKBPROTO_LIBS!$XKBPROTO_LIBS$ac_delim
  XKBPROTO_REQUIRES!$XKBPROTO_REQUIRES$ac_delim
@@ -52,12 +50,12 @@
  LINT!$LINT$ac_delim
  LINT_FLAGS!$LINT_FLAGS$ac_delim
  LINT_TRUE!$LINT_TRUE$ac_delim
-@@ -25133,7 +25155,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -25360,7 +25380,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 5390733e5a9f -r c4948ab9d10c x11/libX11/patches/patch-ad
--- a/x11/libX11/patches/patch-ad       Sun Aug 05 22:06:11 2007 +0000
+++ b/x11/libX11/patches/patch-ad       Sun Aug 05 22:39:38 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2007/08/01 16:48:41 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2007/08/05 22:39:38 joerg Exp $
 
---- src/util/Makefile.am.orig  2006-10-04 19:43:17.000000000 +0200
+--- src/util/Makefile.am.orig  2007-05-16 17:34:44.000000000 +0200
 +++ src/util/Makefile.am
 @@ -1,11 +1,15 @@
  # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
diff -r 5390733e5a9f -r c4948ab9d10c x11/libX11/patches/patch-ae
--- a/x11/libX11/patches/patch-ae       Sun Aug 05 22:06:11 2007 +0000
+++ b/x11/libX11/patches/patch-ae       Sun Aug 05 22:39:38 2007 +0000
@@ -1,35 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2007/08/01 16:48:42 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2007/08/05 22:39:39 joerg Exp $
 
---- src/util/Makefile.in.orig  2007-06-04 06:44:50.000000000 +0200
+--- src/util/Makefile.in.orig  2007-08-06 00:07:57.000000000 +0200
 +++ src/util/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,15 +16,11 @@
- 
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -38,7 +34,6 @@ PRE_UNINSTALL = :
+@@ -34,7 +34,6 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -37,28 +10,19 @@
  subdir = src/util
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -52,27 +47,31 @@ CONFIG_HEADER = $(top_builddir)/src/conf
- CONFIG_CLEAN_FILES =
- PROGRAMS = $(noinst_PROGRAMS)
- makekeys_SOURCES = makekeys.c
--makekeys_OBJECTS = makekeys-makekeys.$(OBJEXT)
-+makekeys_OBJECTS = makekeys.$(OBJEXT)
- makekeys_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_builddir)/include/X11
+@@ -53,6 +52,9 @@ makekeys_LDADD = $(LDADD)
+ makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
 +xmakekeys_SOURCES = xmakekeys.c
 +xmakekeys_OBJECTS = xmakekeys.$(OBJEXT)
 +xmakekeys_LDADD = $(LDADD)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--      $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--      $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+      --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -62,8 +64,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -SOURCES = makekeys.c
 -DIST_SOURCES = makekeys.c
@@ -70,299 +34,45 @@
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
- ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- APP_MAN_DIR = @APP_MAN_DIR@
- APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-@@ -109,6 +108,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
- FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
- GREP = @GREP@
- I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -121,23 +121,16 @@ LIBTOOL = @LIBTOOL@
- LIB_MAN_DIR = @LIB_MAN_DIR@
- LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
- LINT = @LINT@
--LINT_FALSE = @LINT_FALSE@
- LINT_FLAGS = @LINT_FLAGS@
--LINT_TRUE = @LINT_TRUE@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
--MANPAGES_FALSE = @MANPAGES_FALSE@
--MANPAGES_TRUE = @MANPAGES_TRUE@
- MISC_MAN_DIR = @MISC_MAN_DIR@
- MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-+MKDIR_P = $(mkdir_p)
- OBJEXT = @OBJEXT@
--OS2_FALSE = @OS2_FALSE@
--OS2_TRUE = @OS2_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -152,10 +145,6 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
--THRSTUBS_FALSE = @THRSTUBS_FALSE@
--THRSTUBS_TRUE = @THRSTUBS_TRUE@
--UDC_FALSE = @UDC_FALSE@
--UDC_TRUE = @UDC_TRUE@
- VERSION = @VERSION@
- WCHAR32 = @WCHAR32@
- X11_CFLAGS = @X11_CFLAGS@
-@@ -166,26 +155,16 @@ X11_LIBS = @X11_LIBS@
- X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
- X11_LOCALEDIR = @X11_LOCALEDIR@
- X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
--XCB_FALSE = @XCB_FALSE@
--XCB_TRUE = @XCB_TRUE@
--XCMS_FALSE = @XCMS_FALSE@
--XCMS_TRUE = @XCMS_TRUE@
- XDMCP_CFLAGS = @XDMCP_CFLAGS@
- XDMCP_LIBS = @XDMCP_LIBS@
- XERRORDB = @XERRORDB@
- XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
- XKBPROTO_LIBS = @XKBPROTO_LIBS@
- XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
--XKB_FALSE = @XKB_FALSE@
--XKB_TRUE = @XKB_TRUE@
- XKEYSYMDB = @XKEYSYMDB@
--XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
--XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
- XLOCALEDATADIR = @XLOCALEDATADIR@
- XLOCALEDIR = @XLOCALEDIR@
- XLOCALELIBDIR = @XLOCALELIBDIR@
--XLOCALE_FALSE = @XLOCALE_FALSE@
--XLOCALE_TRUE = @XLOCALE_TRUE@
- XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
- XPROTO_CFLAGS = @XPROTO_CFLAGS@
- XPROTO_LIBS = @XPROTO_LIBS@
-@@ -194,13 +173,13 @@ XTHREADS = @XTHREADS@
- XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
- XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
- XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Security fix for gaim-encryption CVE-2005-4693.
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/ico Update to ico-1.0.2: fix typo in man page.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Security fix for gaim-encryption CVE-2005-4693.
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/ico Update to ico-1.0.2: fix typo in man page.
Indexes:
Home | Main Index | Thread Index | Old Index