Hello community, here is the log from the commit of package libXres for openSUSE:Factory checked in at 2017-10-21 20:20:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXres (Old) and /work/SRC/openSUSE:Factory/.libXres.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXres" Sat Oct 21 20:20:43 2017 rev:9 rq:533728 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libXres/libXres.changes 2013-06-05 11:57:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXres.new/libXres.changes 2017-10-21 20:20:46.105830788 +0200 @@ -1,0 +2,19 @@ +Thu Oct 12 17:39:36 UTC 2017 - [email protected] + +- added COPYING to %doc + +------------------------------------------------------------------- +Thu Oct 12 03:53:35 UTC 2017 - [email protected] + +- mention baselibs.conf as source in specfile + +------------------------------------------------------------------- +Wed Oct 11 22:52:40 UTC 2017 - [email protected] + +- Update to version 1.2: + Version 1.2 of the X-Resource extension (added in xserver 1.13) added some + new requests allowing inspection of every resource for a client, the bytes + used per resource, and the PIDs of local clients. + This is the release for the corresponding client library. + +------------------------------------------------------------------- Old: ---- libXres-1.0.7.tar.bz2 New: ---- libXres-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXres.spec ++++++ --- /var/tmp/diff_new_pack.Be7RIE/_old 2017-10-21 20:20:47.741754182 +0200 +++ /var/tmp/diff_new_pack.Be7RIE/_new 2017-10-21 20:20:47.741754182 +0200 @@ -1,7 +1,7 @@ # # spec file for package libXres # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libXres %define lname libXRes1 -Version: 1.0.7 +Version: 1.2.0 Release: 0 Summary: X Resource extension client library License: MIT @@ -28,6 +28,7 @@ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXRes #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXRes/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 +Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool BuildRequires: pkgconfig @@ -84,6 +85,7 @@ %files -n %lname %defattr(-,root,root) +%doc COPYING %_libdir/libXRes.so.1* %files devel ++++++ libXres-1.0.7.tar.bz2 -> libXres-1.2.0.tar.bz2 ++++++ ++++ 36120 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.7/ChangeLog new/libXres-1.2.0/ChangeLog --- old/libXres-1.0.7/ChangeLog 2013-05-31 02:51:59.000000000 +0200 +++ new/libXres-1.2.0/ChangeLog 2017-10-11 17:12:59.000000000 +0200 @@ -1,12 +1,76 @@ -commit b51a7b0ccf0d5ccb53fbd5d34ed8fe57603d2604 +commit 84b9156c7833dfd91c65d33542420ff4fe226948 +Author: Adam Jackson <[email protected]> +Date: Wed Oct 11 11:11:01 2017 -0400 + + libXRes 1.2.0 + + Signed-off-by: Adam Jackson <[email protected]> + +commit 1bc34457619c0d9b94ebd1cadac53366da20fbe3 +Author: Mihail Konev <[email protected]> +Date: Thu Jan 26 13:52:49 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <[email protected]> + +commit e5fbb99729d460eda477bf6e299728bc47542ccb +Author: Emil Velikov <[email protected]> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 16b2d184302d259a8481693285976045386fcc01 +Author: Peter Hutterer <[email protected]> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Emil Velikov <[email protected]> + +commit ae0ddaa9c960aee1b7845da01270b00177f95f3d Author: Alan Coopersmith <[email protected]> -Date: Thu May 30 17:51:12 2013 -0700 +Date: Fri Nov 22 23:22:36 2013 -0800 - libXres 1.0.7 + Remove fallback for _XEatDataWords, require libX11 1.6 for it + + _XEatDataWords was orignally introduced with the May 2013 security + patches, and in order to ease the process of delivering those, + fallback versions of _XEatDataWords were included in the X extension + library patches so they could be applied to older versions that didn't + have libX11 1.6 yet. Now that we're past that hurdle, we can drop + the fallbacks and just require libX11 1.6 for building new versions + of the extension libraries. Signed-off-by: Alan Coopersmith <[email protected]> -commit ad156a716a324ee60362c8ba66a5ed8c835c219b +commit 0f5cfdc3136dd8ef43800bda64f9d39e6b23b2e9 +Author: Julien Cristau <[email protected]> +Date: Sun Jun 30 20:09:49 2013 +0200 + + Compute number of bytes correctly in XResQueryClientPixmapBytes + + 64-bit servers send the upper 32-bit in bytes_overflow. We were + multiplying by 2^32 - 1 instead of 2^32 when putting things back + together. + + Debian bug#621702 + + Reported-by: Kevin Ryde <[email protected]> + Signed-off-by: Julien Cristau <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit f468184963e53feda848853c4aefd0197b2cc116 Author: Alan Coopersmith <[email protected]> Date: Fri Apr 12 23:36:13 2013 -0700 @@ -19,7 +83,7 @@ Reported-by: Ilja Van Sprundel <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> -commit 3ec2db9eeb9ba8fb561802b0c4b8bf79e321b7a2 +commit b053d215b80e721f9afdc5794e4f3f4f2aee0141 Author: Alan Coopersmith <[email protected]> Date: Fri Apr 12 23:36:13 2013 -0700 @@ -32,7 +96,7 @@ Reported-by: Ilja Van Sprundel <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> -commit 95b352b0f4a1ab1bc254e78adbc73cd65223ded4 +commit 69457711050ac3a53859ef11790a7ac815cd7d94 Author: Alan Coopersmith <[email protected]> Date: Sat Apr 13 10:34:22 2013 -0700 @@ -42,7 +106,7 @@ Signed-off-by: Alan Coopersmith <[email protected]> -commit d54acff47096cf52a9b8e018a26f7165e1092eb5 +commit 83e7693515369d57dcd11c2bb1f03563f51bc500 Author: Alan Coopersmith <[email protected]> Date: Fri Jan 18 23:06:20 2013 -0800 @@ -58,7 +122,61 @@ the current minimum level required to build X. Signed-off-by: Alan Coopersmith <[email protected]> - (cherry picked from commit 83e7693515369d57dcd11c2bb1f03563f51bc500) + +commit d9324b7d07294bb18e4902596a1b8ee387188364 +Author: Colin Walters <[email protected]> +Date: Wed Jan 4 17:37:06 2012 -0500 + + autogen.sh: Implement GNOME Build API + + http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Adam Jackson <[email protected]> + +commit 6d1f115422cde2bfca4b69caa395345f3ac454e7 +Author: Adam Jackson <[email protected]> +Date: Tue Jan 15 14:28:48 2013 -0500 + + configure: Remove AM_MAINTAINER_MODE + + Signed-off-by: Adam Jackson <[email protected]> + +commit f44f4e265ec3ab7ef87d6d7009ec079ba4c49336 +Author: Alan Coopersmith <[email protected]> +Date: Mon Apr 23 18:57:48 2012 -0700 + + Bump version to 1.1.99.0 to reflect addition of 1.2 API + + As noted in configure.ac comment, we try to keep library version + based on the protocol version number, so since the protocol skipped + to 1.2, we'll do that with the library as well for simplicity's sake. + + Sets resourceproto requirement to version 1.2.0 since there were no + intermediate/snapshot versions between 1.1.2 & 1.2.0. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 01fc6f81f0a2935741dd1114aa3fa267d8be9095 +Author: Erkki Seppälä <[email protected]> +Date: Wed Dec 15 13:48:09 2010 +0200 + + Implemented second part of XResource extension v1.2: XResQueryResourceBytes + + Signed-off-by: Erkki Seppälä <[email protected]> + Reviewed-by: Rami Ylimäki <[email protected]> + Reviewed-by: Tiago Vignatti <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0f38938a27df1f865dcdda35f4d2ef191092ba42 +Author: Erkki Seppälä <[email protected]> +Date: Mon Nov 29 12:43:51 2010 +0200 + + Implemented first part of XResource extension v1.2: XResQueryClientIds + + Signed-off-by: Erkki Seppälä <[email protected]> + Reviewed-by: Rami Ylimäki <[email protected]> + Reviewed-by: Tiago Vignatti <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> commit e6e0e02e4bf764fa58798540793bdeb44a60cc7f Author: Alan Coopersmith <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.7/INSTALL new/libXres-1.2.0/INSTALL --- old/libXres-1.0.7/INSTALL 2013-05-31 02:51:59.000000000 +0200 +++ new/libXres-1.2.0/INSTALL 2017-10-11 17:13:00.000000000 +0200 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.7/compile new/libXres-1.2.0/compile --- old/libXres-1.0.7/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/libXres-1.2.0/compile 2017-10-11 17:12:55.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.7/config.h.in new/libXres-1.2.0/config.h.in --- old/libXres-1.0.7/config.h.in 2013-05-31 02:51:28.000000000 +0200 +++ new/libXres-1.2.0/config.h.in 2017-10-11 17:12:55.000000000 +0200 @@ -30,11 +30,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `_XEatDataWords' function. */ -#undef HAVE__XEATDATAWORDS - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.7/configure.ac new/libXres-1.2.0/configure.ac --- old/libXres-1.0.7/configure.ac 2013-05-31 02:51:20.000000000 +0200 +++ new/libXres-1.2.0/configure.ac 2017-10-11 17:12:49.000000000 +0200 @@ -29,14 +29,13 @@ # digit in the version number to track changes which don't affect the # protocol, so XRes version l.n.m corresponds to protocol version l.n # -AC_INIT([libXres], [1.0.7], +AC_INIT([libXres], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL @@ -48,18 +47,8 @@ XORG_DEFAULT_OPTIONS XORG_CHECK_MALLOC_ZERO -# Check xres configuration, strip extra digits from package version to -# find the required protocol version -RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] - # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION]) - -# Check for _XEatDataWords function that may be patched into older Xlib release -SAVE_LIBS="$LIBS" -LIBS="$XRES_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(XRES, [x11 >= 1.6] xext xextproto [resourceproto >= 1.2.0]) AC_CONFIG_FILES([Makefile src/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.7/include/X11/extensions/XRes.h new/libXres-1.2.0/include/X11/extensions/XRes.h --- old/libXres-1.0.7/include/X11/extensions/XRes.h 2013-05-31 02:51:20.000000000 +0200 +++ new/libXres-1.2.0/include/X11/extensions/XRes.h 2017-10-11 17:12:49.000000000 +0200 @@ -7,6 +7,8 @@ #include <X11/Xfuncproto.h> +/* v1.0 */ + typedef struct { XID resource_base; XID resource_mask; @@ -17,8 +19,51 @@ unsigned int count; } XResType; +/* v1.2 */ + +typedef enum { + XRES_CLIENT_ID_XID, + XRES_CLIENT_ID_PID, + XRES_CLIENT_ID_NR +} XResClientIdType; + +typedef enum { + XRES_CLIENT_ID_XID_MASK = 1 << XRES_CLIENT_ID_XID, + XRES_CLIENT_ID_PID_MASK = 1 << XRES_CLIENT_ID_PID +} XResClientIdMask; + +typedef struct { + XID client; + unsigned int mask; +} XResClientIdSpec; + +typedef struct { + XResClientIdSpec spec; + long length; + void *value; +} XResClientIdValue; + +typedef struct { + XID resource; + Atom type; +} XResResourceIdSpec; + +typedef struct { + XResResourceIdSpec spec; + long bytes; + long ref_count; + long use_count; +} XResResourceSizeSpec; + +typedef struct { + XResResourceSizeSpec size; + long num_cross_references; + XResResourceSizeSpec *cross_references; +} XResResourceSizeValue; + _XFUNCPROTOBEGIN +/* v1.0 */ Bool XResQueryExtension ( Display *dpy, @@ -51,6 +96,40 @@ unsigned long *bytes ); +/* v1.2 */ + +Status XResQueryClientIds ( + Display *dpy, + long num_specs, + XResClientIdSpec *client_specs, /* in */ + long *num_ids, /* out */ + XResClientIdValue **client_ids /* out */ +); + +XResClientIdType XResGetClientIdType(XResClientIdValue* value); + +/* return -1 if no pid associated to the value */ +pid_t XResGetClientPid(XResClientIdValue* value); + +void XResClientIdsDestroy ( + long num_ids, + XResClientIdValue *client_ids +); + +Status XResQueryResourceBytes ( + Display *dpy, + XID client, + long num_specs, + XResResourceIdSpec *resource_specs, /* in */ + long *num_sizes, /* out */ + XResResourceSizeValue **sizes /* out */ +); + +void XResResourceSizeValuesDestroy ( + long num_sizes, + XResResourceSizeValue *sizes +); + _XFUNCPROTOEND #endif /* _XRES_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.7/missing new/libXres-1.2.0/missing --- old/libXres-1.0.7/missing 2013-05-31 02:51:29.000000000 +0200 +++ new/libXres-1.2.0/missing 2017-10-11 17:12:55.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.7/src/XRes.c new/libXres-1.2.0/src/XRes.c --- old/libXres-1.0.7/src/XRes.c 2013-05-31 02:51:20.000000000 +0200 +++ new/libXres-1.2.0/src/XRes.c 2017-10-11 17:12:49.000000000 +0200 @@ -12,19 +12,9 @@ #include <X11/extensions/extutil.h> #include <X11/extensions/XResproto.h> #include <X11/extensions/XRes.h> +#include <assert.h> #include <limits.h> -#ifndef HAVE__XEATDATAWORDS -static inline void _XEatDataWords(Display *dpy, unsigned long n) -{ -# ifndef LONG64 - if (n >= (ULONG_MAX >> 2)) - _XIOError(dpy); -# endif - _XEatData (dpy, n << 2); -} -#endif - static XExtensionInfo _xres_ext_info_data; static XExtensionInfo *xres_ext_info = &_xres_ext_info_data; static const char *xres_extension_name = XRES_NAME; @@ -239,7 +229,7 @@ } #ifdef LONG64 - *bytes = (rep.bytes_overflow * 4294967295) + rep.bytes; + *bytes = (rep.bytes_overflow * 4294967296UL) + rep.bytes; #else *bytes = rep.bytes_overflow ? 0xffffffff : rep.bytes; #endif @@ -249,3 +239,227 @@ return 1; } +static Bool ReadClientValues( + Display *dpy, + long num_ids, + XResClientIdValue *client_ids /* out */ +) +{ + int c; + for (c = 0; c < num_ids; ++c) { + XResClientIdValue* client = client_ids + c; + long int value; + _XRead32 (dpy, &value, 4); + client->spec.client = value; + _XRead32 (dpy, &value, 4); + client->spec.mask = value; + _XRead32 (dpy, &value, 4); + client->length = value; + client->value = malloc(client->length); + _XRead32 (dpy, client->value, client->length); + } + return True; +} + +Status XResQueryClientIds ( + Display *dpy, + long num_specs, + XResClientIdSpec *client_specs, /* in */ + long *num_ids, /* out */ + XResClientIdValue **client_ids /* out */ +) +{ + XExtDisplayInfo *info = find_display (dpy); + xXResQueryClientIdsReq *req; + xXResQueryClientIdsReply rep; + int c; + + *num_ids = 0; + + XResCheckExtension (dpy, info, 0); + LockDisplay (dpy); + GetReq (XResQueryClientIds, req); + req->reqType = info->codes->major_opcode; + req->XResReqType = X_XResQueryClientIds; + req->length += num_specs * 2; /* 2 longs per client id spec */ + req->numSpecs = num_specs; + + for (c = 0; c < num_specs; ++c) { + Data32(dpy, &client_specs[c].client, 4); + Data32(dpy, &client_specs[c].mask, 4); + } + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { + goto error; + } + + *client_ids = calloc(rep.numIds, sizeof(**client_ids)); + *num_ids = rep.numIds; + + if (!ReadClientValues(dpy, *num_ids, *client_ids)) { + goto error; + } + + UnlockDisplay (dpy); + SyncHandle (); + return Success; + + error: + XResClientIdsDestroy (*num_ids, *client_ids); + *client_ids = NULL; + + UnlockDisplay (dpy); + SyncHandle (); + return !Success; +} + +void XResClientIdsDestroy ( + long num_ids, + XResClientIdValue *client_ids +) +{ + int c; + for (c = 0; c < num_ids; ++c) { + free(client_ids[c].value); + } + free(client_ids); +} + +XResClientIdType XResGetClientIdType( + XResClientIdValue* value +) +{ + int bit; + XResClientIdType idType = 0; + Bool found = False; + for (bit = 0; bit < XRES_CLIENT_ID_NR; ++bit) { + if (value->spec.mask & (1 << bit)) { + assert(!found); + found = True; + idType = bit; + } + } + + assert(found); + + return idType; +} + +pid_t XResGetClientPid( + XResClientIdValue* value +) +{ + if (value->spec.mask & XRES_CLIENT_ID_PID_MASK && value->length >= 4) { + return (pid_t) * (CARD32*) value->value; + } else { + return (pid_t) -1; + } +} + +static Status ReadResourceSizeSpec( + Display *dpy, + XResResourceSizeSpec *size +) +{ + long int value; + _XRead32(dpy, &value, 4); + size->spec.resource = value; + _XRead32(dpy, &value, 4); + size->spec.type = value; + _XRead32(dpy, &value, 4); + size->bytes = value; + _XRead32(dpy, &value, 4); + size->ref_count = value; + _XRead32(dpy, &value, 4); + size->use_count = value; + return 0; +} + +static Status ReadResourceSizeValues( + Display *dpy, + long num_sizes, + XResResourceSizeValue *sizes) +{ + int c; + int d; + for (c = 0; c < num_sizes; ++c) { + long int num; + ReadResourceSizeSpec(dpy, &sizes[c].size); + _XRead32(dpy, &num, 4); + sizes[c].num_cross_references = num; + sizes[c].cross_references = num ? calloc(num, sizeof(*sizes[c].cross_references)) : NULL; + for (d = 0; d < num; ++d) { + ReadResourceSizeSpec(dpy, &sizes[c].cross_references[d]); + } + } + return Success; +} + +Status XResQueryResourceBytes ( + Display *dpy, + XID client, + long num_specs, + XResResourceIdSpec *resource_specs, /* in */ + long *num_sizes, /* out */ + XResResourceSizeValue **sizes /* out */ +) +{ + XExtDisplayInfo *info = find_display (dpy); + xXResQueryResourceBytesReq *req; + xXResQueryResourceBytesReply rep; + int c; + + *num_sizes = 0; + + XResCheckExtension (dpy, info, 0); + + LockDisplay (dpy); + GetReq (XResQueryResourceBytes, req); + req->reqType = info->codes->major_opcode; + req->XResReqType = X_XResQueryResourceBytes; + req->length += num_specs * 2; /* 2 longs per client id spec */ + req->client = client; + req->numSpecs = num_specs; + + for (c = 0; c < num_specs; ++c) { + Data32(dpy, &resource_specs[c].resource, 4); + Data32(dpy, &resource_specs[c].type, 4); + } + + *num_sizes = 0; + *sizes = NULL; + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { + goto error; + } + + *sizes = calloc(rep.numSizes, sizeof(**sizes)); + *num_sizes = rep.numSizes; + + if (ReadResourceSizeValues(dpy, *num_sizes, *sizes) != Success) { + goto error; + } + + UnlockDisplay (dpy); + SyncHandle (); + return Success; + + error: + XResResourceSizeValuesDestroy(*num_sizes, *sizes); + + UnlockDisplay (dpy); + SyncHandle (); + return !Success; +} + +void XResResourceSizeValuesDestroy ( + long num_sizes, + XResResourceSizeValue *sizes +) +{ + int c; + for (c = 0; c < num_sizes; ++c) { + free(sizes[c].cross_references); + } + free(sizes); +}
