head 1.16; access; symbols pkgsrc-2022Q3:1.15.0.2 pkgsrc-2022Q3-base:1.15 pkgsrc-2022Q2:1.14.0.10 pkgsrc-2022Q2-base:1.14 pkgsrc-2022Q1:1.14.0.8 pkgsrc-2022Q1-base:1.14 pkgsrc-2021Q4:1.14.0.6 pkgsrc-2021Q4-base:1.14 pkgsrc-2021Q3:1.14.0.4 pkgsrc-2021Q3-base:1.14 pkgsrc-2021Q2:1.14.0.2 pkgsrc-2021Q2-base:1.14 pkgsrc-2021Q1:1.13.0.56 pkgsrc-2021Q1-base:1.13 pkgsrc-2020Q4:1.13.0.54 pkgsrc-2020Q4-base:1.13 pkgsrc-2020Q3:1.13.0.52 pkgsrc-2020Q3-base:1.13 pkgsrc-2020Q2:1.13.0.48 pkgsrc-2020Q2-base:1.13 pkgsrc-2020Q1:1.13.0.28 pkgsrc-2020Q1-base:1.13 pkgsrc-2019Q4:1.13.0.50 pkgsrc-2019Q4-base:1.13 pkgsrc-2019Q3:1.13.0.46 pkgsrc-2019Q3-base:1.13 pkgsrc-2019Q2:1.13.0.44 pkgsrc-2019Q2-base:1.13 pkgsrc-2019Q1:1.13.0.42 pkgsrc-2019Q1-base:1.13 pkgsrc-2018Q4:1.13.0.40 pkgsrc-2018Q4-base:1.13 pkgsrc-2018Q3:1.13.0.38 pkgsrc-2018Q3-base:1.13 pkgsrc-2018Q2:1.13.0.36 pkgsrc-2018Q2-base:1.13 pkgsrc-2018Q1:1.13.0.34 pkgsrc-2018Q1-base:1.13 pkgsrc-2017Q4:1.13.0.32 pkgsrc-2017Q4-base:1.13 pkgsrc-2017Q3:1.13.0.30 pkgsrc-2017Q3-base:1.13 pkgsrc-2017Q2:1.13.0.26 pkgsrc-2017Q2-base:1.13 pkgsrc-2017Q1:1.13.0.24 pkgsrc-2017Q1-base:1.13 pkgsrc-2016Q4:1.13.0.22 pkgsrc-2016Q4-base:1.13 pkgsrc-2016Q3:1.13.0.20 pkgsrc-2016Q3-base:1.13 pkgsrc-2016Q2:1.13.0.18 pkgsrc-2016Q2-base:1.13 pkgsrc-2016Q1:1.13.0.16 pkgsrc-2016Q1-base:1.13 pkgsrc-2015Q4:1.13.0.14 pkgsrc-2015Q4-base:1.13 pkgsrc-2015Q3:1.13.0.12 pkgsrc-2015Q3-base:1.13 pkgsrc-2015Q2:1.13.0.10 pkgsrc-2015Q2-base:1.13 pkgsrc-2015Q1:1.13.0.8 pkgsrc-2015Q1-base:1.13 pkgsrc-2014Q4:1.13.0.6 pkgsrc-2014Q4-base:1.13 pkgsrc-2014Q3:1.13.0.4 pkgsrc-2014Q3-base:1.13 pkgsrc-2014Q2:1.13.0.2 pkgsrc-2014Q2-base:1.13 pkgsrc-2014Q1:1.12.0.14 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.12 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.10 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.8 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.6 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.4 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.2 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.11.0.8 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.6 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.4 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.2 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.10.0.8 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.6 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.10.0.4 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.2 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.9.0.8 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.6 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.9.0.4 pkgsrc-2009Q4-base:1.9 pkgsrc-2009Q3:1.9.0.2 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.8.0.2 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.7.0.2 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.6.0.4 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.2 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.5.0.2 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.4.0.4 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.2 pkgsrc-2008Q1:1.2.0.6 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.4 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.2 pkgsrc-2007Q3-base:1.2; locks; strict; comment @# @; 1.16 date 2022.11.10.21.29.16; author wiz; state dead; branches; next 1.15; commitid xlFExKAnyoiizc1E; 1.15 date 2022.07.15.23.23.35; author gutteridge; state Exp; branches; next 1.14; commitid TZ6Xwpcxl04FZ2MD; 1.14 date 2021.06.06.21.05.08; author wiz; state Exp; branches; next 1.13; commitid Jp0cem3al6kid7WC; 1.13 date 2014.05.30.12.51.29; author wiz; state Exp; branches; next 1.12; commitid cYMdjjioRvHHTyCx; 1.12 date 2012.07.10.03.03.01; author mef; state Exp; branches; next 1.11; 1.11 date 2011.09.15.19.50.14; author bsiegert; state Exp; branches; next 1.10; 1.10 date 2010.09.10.20.28.03; author joerg; state Exp; branches; next 1.9; 1.9 date 2009.07.18.10.20.51; author wiz; state Exp; branches; next 1.8; 1.8 date 2009.06.06.22.37.28; author wiz; state Exp; branches; next 1.7; 1.7 date 2009.02.21.16.44.29; author wiz; state Exp; branches; next 1.6; 1.6 date 2008.09.16.21.57.09; author bjs; state Exp; branches; next 1.5; 1.5 date 2008.07.24.01.07.31; author bjs; state Exp; branches; next 1.4; 1.4 date 2008.04.24.07.45.49; author joerg; state Exp; branches; next 1.3; 1.3 date 2008.04.17.12.33.56; author wiz; state Exp; branches; next 1.2; 1.2 date 2007.08.05.22.39.38; author joerg; state Exp; branches; next 1.1; 1.1 date 2007.08.01.16.48.41; author joerg; state Exp; branches; next ; desc @@ 1.16 log @libX11: update to 1.8.2. This is primarily a bug fix release, including further work on improving the thread-safety-constructor and making it work with software which had incorrectly called libX11 functions from inside X*IfEvent() calls. Highlights: * Allow X*IfEvent() to reenter libX11 to avoid deadlock from unsafe calls when thread-safety-constructor is enabled (!150). * Remove Xlib's pthread function stubs - instead use system provided threads functions, including linking against any needed pthread libraries if thread-safety-constructor is enabled (!155, !156). * Fix off-by-one error in XKeycodeToKeysym for indexes > 3 (!78). * Allow XNSpotLocation with OnTheSpot (!127). * Fix Win32 build when -fno-common is in effect (!140). * Fix memory leak in XRegisterIMInstantiateCallback (!158). * Add compose sequences for the double-struck capitals ℕ ℤ ℚ ℝ ℂ (!144), Samogitian E with dot above and macron (!147), Unicode minus sign (!163). * Change <^> <-> to mean superscript minus instead of macron (!162). * Delete compose sequences that mix top-row digits with numpad digits (!139) or mix upper & lower case letters (!144). * Delete some unuseful compose sequences meant for Bépo layout (!146). * Delete compose sequences using leftcaret & rightcaret keysyms (!163). * Remove KOI8-R character set from en_US.UTF-8/XLC_LOCALE (!148). * Map sr locales to sr_RS compose files (!161). Complete changelog: Adam Jackson (1): Allow X*IfEvent() to reenter libX11 Adam Sampson (1): xkb: Fix off-by-one error in XKeycodeToKeysym Alan Coopersmith (11): xkb: set num_keys when filling in keys in _XkbReadGetNamesReply() doc: Document possible return values for XkbGetKeyboard() gitlab CI: stop requiring Signed-off-by in commits If thread-safety-constructor is enabled, link against pthreads not stubs Use same pthread-stubs as libxcb COPYING: remove notice for the removed UIThrStubs.c Copyright & license cleanup man pages: document XCloseIM frees its argument Remove NEWS file which only covered 2006 & 2007 releases README.md: Add 1.8.2 changes libX11 1.8.2 Benno Schulenberg (13): nls: delete compose sequences that mix top-row digits with numpad digits docs: hard-wrap some items so that Table 2 fits within 80 characters docs: remove the unsightly dashes from the overviews of arguments docs: replace three placeholders with something that makes sense nls: delete some pointless and wrong compose sequences meant for Bépo nls: add compose sequences for the double-struck capitals ℕ ℤ ℚ ℝ ℂ nls: delete eight sequences that pointlessly mix upper and lower case nls: add four sequences for the Samogitian E with dot above and macron nls: delete two compose sequences with an anomalous post-fixed breve nls: change <^> <-> to mean superscript minus instead of macron nls: let ` ` compose U+2212 (MINUS SIGN) nls: remove two compose sequences that use deprecated symbols nls: reshuffle a few compose sequences, to have similar ones together David H. Gutteridge (1): configure.ac: report thread safety constructor build status Jan Tojnar (1): nls: Map sr locales to sr_RS compose files Jon Turney (1): Fix Win32 build with -fno-common Kirill Chibisov (1): ximcp/imRm.c: allow XNSpotLocation with OnTheSpot Matthieu Herrb (1): Mention that the predicate function is called with the display lock Mike FABIAN (1): Remove KOI8-R character set from en_US.UTF-8/XLC_LOCALE Po Lu (1): specs: document change in XIMPreeditCallbacks Thomas E. Dickey (4): reduce compiler warnings for macros BufAlloc, Data and Data32 using casts use casts to reduce compiler warnings (no object change) reduce compiler warnings with casts (no object change) fix a memory leak in XRegisterIMInstantiateCallback @ text @$NetBSD: patch-ac,v 1.15 2022/07/15 23:23:35 gutteridge Exp $ See patch-aa. --- configure.orig 2022-06-09 01:06:54.000000000 +0000 +++ configure @@@@ -22170,42 +22170,16 @@@@ printf "%s\n" "#define XUSE_MTSAFE_API 1 ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5 -printf %s "checking for pthread_self in -lc... " >&6; } -if test ${ac_cv_lib_c_pthread_self+y} +ac_fn_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_pthread_self" = xyes then : - printf %s "(cached) " >&6 + ac_have_decl=1 else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char pthread_self (); -int -main (void) -{ -return pthread_self (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_c_pthread_self=yes -else $as_nop - ac_cv_lib_c_pthread_self=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ac_have_decl=0 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5 -printf "%s\n" "$ac_cv_lib_c_pthread_self" >&6; } -if test "x$ac_cv_lib_c_pthread_self" = xyes +printf "%s\n" "#define HAVE_DECL_PTHREAD_SELF $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 then : thrstubs="no" else $as_nop @@@@ -22227,12 +22201,12 @@@@ if test x$xthreads = xyes ; then linux*|gnu*|k*bsd*-gnu) XTHREADLIB=-lpthread ;; netbsd*) - XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS" - XTHREADLIB="-lpthread" ;; + XTHREAD_CFLAGS="-D_REENTRANT" + XTHREADLIB="-pthread" ;; freebsd*) XTHREAD_CFLAGS="-D_THREAD_SAFE" XTHREADLIB="-pthread" ;; - dragonfly*|openbsd*) + dragonfly*|openbsd*|mirbsd*) XTHREADLIB="-pthread" ;; solaris*) XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;; @@@@ -25521,6 +25497,7 @@@@ echo " Loadable i18n module support: echo " Loadable xcursor library support: "$XLIB_LOADABLE_XCURSOR echo " Threading support: "$xthreads echo " Use Threads safe API: "$mtsafeapi +echo " Use thread safety constructor: "$USE_THREAD_SAFETY_CONSTRUCTOR echo " Threads stubs in libX11: "$thrstubs echo " XCMS: "$XCMS echo " Internationalization support: "$XLOCALE @ 1.15 log @libX11: report the thread safety constructor build state (NFC) 1.8 added a feature (--enable-thread-safety-constructor) which is enabled by default and can cause issues like hangs with X11 clients that aren't coded properly. (This affects more than one DE in pkgsrc.) When the feature was added, it didn't include any output from configure itself that reports what the state of the option is set to. No change to package defaults or resulting binaries, this is just for informational purposes for anyone else dealing with this, should they want to disable the setting, or just recognize what state the build used. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.14 2021/06/06 21:05:08 wiz Exp $ @ 1.14 log @libX11: update to 1.7.2. This is a bug fix release, correcting a regression [1] introduced by and improving the checks from the fix for CVE-2021-31535. [1] https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/133 Alan Coopersmith (1): libX11 1.7.2 Matthieu Herrb (2): include always, not if HAVE_CONFIG_H is set. Check for NULL strings before getting their lengths Tobias Stoeckmann (1): Protect against overly long strings @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.13 2014/05/30 12:51:29 wiz Exp $ d5 1 a5 1 --- configure.orig 2021-06-06 16:49:01.000000000 +0000 d7 1 a7 1 @@@@ -22009,42 +22009,16 @@@@ printf "%s\n" "#define XUSE_MTSAFE_API 1 d57 1 a57 1 @@@@ -22066,12 +22040,12 @@@@ if test x$xthreads = xyes ; then d73 8 @ 1.13 log @Add patch from upstream to silence qt5 warning: nls/en_US.UTF-8/Compose.pre: Fix typo. Fix typo added in 215ce6a67863, s/actute/acute/. Fixes bug #69476. Reported by Jean Krohn. Signed-off-by: James Cloos Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.12 2012/07/10 03:03:01 mef Exp $ d5 1 a5 1 --- configure.orig 2013-09-09 01:37:35.000000000 +0000 d7 1 a7 1 @@@@ -20104,43 +20104,18 @@@@ $as_echo "#define XUSE_MTSAFE_API 1" >>c d11 8 a18 7 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5 -$as_echo_n "checking for pthread_self in -lc... " >&6; } -if ${ac_cv_lib_c_pthread_self+:} false; then : - $as_echo_n "(cached) " >&6 +ac_fn_c_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include +" +if test "x$ac_cv_have_decl_pthread_self" = xyes; then : d20 1 a20 1 else d25 1 a25 3 + ac_have_decl=0 +fi a28 3 -#ifdef __cplusplus -extern "C" -#endif d31 1 a31 1 -main () d37 3 a39 4 +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_PTHREAD_SELF $ac_have_decl _ACEOF -if ac_fn_c_try_link "$LINENO"; then : d41 1 a41 1 -else d44 1 a44 1 -rm -f core conftest.err conftest.$ac_objext \ d47 8 a54 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5 -$as_echo "$ac_cv_lib_c_pthread_self" >&6; } -if test "x$ac_cv_lib_c_pthread_self" = xyes; then : +if test $ac_have_decl = 1; then : d56 2 a57 3 else thrstubs="yes" @@@@ -20161,12 +20136,12 @@@@ if test x$xthreads = xyes ; then @ 1.12 log @Update from 1.3.5 to 1.5.0 based on PR pkg/46183 [ANNOUNCE] libX11 1.5.0 ------------------------ At long last, the stable release of Xlib 1.5.0. While it only strictly requires libxcb 1.2, it's recommended that libxcb 1.8.1 be used to get the fix for network connection fallback from Unix sockets to TCP that replaces the code previously found in libX11. Since there have been no changes since the final release candidate, here's the full list of changes since libX11 1.4.4: ( Some 150 lines omitted, see following URL for detail ) http://lists.x.org/archives/xorg-announce/2012-June/001970.html [ANNOUNCE] libX11 1.4.4 ----------------------- Thu, 28 Jul 2011 20:05:49 -0700 by Alan Coopersmith Another bug fix release of libX11 brings another large set of fixes found by static analysis or to ease further static analysis, many documentation fixes and improvments, and improved assertions to help users and developers figure out why Xlib just crashed on them. [ANNOUNCE] libX11 1.4.3 ----------------------- Tue Apr 5 14:18:18 PDT 2011 by Alan Coopersmith A minor release of libX11 to add support for the Sinhala keysyms required by the recent xkb-config 2.2 release. Note that to get full support for these keysyms you will also need to upgrade to x11proto 7.0.21 before building the new libX11. [ANNOUNCE] libX11 1.4.2 ----------------------- This bugfix release pulls in a ton of fixes for problems found by code static analysis tools. Many thanks to everyone who has helped find and fix these issues before they turned into nasty problems. Additionally, Jamey Sharp has provided some fixes for Display lock handling that caused some deadlocks when using xcb for transport (which was optional in 1.3.x and is required in 1.4.x), so this update is highly recomended to users of multi-threaded Xlib applications. [ANNOUNCE] libX11 1.4.1 ------------------------ Tue, 11 Jan 2011 22:35:19 -0800 by Alan Coopersmith This bugfix release corrects two small issues in Xlib event handling, and provides, for the first time ever, the XKB API spec in DocBook format. [ANNOUNCE] libX11 1.4.0 ------------------------ Sun Nov 21 14:38:32 PST 2010 by Alan Coopersmith After 3 release candidates, it's finally done - libX11 1.4 is released. As previously warned, libX11 1.4 *requires* libxcb. The Xlib 1.3 branch continues to support the --without-xcb option for the benefit of any remaining distributors who do not yet ship XCB in their stable releases. [ANNOUNCE] libX11 1.3.6 ------------------------ 2010-09-20 6:16:18 by Daniel Stone Just a small maintenance release for libX11; pending any catastrophic bugs, this will probably be the last release from the 1.3.x branch. The XStringToKeysym changes should provide a not-insignificant speedup for X server and application startup. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.11 2011/09/15 19:50:14 bsiegert Exp $ d5 3 a7 3 --- configure.orig 2012-06-02 15:37:31.000000000 +0900 +++ configure 2012-06-28 19:20:03.000000000 +0900 @@@@ -19942,43 +19942,18 @@@@ d60 1 a60 1 @@@@ -19999,12 +19974,12 @@@@ @ 1.11 log @Add a pthread option for MirBSD, regenerate patch-ac using autoconf-2.65nb1 to minimize its size. No change for other platforms, thus no package revision bump. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.10 2010/09/10 20:28:03 joerg Exp $ d5 3 a7 3 --- configure.orig Wed Jul 27 08:46:21 2011 +++ configure @@@@ -14431,43 +14431,18 @@@@ $as_echo "#define XUSE_MTSAFE_API 1" >>c d13 1 a13 1 -if test "${ac_cv_lib_c_pthread_self+set}" = set; then : d17 1 a17 1 +if test "x$ac_cv_have_decl_pthread_self" = x""yes; then : d55 1 a55 1 -if test "x$ac_cv_lib_c_pthread_self" = x""yes; then : d60 2 a61 2 @@@@ -14487,12 +14462,12 @@@@ if test x$xthreads = xyes ; then linux*|openbsd*|gnu*|k*bsd*-gnu) d71 2 a72 2 - dragonfly*) + dragonfly*|mirbsd*) @ 1.10 log @Update to libX11-1.3.5: - Enable XCB support [pkgsrc] - Improve I18N support - Various bug fixes, including use-after-free and XCB thread fixes @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- configure.orig 2010-08-11 23:24:54.000000000 +0000 d7 1 a7 381 @@@@ -828,28 +828,22 @@@@ ac_ct_DUMPBIN DUMPBIN LD FGREP +SED LIBTOOL HAVE_PS2PDF_FALSE HAVE_PS2PDF_TRUE PS2PDF -HAVE_GROFF_HTML_FALSE -HAVE_GROFF_HTML_TRUE HAVE_GROFF_MM_FALSE HAVE_GROFF_MM_TRUE HAVE_GROFF_MS_FALSE HAVE_GROFF_MS_TRUE HAVE_GROFF_FALSE HAVE_GROFF_TRUE -PSSELECT_PATH -PNMTOPNG_PATH -GS_PATH GROFF ENABLE_SPECS_FALSE ENABLE_SPECS_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY -MAN_SUBSTS -XORG_MAN_PAGE ADMIN_MAN_DIR DRIVER_MAN_DIR MISC_MAN_DIR @@@@ -862,7 +856,6 @@@@ MISC_MAN_SUFFIX FILE_MAN_SUFFIX LIB_MAN_SUFFIX APP_MAN_SUFFIX -SED INSTALL_CMD PKG_CONFIG CHANGELOG_CMD @@@@ -964,6 +957,7 @@@@ enable_option_checking enable_maintainer_mode enable_dependency_tracking enable_strict_compilation +with_release_version enable_silent_rules enable_specs with_groff @@@@ -1014,8 +1008,6 @@@@ XDMCP_CFLAGS XDMCP_LIBS BIGFONT_CFLAGS BIGFONT_LIBS -LINT -LINT_FLAGS X11_CFLAGS X11_LIBS' @@@@ -1677,6 +1669,8 @@@@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-release-version=STRING + Use release version string in package name --with-groff Use groff to regenerate documentation (default: yes, if installed) --with-ps2pdf Use ps2pdf to regenerate documentation (default: @@@@ -1716,8 +1710,6 @@@@ Some influential environment variables: C compiler flags for BIGFONT, overriding pkg-config BIGFONT_LIBS linker flags for BIGFONT, overriding pkg-config - LINT Path to a lint-style command - LINT_FLAGS Flags for the lint-style command X11_CFLAGS C compiler flags for X11, overriding pkg-config X11_LIBS linker flags for X11, overriding pkg-config @@@@ -5010,76 +5002,6 @@@@ $as_echo "no" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - - @@@@ -5107,7 +5029,7 @@@@ fi -# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 + @@@@ -5146,6 +5068,20 @@@@ CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" +# Check whether --with-release-version was given. +if test "${with_release_version+set}" = set; then : + withval=$with_release_version; RELEASE_VERSION="$withval" +else + RELEASE_VERSION="" +fi + + if test "x$RELEASE_VERSION" != "x"; then + PACKAGE="$PACKAGE-$RELEASE_VERSION" + PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" + { $as_echo "$as_me:${as_lineno-$LINENO}: Building with package name set to $PACKAGE" >&5 +$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;} + fi + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@@@ -5188,7 +5124,6 @@@@ echo 'util-macros \"pkgdatadir\" from xo - if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 fi @@@@ -5257,23 +5192,6 @@@@ fi -XORG_MAN_PAGE="X Version 11" - -MAN_SUBSTS="\ - -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ - -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|\$(prefix)|g' \ - -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ - -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'" - - - # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@@@ -5425,7 +5343,6 @@@@ $as_echo "$as_me: WARNING: ignoring GROF else as_fn_error "--with-groff expects 'yes' or 'no'" "$LINENO" 5 fi - # We have groff, test for the presence of the macro packages if test "x$have_groff" = x"yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${GROFF} -ms macros" >&5 @@@@ -5447,144 +5364,6 @@@@ $as_echo_n "checking for ${GROFF} -mm ma { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_mm_works" >&5 $as_echo "$groff_mm_works" >&6; } fi - -# We have groff, test for HTML dependencies, one command per package -if test "x$have_groff" = x"yes"; then - for ac_prog in gs gswin32c -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GS_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $GS_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_GS_PATH="$GS_PATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GS_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GS_PATH=$ac_cv_path_GS_PATH -if test -n "$GS_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GS_PATH" >&5 -$as_echo "$GS_PATH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$GS_PATH" && break -done - - # Extract the first word of "pnmtopng", so it can be a program name with args. -set dummy pnmtopng; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PNMTOPNG_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $PNMTOPNG_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_PNMTOPNG_PATH="$PNMTOPNG_PATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PNMTOPNG_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PNMTOPNG_PATH=$ac_cv_path_PNMTOPNG_PATH -if test -n "$PNMTOPNG_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PNMTOPNG_PATH" >&5 -$as_echo "$PNMTOPNG_PATH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "psselect", so it can be a program name with args. -set dummy psselect; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PSSELECT_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $PSSELECT_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_PSSELECT_PATH="$PSSELECT_PATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PSSELECT_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PSSELECT_PATH=$ac_cv_path_PSSELECT_PATH -if test -n "$PSSELECT_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PSSELECT_PATH" >&5 -$as_echo "$PSSELECT_PATH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then - have_groff_html=yes - else - have_groff_html=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages" >&5 -$as_echo "$as_me: WARNING: grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages" >&2;} - fi -fi - -# Set Automake conditionals for Makefiles if test "$have_groff" = yes; then HAVE_GROFF_TRUE= HAVE_GROFF_FALSE='#' @@@@ -5609,14 +5388,6 @@@@ else HAVE_GROFF_MM_FALSE= fi - if test "$have_groff_html" = yes; then - HAVE_GROFF_HTML_TRUE= - HAVE_GROFF_HTML_FALSE='#' -else - HAVE_GROFF_HTML_TRUE='#' - HAVE_GROFF_HTML_FALSE= -fi - @@@@ -14431,43 +14202,18 @@@@ $as_echo "#define XUSE_MTSAFE_API 1" >>c d60 1 a60 1 @@@@ -14487,8 +14233,8 @@@@ if test x$xthreads = xyes ; then d71 5 a75 157 @@@@ -14960,8 +14706,7 @@@@ fi - - +# Allow checking code with lint, sparse, etc. # Check whether --with-lint was given. if test "${with_lint+set}" = set; then : @@@@ -14970,86 +14715,26 @@@@ else use_lint=no fi - -# Obtain platform specific info like program name and options -# The lint program on FreeBSD and NetBSD is different from the one on Solaris -case $host_os in - *linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*) - lint_name=splint - lint_options="-badflag" - ;; - *freebsd* | *netbsd*) - lint_name=lint - lint_options="-u -b" - ;; - *solaris*) - lint_name=lint - lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" - ;; -esac - -# Test for the presence of the program (either guessed by the code or spelled out by the user) -if test "x$use_lint" = x"yes" ; then - # Extract the first word of "$lint_name", so it can be a program name with args. -set dummy $lint_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_LINT+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $LINT in - [\\/]* | ?:[\\/]*) - ac_cv_path_LINT="$LINT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_LINT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -LINT=$ac_cv_path_LINT -if test -n "$LINT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5 -$as_echo "$LINT" >&6; } +if test "x$use_lint" = "xyes" ; then + LINT="lint" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + LINT="$use_lint" fi - - - if test "x$LINT" = "x"; then - as_fn_error "--with-lint=yes specified but lint-style tool not found in PATH" "$LINENO" 5 - fi -elif test "x$use_lint" = x"no" ; then - if test "x$LINT" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&2;} - fi -else - as_fn_error "--with-lint expects 'yes' or 'no'. Use LINT variable to specify path." "$LINENO" 5 +if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then + case $LINT in + lint|*/lint) + case $host_os in + solaris*) + LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" + ;; + esac + ;; + esac fi -# User supplied flags override default flags -if test "x$LINT_FLAGS" != "x"; then - lint_options=$LINT_FLAGS -fi -LINT_FLAGS=$lint_options - if test "x$LINT" != x; then + if test x$LINT != xno; then LINT_TRUE= LINT_FALSE='#' else @@@@ -15061,6 +14746,7 @@@@ fi +# Build lint "library" for more indepth checks of programs calling this library # Check whether --enable-lint-library was given. if test "${enable_lint_library+set}" = set; then : enableval=$enable_lint_library; make_lint_lib=$enableval @@@@ -15068,17 +14754,17 @@@@ else make_lint_lib=no fi - -if test "x$make_lint_lib" = x"yes" ; then - LINTLIB=llib-lX11.ln - if test "x$LINT" = "x"; then - as_fn_error "Cannot make lint library without --with-lint" "$LINENO" 5 - fi -elif test "x$make_lint_lib" != x"no" ; then - as_fn_error "--enable-lint-library expects 'yes' or 'no'." "$LINENO" 5 +if test "x$make_lint_lib" != "xno" ; then + if test "x$LINT" = "xno" ; then + as_fn_error "Cannot make lint library without --with-lint" "$LINENO" 5 + fi + if test "x$make_lint_lib" = "xyes" ; then + LINTLIB=llib-lX11.ln + else + LINTLIB=$make_lint_lib + fi fi - if test x$make_lint_lib != xno; then MAKE_LINT_LIB_TRUE= MAKE_LINT_LIB_FALSE='#' @@@@ -15524,10 +15210,6 @@@@ if test -z "${HAVE_GROFF_MM_TRUE}" && te as_fn_error "conditional \"HAVE_GROFF_MM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HAVE_GROFF_HTML_TRUE}" && test -z "${HAVE_GROFF_HTML_FALSE}"; then - as_fn_error "conditional \"HAVE_GROFF_HTML\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_PS2PDF_TRUE}" && test -z "${HAVE_PS2PDF_FALSE}"; then as_fn_error "conditional \"HAVE_PS2PDF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @ 1.9 log @Update to 1.2.2: Adam Jackson (1): Remove X_NOT_STDC_ENV usage. (#6527) Alan Coopersmith (4): Revert "Change masculine to ordmasculine in Compose file comments" Use AC_USE_SYSTEM_EXTENSIONS instead of hand-rolled check for _GNU_SOURCE Correct return type in XkbGetKeyboard man page Drop ancient USG SysV #ifdefs Caolan McNamara (1): man: missing space in XAllocColor man page Christoph Pfister (1): X.Org Bug #21117: crash in get_rotate_fontname (omGeneric.c) James Cloos (3): [nls] Remove combining_ keysyms from the Compose files [nls] Remove extraneous instances of UCS Combining Characters in Compose sequences. [nls] Replace remaining UCS Combining Characters in Compose sequences. Julien Cristau (4): Fix fi_FI.UTF-8, again nls: remove duplicated en_US* aliases nls: remove broken sd_IN.UTF-8 alias nls: remove more duplicated aliases Peter Hutterer (3): XWindowEvent/XCheckWindowEvent must not return GenericEvents. XMaskEvent/XCheckMaskedEvents must not check for GenericEvents. Bump to 1.2.2 Theppitak Karoonboonyanan (3): CharSet-to-CompoundText Conversion Failed for Thai Locales Thai XIM not filters when NumLock or CapsLock is on Thai XIM not retrieve MB surrounding on UTF-8 LC parag (2): libX11: Add new Indic language information to nls directory files. #21560 nls: Add pa_PK locale information and make pa_IN as default for pa. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2009/06/06 22:37:28 wiz Exp $ d3 1 a3 2 _POSIX_THREAD_SAFE_FUNCTIONS is not used on NetBSD. Instead, let's use _REENTRANT. d5 1 a5 1 --- configure.orig 2009-07-10 04:08:41.000000000 +0000 d7 381 a387 10 @@@@ -812,6 +812,8 @@@@ LINT_FALSE LINT_TRUE LINT_FLAGS LINT +CROSS_COMPILING_FALSE +CROSS_COMPILING_TRUE XKBPROTO_REQUIRES XKBPROTO_LIBS XKBPROTO_CFLAGS @@@@ -15467,44 +15469,39 @@@@ _ACEOF d391 1 a391 1 -{ $as_echo "$as_me:$LINENO: checking for pthread_self in -lc" >&5 d393 6 a398 5 -if test "${ac_cv_lib_c_pthread_self+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking whether pthread_self is declared" >&5 +$as_echo_n "checking whether pthread_self is declared... " >&6; } +if test "${ac_cv_have_decl_pthread_self+set}" = set; then $as_echo_n "(cached) " >&6 d402 4 a405 8 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include d414 3 a416 3 int main () { d418 5 a422 7 +#ifndef pthread_self + (void) pthread_self; +#endif + ; return 0; } d424 1 a424 23 -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@@@ -15513,31 +15510,35 @@@@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then d426 5 a430 13 + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_pthread_self=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_c_pthread_self=no + ac_cv_have_decl_pthread_self=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext d432 2 a433 3 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_self" >&5 d435 3 a437 11 -if test "x$ac_cv_lib_c_pthread_self" = x""yes; then - thrstubs="no" +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_pthread_self" >&5 +$as_echo "$ac_cv_have_decl_pthread_self" >&6; } +if test "x$ac_cv_have_decl_pthread_self" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_PTHREAD_SELF 1 +_ACEOF + +thrstubs="no" d439 2 a440 13 - thrstubs="yes" + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_PTHREAD_SELF 0 +_ACEOF + +thrstubs="yes" fi + if test x$thrstubs = xyes; then THRSTUBS_TRUE= THRSTUBS_FALSE='#' @@@@ -15552,8 +15553,8 @@@@ if test x$xthreads = xyes ; then d451 97 a547 1 @@@@ -16082,6 +16083,15 @@@@ else d550 14 a564 9 + if test $cross_compiling = yes ; then + CROSS_COMPILING_TRUE= + CROSS_COMPILING_FALSE='#' +else + CROSS_COMPILING_TRUE='#' + CROSS_COMPILING_FALSE= +fi + + d566 26 d593 15 a607 15 for ac_header in stdlib.h unistd.h @@@@ -17206,6 +17216,13 @@@@ $as_echo "$as_me: error: conditional \"X Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @ 1.8 log @Update to 1.2.1: Alan Coopersmith (21): flags member of Display structure needs to be marked volatile Incorporate char range comments from Solaris version of ksc5601.h Incorporate more locale names/aliases from Solaris libX11 Add --with-locale-lib-dir configure option to set locale lib install dir Bug 6820: Xlib shouldn't handle EAGAIN as a fatal IO error Bug 9953: Please provide locale alias hu_HU.utf8 Correct locale alias for sh_BA.ISO8859-2@@bosnia (should be sr, not nr) Bug 14651: We need to add new locale specification for Belarusian Latin locale Bug 10082: Compose entries for some standard mathematical operators XErrorDB additions for RANDR 1.3 XErrorDB additions for XInput errors and new XInput 1.5 requests XErrorDB additions for DRI2 requests Remove ifdef checks for macII left over from ancient A/UX 3.0 support When makekeys fails to find a good hash, print error instead of divide-by-zero makekeys: combine malloc(strlen)+strcpy into strdup Remove _XP_PRINT_SERVER_ #ifdefs from Xrm.c Delete some unused "#ifdef notdef" static functions Change masculine to ordmasculine in Compose file comments Further ansify prototypes & reduce #ifdefs in locking.c Fix a several sparse warnings: Using plain integer as NULL pointer Version bump: 1.2.1 Caolan McNamara (1): Bug 20575: man page for XCreatePixmapFromBitmapData doesn't match signature Chris Ball (2): Build fix for fi_FI. Fix fi_FI locale install directory. Emilio Jesús Gallego Arias (1): xcb_io: Avoid datatype overflow on AMD64 and friends. Julien Cristau (2): nls: actually use the fi_FI.UTF-8 files Add a ru_RU.UTF-8 locale Lubos Lunak (2): XGetErrorText() fails for extension error codes equal to the error base XErrorDB updates for XTEST, RANDR, DAMAGE extensions Mlos Komarcevic (1): Bug 11456: Serbian locale updates (sr_RS and sr_ME) Paul Bender (1): Bug 15664: xau & xdmcp not needed in x11.pc dependencies when built with xcb Xue Wei (4): Add kk_KZ.UTF-8 to locale.dir.pre for Kazakhstan Add locale aliases for no_NO & sh_BA locale variants Add nn_NO.UTF-8 to compose.dir.pre for Norwegian Nynorsk Add UTF-8 locale entries for es_US, kk_KZ, mt_MT, and sh_BA Yaakov Selkowitz (Cygwin Ports maintainer) (1): Bug 20773: Xcursor dynamic loading on Cygwin @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2009/02/21 16:44:29 wiz Exp $ d6 1 a6 1 --- configure.orig 2009-04-07 22:40:47.000000000 +0000 d8 8 a15 1 @@@@ -929,6 +929,8 @@@@ XKB_FALSE d17 1 a17 8 XKBPROTO_LIBS XKBPROTO_REQUIRES +CROSS_COMPILING_TRUE +CROSS_COMPILING_FALSE LINT LINT_FLAGS LINT_TRUE @@@@ -23139,43 +23141,38 @@@@ _ACEOF d21 2 a22 2 -{ echo "$as_me:$LINENO: checking for pthread_self in -lc" >&5 -echo $ECHO_N "checking for pthread_self in -lc... $ECHO_C" >&6; } d24 2 a25 2 +{ echo "$as_me:$LINENO: checking whether pthread_self is declared" >&5 +echo $ECHO_N "checking whether pthread_self is declared... $ECHO_C" >&6; } d27 1 a27 1 echo $ECHO_N "(cached) $ECHO_C" >&6 d67 2 a68 1 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 d74 1 a74 1 @@@@ -23184,28 +23181,35 @@@@ eval "echo \"\$as_me:$LINENO: $ac_try_ec d78 4 a81 2 - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then d86 1 a86 1 echo "$as_me: failed program was:" >&5 d93 1 d99 3 a101 3 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_self" >&5 -echo "${ECHO_T}$ac_cv_lib_c_pthread_self" >&6; } -if test $ac_cv_lib_c_pthread_self = yes; then d103 3 a105 3 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_pthread_self" >&5 +echo "${ECHO_T}$ac_cv_have_decl_pthread_self" >&6; } +if test $ac_cv_have_decl_pthread_self = yes; then d125 1 a125 1 @@@@ -23220,8 +23224,8 @@@@ if test x$xthreads = xyes ; then d136 1 a136 1 @@@@ -23702,6 +23706,15 @@@@ else d152 1 a152 1 @@@@ -24850,6 +24863,13 @@@@ echo "$as_me: error: conditional \"XKB\" d157 1 a157 1 + { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. d159 1 a159 1 +echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. d164 1 a164 1 { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined. a165 18 @@@@ -25679,6 +25699,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 +CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim +CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim LINT!$LINT$ac_delim LINT_FLAGS!$LINT_FLAGS$ac_delim LINT_TRUE!$LINT_TRUE$ac_delim @@@@ -25705,7 +25727,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` = 87; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @ 1.7 log @Update to 1.2: New libX11 release to go with libxcb 1.2. Some more fixes, janitorial work, NLS updates, and the long-awaited addition of ☭ and ♥ to your favorite Compose file. Details follow in the shortlog from 1.1.99.2. Cheers, Julien Adam Jackson (1): Fix leak in _XimXGetReadData Alan Coopersmith (1): Add README with pointers to mailing list, bugzilla & git repos Brian Rogers (1): Initialize event_notify after allocating the memory for it. Colin Harrison (1): Fix copy/paste typo in imLcPrs James Cloos (7): [nls] Add some UTF-8 Compose sequences [nls] Annotate the Bépo compose sequences Use C comments rather than initial doubled hashes to exclude lines from .pre files Revert "For nls/*.pre, allow people to comment lines by starting them with '##'." [i18n] s/U00DC/Udiaeresis/g NLS: Add UTF-8 compose file for Finnish dolt: allow older versions of bash to compile the library Jeremy Huddleston (1): Force local transport when using the launchd socket. Julien Cristau (2): Check Xmalloc return value in _XConnectXCB Bump to 1.2 Ken Thomases (1): [i18n] Provide translation from XK_partialderivative (8ef) to Unicode (U2202) Paulo Cesar Pereira de Andrade (10): Janitor: ansification, make distcheck, compiler warnings. Janitor: Correct some gcc/sparse warnings. patches to avoid gcc warnings for libX11 (#1) patches to avoid gcc warnings for libX11 (#2) patches to avoid gcc warnings for libX11 (#3) patches to avoid gcc warnings for libX11 (#4) WORD64 compile fix. This bug catched on a overview of the code. Don't add prototypes for functions that don't exist. Allow multiple inclusions of cursorfont.h, cosmetic patch. Check if a function argument is NULL. Peter Hutterer (2): Add XF86Suspend, XF86Hibernate to KeysymDB. Fix wrong implies symbol. Stefan Dirsch (3): Added remaining hunk of Egbert's patch to prevent XIM deadlocks (#1182). Added remaining xlib patch required for gb18030 support (#1573). Fixed strange font mixups, when fontsets are still used (#2676, Novell #74299). Will Thompson (2): Add two essential compose sequences NLS: Compose: Non-aliasing CCCP vehemens (1): [i18n] Distribute new headers which were added for gb18030 support. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2008/09/16 21:57:09 bjs Exp $ d6 1 a6 1 --- configure.orig 2009-02-17 15:10:53.000000000 +0000 d8 1 a8 1 @@@@ -932,6 +932,8 @@@@ XKB_FALSE d17 1 a17 1 @@@@ -23828,43 +23830,38 @@@@ _ACEOF d73 1 a73 1 @@@@ -23873,28 +23870,35 @@@@ eval "echo \"\$as_me:$LINENO: $ac_try_ec d121 1 a121 1 @@@@ -23909,8 +23913,8 @@@@ if test x$xthreads = xyes ; then d132 1 a132 1 @@@@ -24441,6 +24445,15 @@@@ else d148 1 a148 1 @@@@ -25582,6 +25595,13 @@@@ echo "$as_me: error: conditional \"XKB\" d162 1 a162 1 @@@@ -26412,6 +26432,8 @@@@ XKB_FALSE!$XKB_FALSE$ac_delim d171 1 a171 1 @@@@ -26438,7 +26460,7 @@@@ LIBOBJS!$LIBOBJS$ac_delim d175 2 a176 2 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then @ 1.6 log @Update to libX11-1.1.5: integrates the patches listed as removed as well as a number of i18n fixes. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2008/07/24 01:07:31 bjs Exp $ d6 1 a6 1 --- configure.orig 2008-09-04 17:48:46.000000000 -0400 d8 1 a8 1 @@@@ -929,6 +929,8 @@@@ XKB_FALSE d17 3 a19 3 @@@@ -23393,43 +23395,38 @@@@ esac d73 1 a73 1 @@@@ -23438,28 +23435,35 @@@@ eval "echo \"\$as_me:$LINENO: $ac_try_ec d121 1 a121 1 @@@@ -23474,8 +23478,8 @@@@ if test x$xthreads = xyes ; then d132 1 a132 1 @@@@ -24006,6 +24010,15 @@@@ else d148 1 a148 1 @@@@ -25140,6 +25153,13 @@@@ echo "$as_me: error: conditional \"XKB\" d162 1 a162 1 @@@@ -25967,6 +25993,8 @@@@ XKB_FALSE!$XKB_FALSE$ac_delim d171 1 a171 1 @@@@ -25991,7 +26019,7 @@@@ LIBOBJS!$LIBOBJS$ac_delim d175 2 a176 2 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then @ 1.5 log @ Properly define XTHREAD_CFLAGS/XTHREADLIB on NetBSD: We do not want -pthread in XTHREAD_CFLAGS, as this will end up linking everything against libpthread. Thus, in keeping with our gcc specfile, define _REENTRANT in XTHREAD_CFLAGS instead. XTHREADLIB is now -pthread, not -lpthread. While here, update to head of libX11-1.1 branch in GIT (with the exception of some unicode changes which caused mkpatches to choke). changes: - IM: Respect XMODIFIERS for Thai locale (bug #15719) - Bug #15884: Remove useless sleep()'s from the connection code. - NLS: Make UTF-8 the default for Russian - ConnDis: properly cast 'addr' before accessing it as a byte array. - added error check in Xcms color file parser; closes bug #15305 - Fix missing error condition in cmsColNm.c, also. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2008/04/24 07:45:49 joerg Exp $ d6 1 a6 1 --- configure.orig 2008-03-06 15:48:42.000000000 -0500 d8 1 a8 1 @@@@ -927,6 +927,8 @@@@ XKB_FALSE d17 1 a17 1 @@@@ -22885,43 +22887,38 @@@@ esac d73 1 a73 1 @@@@ -22930,28 +22927,35 @@@@ eval "echo \"\$as_me:$LINENO: $ac_try_ec d121 1 a121 1 @@@@ -22966,8 +22970,8 @@@@ if test x$xthreads = xyes ; then d132 1 a132 1 @@@@ -23507,6 +23511,15 @@@@ else d148 1 a148 1 @@@@ -24641,6 +24654,13 @@@@ echo "$as_me: error: conditional \"XKB\" d162 1 a162 1 @@@@ -25466,6 +25486,8 @@@@ XKB_FALSE!$XKB_FALSE$ac_delim d171 1 a171 1 @@@@ -25490,7 +25512,7 @@@@ LIBOBJS!$LIBOBJS$ac_delim d175 2 a176 2 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then @ 1.4 log @Make sure that configure includes pthread.h when checking for pthread stubs as they are macros at least on NetBSD. Bump revision. @ text @d1 1 a1 1 $NetBSD$ d3 4 a6 1 --- configure.orig 2008-03-06 21:48:42.000000000 +0100 d121 11 @ 1.3 log @Update to 1.1.4: Adam Jackson (2): Bug #14029: Don't LockDisplay() recursively. libX11 1.1.4 Alan Coopersmith (6): X.Org Bug #4312: incorrect comment asterisk in XAnyEvent.3x man page XErrorDB updates for Render 0.9 & XFixes 4.0 Add WM_LOCALE_NAME to list of properties set in XSetWMProperties comment Spell out number in XkbGetKeyVirtualModMap man page to avoid cpp errors from # Add support for building lint library with --enable-lint-library Man page typo fixes Anton Zinoviev (1): Additions to the Compose file for UTF-8 Daniel Stone (1): Colours: Fix --disable-xcms Eric Anholt (2): Add XF86 keyboard/monitor brightness keysyms to the keysymbdb. Bug #2081: Note the range limitation of XSetScreenSaver arguments. Eric S. Raymond (9): Bug #9516: Markup error in XAllocWMHints.3x Bug 9523: Markup problems in XQueryExtension.3x Bug #9650: Bad markup in XLoadFont.3x manual page Bug #9651: Bad markup in XcmsColor.3x Bug #9652: Bad markup in XDrawArc.3x Bug #9653: Bad markup in XQueryColor.3x Bug #9654: Bad markup in XrmGetFileDatabase.3x Bug #9655: Bad markup in XrmUniqueQuark.3x Bug #9658: Bad markup on XIfEvent.3x Ian Romanick (1): Make sure nls/am_ET.UTF-8/Makefile is created by configure. James Cloos (12): Fix SMP Compose targets Add some compose sequences Compose fix for Latin-1 (from Debian) Add additional Euro signs to compose Patch for Catalan locales Add compose file for Ethiopic to match new keyboard in xkeyboard-config Fix typo Use the new dead_psili and dead_dasia keysyms added to proto/x11proto 7.0.11 Fix the keysyms in the en_US.UTF-8 Compose file Update the currency symbols block of en_US.UTF-8/Compose.pre Add compose sequences add a comment to en_US.UTF-8/Compose Jamey Sharp (1): Two threads can request sequence sync and XID fetch simultaneously. Jeremy C. Reed (1): Fix a mutex reference-counting bug. Jeremy Huddleston (3): Define __DARWIN__ when host_os =3D=3D darwin* as needed in SetLocale.= c Use __APPLE__ instead of __DARWIN__ Added launchd support. Kim Woelders (1): Fix bs_BA entries in locale.dir.pre Kristian H=C3=B8gsberg (1): Add GLX 1.4 requests and errors. Samuel Thibault (1): X.Org Bug #12983: Typos in ./man/XChangeKeyboardControl.man S=C3=B8ren Sandmann Pedersen (1): XIM: Fix a hand when switching input context. Yann Droneaud (1): XIM: Properly initialise client event @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2007/08/05 22:39:38 joerg Exp $ d3 1 a3 1 --- configure.orig 2008-03-06 20:48:42.000000000 +0000 d14 105 a118 1 @@@@ -23507,6 +23509,15 @@@@ else d134 1 a134 1 @@@@ -24641,6 +24652,13 @@@@ echo "$as_me: error: conditional \"XKB\" @ 1.2 log @Update libX11 to 1.1.3: - man page fixes - reset hostname when setting it internally for consistency - fix XGetMotionEvents argument order - locking fixes @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig 2007-08-06 00:08:02.000000000 +0200 d5 1 a5 1 @@@@ -926,6 +926,8 @@@@ XKB_FALSE d14 1 a14 1 @@@@ -23423,6 +23425,15 @@@@ else d30 1 a30 1 @@@@ -24523,6 +24534,13 @@@@ echo "$as_me: error: conditional \"XKB\" d44 1 a44 1 @@@@ -25339,6 +25357,8 @@@@ XKB_FALSE!$XKB_FALSE$ac_delim d53 1 a53 1 @@@@ -25360,7 +25380,7 @@@@ LIBOBJS!$LIBOBJS$ac_delim d57 2 a58 2 - 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 @ 1.1 log @Teach libX11 about cross-compilation: - define an automake conditional for cross-compilation - build xmakekeys in addition to makekeys when using cross-compilation. Provide manual compiliation rules to replace the default automake rules. We do use X11_CFLAGS, but we do *not* want CFLAGS as the latter can contain platform specific flags like -mieee on Alpha. - Use either xmakekeys or makekeys depending on whether this is a native build or not. Supported-by: Google SoC 2007 @ text @d3 1 a3 1 --- configure.orig 2007-06-04 06:44:39.000000000 +0200 d5 1 a5 1 @@@@ -924,6 +924,8 @@@@ XKB_FALSE d14 2 a15 2 @@@@ -23199,6 +23201,17 @@@@ fi d18 1 a18 1 +if test $cross_compiling = yes ; then d27 2 a28 2 + + d30 1 a30 3 do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@@@ -24299,6 +24312,13 @@@@ echo "$as_me: error: conditional \"XKB\" d44 1 a44 1 @@@@ -25112,6 +25132,8 @@@@ XKB_FALSE!$XKB_FALSE$ac_delim d53 1 a53 1 @@@@ -25133,7 +25155,7 @@@@ LIBOBJS!$LIBOBJS$ac_delim d57 2 a58 2 - 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 @