June 2009 - openSUSE Commits - openSUSE Mailing Lists

commit bluez for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at Tue Jun 2 12:25:11 CEST 2009. -------- --- bluez/bluez.changes 2009-05-11 19:34:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez/bluez.changes 2009-05-20 20:33:58.000000000 +0200 @@ -1,0 +2,15 @@ +Wed May 20 19:42:27 CEST 2009 - seife(a)suse.de + +- update to bluez-4.40: + - Add telephony driver for oFono telephony stack. + - Add support for Dell specific HID proxy switching. + - Add support for running hid2hci from udev. + - Add mapping for AVRCP Play and Pause to dedicated key codes. + - Fix AVRCP keycodes to better match existing X keymap support. + - Fix various quoting issues within telephony support. + - Fix memory allocation issue when generating PDUs for SDP. + - Fix race condition on device removal. + - Fix non-cancelable issue with CreateDevice method. + - Fix non-working CancelDiscovery method call. + +------------------------------------------------------------------- bluez-gstreamer.changes: same change calling whatdependson for head-i586 Old: ---- bluez-4.20-bluetooth.rules.diff bluez-4.39.tar.bz2 New: ---- bluetooth.rules bluez-4.40.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.PX8903/_old 2009-06-02 12:24:33.000000000 +0200 +++ /var/tmp/diff_new_pack.PX8903/_new 2009-06-02 12:24:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bluez-gstreamer (Version 4.39) +# spec file for package bluez-gstreamer (Version 4.40) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ BuildRequires: alsa-devel libsndfile-devel BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel Url: http://www.bluez.org -Version: 4.39 +Version: 4.40 Release: 1 Summary: Bluetooth Sound Support Group: Productivity/Multimedia/Sound/Utilities @@ -38,7 +38,7 @@ Source4: bluetooth.sh Source5: org.bluez.service Source6: README.SUSE -Patch1: bluez-4.20-bluetooth.rules.diff +Source7: bluetooth.rules BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libbluetooth3 = %{version} Provides: bluez-audio:%_libdir/gstreamer-0.10/libgstbluetooth.so @@ -57,9 +57,9 @@ %prep %setup -n bluez-%{version} -q -%patch1 -p0 cp %{S:1} scripts/ cp %{S:6} . +cp %{S:7} scripts %{?suse_update_config:%{suse_update_config -f . }} %build @@ -109,6 +109,18 @@ %{_libdir}/gstreamer-*/*.so %changelog +* Wed May 20 2009 seife(a)suse.de +- update to bluez-4.40: + - Add telephony driver for oFono telephony stack. + - Add support for Dell specific HID proxy switching. + - Add support for running hid2hci from udev. + - Add mapping for AVRCP Play and Pause to dedicated key codes. + - Fix AVRCP keycodes to better match existing X keymap support. + - Fix various quoting issues within telephony support. + - Fix memory allocation issue when generating PDUs for SDP. + - Fix race condition on device removal. + - Fix non-cancelable issue with CreateDevice method. + - Fix non-working CancelDiscovery method call. * Mon May 11 2009 seife(a)suse.de - update to bluez-4.39: - Add workaround for dealing with unknown inquiry complete. ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.PX8903/_old 2009-06-02 12:24:33.000000000 +0200 +++ /var/tmp/diff_new_pack.PX8903/_new 2009-06-02 12:24:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bluez (Version 4.39) +# spec file for package bluez (Version 4.40) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ BuildRequires: glib2-devel libnl-devel libusb-devel BuildRequires: alsa-devel libsndfile-devel Url: http://www.bluez.org -Version: 4.39 +Version: 4.40 Release: 1 Summary: Bluetooth Stack for Linux Group: Hardware/Mobile @@ -38,7 +38,7 @@ Source5: org.bluez.service Source6: README.SUSE Source7: bluetooth.modprobe -Patch1: bluez-4.20-bluetooth.rules.diff +Source8: bluetooth.rules BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: bluez-utils = 3.36 Obsoletes: bluez-utils <= 3.36 @@ -162,7 +162,6 @@ %prep %setup -q -%patch1 -p0 cp %{S:1} scripts/ cp %{S:6} . %{?suse_update_config:%{suse_update_config -f . }} @@ -221,13 +220,15 @@ rm -v $RPM_BUILD_ROOT/%{_libdir}/bluetooth/plugins/*.la $RPM_BUILD_ROOT/%{_libdir}/libbluetooth.la rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-* rm -v $RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d -mv -v $RPM_BUILD_ROOT/%{_sysconfdir}/udev/bluetooth.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/40-bluetooth.rules install --mode=0755 -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bluetooth-coldplug install --mode=0644 -D %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bluetooth install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/lib/udev/bluetooth.sh install --mode=0644 -D %{S:5} $RPM_BUILD_ROOT/usr/share/dbus-1/system-services/org.bluez.service install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf +install --mode=0644 -D %{S:8} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/40-bluetooth.rules +#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d +mv -v $RPM_BUILD_ROOT/etc/udev/bluetooth-hid2hci.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/41-bluetooth-hid2hci.rules +mv -v $RPM_BUILD_ROOT/etc/udev/bluetooth-serial.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/42-bluetooth-serial.rules ln -s ../../etc/init.d/bluetooth $RPM_BUILD_ROOT/usr/sbin/rcbluetooth %clean @@ -354,6 +355,18 @@ %doc %{_mandir}/man1/dund.1.gz %changelog +* Wed May 20 2009 seife(a)suse.de +- update to bluez-4.40: + - Add telephony driver for oFono telephony stack. + - Add support for Dell specific HID proxy switching. + - Add support for running hid2hci from udev. + - Add mapping for AVRCP Play and Pause to dedicated key codes. + - Fix AVRCP keycodes to better match existing X keymap support. + - Fix various quoting issues within telephony support. + - Fix memory allocation issue when generating PDUs for SDP. + - Fix race condition on device removal. + - Fix non-cancelable issue with CreateDevice method. + - Fix non-working CancelDiscovery method call. * Mon May 11 2009 seife(a)suse.de - update to bluez-4.39: - Add workaround for dealing with unknown inquiry complete. ++++++ bluetooth-coldplug.init ++++++ --- /var/tmp/diff_new_pack.PX8903/_old 2009-06-02 12:24:33.000000000 +0200 +++ /var/tmp/diff_new_pack.PX8903/_new 2009-06-02 12:24:33.000000000 +0200 @@ -24,4 +24,9 @@ [ -e $CONFIGFILE ] && . $CONFIGFILE [ x"$START_SERVICES" = xno ] && exit 0 +case $1 in + reload) exec $INITSCRIPT "$@" ;; + status) exec $INITSCRIPT "$@" ;; +esac + exec $INITSCRIPT "$@" ++++++ bluetooth.rules ++++++ # bluetooth subsystem SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh" ++++++ bluez-4.39.tar.bz2 -> bluez-4.40.tar.bz2 ++++++ ++++ 3856 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fam for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package fam for openSUSE:Factory checked in at Tue Jun 2 12:24:15 CEST 2009. -------- --- fam/fam.changes 2008-12-10 13:56:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/fam/fam.changes 2009-06-02 08:41:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 2 08:44:03 CEST 2009 - adrian(a)novell.com + +- fix build for gcc 4.4 (patch from dl9pf) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bug-401247_fam_09_fix_leak.patch fam-gcc44.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fam.spec ++++++ --- /var/tmp/diff_new_pack.mi6925/_old 2009-06-02 12:23:22.000000000 +0200 +++ /var/tmp/diff_new_pack.mi6925/_new 2009-06-02 12:23:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fam (Version 2.7.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ Summary: File Alteration Monitoring Daemon Url: http://oss.sgi.com/projects/fam/ Version: 2.7.0 -Release: 130 +Release: 131 %define fc_version 0.6.5 Source0: fam-%{version}.tar.bz2 Source1: sysconfig.fam @@ -46,6 +46,8 @@ Patch9: fam-man.patch Patch10: fam-largefile.diff Patch11: fam-gcc43.patch +Patch12: bug-401247_fam_09_fix_leak.patch +Patch13: fam-gcc44.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -124,6 +126,8 @@ %patch9 -p1 %patch10 %patch11 +%patch12 -p1 +%patch13 -p1 cd ../fileschanged-%fc_version %patch5 @@ -223,6 +227,8 @@ %config(noreplace) /etc/xinetd.d/fam %changelog +* Tue Jun 02 2009 adrian(a)novell.com +- fix build for gcc 4.4 (patch from dl9pf) * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) @@ -295,7 +301,7 @@ - Fixed gcc3.4 C++ problems. * Sun Nov 09 2003 adrian(a)suse.de - add default stop run levels to init script -* Tue Oct 21 2003 adrian(a)suse.de +* Wed Oct 22 2003 adrian(a)suse.de - apply dnotify patch correct - fix possible sig11 on signal storm * Tue Sep 02 2003 mmj(a)suse.de ++++++ bug-401247_fam_09_fix_leak.patch ++++++ diff -Naur src/DNotify.c++ fam-2.7.0-fix-leak/src/DNotify.c++ --- src/DNotify.c++ 2006-08-04 20:20:01.000000000 +1000 +++ fam-2.7.0-fix-leak/src/DNotify.c++ 2006-08-04 20:21:31.000000000 +1000 @@ -69,6 +69,12 @@ n_dir_watches = 0; } + ~FileWatch(void) { + if (dir_watch) { + free(dir_watch); + } + } + void add_dir_watch (DirWatch *w); bool has_dir_watch (DirWatch *w); }; ++++++ fam-gcc44.diff ++++++ diff -Naur _fam-2.7.0//src/NFSFileSystem.c++ fam-2.7.0/src/NFSFileSystem.c++ --- _fam-2.7.0//src/NFSFileSystem.c++ 2003-01-18 15:18:12.000000000 +0100 +++ fam-2.7.0/src/NFSFileSystem.c++ 2009-05-29 23:15:10.237713770 +0200 @@ -97,7 +97,7 @@ attr_cache_timeout = ACREGMAX; - char * p; + const char * p; if (strstr(opt, "noac")) { f_noac = true; ++++++ init.fam ++++++ --- /var/tmp/diff_new_pack.mi6925/_old 2009-06-02 12:23:22.000000000 +0200 +++ /var/tmp/diff_new_pack.mi6925/_new 2009-06-02 12:23:22.000000000 +0200 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: fam # Required-Start: $remote_fs $time $named $syslog $portmap -# Required-Stop: $remote_fs +# Required-Stop: $null # Default-Start: 3 5 # Default-Stop: 0 1 2 4 6 # Description: file access monitoring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit opie for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package opie for openSUSE:Factory checked in at Tue Jun 2 12:24:12 CEST 2009. -------- --- opie/opie.changes 2008-04-10 12:59:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/opie/opie.changes 2009-06-02 10:38:16.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 2 10:35:44 CEST 2009 - meissner(a)suse.de + +- rename getline() to telnetgetline() to fix glibc 2.10 build failure. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- opie-2.4-getline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opie.spec ++++++ --- /var/tmp/diff_new_pack.Oa6815/_old 2009-06-02 12:23:21.000000000 +0200 +++ /var/tmp/diff_new_pack.Oa6815/_new 2009-06-02 12:23:21.000000000 +0200 @@ -1,10 +1,17 @@ # # spec file for package opie (Version 2.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,7 +22,7 @@ BuildRequires: bison pam-devel Url: http://www.inner.net/opie Version: 2.4 -Release: 662 +Release: 697 License: GPL v2 or later Group: Productivity/Security Provides: pam_opie @@ -37,6 +44,7 @@ Patch10: %name-2.4-noroot.patch Patch11: %{name}-%{version}_array-subscript.patch Patch12: %{name_pam}-%{version_pam}_array-subscript.patch +Patch13: %name-2.4-getline.patch Summary: Support for One-Time Passwords BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,6 +82,8 @@ cd %{name_pam} %patch1 -p0 %patch12 +cd .. +%patch13 %build # build opie @@ -117,6 +127,8 @@ %doc %{_mandir}/man*/* %changelog +* Tue Jun 02 2009 meissner(a)suse.de +- rename getline() to telnetgetline() to fix glibc 2.10 build failure. * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support ++++++ opie-2.4-getline.patch ++++++ --- ftpcmd.y +++ ftpcmd.y @@ -877,7 +877,7 @@ /* * getline - a hacked up version of fgets to ignore TELNET escape codes. */ -char *getline FUNCTION((s, n, iop), char *s AND int n AND FILE *iop) +char *telnetgetline FUNCTION((s, n, iop), char *s AND int n AND FILE *iop) { register c; register char *cs; @@ -958,7 +958,7 @@ case CMD: (void) signal(SIGALRM, toolong); (void) alarm((unsigned) timeout); - if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) { + if (telnetgetline(cbuf, sizeof(cbuf)-1, stdin) == NULL) { reply(221, "You could at least say goodbye."); dologout(0); } --- opieftpd.c +++ opieftpd.c @@ -229,7 +229,7 @@ VOIDRET perror_reply __P((int, char *)); VOIDRET dologout __P((int)); -char *getline __P((char *, int, FILE *)); +char *telnetgetline __P((char *, int, FILE *)); VOIDRET upper __P((char *)); static VOIDRET lostconn __P((int)); @@ -1290,7 +1290,7 @@ if (!transflag) return; cp = tmpline; - if (getline(cp, 7, stdin) == NULL) { + if (telnetgetline(cp, 7, stdin) == NULL) { reply(221, "You could at least say goodbye."); dologout(0); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-libxcb for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package xorg-x11-libxcb for openSUSE:Factory checked in at Tue Jun 2 12:23:10 CEST 2009. -------- --- xorg-x11-libxcb/xorg-x11-libxcb.changes 2009-05-16 09:51:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-libxcb/xorg-x11-libxcb.changes 2009-05-29 18:23:59.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 29 17:31:34 CEST 2009 - sndirsch(a)suse.de + +- libxcb 1.3 + * various issues fixed +- obsoletes commit-beccb0b.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- commit-beccb0b.diff libxcb-1.2.tar.bz2 New: ---- libxcb-1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libxcb.spec ++++++ --- /var/tmp/diff_new_pack.sh3292/_old 2009-06-02 12:22:47.000000000 +0200 +++ /var/tmp/diff_new_pack.sh3292/_new 2009-06-02 12:22:47.000000000 +0200 @@ -19,7 +19,7 @@ Name: xorg-x11-libxcb -%define dirsuffix 1.2 +%define dirsuffix 1.3 BuildRequires: libxslt pkgconfig python-base python-xml xorg-x11-libXau-devel xorg-x11-proto-devel #%ifarch ppc64 s390x x86_64 #Provides: libxcb-xlib.so.0()(64bit) @@ -28,7 +28,7 @@ #%endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 8 +Release: 9 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -36,7 +36,6 @@ Source: libxcb-%{dirsuffix}.tar.bz2 Source1: libxcb-xlib.la Patch1: bug-262309_xcb-xauthlocalhostname.diff -Patch2: commit-beccb0b.diff %description This package contains the X.Org xcb library. @@ -70,8 +69,7 @@ %prep %setup -q -n libxcb-%{dirsuffix} -%patch1 -p1 -%patch2 -p1 +%patch1 -p0 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -121,6 +119,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Fri May 29 2009 sndirsch(a)suse.de +- libxcb 1.3 + * various issues fixed +- obsoletes commit-beccb0b.diff * Sat May 16 2009 sndirsch(a)suse.de - commit-beccb0b.diff * kludgily hand-merged xid fixes (bnc #423740, bfo #20254) ++++++ bug-262309_xcb-xauthlocalhostname.diff ++++++ --- /var/tmp/diff_new_pack.sh3292/_old 2009-06-02 12:22:47.000000000 +0200 +++ /var/tmp/diff_new_pack.sh3292/_new 2009-06-02 12:22:47.000000000 +0200 @@ -1,37 +1,27 @@ -diff --git a/src/xcb_auth.c b/src/xcb_auth.c -index ffc0515..9bd9a35 100644 ---- a/src/xcb_auth.c -+++ b/src/xcb_auth.c -@@ -89,6 +89,7 @@ static Xauth *get_authptr(struct sockadd - char dispbuf[40]; /* big enough to hold more than 2^64 base 10 */ - int authnamelens[N_AUTH_PROTOS]; - int i; +--- src/xcb_auth.c.orig 2009-05-29 17:48:24.000000000 +0200 ++++ src/xcb_auth.c 2009-05-29 17:56:01.000000000 +0200 +@@ -100,2 +100,3 @@ static Xauth *get_authptr(struct sockadd + int dispbuflen; + Xauth *authptr = NULL; - family = FamilyLocal; /* 256 */ - switch(sockname->sa_family) -@@ -128,10 +129,20 @@ static Xauth *get_authptr(struct sockadd +@@ -143,6 +143,16 @@ static Xauth *get_authptr(struct sockadd - for (i = 0; i < N_AUTH_PROTOS; i++) - authnamelens[i] = strlen(authnames[i]); - return XauGetBestAuthByAddr (family, - (unsigned short) addrlen, addr, -- (unsigned short) strlen(dispbuf), dispbuf, -- N_AUTH_PROTOS, authnames, authnamelens); +- (unsigned short) dispbuflen, dispbuf, +- N_AUTH_PROTOS, authnames, authnameslen); + authptr = XauGetBestAuthByAddr (family, -+ (unsigned short) addrlen, addr, -+ (unsigned short) strlen(dispbuf), dispbuf, -+ N_AUTH_PROTOS, authnames, authnamelens); ++ (unsigned short) addrlen, addr, ++ (unsigned short) dispbuflen, dispbuf, ++ N_AUTH_PROTOS, authnames, authnameslen); + // && !phostname + if ((!authptr || !authptr->data_length) && family == FamilyLocal) { + if ( (addr = getenv("XAUTHLOCALHOSTNAME")) ) { + authptr = XauGetBestAuthByAddr (family, -+ (unsigned short) strlen(addr), addr, -+ (unsigned short) strlen(dispbuf), dispbuf, -+ N_AUTH_PROTOS, authnames, authnamelens); ++ (unsigned short) strlen(addr), addr, ++ (unsigned short) dispbuflen, dispbuf, ++ N_AUTH_PROTOS, authnames, authnameslen); + } + } + return authptr; } - - #ifdef HASXDMAUTH ++++++ libxcb-1.2.tar.bz2 -> libxcb-1.3.tar.bz2 ++++++ ++++ 60078 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/libxcb-1.2/configure.ac new/libxcb-1.3/configure.ac --- old/libxcb-1.2/configure.ac 2009-02-17 13:36:53.000000000 +0100 +++ new/libxcb-1.3/configure.ac 2009-05-29 08:28:44.000000000 +0200 @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([libxcb], - 1.2, + 1.3, [xcb(a)lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -32,7 +32,7 @@ AC_SUBST(HTML_CHECK_RESULT) # Checks for pkg-config packages -PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1) +PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.5) NEEDED="pthread-stubs xau >= 0.99.2" PKG_CHECK_MODULES(NEEDED, $NEEDED) @@ -58,6 +58,10 @@ AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) AC_SUBST(XCBPROTO_XCBINCLUDEDIR) +# Find the xcb-proto version +XCBPROTO_VERSION=`$PKG_CONFIG --modversion xcb-proto` +AC_SUBST(XCBPROTO_VERSION) + # Find the xcbgen Python package AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR) XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` @@ -116,6 +120,15 @@ XCB_CHECK_DOXYGEN() +case $host_os in + # darwin has poll() but can't be used to poll character devices + # darwin10 (SnowLeopard) should be tested as well once released + darwin7*) ;; darwin8*) ;; darwin9*) ;; + *) + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + ;; +esac + XCB_EXTENSION(Composite, "yes") XCB_EXTENSION(Damage, "yes") XCB_EXTENSION(DPMS, "yes") 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/libxcb-1.2/NEWS new/libxcb-1.3/NEWS --- old/libxcb-1.2/NEWS 2009-02-17 13:36:33.000000000 +0100 +++ new/libxcb-1.3/NEWS 2009-05-29 08:22:35.000000000 +0200 @@ -1,3 +1,12 @@ +Release 1.3 (2009-05-29) +======================== +* Copy full IPv4 mapping (Bug #20665) +* Fix XID allocation +* Use poll() instead of select() when available +* Fix local socket connection on Hurd +* Fix XDM-AUTHORIZATION-1 +* Disable Nagle on TCP socket + Release 1.2 (2009-02-17) ======================== * Stop packaging auto-generated C files into tarball. 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/libxcb-1.2/src/c_client.py new/libxcb-1.3/src/c_client.py --- old/libxcb-1.2/src/c_client.py 2008-12-11 11:15:34.000000000 +0100 +++ new/libxcb-1.3/src/c_client.py 2009-03-15 19:57:56.000000000 +0100 @@ -135,6 +135,9 @@ _ns = self.namespace _ns.c_ext_global_name = _n(_ns.prefix + ('id',)) + # Build the type-name collision avoidance table used by c_enum + build_collision_table() + _h_setlevel(0) _c_setlevel(0) @@ -216,13 +219,26 @@ cfile.write('\n') cfile.close() +def build_collision_table(): + global namecount + namecount = {} + + for v in module.types.values(): + name = _t(v[0]) + namecount[name] = (namecount.get(name) or 0) + 1 + def c_enum(self, name): ''' Exported function that handles enum declarations. ''' + + tname = _t(name) + if namecount[tname] > 1: + tname = _t(name + ('enum',)) + _h_setlevel(0) _h('') - _h('typedef enum %s {', _t(name)) + _h('typedef enum %s {', tname) count = len(self.values) @@ -232,7 +248,7 @@ comma = ',' if count > 0 else '' _h(' %s%s%s%s', _n(name + (enam,)).upper(), equals, eval, comma) - _h('} %s;', _t(name)) + _h('} %s;', tname) def _c_type_setup(self, name, postfix): ''' 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/libxcb-1.2/src/config.h.in new/libxcb-1.3/src/config.h.in --- old/libxcb-1.2/src/config.h.in 2009-02-17 13:37:50.000000000 +0100 +++ new/libxcb-1.3/src/config.h.in 2009-05-29 08:29:56.000000000 +0200 @@ -45,6 +45,10 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -66,6 +70,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* poll() function is available */ +#undef USE_POLL + /* Version number of package */ #undef VERSION 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/libxcb-1.2/src/Makefile.am new/libxcb-1.3/src/Makefile.am --- old/libxcb-1.2/src/Makefile.am 2009-02-16 11:17:00.000000000 +0100 +++ new/libxcb-1.3/src/Makefile.am 2009-05-09 17:39:25.000000000 +0200 @@ -75,7 +75,7 @@ EXTENSION_XML += randr.xml if BUILD_RANDR lib_LTLIBRARIES += libxcb-randr.la -libxcb_randr_la_LDFLAGS = -version-info 0:0:0 +libxcb_randr_la_LDFLAGS = -version-info 1:0:0 libxcb_randr_la_LIBADD = $(XCB_LIBS) nodist_libxcb_randr_la_SOURCES = randr.c randr.h endif 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/libxcb-1.2/src/xcb_auth.c new/libxcb-1.3/src/xcb_auth.c --- old/libxcb-1.2/src/xcb_auth.c 2008-08-28 13:49:21.000000000 +0200 +++ new/libxcb-1.3/src/xcb_auth.c 2009-04-21 08:39:35.000000000 +0200 @@ -49,11 +49,21 @@ N_AUTH_PROTOS }; +#define AUTH_PROTO_XDM_AUTHORIZATION "XDM-AUTHORIZATION-1" +#define AUTH_PROTO_MIT_MAGIC_COOKIE "MIT-MAGIC-COOKIE-1" + static char *authnames[N_AUTH_PROTOS] = { #ifdef HASXDMAUTH - "XDM-AUTHORIZATION-1", + AUTH_PROTO_XDM_AUTHORIZATION, #endif - "MIT-MAGIC-COOKIE-1", + AUTH_PROTO_MIT_MAGIC_COOKIE, +}; + +static int authnameslen[N_AUTH_PROTOS] = { +#ifdef HASXDMAUTH + sizeof(AUTH_PROTO_XDM_AUTHORIZATION) - 1, +#endif + sizeof(AUTH_PROTO_MIT_MAGIC_COOKIE) - 1, }; static size_t memdup(char **dst, void *src, size_t len) @@ -70,7 +80,7 @@ static int authname_match(enum auth_protos kind, char *name, size_t namelen) { - if(strlen(authnames[kind]) != namelen) + if(authnameslen[kind] != namelen) return 0; if(memcmp(authnames[kind], name, namelen)) return 0; @@ -87,8 +97,7 @@ unsigned short family; char hostnamebuf[256]; /* big enough for max hostname */ char dispbuf[40]; /* big enough to hold more than 2^64 base 10 */ - int authnamelens[N_AUTH_PROTOS]; - int i; + int dispbuflen; family = FamilyLocal; /* 256 */ switch(sockname->sa_family) @@ -119,7 +128,11 @@ return 0; /* cannot authenticate this family */ } - snprintf(dispbuf, sizeof(dispbuf), "%d", display); + dispbuflen = snprintf(dispbuf, sizeof(dispbuf), "%d", display); + if(dispbuflen < 0) + return 0; + /* snprintf may have truncate our text */ + dispbuflen = MIN(dispbuflen, sizeof(dispbuf) - 1); if (family == FamilyLocal) { if (gethostname(hostnamebuf, sizeof(hostnamebuf)) == -1) @@ -128,12 +141,10 @@ addrlen = strlen(addr); } - for (i = 0; i < N_AUTH_PROTOS; i++) - authnamelens[i] = strlen(authnames[i]); return XauGetBestAuthByAddr (family, (unsigned short) addrlen, addr, - (unsigned short) strlen(dispbuf), dispbuf, - N_AUTH_PROTOS, authnames, authnamelens); + (unsigned short) dispbuflen, dispbuf, + N_AUTH_PROTOS, authnames, authnameslen); } #ifdef HASXDMAUTH @@ -187,7 +198,7 @@ struct sockaddr_in6 *si6 = (struct sockaddr_in6 *) sockname; if(IN6_IS_ADDR_V4MAPPED(SIN6_ADDR(sockname))) { - APPEND(info->data, j, si6->sin6_addr.s6_addr[12]); + do_append(info->data, &j, &si6->sin6_addr.s6_addr[12], 4); APPEND(info->data, j, si6->sin6_port); } else @@ -239,25 +250,50 @@ char sockbuf[sizeof(struct sockaddr) + MAXPATHLEN]; unsigned int socknamelen = sizeof(sockbuf); /* need extra space */ struct sockaddr *sockname = (struct sockaddr *) &sockbuf; + int gotsockname = 0; Xauth *authptr = 0; int ret = 1; + /* Some systems like hpux or Hurd do not expose peer names + * for UNIX Domain Sockets, but this is irrelevant, + * since compute_auth() ignores the peer name in this + * case anyway.*/ if (getpeername(fd, sockname, &socknamelen) == -1) - return 0; /* can only authenticate sockets */ + { + if (sockname->sa_family != AF_UNIX) + return 0; /* except for AF_UNIX, sockets should have peernames */ + if (getsockname(fd, sockname, &socknamelen) == -1) + return 0; /* can only authenticate sockets */ + gotsockname = 1; + } authptr = get_authptr(sockname, socknamelen, display); if (authptr == 0) return 0; /* cannot find good auth data */ info->namelen = memdup(&info->name, authptr->name, authptr->name_length); - if(info->namelen) - ret = compute_auth(info, authptr, sockname); + if (!info->namelen) + goto no_auth; /* out of memory */ + + if (!gotsockname && getsockname(fd, sockname, &socknamelen) == -1) + { + free(info->name); + goto no_auth; /* can only authenticate sockets */ + } + + ret = compute_auth(info, authptr, sockname); if(!ret) { - free(info->name); - info->name = 0; - info->namelen = 0; + free(info->name); + goto no_auth; /* cannot build auth record */ } + XauDisposeAuth(authptr); return ret; + + no_auth: + info->name = 0; + info->namelen = 0; + XauDisposeAuth(authptr); + return 0; } 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/libxcb-1.2/src/xcb_conn.c new/libxcb-1.3/src/xcb_conn.c --- old/libxcb-1.2/src/xcb_conn.c 2008-11-04 10:36:17.000000000 +0100 +++ new/libxcb-1.3/src/xcb_conn.c 2009-04-06 10:47:58.000000000 +0200 @@ -31,12 +31,16 @@ #include <unistd.h> #include <stdlib.h> #include <netinet/in.h> -#include <sys/select.h> #include <fcntl.h> #include <errno.h> #include "xcb.h" #include "xcbint.h" +#if USE_POLL +#include <poll.h> +#else +#include <sys/select.h> +#endif typedef struct { uint8_t status; @@ -258,7 +262,11 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count) { int ret; +#if USE_POLL + struct pollfd fd; +#else fd_set rfds, wfds; +#endif /* If the thing I should be doing is already being done, wait for it. */ if(count ? c->out.writing : c->in.reading) @@ -267,20 +275,38 @@ return 1; } +#if USE_POLL + memset(&fd, 0, sizeof(fd)); + fd.fd = c->fd; + fd.events = POLLIN; +#else FD_ZERO(&rfds); FD_SET(c->fd, &rfds); +#endif ++c->in.reading; +#if USE_POLL + if(count) + { + fd.events |= POLLOUT; + ++c->out.writing; + } +#else FD_ZERO(&wfds); if(count) { FD_SET(c->fd, &wfds); ++c->out.writing; } +#endif pthread_mutex_unlock(&c->iolock); do { +#if USE_POLL + ret = poll(&fd, 1, -1); +#else ret = select(c->fd + 1, &rfds, &wfds, 0, 0); +#endif } while (ret == -1 && errno == EINTR); if (ret < 0) { @@ -291,10 +317,18 @@ if(ret) { +#if USE_POLL + if((fd.revents & POLLIN) == POLLIN) +#else if(FD_ISSET(c->fd, &rfds)) +#endif ret = ret && _xcb_in_read(c); +#if USE_POLL + if((fd.revents & POLLOUT) == POLLOUT) +#else if(FD_ISSET(c->fd, &wfds)) +#endif ret = ret && write_vec(c, vector, count); } 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/libxcb-1.2/src/xcb_in.c new/libxcb-1.3/src/xcb_in.c --- old/libxcb-1.2/src/xcb_in.c 2008-11-04 10:36:17.000000000 +0100 +++ new/libxcb-1.3/src/xcb_in.c 2009-04-06 10:47:58.000000000 +0200 @@ -30,12 +30,16 @@ #include <stdlib.h> #include <unistd.h> #include <stdio.h> -#include <sys/select.h> #include <errno.h> #include "xcb.h" #include "xcbext.h" #include "xcbint.h" +#if USE_POLL +#include <poll.h> +#else +#include <sys/select.h> +#endif #define XCB_ERROR 0 #define XCB_REPLY 1 @@ -268,12 +272,22 @@ done += ret; if(ret < 0 && errno == EAGAIN) { +#if USE_POLL + struct pollfd pfd; + pfd.fd = fd; + pfd.events = POLLIN; + pfd.revents = 0; + do { + ret = poll(&pfd, 1, -1); + } while (ret == -1 && errno == EINTR); +#else fd_set fds; FD_ZERO(&fds); FD_SET(fd, &fds); do { ret = select(fd + 1, &fds, 0, 0, 0); } while (ret == -1 && errno == EINTR); +#endif } if(ret <= 0) return ret; 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/libxcb-1.2/src/xcbint.h new/libxcb-1.3/src/xcbint.h --- old/libxcb-1.2/src/xcbint.h 2008-11-04 10:36:17.000000000 +0100 +++ new/libxcb-1.3/src/xcbint.h 2009-04-11 16:31:18.000000000 +0200 @@ -60,6 +60,10 @@ #define offsetof(type,member) ((size_t) &((type *)0)->member) #endif +#ifndef MIN +#define MIN(x,y) ((x) < (y) ? (x) : (y)) +#endif + #define container_of(pointer,type,member) ((type *)(((char *)(pointer)) - offsetof(type, member))) /* xcb_list.c */ 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/libxcb-1.2/src/xcb_util.c new/libxcb-1.3/src/xcb_util.c --- old/libxcb-1.2/src/xcb_util.c 2008-12-11 11:15:34.000000000 +0100 +++ new/libxcb-1.3/src/xcb_util.c 2009-05-29 08:20:17.000000000 +0200 @@ -30,6 +30,7 @@ #include <sys/socket.h> #include <sys/un.h> #include <netinet/in.h> +#include <netinet/tcp.h> #ifdef DNETCONN #include <netdnet/dnetdb.h> #include <netdnet/dn.h> @@ -125,7 +126,7 @@ static int _xcb_open_decnet(const char *host, char *protocol, const unsigned short port); #endif #ifdef HAVE_ABSTRACT_SOCKETS -static int _xcb_open_abstract(char *protocol, const char *file); +static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen); #endif static int _xcb_open(char *host, char *protocol, const int display) @@ -135,6 +136,7 @@ #endif static const char base[] = "/tmp/.X11-unix/X"; char file[sizeof(base) + 20]; + int filelen; if(*host) { @@ -161,9 +163,13 @@ } /* display specifies Unix socket */ - snprintf(file, sizeof(file), "%s%d", base, display); + filelen = snprintf(file, sizeof(file), "%s%d", base, display); + if(filelen < 0) + return -1; + /* snprintf may truncate the file */ + filelen = MIN(filelen, sizeof(file) - 1); #ifdef HAVE_ABSTRACT_SOCKETS - fd = _xcb_open_abstract(protocol, file); + fd = _xcb_open_abstract(protocol, file, filelen); if (fd >= 0 || (errno != ENOENT && errno != ECONNREFUSED)) return fd; @@ -188,8 +194,9 @@ addr.sdn_add.a_len = nodeaddr->n_length; memcpy(addr.sdn_add.a_addr, nodeaddr->n_addr, addr.sdn_add.a_len); - sprintf((char *)addr.sdn_objname, "X$X%d", port); - addr.sdn_objnamel = strlen((char *)addr.sdn_objname); + addr.sdn_objnamel = sprintf((char *)addr.sdn_objname, "X$X%d", port); + if(addr.sdn_objnamel < 0) + return -1; addr.sdn_objnum = 0; fd = socket(PF_DECnet, SOCK_STREAM, 0); @@ -197,8 +204,9 @@ return -1; memset(&accessdata, 0, sizeof(accessdata)); - sprintf((char*)accessdata.acc_acc, "%d", getuid()); - accessdata.acc_accl = strlen((char *)accessdata.acc_acc); + accessdata.acc_accl = sprintf((char*)accessdata.acc_acc, "%d", getuid()); + if(accessdata.acc_accl < 0) + return -1; setsockopt(fd, DNPROTO_NSP, SO_CONACCESS, &accessdata, sizeof(accessdata)); if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) { @@ -250,6 +258,9 @@ { fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); if(fd >= 0) { + int on = 1; + setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); + if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0) break; close(fd); @@ -284,7 +295,7 @@ } #ifdef HAVE_ABSTRACT_SOCKETS -static int _xcb_open_abstract(char *protocol, const char *file) +static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen) { int fd; struct sockaddr_un addr = {0}; @@ -295,9 +306,9 @@ strcpy(addr.sun_path + 1, file); addr.sun_family = AF_UNIX; - namelen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(file); + namelen = offsetof(struct sockaddr_un, sun_path) + 1 + filelen; #ifdef HAVE_SOCKADDR_SUN_LEN - addr.sun_len = 1 + strlen(file); + addr.sun_len = 1 + filelen; #endif fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd == -1) @@ -312,39 +323,7 @@ xcb_connection_t *xcb_connect(const char *displayname, int *screenp) { - int fd, display = 0; - char *host; - char *protocol; - xcb_connection_t *c; - xcb_auth_info_t auth; - - int parsed = _xcb_parse_display(displayname, &host, &protocol, &display, screenp); - -#ifdef HAVE_LAUNCHD - if(!displayname) - displayname = getenv("DISPLAY"); - if(displayname && strlen(displayname)>11 && !strncmp(displayname, "/tmp/launch", 11)) - fd = _xcb_open_unix(NULL, displayname); - else -#endif - if(!parsed) - return (xcb_connection_t *) &error_connection; - else - fd = _xcb_open(host, protocol, display); - free(host); - - if(fd == -1) - return (xcb_connection_t *) &error_connection; - - if(_xcb_get_auth_info(fd, &auth, display)) - { - c = xcb_connect_to_fd(fd, &auth); - free(auth.name); - free(auth.data); - } - else - c = xcb_connect_to_fd(fd, 0); - return c; + return xcb_connect_to_display_with_auth_info(displayname, NULL, screenp); } xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, xcb_auth_info_t *auth, int *screenp) @@ -352,6 +331,8 @@ int fd, display = 0; char *host; char *protocol; + xcb_auth_info_t ourauth; + xcb_connection_t *c; int parsed = _xcb_parse_display(displayname, &host, &protocol, &display, screenp); @@ -371,5 +352,17 @@ if(fd == -1) return (xcb_connection_t *) &error_connection; - return xcb_connect_to_fd(fd, auth); + if(auth) + return xcb_connect_to_fd(fd, auth); + + if(_xcb_get_auth_info(fd, &ourauth, display)) + { + c = xcb_connect_to_fd(fd, &ourauth); + free(ourauth.name); + free(ourauth.data); + } + else + c = xcb_connect_to_fd(fd, 0); + + return c; } 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/libxcb-1.2/src/xcb_xid.c new/libxcb-1.3/src/xcb_xid.c --- old/libxcb-1.2/src/xcb_xid.c 2008-07-07 17:56:57.000000000 +0200 +++ new/libxcb-1.3/src/xcb_xid.c 2009-03-28 14:59:01.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2004 Bart Massey and Jamey Sharp. +/* Copyright (C) 2001-2008 Bart Massey and Jamey Sharp. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -25,6 +25,7 @@ /* XID allocators. */ +#include <assert.h> #include <stdlib.h> #include "xcb.h" #include "xcbext.h" @@ -39,21 +40,40 @@ if(c->has_error) return -1; pthread_mutex_lock(&c->xid.lock); - if(c->xid.last == c->xid.max) + if(c->xid.last >= c->xid.max - c->xid.inc + 1) { xcb_xc_misc_get_xid_range_reply_t *range; - range = xcb_xc_misc_get_xid_range_reply(c, xcb_xc_misc_get_xid_range(c), 0); - if(!range) - { - pthread_mutex_unlock(&c->xid.lock); - return -1; + assert(c->xid.last == c->xid.max); + if (c->xid.last == 0) { + /* finish setting up initial range */ + c->xid.max = c->setup->resource_id_mask; + } else { + /* check for extension */ + const xcb_query_extension_reply_t *xc_misc_reply = + xcb_get_extension_data(c, &xcb_xc_misc_id); + if (!xc_misc_reply) { + pthread_mutex_unlock(&c->xid.lock); + return -1; + } + /* get new range */ + range = xcb_xc_misc_get_xid_range_reply(c, + xcb_xc_misc_get_xid_range(c), 0); + /* XXX The latter disjunct is what the server returns + when it is out of XIDs. Sweet. */ + if(!range || (range->start_id == 0 && range->count == 1)) + { + pthread_mutex_unlock(&c->xid.lock); + return -1; + } + assert(range->count > 0 && range->start_id > 0); + c->xid.last = range->start_id; + c->xid.max = range->start_id + (range->count - 1) * c->xid.inc; + free(range); } - c->xid.last = range->start_id; - c->xid.max = range->start_id + (range->count - 1) * c->xid.inc; - free(range); + } else { + c->xid.last += c->xid.inc; } ret = c->xid.last | c->xid.base; - c->xid.last += c->xid.inc; pthread_mutex_unlock(&c->xid.lock); return ret; } @@ -65,8 +85,8 @@ if(pthread_mutex_init(&c->xid.lock, 0)) return 0; c->xid.last = 0; + c->xid.max = 0; c->xid.base = c->setup->resource_id_base; - c->xid.max = c->setup->resource_id_mask; c->xid.inc = c->setup->resource_id_mask & -(c->setup->resource_id_mask); return 1; } 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/libxcb-1.2/xcb.pc.in new/libxcb-1.3/xcb.pc.in --- old/libxcb-1.2/xcb.pc.in 2008-07-07 17:56:57.000000000 +0200 +++ new/libxcb-1.3/xcb.pc.in 2009-05-29 08:20:17.000000000 +0200 @@ -2,6 +2,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +xcbproto_version=@XCBPROTO_VERSION@ Name: XCB Description: X-protocol C Binding ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-libs for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package xorg-x11-libs for openSUSE:Factory checked in at Tue Jun 2 12:23:09 CEST 2009. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2009-04-25 04:58:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2009-05-29 18:32:37.000000000 +0200 @@ -1,0 +2,27 @@ +Fri May 29 18:31:51 CEST 2009 - sndirsch(a)suse.de + +- xcb-util 0.3.5 + * various issues fixed + +------------------------------------------------------------------- +Thu Apr 30 22:40:53 CEST 2009 + +- fix a version typo that prevented the .la files to be found for + 11.0 <= version <= 11.1 + +------------------------------------------------------------------- +Thu Apr 30 21:53:45 CEST 2009 + +- pack .la files in devel package + +------------------------------------------------------------------- +Thu Apr 30 20:35:27 CEST 2009 - eich(a)suse.de + +- move static libraries to devel package + +------------------------------------------------------------------- +Thu Apr 30 18:55:01 CEST 2009 - sndirsch(a)suse.de + +- build static libraries for versions <= 11.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xcb-util-0.3.4.tar.bz2 New: ---- xcb-util-0.3.5.diff xcb-util-0.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.gG3619/_old 2009-06-02 12:22:50.000000000 +0200 +++ /var/tmp/diff_new_pack.gG3619/_new 2009-06-02 12:22:50.000000000 +0200 @@ -32,8 +32,8 @@ # Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 19 -License: X11/MIT +Release: 20 +License: GPL v2 or later; X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries Summary: Remaining X.Org libraries @@ -68,12 +68,13 @@ Source28: libXft1-X11R6.9-1.2.tar.bz2 Source29: libvnc-20070501.tar.bz2 Source30: libXcliplist-20070501.tar.bz2 -Source31: xcb-util-0.3.4.tar.bz2 +Source31: xcb-util-0.3.5.tar.bz2 Source33: libpciaccess-0.10.6.tar.bz2 Patch2: libXft-2.1.7-lcd-filter-2.patch Patch3: p_xft_cjk.diff Patch5: libxkbui.diff Patch10: libXxf86misc-xcb.diff +Patch11: xcb-util-0.3.5.diff %description This package contains the remaining X.Org libraries. @@ -103,7 +104,7 @@ Susan Angebrandt %package -n xorg-x11-devel -License: X11/MIT +License: GPL v2 or later; X11/MIT Summary: Include Files and Libraries mandatory for X11 Development Group: Development/Libraries/X11 Provides: xorg-x11-compat70-devel xorg-x11-man XFree86-devel @@ -230,6 +231,9 @@ pushd libXxf86misc-* %patch10 -p0 popd +pushd xcb-util-* +%patch11 -p0 +popd %build for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do @@ -242,7 +246,11 @@ *) echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - %configure --disable-static --with-pic --enable-type1 ${option} + %configure \ +%if %suse_version > 1110 + --disable-static \ +%endif + --with-pic --enable-type1 ${option} ;; esac %{__make} %{?jobs:-j%jobs} @@ -257,7 +265,7 @@ done /sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/ -%if %suse_version > 1100 +%if %suse_version > 1110 rm $RPM_BUILD_ROOT/%{_libdir}/*.la %endif @@ -298,6 +306,10 @@ /usr/include/xcb/ /usr/%{_lib}/*.so %exclude /usr/%{_lib}/libpciaccess.so.0* +%if %suse_version <= 1110 +/usr/%{_lib}/*.a +/usr/%{_lib}/*.la +%endif /usr/%{_lib}/pkgconfig/*.pc /usr/share/aclocal/*.m4 %{_mandir}/man1/* @@ -313,6 +325,18 @@ /usr/%{_lib}/libpciaccess.so %changelog +* Fri May 29 2009 sndirsch(a)suse.de +- xcb-util 0.3.5 + * various issues fixed + Thu Apr 30 22:40:53 CEST 2009 +- fix a version typo that prevented the .la files to be found for + 11.0 <= version <= 11.1 + Thu Apr 30 21:53:45 CEST 2009 +- pack .la files in devel package +* Thu Apr 30 2009 eich(a)suse.de +- move static libraries to devel package +* Thu Apr 30 2009 sndirsch(a)suse.de +- build static libraries for versions <= 11.1 * Sat Apr 25 2009 sndirsch(a)suse.de - libpciaccess 0.10.6 * Tue Apr 21 2009 crrodriguez(a)suse.de ++++++ xcb-util-0.3.5.diff ++++++ --- event/event.c.orig 2009-05-29 19:05:59.274261734 +0200 +++ event/event.c 2009-05-29 19:06:47.128402256 +0200 @@ -28,6 +28,7 @@ #include <assert.h> #include <stdlib.h> +#include <string.h> #include "xcb_event.h" #include "../xcb-util-common.h" ++++++ xcb-util-0.3.4.tar.bz2 -> xcb-util-0.3.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/acinclude.m4 new/xcb-util-0.3.5/acinclude.m4 --- old/xcb-util-0.3.4/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/xcb-util-0.3.5/acinclude.m4 2009-05-29 08:35:36.000000000 +0200 @@ -0,0 +1,173 @@ +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan <toolan(a)ele.uri.edu> +# +# 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. + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/$[[0-9]]*$/Z\1Z/g' \ + -e 's/Z$[[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/$[[0-9]]*$/Z\1Z/g' \ + -e 's/Z$[[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/Z$[[0-9]][[0-9]][[0-9]]$Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/$.\{$ax_compare_version_len_B\}$.*/\1/"` + B=`echo "$B" | sed "s/$.\{$ax_compare_version_len_A\}$.*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/$\([[0-9]]\{4\}$\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/$\([[0-9]]\{4\}$\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/aclocal.m4 new/xcb-util-0.3.5/aclocal.m4 --- old/xcb-util-0.3.4/aclocal.m4 2009-04-15 15:44:52.000000000 +0200 +++ new/xcb-util-0.3.5/aclocal.m4 2009-05-29 08:37:17.000000000 +0200 @@ -8998,3 +8998,4 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([acinclude.m4]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/atom/Makefile.in new/xcb-util-0.3.5/atom/Makefile.in --- old/xcb-util-0.3.4/atom/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/atom/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-atom.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,6 +106,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/atom/xcb_atom.h new/xcb-util-0.3.5/atom/xcb_atom.h --- old/xcb-util-0.3.4/atom/xcb_atom.h 2009-04-12 21:55:07.000000000 +0200 +++ new/xcb-util-0.3.5/atom/xcb_atom.h 2009-05-29 08:36:54.000000000 +0200 @@ -3,6 +3,10 @@ #include <xcb/xcb.h> +#ifdef __cplusplus +extern "C" { +#endif + enum xcb_atom_fast_tag_t { TAG_COOKIE, TAG_VALUE @@ -105,4 +109,8 @@ extern const xcb_atom_t WM_CLASS; extern const xcb_atom_t WM_TRANSIENT_FOR; +#ifdef __cplusplus +} +#endif + #endif /* __XCB_ATOM_H__ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/atom/xcb_atom.h.m4 new/xcb-util-0.3.5/atom/xcb_atom.h.m4 --- old/xcb-util-0.3.4/atom/xcb_atom.h.m4 2008-09-18 21:32:29.000000000 +0200 +++ new/xcb-util-0.3.5/atom/xcb_atom.h.m4 2009-05-29 08:35:36.000000000 +0200 @@ -3,6 +3,10 @@ #include <xcb/xcb.h> +#ifdef __cplusplus +extern "C" { +#endif + enum xcb_atom_fast_tag_t { TAG_COOKIE, TAG_VALUE @@ -39,4 +43,8 @@ define(`DO', `extern const xcb_atom_t $1;')dnl include(atomlist.m4)`'dnl +#ifdef __cplusplus +} +#endif + #endif /* __XCB_ATOM_H__ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/aux/Makefile.in new/xcb-util-0.3.5/aux/Makefile.in --- old/xcb-util-0.3.4/aux/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/aux/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-aux.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -102,6 +103,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/aux/xcb_aux.c new/xcb-util-0.3.5/aux/xcb_aux.c --- old/xcb-util-0.3.4/aux/xcb_aux.c 2008-12-16 13:36:06.000000000 +0100 +++ new/xcb-util-0.3.5/aux/xcb_aux.c 2009-04-19 20:40:33.000000000 +0200 @@ -208,6 +208,17 @@ } xcb_void_cookie_t +xcb_aux_change_window_attributes_checked (xcb_connection_t *c, + xcb_window_t window, + uint32_t mask, + const xcb_params_cw_t *params) +{ + uint32_t value_list[16]; + pack_list(mask, (const uint32_t *)params, value_list); + return xcb_change_window_attributes_checked( c, window, mask, value_list ); +} + +xcb_void_cookie_t xcb_aux_change_window_attributes (xcb_connection_t *c, xcb_window_t window, uint32_t mask, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/aux/xcb_aux.h new/xcb-util-0.3.5/aux/xcb_aux.h --- old/xcb-util-0.3.4/aux/xcb_aux.h 2008-10-19 16:42:11.000000000 +0200 +++ new/xcb-util-0.3.5/aux/xcb_aux.h 2009-04-19 20:40:33.000000000 +0200 @@ -102,6 +102,12 @@ uint32_t mask, const xcb_params_cw_t *params); +xcb_void_cookie_t +xcb_aux_change_window_attributes_checked (xcb_connection_t *c, + xcb_window_t window, + uint32_t mask, + const xcb_params_cw_t *params); + typedef struct { int32_t x; int32_t y; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/config.guess new/xcb-util-0.3.5/config.guess --- old/xcb-util-0.3.4/config.guess 2009-04-15 15:44:53.000000000 +0200 +++ new/xcb-util-0.3.5/config.guess 2009-05-29 08:37:19.000000000 +0200 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2009-04-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -324,6 +324,9 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -331,7 +334,20 @@ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -796,7 +812,7 @@ x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -935,6 +951,9 @@ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -985,9 +1004,6 @@ a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1102,8 +1118,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1141,6 +1160,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1216,6 +1245,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1324,6 +1356,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/config.sub new/xcb-util-0.3.5/config.sub --- old/xcb-util-0.3.4/config.sub 2009-04-15 15:44:53.000000000 +0200 +++ new/xcb-util-0.3.5/config.sub 2009-05-29 08:37:19.000000000 +0200 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2009-04-17' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,6 +122,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'` @@ -249,13 +250,16 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +272,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +282,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +291,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -329,14 +334,17 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +366,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -439,6 +447,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -459,6 +471,10 @@ basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -526,6 +542,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1128,6 +1148,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1166,7 +1190,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1238,8 +1262,9 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1248,7 +1273,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1388,6 +1413,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/configure new/xcb-util-0.3.5/configure --- old/xcb-util-0.3.4/configure 2009-04-15 15:44:53.000000000 +0200 +++ new/xcb-util-0.3.5/configure 2009-05-29 08:37:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xcb-util 0.3.4. +# Generated by GNU Autoconf 2.63 for xcb-util 0.3.5. # # Report bugs to <xcb(a)lists.freedesktop.org>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='xcb-util' PACKAGE_TARNAME='xcb-util' -PACKAGE_VERSION='0.3.4' -PACKAGE_STRING='xcb-util 0.3.4' +PACKAGE_VERSION='0.3.5' +PACKAGE_STRING='xcb-util 0.3.5' PACKAGE_BUGREPORT='xcb(a)lists.freedesktop.org' ac_unique_file="Makefile.am" @@ -856,6 +856,8 @@ CFLAGS CC GPERF +GNUM4 +GM4 M4 am__untar am__tar @@ -1498,7 +1500,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xcb-util 0.3.4 to adapt to many kinds of systems. +\`configure' configures xcb-util 0.3.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1568,7 +1570,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xcb-util 0.3.4:";; + short | recursive ) echo "Configuration of xcb-util 0.3.5:";; esac cat <<\_ACEOF @@ -1681,7 +1683,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xcb-util configure 0.3.4 +xcb-util configure 0.3.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1695,7 +1697,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xcb-util $as_me 0.3.4, which was +It was created by xcb-util $as_me 0.3.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2413,7 +2415,7 @@ # Define the identity of the package. PACKAGE='xcb-util' - VERSION='0.3.4' + VERSION='0.3.5' cat >>confdefs.h <<_ACEOF @@ -2556,7 +2558,7 @@ -for ac_prog in m4 +for ac_prog in m4 gm4 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2599,9 +2601,115 @@ done test -n "$M4" || M4="no" +if test $M4 != "no" ; then + { $as_echo "$as_me:$LINENO: checking if $M4 supports -I" >&5 +$as_echo_n "checking if $M4 supports -I... " >&6; } + if $M4 -I. /dev/null > /dev/null 2>&1 ; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + # Try finding the gnu version + for ac_prog in gm4 +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:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GM4+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$GM4"; then + ac_cv_prog_GM4="$GM4" # Let the user override the test. +else +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_prog_GM4="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GM4=$ac_cv_prog_GM4 +if test -n "$GM4"; then + { $as_echo "$as_me:$LINENO: result: $GM4" >&5 +$as_echo "$GM4" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GM4" && break +done +test -n "$GM4" || GM4="no" + + if test $GM4 = "no" ; then + for ac_prog in m4 +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:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GNUM4+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $GNUM4 in + [\\/]* | ?:[\\/]*) + ac_cv_path_GNUM4="$GNUM4" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /usr/gnu/bin +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_GNUM4="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +GNUM4=$ac_cv_path_GNUM4 +if test -n "$GNUM4"; then + { $as_echo "$as_me:$LINENO: result: $GNUM4" >&5 +$as_echo "$GNUM4" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$GNUM4" && break +done +test -n "$GNUM4" || GNUM4="no" + + M4="$GNUM4" + else + M4="$GM4" + fi + fi +fi if test $M4 = "no"; then - { { $as_echo "$as_me:$LINENO: error: Can't find m4, please install it and try again" >&5 -$as_echo "$as_me: error: Can't find m4, please install it and try again" >&2;} + { { $as_echo "$as_me:$LINENO: error: Can't find usable m4, please install it and try again" >&5 +$as_echo "$as_me: error: Can't find usable m4, please install it and try again" >&2;} { (exit 1); exit 1; }; } fi for ac_prog in gperf @@ -4457,13 +4565,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4460: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4568: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4463: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4571: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4466: output\"" >&5) + (eval echo "\"\$as_me:4574: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5669,7 +5777,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5672 "configure"' > conftest.$ac_ext + echo '#line 5780 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7522,11 +7630,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7525: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7633: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7529: \$? = $ac_status" >&5 + echo "$as_me:7637: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7861,11 +7969,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7864: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7972: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7868: \$? = $ac_status" >&5 + echo "$as_me:7976: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7966,11 +8074,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7969: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8077: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7973: \$? = $ac_status" >&5 + echo "$as_me:8081: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8021,11 +8129,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8024: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8132: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8028: \$? = $ac_status" >&5 + echo "$as_me:8136: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10837,7 +10945,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10840 "configure" +#line 10948 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10933,7 +11041,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10936 "configure" +#line 11044 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11473,12 +11581,12 @@ pkg_cv_XCB_CFLAGS="$XCB_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "xcb >= 1.0") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "xcb >= 1.2") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb >= 1.0" 2>/dev/null` + pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb >= 1.2" 2>/dev/null` else pkg_failed=yes fi @@ -11491,12 +11599,12 @@ pkg_cv_XCB_LIBS="$XCB_LIBS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "xcb >= 1.0") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "xcb >= 1.2") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb >= 1.0" 2>/dev/null` + pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb >= 1.2" 2>/dev/null` else pkg_failed=yes fi @@ -11515,14 +11623,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb >= 1.0"` + XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb >= 1.2"` else - XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb >= 1.0"` + XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb >= 1.2"` fi # Put the nasty error message in config.log where it belongs echo "$XCB_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (xcb >= 1.0) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (xcb >= 1.2) were not met: $XCB_PKG_ERRORS @@ -11533,7 +11641,7 @@ and XCB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -$as_echo "$as_me: error: Package requirements (xcb >= 1.0) were not met: +$as_echo "$as_me: error: Package requirements (xcb >= 1.2) were not met: $XCB_PKG_ERRORS @@ -11577,6 +11685,104 @@ : fi +###### +# Check version of xcb-proto that xcb was compiled against +###### +xcbproto_required=1.5 + +# Moved from AX_COMPARE_VERSION to maintain proper output +for ac_prog in gawk mawk nawk awk +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:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +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_prog_AWK="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + + +{ $as_echo "$as_me:$LINENO: checking whether libxcb was compiled against xcb-proto >= $xcbproto_required" >&5 +$as_echo_n "checking whether libxcb was compiled against xcb-proto >= $xcbproto_required... " >&6; } +xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb` + + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + + ax_compare_version_A=`echo "$xcbproto_version" | sed -e 's/$[0-9]*$/Z\1Z/g' \ + -e 's/Z$[0-9]$Z/Z0\1Z/g' \ + -e 's/Z$[0-9][0-9]$Z/Z0\1Z/g' \ + -e 's/Z$[0-9][0-9][0-9]$Z/Z0\1Z/g' \ + -e 's/[^0-9]//g'` + + + ax_compare_version_B=`echo "$xcbproto_required" | sed -e 's/$[0-9]*$/Z\1Z/g' \ + -e 's/Z$[0-9]$Z/Z0\1Z/g' \ + -e 's/Z$[0-9][0-9]$Z/Z0\1Z/g' \ + -e 's/Z$[0-9][0-9][0-9]$Z/Z0\1Z/g' \ + -e 's/[^0-9]//g'` + + + ax_compare_version=`echo "x$ax_compare_version_A +x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"` + + + + if test "$ax_compare_version" = "true" ; then + xcbproto_ok="yes" + else xcbproto_ok="no" + fi + +{ $as_echo "$as_me:$LINENO: result: $xcbproto_ok" >&5 +$as_echo "$xcbproto_ok" >&6; } + +if test $xcbproto_ok = no; then + { { $as_echo "$as_me:$LINENO: error: libxcb was compiled against xcb-proto $xcbproto_version; it needs needs to be compiled against version $xcbproto_required or higher" >&5 +$as_echo "$as_me: error: libxcb was compiled against xcb-proto $xcbproto_version; it needs needs to be compiled against version $xcbproto_required or higher" >&2;} + { (exit 1); exit 1; }; } +fi + + + pkg_failed=no { $as_echo "$as_me:$LINENO: checking for XCB_SHM" >&5 $as_echo_n "checking for XCB_SHM... " >&6; } @@ -12408,7 +12614,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xcb-util $as_me 0.3.4, which was +This file was extended by xcb-util $as_me 0.3.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12462,7 +12668,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xcb-util config.status 0.3.4 +xcb-util config.status 0.3.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/configure.ac new/xcb-util-0.3.5/configure.ac --- old/xcb-util-0.3.4/configure.ac 2009-04-15 15:44:12.000000000 +0200 +++ new/xcb-util-0.3.5/configure.ac 2009-05-29 08:37:03.000000000 +0200 @@ -1,11 +1,27 @@ AC_PREREQ(2.57) -AC_INIT([xcb-util],0.3.4,[xcb(a)lists.freedesktop.org]) +AC_INIT([xcb-util],0.3.5,[xcb(a)lists.freedesktop.org]) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AC_CHECK_PROGS(M4, m4, [no]) +AC_CHECK_PROGS(M4, [m4 gm4], [no]) +if test $M4 != "no" ; then + AC_MSG_CHECKING([if $M4 supports -I]) + if $M4 -I. /dev/null > /dev/null 2>&1 ; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + # Try finding the gnu version + AC_CHECK_PROGS(GM4, gm4, [no]) + if test $GM4 = "no" ; then + AC_PATH_PROGS(GNUM4, m4, [no], [/usr/gnu/bin]) + M4="$GNUM4" + else + M4="$GM4" + fi + fi +fi if test $M4 = "no"; then - AC_MSG_ERROR([Can't find m4, please install it and try again]) + AC_MSG_ERROR([Can't find usable m4, please install it and try again]) fi AC_CHECK_PROGS(GPERF, gperf, [no]) if test $GPERF = "no"; then @@ -31,7 +47,26 @@ pkgconfigdir='${libdir}/pkgconfig' AC_SUBST(pkgconfigdir) -PKG_CHECK_MODULES(XCB, xcb >= 1.0) +PKG_CHECK_MODULES(XCB, xcb >= 1.2) + +###### +# Check version of xcb-proto that xcb was compiled against +###### +xcbproto_required=1.5 + +# Moved from AX_COMPARE_VERSION to maintain proper output +AC_PROG_AWK + +AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required]) +xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb` +AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes", xcbproto_ok="no") +AC_MSG_RESULT([$xcbproto_ok]) + +if test $xcbproto_ok = no; then + AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs needs to be compiled against version $xcbproto_required or higher]) +fi + + PKG_CHECK_MODULES(XCB_SHM, xcb-shm) PKG_CHECK_MODULES(XCB_RENDER, xcb-render) PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/event/event.c new/xcb-util-0.3.5/event/event.c --- old/xcb-util-0.3.4/event/event.c 2009-04-15 15:44:12.000000000 +0200 +++ new/xcb-util-0.3.5/event/event.c 2009-05-29 08:35:36.000000000 +0200 @@ -35,6 +35,7 @@ void xcb_event_handlers_init(xcb_connection_t *c, xcb_event_handlers_t *evenths) { + memset(evenths, 0, sizeof(xcb_event_handlers_t)); evenths->c = c; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/event/Makefile.in new/xcb-util-0.3.5/event/Makefile.in --- old/xcb-util-0.3.4/event/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/event/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-event.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,6 +106,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/icccm/icccm.c new/xcb-util-0.3.5/icccm/icccm.c --- old/xcb-util-0.3.4/icccm/icccm.c 2009-04-04 13:38:06.000000000 +0200 +++ new/xcb-util-0.3.5/icccm/icccm.c 2009-05-09 17:56:55.000000000 +0200 @@ -64,7 +64,7 @@ prop->_reply = reply; prop->encoding = prop->_reply->type; prop->format = prop->_reply->format; - prop->name_len = xcb_get_property_value_length(prop->_reply) * prop->format >> 3; + prop->name_len = xcb_get_property_value_length(prop->_reply); prop->name = xcb_get_property_value(prop->_reply); return 1; @@ -434,7 +434,7 @@ if(!reply) return 0; - int length = xcb_get_property_value_length(reply); + int length = xcb_get_property_value_length(reply) / (reply->format / 8); if (!(reply->type == WM_SIZE_HINTS && (reply->format == 8 || reply->format == 16 || @@ -627,16 +627,16 @@ return 0; int length = xcb_get_property_value_length(reply); + int num_elem = length / (reply->format / 8); - if ((reply->type != WM_HINTS) || - (length < (XCB_NUM_WM_HINTS_ELEMENTS - 1)) || - (reply->format != 32)) + if (reply->type != WM_HINTS + || reply->format != 32 + || num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1) return 0; - memcpy(hints, (xcb_size_hints_t *) xcb_get_property_value(reply), - length * reply->format >> 3); + memcpy(hints, (xcb_size_hints_t *) xcb_get_property_value(reply), length); - if(length < XCB_NUM_WM_HINTS_ELEMENTS) + if(num_elem < XCB_NUM_WM_HINTS_ELEMENTS) hints->window_group = XCB_NONE; return 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/icccm/Makefile.in new/xcb-util-0.3.5/icccm/Makefile.in --- old/xcb-util-0.3.4/icccm/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/icccm/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-icccm.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -106,6 +107,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/image/Makefile.in new/xcb-util-0.3.5/image/Makefile.in --- old/xcb-util-0.3.4/image/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/image/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -42,7 +42,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-image.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -132,6 +133,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/keysyms/Makefile.in new/xcb-util-0.3.5/keysyms/Makefile.in --- old/xcb-util-0.3.4/keysyms/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/keysyms/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-keysyms.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,6 +106,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/Makefile.in new/xcb-util-0.3.5/Makefile.in --- old/xcb-util-0.3.4/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -37,7 +37,8 @@ $(top_srcdir)/configure config.guess config.sub depcomp \ install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -93,6 +94,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/property/Makefile.in new/xcb-util-0.3.5/property/Makefile.in --- old/xcb-util-0.3.4/property/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/property/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-property.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -106,6 +107,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/renderutil/Makefile.in new/xcb-util-0.3.5/renderutil/Makefile.in --- old/xcb-util-0.3.4/renderutil/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/renderutil/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -38,7 +38,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-renderutil.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -104,6 +105,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/reply/Makefile.in new/xcb-util-0.3.5/reply/Makefile.in --- old/xcb-util-0.3.4/reply/Makefile.in 2009-04-15 15:44:54.000000000 +0200 +++ new/xcb-util-0.3.5/reply/Makefile.in 2009-05-29 08:37:19.000000000 +0200 @@ -40,7 +40,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/xcb-reply.pc.in $(xcbinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -111,6 +112,8 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GM4 = @GM4@ +GNUM4 = @GNUM4@ GPERF = @GPERF@ GREP = @GREP@ INSTALL = @INSTALL@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-proto-devel for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package xorg-x11-proto-devel for openSUSE:Factory checked in at Tue Jun 2 12:22:38 CEST 2009. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-05-27 09:58:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-05-29 17:27:50.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 29 17:26:45 CEST 2009 - sndirsch(a)suse.de + +- xcb-proto 1.5 + * various issues fixed + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xcb-proto-1.4.tar.bz2 New: ---- xcb-proto-1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.QF1610/_old 2009-06-02 12:22:24.000000000 +0200 +++ /var/tmp/diff_new_pack.QF1610/_new 2009-06-02 12:22:24.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: python-base Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 11 +Release: 12 License: GPL v2 or later; X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -60,7 +60,7 @@ Source30: xproto-7.0.15.tar.bz2 Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2 Source32: evieext-X11R7.0-1.0.2.tar.bz2 -Source33: xcb-proto-1.4.tar.bz2 +Source33: xcb-proto-1.5.tar.bz2 Source34: libpthread-stubs-0.1.tar.bz2 Source35: vncproto-20070501.tar.bz2 Source36: xcliplistproto-20070501.tar.bz2 @@ -143,6 +143,9 @@ /usr/share/xcb/ %changelog +* Fri May 29 2009 sndirsch(a)suse.de +- xcb-proto 1.5 + * various issues fixed * Wed May 27 2009 sndirsch(a)suse.de - glproto 1.4.10 * Upgrade SGI FREE SOFTWARE LICENSE B 2.0 ++++++ xcb-proto-1.4.tar.bz2 -> xcb-proto-1.5.tar.bz2 ++++++ ++++ 4758 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgpg-error for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package libgpg-error for openSUSE:Factory checked in at Tue Jun 2 12:22:34 CEST 2009. -------- --- libgpg-error/libgpg-error.changes 2009-02-20 03:01:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/libgpg-error/libgpg-error.changes 2009-06-01 11:43:49.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jun 1 11:41:02 CEST 2009 - puzel(a)suse.cz + +- update to version 1.7 + * Minor fixes and a few new error codes. + * Interface changes relative to the 1.6 release: + GPG_ERR_NOT_OPERATIONAL NEW + GPG_ERR_NO_PASSPHRASE NEW + GPG_ERR_NO_PIN NEW + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgpg-error-1.6.tar.bz2 New: ---- libgpg-error-1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgpg-error.spec ++++++ --- /var/tmp/diff_new_pack.Zb1401/_old 2009-06-02 12:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Zb1401/_new 2009-06-02 12:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgpg-error (Version 1.6) +# spec file for package libgpg-error (Version 1.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: libgpg-error Url: http://www.gnupg.org/ -Version: 1.6 -Release: 9 +Version: 1.7 +Release: 1 Summary: Library That Defines Common Error Values for All GnuPG Components License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ @@ -131,6 +131,13 @@ %_libdir/libgpg-error*.so %changelog +* Mon Jun 01 2009 puzel(a)suse.cz +- update to version 1.7 + * Minor fixes and a few new error codes. + * Interface changes relative to the 1.6 release: + GPG_ERR_NOT_OPERATIONAL NEW + GPG_ERR_NO_PASSPHRASE NEW + GPG_ERR_NO_PIN NEW * Fri Feb 20 2009 crrodriguez(a)suse.de - remove static libraries, there is no reason to use them as shared libraries live in /%%{_lib} ++++++ libgpg-error-1.6.tar.bz2 -> libgpg-error-1.7.tar.bz2 ++++++ ++++ 3419 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit update-desktop-files for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package update-desktop-files for openSUSE:Factory checked in at Tue Jun 2 12:19:28 CEST 2009. -------- --- update-desktop-files/update-desktop-files.changes 2008-11-02 17:43:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/update-desktop-files/update-desktop-files.changes 2009-05-20 20:10:08.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 20 19:55:00 CEST 2009 - cmorve69o(a)yahoo.es + +- fix error message when an unknown category is found + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-desktop-files.spec ++++++ --- /var/tmp/diff_new_pack.K29054/_old 2009-06-02 12:19:00.000000000 +0200 +++ /var/tmp/diff_new_pack.K29054/_new 2009-06-02 12:19:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package update-desktop-files (Version 11.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: update-desktop-files Version: 11.1 -Release: 1 +Release: 2 Summary: A Build Tool to Update Desktop Files License: GPL v2 or later Group: Development/Tools/Building @@ -64,6 +64,8 @@ /etc/rpm/* %changelog +* Wed May 20 2009 cmorve69o(a)yahoo.es +- fix error message when an unknown category is found * Sun Nov 02 2008 coolo(a)suse.de - mark files as translated even if not trimmed * Fri Oct 24 2008 ke(a)suse.de @@ -101,7 +103,7 @@ * Tue May 27 2008 ke(a)suse.de - Remove test directory. - update translations. -* Tue May 27 2008 ro(a)suse.de +* Mon May 26 2008 ro(a)suse.de - added directories to filelist to fix build * Mon May 26 2008 ke(a)suse.de - update translations. @@ -119,7 +121,7 @@ - reupdate to fix build * Fri Apr 25 2008 ke(a)suse.de - update translations. -* Wed Apr 02 2008 coolo(a)suse.de +* Tue Apr 01 2008 coolo(a)suse.de - work with split po files - update from SVN * Tue Mar 25 2008 ke(a)suse.de - Add /etc/xdg/autostart/ for autostarted applications. Provided by ++++++ suse_update_desktop_file.sh ++++++ --- /var/tmp/diff_new_pack.K29054/_old 2009-06-02 12:19:00.000000000 +0200 +++ /var/tmp/diff_new_pack.K29054/_new 2009-06-02 12:19:00.000000000 +0200 @@ -241,7 +241,7 @@ ret="" mapCategory $i if [ -z "$ret" ]; then - echo 'WARNING: Category \"$i\" is unknown \!' + echo "WARNING: Category \"$i\" is unknown \!" echo WARNING: it is ignored, until you registered a Category at adrian(a)suse.de . else echo "$CAT" | grep -q "[=;]$i;" || CAT="$CAT$ret;" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pcre for openSUSE:Factory
by root＠Hilbert.suse.de 02 Jun '09

