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 xwininfo 1.1.4

matthieu b04bdc2c 4781b8e9

+578 -68
+96 -5
app/xwininfo/ChangeLog
··· 1 + commit 919665db8ceb8e2c38a1a4ce4686eb224ddf5234 2 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 + Date: Fri Mar 9 20:41:31 2018 -0800 4 + 5 + xwininfo 1.1.4 6 + 7 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8 + 9 + commit e3c764b14da65c5d3afcd19f920705b397aa765c 10 + Author: Mihail Konev <k.mvc@ya.ru> 11 + Date: Thu Jan 26 14:00:21 2017 +1000 12 + 13 + autogen: add default patch prefix 14 + 15 + Signed-off-by: Mihail Konev <k.mvc@ya.ru> 16 + 17 + commit 4edd69d5f9abd111e6b52f600696f84e023f6249 18 + Author: Emil Velikov <emil.l.velikov@gmail.com> 19 + Date: Mon Mar 9 12:00:52 2015 +0000 20 + 21 + autogen.sh: use quoted string variables 22 + 23 + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent 24 + fall-outs, when they contain space. 25 + 26 + Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> 27 + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 28 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 29 + 30 + commit 30488a8c7ef5f24ce445a268b168a9a5646b9f7d 31 + Author: Peter Hutterer <peter.hutterer@who-t.net> 32 + Date: Tue Jan 24 10:32:07 2017 +1000 33 + 34 + autogen.sh: use exec instead of waiting for configure to finish 35 + 36 + Syncs the invocation of configure with the one from the server. 37 + 38 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 39 + Reviewed-by: Emil Velikov <emil.velikov@collabora.com> 40 + 41 + commit 0c49f8f2bd56b1e77721e81030ea948386dcdf4e 42 + Author: Olivier Fourdan <ofourdan@redhat.com> 43 + Date: Tue Jan 6 11:57:33 2015 +0100 44 + 45 + xwininfo: do not segfault on IO error 46 + 47 + If the connection to the X server is lost while waiting for 48 + the user to select a window interactively, xwininfo segfaults. 49 + 50 + This is a regression introduced with the port to XCB, because 51 + xcb_wait_for_event() can return NULL in case of an IO error and 52 + xwininfo does not check for the actual returned value. 53 + 54 + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> 55 + Reviewed-by: Adam Jackson <ajax@redhat.com> 56 + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 57 + 58 + commit 017b3736489985999d8dcf4d9e473e1fd6dd3647 59 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 60 + Date: Tue Jun 3 23:58:54 2014 -0700 61 + 62 + Add -version option to print program version 63 + 64 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 65 + 66 + commit d41d834d8b2be86eb56802de12c2399c7ff0919f 67 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 68 + Date: Tue Jun 3 23:56:08 2014 -0700 69 + 70 + Print which option was in error along with usage message 71 + 72 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 73 + 74 + commit d5417f2eb09e7061801f63ce77e3441d80e5e4a1 75 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 76 + Date: Sat May 31 21:39:32 2014 -0700 77 + 78 + autogen.sh: Honor NOCONFIGURE=1 79 + 80 + See http://people.gnome.org/~walters/docs/build-api.txt 81 + 82 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 83 + 84 + commit 301f9c7970548539a2679cc3e354680a60733a68 85 + Author: Alan Coopersmith <alan.coopersmith@oracle.com> 86 + Date: Sat May 31 21:38:41 2014 -0700 87 + 88 + configure: Drop AM_MAINTAINER_MODE 89 + 90 + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 91 + 1 92 commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 2 93 Author: Alan Coopersmith <alan.coopersmith@oracle.com> 3 94 Date: Fri May 17 21:04:26 2013 -0700 ··· 324 415 325 416 Fix build error when building --with-xcb-icccm 326 417 327 - xwininfo.c:633:34: error: incompatible types when assigning to type xcb_get_property_cookie_t from type int 418 + xwininfo.c:633:34: error: incompatible types when assigning to type xcb_get_property_cookie_t from type int 328 419 329 420 Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org> 330 421 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ··· 441 532 442 533 Over a local connection on the same machine: 443 534 444 - Xlib: 0.00u 0.01s 0:00.05 20.0% 445 - xcb: 0.00u 0.00s 0:00.02 0.0% 535 + Xlib: 0.00u 0.01s 0:00.05 20.0% 536 + xcb: 0.00u 0.00s 0:00.02 0.0% 446 537 447 538 (i.e. barely measurable difference - I had more variation between 448 539 repeated runs of the command) ··· 450 541 Introducing latency by running over ssh -X from California to Beijing 451 542 and back: 452 543 453 - Xlib: 0.03u 0.02s 8:19.12 0.0% 454 - xcb: 0.00u 0.00s 0:45.26 0.0% 544 + Xlib: 0.03u 0.02s 8:19.12 0.0% 545 + xcb: 0.00u 0.00s 0:45.26 0.0% 455 546 456 547 Memory size when exit() is called: 457 548
+3 -2
app/xwininfo/Makefile.in
··· 75 75 subdir = . 76 76 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 77 77 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 78 - $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \ 79 - config.rpath config.sub depcomp install-sh missing strnlen.c 78 + $(top_srcdir)/configure COPYING ChangeLog INSTALL compile \ 79 + config.guess config.rpath config.sub depcomp install-sh \ 80 + missing strnlen.c 80 81 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 81 82 am__aclocal_m4_deps = $(top_srcdir)/configure.ac 82 83 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+44 -20
app/xwininfo/aclocal.m4
··· 2637 2637 2638 2638 dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. 2639 2639 dnl 2640 - dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. 2640 + dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 2641 2641 dnl 2642 2642 dnl Permission is hereby granted, free of charge, to any person obtaining a 2643 2643 dnl copy of this software and associated documentation files (the "Software"), ··· 2674 2674 # See the "minimum version" comment for each macro you use to see what 2675 2675 # version you require. 2676 2676 m4_defun([XORG_MACROS_VERSION],[ 2677 - m4_define([vers_have], [1.19.0]) 2677 + m4_define([vers_have], [1.19.2]) 2678 2678 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) 2679 2679 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) 2680 2680 m4_if(m4_cmp(maj_have, maj_needed), 0,, ··· 2752 2752 AC_REQUIRE([AC_CANONICAL_HOST]) 2753 2753 AC_REQUIRE([AC_PROG_SED]) 2754 2754 2755 + case $host_os in 2756 + solaris*) 2757 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 2758 + # check for a man page file found in later versions that use 2759 + # traditional section numbers instead 2760 + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], 2761 + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) 2762 + ;; 2763 + *) SYSV_MAN_SECTIONS=false ;; 2764 + esac 2765 + 2755 2766 if test x$APP_MAN_SUFFIX = x ; then 2756 2767 APP_MAN_SUFFIX=1 2757 2768 fi ··· 2767 2778 fi 2768 2779 2769 2780 if test x$FILE_MAN_SUFFIX = x ; then 2770 - case $host_os in 2771 - solaris*) FILE_MAN_SUFFIX=4 ;; 2772 - *) FILE_MAN_SUFFIX=5 ;; 2781 + case $SYSV_MAN_SECTIONS in 2782 + true) FILE_MAN_SUFFIX=4 ;; 2783 + *) FILE_MAN_SUFFIX=5 ;; 2773 2784 esac 2774 2785 fi 2775 2786 if test x$FILE_MAN_DIR = x ; then ··· 2777 2788 fi 2778 2789 2779 2790 if test x$MISC_MAN_SUFFIX = x ; then 2780 - case $host_os in 2781 - solaris*) MISC_MAN_SUFFIX=5 ;; 2782 - *) MISC_MAN_SUFFIX=7 ;; 2791 + case $SYSV_MAN_SECTIONS in 2792 + true) MISC_MAN_SUFFIX=5 ;; 2793 + *) MISC_MAN_SUFFIX=7 ;; 2783 2794 esac 2784 2795 fi 2785 2796 if test x$MISC_MAN_DIR = x ; then ··· 2787 2798 fi 2788 2799 2789 2800 if test x$DRIVER_MAN_SUFFIX = x ; then 2790 - case $host_os in 2791 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 2792 - *) DRIVER_MAN_SUFFIX=4 ;; 2801 + case $SYSV_MAN_SECTIONS in 2802 + true) DRIVER_MAN_SUFFIX=7 ;; 2803 + *) DRIVER_MAN_SUFFIX=4 ;; 2793 2804 esac 2794 2805 fi 2795 2806 if test x$DRIVER_MAN_DIR = x ; then ··· 2797 2808 fi 2798 2809 2799 2810 if test x$ADMIN_MAN_SUFFIX = x ; then 2800 - case $host_os in 2801 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 2802 - *) ADMIN_MAN_SUFFIX=8 ;; 2811 + case $SYSV_MAN_SECTIONS in 2812 + true) ADMIN_MAN_SUFFIX=1m ;; 2813 + *) ADMIN_MAN_SUFFIX=8 ;; 2803 2814 esac 2804 2815 fi 2805 2816 if test x$ADMIN_MAN_DIR = x ; then ··· 3060 3071 fi]) 3061 3072 3062 3073 # Test for the ability of xmlto to generate a text target 3074 + # 3075 + # NOTE: xmlto 0.0.27 or higher return a non-zero return code in the 3076 + # following test for empty XML docbook files. 3077 + # For compatibility reasons use the following empty XML docbook file and if 3078 + # it fails try it again with a non-empty XML file. 3063 3079 have_xmlto_text=no 3064 3080 cat > conftest.xml << "EOF" 3065 3081 EOF 3066 3082 AS_IF([test "$have_xmlto" = yes], 3067 3083 [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 3068 3084 [have_xmlto_text=yes], 3069 - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) 3085 + [# Try it again with a non-empty XML file. 3086 + cat > conftest.xml << "EOF" 3087 + <x></x> 3088 + EOF 3089 + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], 3090 + [have_xmlto_text=yes], 3091 + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) 3070 3092 rm -f conftest.xml 3071 3093 AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) 3072 3094 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ··· 4462 4484 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 4463 4485 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 4464 4486 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 4465 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 4466 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 4487 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 4488 + touch \$(top_srcdir)/INSTALL; \ 4489 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 4467 4490 AC_SUBST([INSTALL_CMD]) 4468 4491 ]) # XORG_INSTALL 4469 4492 dnl Copyright 2005 Red Hat, Inc ··· 4524 4547 # 4525 4548 # 4526 4549 AC_DEFUN([XORG_CHANGELOG], [ 4527 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 4550 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 4528 4551 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 4529 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 4530 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 4552 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 4553 + touch \$(top_srcdir)/ChangeLog; \ 4554 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 4531 4555 AC_SUBST([CHANGELOG_CMD]) 4532 4556 ]) # XORG_CHANGELOG 4533 4557
+347
app/xwininfo/compile
··· 1 + #! /bin/sh 2 + # Wrapper for compilers which do not understand '-c -o'. 3 + 4 + scriptversion=2012-10-14.11; # UTC 5 + 6 + # Copyright (C) 1999-2014 Free Software Foundation, Inc. 7 + # Written by Tom Tromey <tromey@cygnus.com>. 8 + # 9 + # This program is free software; you can redistribute it and/or modify 10 + # it under the terms of the GNU General Public License as published by 11 + # the Free Software Foundation; either version 2, or (at your option) 12 + # any later version. 13 + # 14 + # This program is distributed in the hope that it will be useful, 15 + # but WITHOUT ANY WARRANTY; without even the implied warranty of 16 + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17 + # GNU General Public License for more details. 18 + # 19 + # You should have received a copy of the GNU General Public License 20 + # along with this program. If not, see <http://www.gnu.org/licenses/>. 21 + 22 + # As a special exception to the GNU General Public License, if you 23 + # distribute this file as part of a program that contains a 24 + # configuration script generated by Autoconf, you may include it under 25 + # the same distribution terms that you use for the rest of that program. 26 + 27 + # This file is maintained in Automake, please report 28 + # bugs to <bug-automake@gnu.org> or send patches to 29 + # <automake-patches@gnu.org>. 30 + 31 + nl=' 32 + ' 33 + 34 + # We need space, tab and new line, in precisely that order. Quoting is 35 + # there to prevent tools from complaining about whitespace usage. 36 + IFS=" "" $nl" 37 + 38 + file_conv= 39 + 40 + # func_file_conv build_file lazy 41 + # Convert a $build file to $host form and store it in $file 42 + # Currently only supports Windows hosts. If the determined conversion 43 + # type is listed in (the comma separated) LAZY, no conversion will 44 + # take place. 45 + func_file_conv () 46 + { 47 + file=$1 48 + case $file in 49 + / | /[!/]*) # absolute file, and not a UNC file 50 + if test -z "$file_conv"; then 51 + # lazily determine how to convert abs files 52 + case `uname -s` in 53 + MINGW*) 54 + file_conv=mingw 55 + ;; 56 + CYGWIN*) 57 + file_conv=cygwin 58 + ;; 59 + *) 60 + file_conv=wine 61 + ;; 62 + esac 63 + fi 64 + case $file_conv/,$2, in 65 + *,$file_conv,*) 66 + ;; 67 + mingw/*) 68 + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` 69 + ;; 70 + cygwin/*) 71 + file=`cygpath -m "$file" || echo "$file"` 72 + ;; 73 + wine/*) 74 + file=`winepath -w "$file" || echo "$file"` 75 + ;; 76 + esac 77 + ;; 78 + esac 79 + } 80 + 81 + # func_cl_dashL linkdir 82 + # Make cl look for libraries in LINKDIR 83 + func_cl_dashL () 84 + { 85 + func_file_conv "$1" 86 + if test -z "$lib_path"; then 87 + lib_path=$file 88 + else 89 + lib_path="$lib_path;$file" 90 + fi 91 + linker_opts="$linker_opts -LIBPATH:$file" 92 + } 93 + 94 + # func_cl_dashl library 95 + # Do a library search-path lookup for cl 96 + func_cl_dashl () 97 + { 98 + lib=$1 99 + found=no 100 + save_IFS=$IFS 101 + IFS=';' 102 + for dir in $lib_path $LIB 103 + do 104 + IFS=$save_IFS 105 + if $shared && test -f "$dir/$lib.dll.lib"; then 106 + found=yes 107 + lib=$dir/$lib.dll.lib 108 + break 109 + fi 110 + if test -f "$dir/$lib.lib"; then 111 + found=yes 112 + lib=$dir/$lib.lib 113 + break 114 + fi 115 + if test -f "$dir/lib$lib.a"; then 116 + found=yes 117 + lib=$dir/lib$lib.a 118 + break 119 + fi 120 + done 121 + IFS=$save_IFS 122 + 123 + if test "$found" != yes; then 124 + lib=$lib.lib 125 + fi 126 + } 127 + 128 + # func_cl_wrapper cl arg... 129 + # Adjust compile command to suit cl 130 + func_cl_wrapper () 131 + { 132 + # Assume a capable shell 133 + lib_path= 134 + shared=: 135 + linker_opts= 136 + for arg 137 + do 138 + if test -n "$eat"; then 139 + eat= 140 + else 141 + case $1 in 142 + -o) 143 + # configure might choose to run compile as 'compile cc -o foo foo.c'. 144 + eat=1 145 + case $2 in 146 + *.o | *.[oO][bB][jJ]) 147 + func_file_conv "$2" 148 + set x "$@" -Fo"$file" 149 + shift 150 + ;; 151 + *) 152 + func_file_conv "$2" 153 + set x "$@" -Fe"$file" 154 + shift 155 + ;; 156 + esac 157 + ;; 158 + -I) 159 + eat=1 160 + func_file_conv "$2" mingw 161 + set x "$@" -I"$file" 162 + shift 163 + ;; 164 + -I*) 165 + func_file_conv "${1#-I}" mingw 166 + set x "$@" -I"$file" 167 + shift 168 + ;; 169 + -l) 170 + eat=1 171 + func_cl_dashl "$2" 172 + set x "$@" "$lib" 173 + shift 174 + ;; 175 + -l*) 176 + func_cl_dashl "${1#-l}" 177 + set x "$@" "$lib" 178 + shift 179 + ;; 180 + -L) 181 + eat=1 182 + func_cl_dashL "$2" 183 + ;; 184 + -L*) 185 + func_cl_dashL "${1#-L}" 186 + ;; 187 + -static) 188 + shared=false 189 + ;; 190 + -Wl,*) 191 + arg=${1#-Wl,} 192 + save_ifs="$IFS"; IFS=',' 193 + for flag in $arg; do 194 + IFS="$save_ifs" 195 + linker_opts="$linker_opts $flag" 196 + done 197 + IFS="$save_ifs" 198 + ;; 199 + -Xlinker) 200 + eat=1 201 + linker_opts="$linker_opts $2" 202 + ;; 203 + -*) 204 + set x "$@" "$1" 205 + shift 206 + ;; 207 + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) 208 + func_file_conv "$1" 209 + set x "$@" -Tp"$file" 210 + shift 211 + ;; 212 + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) 213 + func_file_conv "$1" mingw 214 + set x "$@" "$file" 215 + shift 216 + ;; 217 + *) 218 + set x "$@" "$1" 219 + shift 220 + ;; 221 + esac 222 + fi 223 + shift 224 + done 225 + if test -n "$linker_opts"; then 226 + linker_opts="-link$linker_opts" 227 + fi 228 + exec "$@" $linker_opts 229 + exit 1 230 + } 231 + 232 + eat= 233 + 234 + case $1 in 235 + '') 236 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 237 + exit 1; 238 + ;; 239 + -h | --h*) 240 + cat <<\EOF 241 + Usage: compile [--help] [--version] PROGRAM [ARGS] 242 + 243 + Wrapper for compilers which do not understand '-c -o'. 244 + Remove '-o dest.o' from ARGS, run PROGRAM with the remaining 245 + arguments, and rename the output as expected. 246 + 247 + If you are trying to build a whole package this is not the 248 + right script to run: please start by reading the file 'INSTALL'. 249 + 250 + Report bugs to <bug-automake@gnu.org>. 251 + EOF 252 + exit $? 253 + ;; 254 + -v | --v*) 255 + echo "compile $scriptversion" 256 + exit $? 257 + ;; 258 + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) 259 + func_cl_wrapper "$@" # Doesn't return... 260 + ;; 261 + esac 262 + 263 + ofile= 264 + cfile= 265 + 266 + for arg 267 + do 268 + if test -n "$eat"; then 269 + eat= 270 + else 271 + case $1 in 272 + -o) 273 + # configure might choose to run compile as 'compile cc -o foo foo.c'. 274 + # So we strip '-o arg' only if arg is an object. 275 + eat=1 276 + case $2 in 277 + *.o | *.obj) 278 + ofile=$2 279 + ;; 280 + *) 281 + set x "$@" -o "$2" 282 + shift 283 + ;; 284 + esac 285 + ;; 286 + *.c) 287 + cfile=$1 288 + set x "$@" "$1" 289 + shift 290 + ;; 291 + *) 292 + set x "$@" "$1" 293 + shift 294 + ;; 295 + esac 296 + fi 297 + shift 298 + done 299 + 300 + if test -z "$ofile" || test -z "$cfile"; then 301 + # If no '-o' option was seen then we might have been invoked from a 302 + # pattern rule where we don't need one. That is ok -- this is a 303 + # normal compilation that the losing compiler can handle. If no 304 + # '.c' file was seen then we are probably linking. That is also 305 + # ok. 306 + exec "$@" 307 + fi 308 + 309 + # Name of file we expect compiler to create. 310 + cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` 311 + 312 + # Create the lock directory. 313 + # Note: use '[/\\:.-]' here to ensure that we don't use the same name 314 + # that we are using for the .o file. Also, base the name on the expected 315 + # object file name, since that is what matters with a parallel build. 316 + lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d 317 + while true; do 318 + if mkdir "$lockdir" >/dev/null 2>&1; then 319 + break 320 + fi 321 + sleep 1 322 + done 323 + # FIXME: race condition here if user kills between mkdir and trap. 324 + trap "rmdir '$lockdir'; exit 1" 1 2 15 325 + 326 + # Run the compile. 327 + "$@" 328 + ret=$? 329 + 330 + if test -f "$cofile"; then 331 + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" 332 + elif test -f "${cofile}bj"; then 333 + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" 334 + fi 335 + 336 + rmdir "$lockdir" 337 + exit $ret 338 + 339 + # Local Variables: 340 + # mode: shell-script 341 + # sh-indentation: 2 342 + # eval: (add-hook 'write-file-hooks 'time-stamp) 343 + # time-stamp-start: "scriptversion=" 344 + # time-stamp-format: "%:y-%02m-%02d.%02H" 345 + # time-stamp-time-zone: "UTC" 346 + # time-stamp-end: "; # UTC" 347 + # End:
+68 -36
app/xwininfo/configure
··· 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 - # Generated by GNU Autoconf 2.69 for xwininfo 1.1.3. 3 + # Generated by GNU Autoconf 2.69 for xwininfo 1.1.4. 4 4 # 5 5 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. 6 6 # ··· 581 581 # Identity of this package. 582 582 PACKAGE_NAME='xwininfo' 583 583 PACKAGE_TARNAME='xwininfo' 584 - PACKAGE_VERSION='1.1.3' 585 - PACKAGE_STRING='xwininfo 1.1.3' 584 + PACKAGE_VERSION='1.1.4' 585 + PACKAGE_STRING='xwininfo 1.1.4' 586 586 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' 587 587 PACKAGE_URL='' 588 588 ··· 1321 1321 # Omit some internal or obsolete options to make the list less imposing. 1322 1322 # This message is too long to be a string in the A/UX 3.1 sh. 1323 1323 cat <<_ACEOF 1324 - \`configure' configures xwininfo 1.1.3 to adapt to many kinds of systems. 1324 + \`configure' configures xwininfo 1.1.4 to adapt to many kinds of systems. 1325 1325 1326 1326 Usage: $0 [OPTION]... [VAR=VALUE]... 1327 1327 ··· 1391 1391 1392 1392 if test -n "$ac_init_help"; then 1393 1393 case $ac_init_help in 1394 - short | recursive ) echo "Configuration of xwininfo 1.1.3:";; 1394 + short | recursive ) echo "Configuration of xwininfo 1.1.4:";; 1395 1395 esac 1396 1396 cat <<\_ACEOF 1397 1397 ··· 1511 1511 test -n "$ac_init_help" && exit $ac_status 1512 1512 if $ac_init_version; then 1513 1513 cat <<\_ACEOF 1514 - xwininfo configure 1.1.3 1514 + xwininfo configure 1.1.4 1515 1515 generated by GNU Autoconf 2.69 1516 1516 1517 1517 Copyright (C) 2012 Free Software Foundation, Inc. ··· 1926 1926 This file contains any messages produced by compilers while 1927 1927 running configure, to aid debugging if configure makes a mistake. 1928 1928 1929 - It was created by xwininfo $as_me 1.1.3, which was 1929 + It was created by xwininfo $as_me 1.1.4, which was 1930 1930 generated by GNU Autoconf 2.69. Invocation command line was 1931 1931 1932 1932 $ $0 $@ ··· 4066 4066 4067 4067 # Define the identity of the package. 4068 4068 PACKAGE='xwininfo' 4069 - VERSION='1.1.3' 4069 + VERSION='1.1.4' 4070 4070 4071 4071 4072 4072 cat >>confdefs.h <<_ACEOF ··· 11492 11492 11493 11493 11494 11494 11495 - CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ 11495 + CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ 11496 11496 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ 11497 - || (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ 11498 - echo 'git directory not found: installing possibly empty changelog.' >&2)" 11497 + || (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ 11498 + touch \$(top_srcdir)/ChangeLog; \ 11499 + echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" 11499 11500 11500 11501 11501 11502 ··· 11503 11504 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` 11504 11505 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ 11505 11506 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ 11506 - || (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ 11507 - echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" 11507 + || (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ 11508 + touch \$(top_srcdir)/INSTALL; \ 11509 + echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" 11508 11510 11509 11511 11510 11512 11511 11513 11512 11514 11513 11515 11516 + case $host_os in 11517 + solaris*) 11518 + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we 11519 + # check for a man page file found in later versions that use 11520 + # traditional section numbers instead 11521 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 11522 + $as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } 11523 + if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : 11524 + $as_echo_n "(cached) " >&6 11525 + else 11526 + test "$cross_compiling" = yes && 11527 + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 11528 + if test -r "/usr/share/man/man7/attributes.7"; then 11529 + ac_cv_file__usr_share_man_man7_attributes_7=yes 11530 + else 11531 + ac_cv_file__usr_share_man_man7_attributes_7=no 11532 + fi 11533 + fi 11534 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 11535 + $as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } 11536 + if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : 11537 + SYSV_MAN_SECTIONS=false 11538 + else 11539 + SYSV_MAN_SECTIONS=true 11540 + fi 11541 + 11542 + ;; 11543 + *) SYSV_MAN_SECTIONS=false ;; 11544 + esac 11545 + 11514 11546 if test x$APP_MAN_SUFFIX = x ; then 11515 11547 APP_MAN_SUFFIX=1 11516 11548 fi ··· 11526 11558 fi 11527 11559 11528 11560 if test x$FILE_MAN_SUFFIX = x ; then 11529 - case $host_os in 11530 - solaris*) FILE_MAN_SUFFIX=4 ;; 11531 - *) FILE_MAN_SUFFIX=5 ;; 11561 + case $SYSV_MAN_SECTIONS in 11562 + true) FILE_MAN_SUFFIX=4 ;; 11563 + *) FILE_MAN_SUFFIX=5 ;; 11532 11564 esac 11533 11565 fi 11534 11566 if test x$FILE_MAN_DIR = x ; then ··· 11536 11568 fi 11537 11569 11538 11570 if test x$MISC_MAN_SUFFIX = x ; then 11539 - case $host_os in 11540 - solaris*) MISC_MAN_SUFFIX=5 ;; 11541 - *) MISC_MAN_SUFFIX=7 ;; 11571 + case $SYSV_MAN_SECTIONS in 11572 + true) MISC_MAN_SUFFIX=5 ;; 11573 + *) MISC_MAN_SUFFIX=7 ;; 11542 11574 esac 11543 11575 fi 11544 11576 if test x$MISC_MAN_DIR = x ; then ··· 11546 11578 fi 11547 11579 11548 11580 if test x$DRIVER_MAN_SUFFIX = x ; then 11549 - case $host_os in 11550 - solaris*) DRIVER_MAN_SUFFIX=7 ;; 11551 - *) DRIVER_MAN_SUFFIX=4 ;; 11581 + case $SYSV_MAN_SECTIONS in 11582 + true) DRIVER_MAN_SUFFIX=7 ;; 11583 + *) DRIVER_MAN_SUFFIX=4 ;; 11552 11584 esac 11553 11585 fi 11554 11586 if test x$DRIVER_MAN_DIR = x ; then ··· 11556 11588 fi 11557 11589 11558 11590 if test x$ADMIN_MAN_SUFFIX = x ; then 11559 - case $host_os in 11560 - solaris*) ADMIN_MAN_SUFFIX=1m ;; 11561 - *) ADMIN_MAN_SUFFIX=8 ;; 11591 + case $SYSV_MAN_SECTIONS in 11592 + true) ADMIN_MAN_SUFFIX=1m ;; 11593 + *) ADMIN_MAN_SUFFIX=8 ;; 11562 11594 esac 11563 11595 fi 11564 11596 if test x$ADMIN_MAN_DIR = x ; then ··· 11839 11871 pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" 11840 11872 elif test -n "$PKG_CONFIG"; then 11841 11873 if test -n "$PKG_CONFIG" && \ 11842 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xproto >= 7.0.17\""; } >&5 11843 - ($PKG_CONFIG --exists --print-errors "x11 xproto >= 7.0.17") 2>&5 11874 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xproto >= 7.0.25\""; } >&5 11875 + ($PKG_CONFIG --exists --print-errors "x11 xproto >= 7.0.25") 2>&5 11844 11876 ac_status=$? 11845 11877 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 11846 11878 test $ac_status = 0; }; then 11847 - pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11 xproto >= 7.0.17" 2>/dev/null` 11879 + pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11 xproto >= 7.0.25" 2>/dev/null` 11848 11880 test "x$?" != "x0" && pkg_failed=yes 11849 11881 else 11850 11882 pkg_failed=yes ··· 11856 11888 pkg_cv_XLIB_LIBS="$XLIB_LIBS" 11857 11889 elif test -n "$PKG_CONFIG"; then 11858 11890 if test -n "$PKG_CONFIG" && \ 11859 - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xproto >= 7.0.17\""; } >&5 11860 - ($PKG_CONFIG --exists --print-errors "x11 xproto >= 7.0.17") 2>&5 11891 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xproto >= 7.0.25\""; } >&5 11892 + ($PKG_CONFIG --exists --print-errors "x11 xproto >= 7.0.25") 2>&5 11861 11893 ac_status=$? 11862 11894 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 11863 11895 test $ac_status = 0; }; then 11864 - pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xproto >= 7.0.17" 2>/dev/null` 11896 + pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xproto >= 7.0.25" 2>/dev/null` 11865 11897 test "x$?" != "x0" && pkg_failed=yes 11866 11898 else 11867 11899 pkg_failed=yes ··· 11882 11914 _pkg_short_errors_supported=no 11883 11915 fi 11884 11916 if test $_pkg_short_errors_supported = yes; then 11885 - XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 xproto >= 7.0.17" 2>&1` 11917 + XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 xproto >= 7.0.25" 2>&1` 11886 11918 else 11887 - XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 xproto >= 7.0.17" 2>&1` 11919 + XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 xproto >= 7.0.25" 2>&1` 11888 11920 fi 11889 11921 # Put the nasty error message in config.log where it belongs 11890 11922 echo "$XLIB_PKG_ERRORS" >&5 11891 11923 11892 - as_fn_error $? "Package requirements (x11 xproto >= 7.0.17) were not met: 11924 + as_fn_error $? "Package requirements (x11 xproto >= 7.0.25) were not met: 11893 11925 11894 11926 $XLIB_PKG_ERRORS 11895 11927 ··· 12464 12496 # report actual input values of CONFIG_FILES etc. instead of their 12465 12497 # values after options handling. 12466 12498 ac_log=" 12467 - This file was extended by xwininfo $as_me 1.1.3, which was 12499 + This file was extended by xwininfo $as_me 1.1.4, which was 12468 12500 generated by GNU Autoconf 2.69. Invocation command line was 12469 12501 12470 12502 CONFIG_FILES = $CONFIG_FILES ··· 12530 12562 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 12531 12563 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 12532 12564 ac_cs_version="\\ 12533 - xwininfo config.status 1.1.3 12565 + xwininfo config.status 1.1.4 12534 12566 configured by $0, generated by GNU Autoconf 2.69, 12535 12567 with options \\"\$ac_cs_config\\" 12536 12568
+2 -2
app/xwininfo/configure.ac
··· 23 23 24 24 # Initialize Autoconf 25 25 AC_PREREQ([2.60]) 26 - AC_INIT([xwininfo], [1.1.3], 26 + AC_INIT([xwininfo], [1.1.4], 27 27 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xwininfo]) 28 28 AC_CONFIG_SRCDIR([Makefile.am]) 29 29 AC_CONFIG_HEADERS([config.h]) ··· 67 67 68 68 # Even when using xcb, xproto is still required for Xfuncproto.h 69 69 # and libX11 headers for cursorfont.h 70 - PKG_CHECK_MODULES(XLIB, x11 [xproto >= 7.0.17]) 70 + PKG_CHECK_MODULES(XLIB, x11 [xproto >= 7.0.25]) 71 71 XWININFO_CFLAGS="${XWININFO_CFLAGS} ${XLIB_CFLAGS}" 72 72 XWININFO_LIBS="${XWININFO_LIBS} ${LIBICONV}" 73 73
+2
app/xwininfo/dsimple.c
··· 205 205 xcb_allow_events (dpy, XCB_ALLOW_SYNC_POINTER, XCB_TIME_CURRENT_TIME); 206 206 xcb_flush (dpy); 207 207 event = xcb_wait_for_event (dpy); 208 + if (event == NULL) 209 + Fatal_Error ("Fatal IO error"); 208 210 switch (event->response_type & 0x7f) { 209 211 case XCB_BUTTON_PRESS: 210 212 {
+1 -1
app/xwininfo/dsimple.h
··· 54 54 xcb_window_t Select_Window (xcb_connection_t *, const xcb_screen_t *, int); 55 55 xcb_window_t Window_With_Name (xcb_connection_t *, xcb_window_t, const char *); 56 56 57 - void Fatal_Error (const char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2); 57 + void Fatal_Error (const char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2) _X_COLD; 58 58 59 59 void Print_X_Error (xcb_connection_t *, xcb_generic_error_t *); 60 60
+7 -1
app/xwininfo/man/xwininfo.man
··· 32 32 [\-children] [\-tree] [\-stats] [\-bits] [\-events] [\-size] [\-wm] [\-shape] 33 33 [\-frame] [\-all] 34 34 [\-english] [\-metric] 35 - [\-display \fIdisplay\fP] 35 + [\-display \fIdisplay\fP] [\-version] 36 36 .SH DESCRIPTION 37 37 .PP 38 38 .I Xwininfo ··· 154 154 .TP 8 155 155 .B \-display \fIdisplay\fP 156 156 This option allows you to specify the server to connect to; see \fIX(__miscmansuffix__)\fP. 157 + PP 158 + .TP 8 159 + .B \-version 160 + This option indicates that 161 + .I xwininfo 162 + should print its version information and exit. 157 163 .SH EXAMPLE 158 164 .PP 159 165 The following is a sample summary taken with no options specified:
+8 -1
app/xwininfo/xwininfo.c
··· 278 278 /* 279 279 * Report the syntax for calling xwininfo: 280 280 */ 281 - _X_NORETURN 281 + _X_NORETURN _X_COLD 282 282 static void 283 283 usage (void) 284 284 { ··· 286 286 "usage: %s [-options ...]\n\n" 287 287 "where options include:\n" 288 288 " -help print this message\n" 289 + " -version print version message\n" 289 290 " -display host:dpy X server to contact\n" 290 291 " -root use the root window\n" 291 292 " -id windowid use the window with the specified id\n" ··· 537 538 tree = stats = bits = events = wm = size = shape = 1; 538 539 continue; 539 540 } 541 + if (!strcmp(argv[i], "-version")) { 542 + puts(PACKAGE_STRING); 543 + exit(0); 544 + } 545 + fprintf (stderr, "%s: unrecognized argument %s\n\n", 546 + program_name, argv[i]); 540 547 usage (); 541 548 } 542 549