02 Jun '09

Hello community, here is the log from the commit of package pcre for openSUSE:Factory checked in at Tue Jun 2 12:10:15 CEST 2009. -------- --- pcre/pcre.changes 2009-05-27 18:07:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcre/pcre.changes 2009-05-30 22:02:33.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 30 22:02:07 CEST 2009 - dmueller(a)suse.de + +- fix symlinks to libpcre and libpcreposix to fix the build + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcre.spec ++++++ --- /var/tmp/diff_new_pack.U13648/_old 2009-06-02 12:09:51.000000000 +0200 +++ /var/tmp/diff_new_pack.U13648/_new 2009-06-02 12:09:51.000000000 +0200 @@ -21,7 +21,7 @@ Name: pcre BuildRequires: gcc-c++ Version: 7.9 -Release: 2 +Release: 3 Summary: A library for Perl-compatible regular expressions License: BSD 3-Clause; Other uncritical OpenSource License Group: System/Libraries @@ -90,9 +90,12 @@ %{__rm} -f %{buildroot}%{_libdir}/*.la #move pcre and pcreposix library into /lib %{__mkdir_p} %{buildroot}/%{_lib} -mv %{buildroot}%{_libdir}/libpcre{,posix}.so.* %{buildroot}/%{_lib} -#update the symlinks for linking. -%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so +for l in libpcre libpcreposix; do + ldest=$(readlink %{buildroot}/%{_libdir}/$l.so) + mv %{buildroot}%{_libdir}/$l.so.* %{buildroot}/%{_lib} + #update the symlinks for linking. + %{__ln_s} -vf /%{_lib}/$ldest %{buildroot}%{_libdir}/$l.so +done %check export LANG=POSIX @@ -130,6 +133,8 @@ %{_mandir}/man3/*.gz %changelog +* Sat May 30 2009 dmueller(a)suse.de +- fix symlinks to libpcre and libpcreposix to fix the build * Wed May 27 2009 ms(a)suse.de - moved libpcre and libpcreposix to %%{_lib} (bnc #507449) * Tue May 05 2009 ms(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0