openSUSE Commits

Download

commit@lists.opensuse.org

November 2010

1 participants
1023 discussions

commit cronie for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package cronie for openSUSE:Factory checked in at Tue Nov 2 11:04:01 CET 2010. -------- --- cronie/cronie.changes 2010-10-27 11:10:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/cronie/cronie.changes 2010-10-31 19:03:08.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cronie.spec ++++++ --- /var/tmp/diff_new_pack.TCpgFs/_old 2010-11-02 11:03:34.000000000 +0100 +++ /var/tmp/diff_new_pack.TCpgFs/_new 2010-11-02 11:03:34.000000000 +0100 @@ -30,7 +30,7 @@ AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq cron Version: 1.4.6 -Release: 1 +Release: 2 %{expand: %%define cronie_version %version} Summary: Cron Daemon Source0: %name-%version.tar.xz @@ -68,7 +68,7 @@ %package -n cron License: MIT and BSD and GPLv2 Version: 4.2 -Release: 3 +Release: 4 Summary: Auxiliary package Group: System/Daemons Requires: %{name} = %{cronie_version}-%{release} @@ -99,7 +99,7 @@ # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\"" %configure --with-audit --enable-anacron --with-pam --with-selinux --with-inotify --enable-pie SPOOL_DIR="/var/spool/cron/tabs" -%{__make} %{?jobs:-j%jobs} +%{__make} %{?_smp_mflags} %install %makeinstall ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libssh2_org for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package libssh2_org for openSUSE:Factory checked in at Tue Nov 2 11:03:18 CET 2010. -------- --- libssh2_org/libssh2_org.changes 2010-08-08 16:28:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/libssh2_org/libssh2_org.changes 2010-10-29 19:12:03.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Oct 29 17:09:09 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Update 1.2.7 +- Better handling of invalid key files +- inputchecks: make lots of API functions check for NULL pointers +- libssh2_session_callback_set: extended the man page +- SFTP: limit write() to not produce overly large packets +- agent: make libssh2_agent_userauth() work blocking properly +- _libssh2_userauth_publickey: reject method names longer than the data +- channel_free: ignore problems with channel_close() +- typedef: make ssize_t get typedef without LIBSSH2_WIN32 +- _libssh2_wait_socket: poll needs milliseconds +- libssh2_wait_socket: reset error code to "leak" EAGAIN less +- Added include for sys/select.h to get fd.set on some platforms +- session_free: free more data to avoid memory leaks +- openssl: make use of the EVP interface +- Fix underscore typo for 64-bit printf format specifiers on Windows +- Make libssh2_debug() create a correctly terminated string +- userauth_hostbased_fromfile: packet length too short +- handshake: Compression enabled at the wrong time +- Don't overflow MD5 server hostkey- + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libssh2-1.2.6.tar.bz2 New: ---- libssh2-1.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libssh2_org.spec ++++++ --- /var/tmp/diff_new_pack.LJSEuP/_old 2010-11-02 11:02:52.000000000 +0100 +++ /var/tmp/diff_new_pack.LJSEuP/_new 2010-11-02 11:02:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libssh2_org (Version 1.2.6) +# spec file for package libssh2_org (Version 1.2.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Summary: A library implementing the SSH2 protocol Name: libssh2_org -Version: 1.2.6 +Version: 1.2.7 Release: 1 %define pkg_name libssh2 Group: Development/Libraries/C and C++ ++++++ libssh2-1.2.6.tar.bz2 -> libssh2-1.2.7.tar.bz2 ++++++ ++++ 2654 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 openssh for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at Tue Nov 2 11:02:35 CET 2010. -------- --- openssh/openssh.changes 2010-10-14 18:02:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/openssh/openssh.changes 2010-10-31 19:04:09.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh-askpass-gnome.spec ++++++ --- /var/tmp/diff_new_pack.zHkeQq/_old 2010-11-02 10:59:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zHkeQq/_new 2010-11-02 10:59:45.000000000 +0100 @@ -23,7 +23,7 @@ License: BSD3c(or similar) Group: Productivity/Networking/SSH Version: 5.6p1 -Release: 3 +Release: 4 Requires: openssh = %{version} openssh-askpass = %{version} AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.zHkeQq/_old 2010-11-02 10:59:45.000000000 +0100 +++ /var/tmp/diff_new_pack.zHkeQq/_new 2010-11-02 10:59:45.000000000 +0100 @@ -36,7 +36,7 @@ Conflicts: nonfreessh AutoReqProv: on Version: 5.6p1 -Release: 3 +Release: 4 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ @@ -161,8 +161,8 @@ --with-xauth=%{_prefix}/bin/xauth \ --target=%{_target_cpu}-suse-linux # --with-afs=/usr \ -make %{?jobs:-j%jobs} -(cd converter; make %{?jobs:-j%jobs}) +make %{?_smp_mflags} +(cd converter; make %{?_smp_mflags}) cd contrib cd ../../x11-ssh-askpass-%{xversion} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" @@ -172,7 +172,7 @@ --libexecdir=%{prefix}/%_lib/ssh xmkmf make includes USRLIBDIR=%_prefix/%_lib -make %{?jobs:-j%jobs} USRLIBDIR=%_prefix/%_lib CCOPTIONS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} USRLIBDIR=%_prefix/%_lib CCOPTIONS="$RPM_OPT_FLAGS" %install make DESTDIR=$RPM_BUILD_ROOT/ 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 libassuan for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package libassuan for openSUSE:Factory checked in at Tue Nov 2 10:59:29 CET 2010. -------- --- libassuan/libassuan.changes 2010-08-17 16:18:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/libassuan/libassuan.changes 2010-10-31 19:03:36.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libassuan.spec ++++++ --- /var/tmp/diff_new_pack.thG0z9/_old 2010-11-02 10:59:19.000000000 +0100 +++ /var/tmp/diff_new_pack.thG0z9/_new 2010-11-02 10:59:19.000000000 +0100 @@ -21,7 +21,7 @@ Name: libassuan Summary: IPC library used by GnuPG version 2 Version: 2.0.1 -Release: 1 +Release: 2 License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/C and C++ Url: http://www.gnupg.org/aegypten2/index.html @@ -93,7 +93,7 @@ export CFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="-fPIC" %configure -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 procps for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at Tue Nov 2 10:59:05 CET 2010. -------- --- procps/procps.changes 2010-10-04 18:59:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/procps/procps.changes 2010-10-29 12:18:14.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Oct 29 12:17:40 CEST 2010 - werner(a)suse.de + +- Fix race in parallel make + +------------------------------------------------------------------- +Fri Oct 29 11:47:52 CEST 2010 - werner(a)suse.de + +- On IA64 the priorities from 0 upto 100 are reserved for the + implementation + +------------------------------------------------------------------- +Fri Oct 29 10:14:51 CEST 2010 - werner(a)suse.de + +- Avoid running HZ initialization twice by using priority for + the constructors for excuting before main() +- Add test on "Unknown HZ value!" + +------------------------------------------------------------------- +Thu Oct 28 14:06:16 UTC 2010 - seife(a)b1-systems.de + +- fix "Unknown HZ value!" error (bnc#649501) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- procps-3.2.8-fix-unknown-HZ.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.nOHJwo/_old 2010-11-02 10:57:50.000000000 +0100 +++ /var/tmp/diff_new_pack.nOHJwo/_new 2010-11-02 10:57:50.000000000 +0100 @@ -27,7 +27,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.8 -Release: 21 +Release: 22 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -71,6 +71,8 @@ Patch34: bug-634071_procstat2.diff Patch35: bug-634840.patch Patch36: procps-3.2.8.dif +# bnc #649501, apparently the initialization is depending on linking order... +Patch37: procps-3.2.8-fix-unknown-HZ.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,10 +137,13 @@ %patch34 -p1 %patch35 -p1 %patch36 +%patch37 -p1 %build make %{?_smp_mflags} CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \ CC="gcc" +hz="$(ps/ps aux 2>&1 | grep -E '^Unknown HZ value')" || true +test -z "$hz" || exit 1 %install make DESTDIR=$RPM_BUILD_ROOT install ++++++ procps-3.2.8.dif ++++++ --- /var/tmp/diff_new_pack.nOHJwo/_old 2010-11-02 10:57:51.000000000 +0100 +++ /var/tmp/diff_new_pack.nOHJwo/_new 2010-11-02 10:57:51.000000000 +0100 @@ -9,6 +9,15 @@ ALL_LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS) ############ Add some extra flags if gcc allows +@@ -250,7 +250,7 @@ pmap w uptime tload free sysctl vmstat u + slabtop top: % : %.o $(LIBPROC) + $(CC) $(ALL_CFLAGS) $^ $(ALL_LDFLAGS) -o $@ $(CURSES) + +-watch: % : %.o ++watch: % : %.o $(LIBPROC) + $(CC) $(ALL_CFLAGS) $^ $(ALL_LDFLAGS) -o $@ $(CURSES) + + ############ progX --> progY --- ps/module.mk +++ ps/module.mk 2010-10-04 16:46:47.668425720 +0000 @@ -20,11 +20,11 @@ PS_X := COPYING HACKING TRANSLATION comm ++++++ procps-3.2.8-fix-unknown-HZ.dif ++++++ --- a/proc/sig.c +++ b/proc/sig.c 2010-10-29 09:15:13.872426803 +0000 @@ -231,7 +231,7 @@ void unix_print_signals(void){ } /* sanity check */ -static int init_signal_list(void) __attribute__((constructor)); +static int init_signal_list(void) __attribute__((constructor (103))); static int init_signal_list(void){ if(number_of_signals != 31){ fprintf(stderr, "WARNING: %d signals -- adjust and recompile.\n", number_of_signals); --- a/proc/sysinfo.c +++ b/proc/sysinfo.c 2010-10-29 09:12:17.768426168 +0000 @@ -158,6 +158,14 @@ static void old_Hertz_hack(void){ unsigned long long jiffies; unsigned h; char *restrict savelocale; + long hz; + +#ifdef _SC_CLK_TCK + if((hz = sysconf(_SC_CLK_TCK)) > 0){ + Hertz = hz; + return; + } +#endif savelocale = setlocale(LC_NUMERIC, NULL); setlocale(LC_NUMERIC, "C"); @@ -258,7 +266,7 @@ long smp_num_cpus(void) return(_smp_num_cpus); } -static void init_libproc(void) __attribute__((constructor)); +static void init_libproc(void) __attribute__((constructor (102))); static void init_libproc(void){ have_privs = check_for_privs(); --- a/proc/version.c +++ b/proc/version.c 2010-10-29 09:11:53.192426444 +0000 @@ -33,7 +33,7 @@ void display_version(void) { int linux_version_code; -static void init_Linux_version(void) __attribute__((constructor)); +static void init_Linux_version(void) __attribute__((constructor (101))); static void init_Linux_version(void) { static struct utsname uts; int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ ++++++ procps-3.2.8-glibc-2.6.1.dif ++++++ --- /var/tmp/diff_new_pack.nOHJwo/_old 2010-11-02 10:57:51.000000000 +0100 +++ /var/tmp/diff_new_pack.nOHJwo/_new 2010-11-02 10:57:51.000000000 +0100 @@ -106,3 +106,13 @@ free(tmpname); free(outname); return rc; +--- w.c ++++ w.c 2010-10-29 09:56:22.936426251 +0000 +@@ -15,6 +15,7 @@ + #include <ctype.h> + #include <errno.h> + #include <fcntl.h> ++#include <signal.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 hal for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package hal for openSUSE:Factory checked in at Tue Nov 2 10:57:39 CET 2010. -------- --- hal/hal.changes 2010-10-12 13:48:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2010-10-31 19:03:21.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- hal-doc.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.Mzk2n6/_old 2010-11-02 10:57:23.000000000 +0100 +++ /var/tmp/diff_new_pack.Mzk2n6/_new 2010-11-02 10:57:23.000000000 +0100 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 11 +Release: 12 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons @@ -153,7 +153,7 @@ --enable-docbook-docs \ %endif CFLAGS="${RPM_OPT_FLAGS} -fstack-protector" -make %{?jobs:-j%jobs} +make %{?_smp_mflags} # hal-info pushd hal-info-%{hal_info_version} %configure \ hal.spec: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dbus-1-python for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package dbus-1-python for openSUSE:Factory checked in at Tue Nov 2 10:57:02 CET 2010. -------- --- dbus-1-python/dbus-1-python.changes 2009-08-09 08:45:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbus-1-python/dbus-1-python.changes 2010-10-31 19:03:09.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-python.spec ++++++ --- /var/tmp/diff_new_pack.65KjwV/_old 2010-11-02 10:56:10.000000000 +0100 +++ /var/tmp/diff_new_pack.65KjwV/_new 2010-11-02 10:56:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dbus-1-python (Version 0.83.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -24,7 +24,7 @@ License: MIT License (or similar) Group: Development/Libraries/Python Version: 0.83.0 -Release: 27 +Release: 34 AutoReqProv: on Summary: Python bindings for D-Bus Source0: dbus-python-%{version}.tar.gz @@ -102,7 +102,7 @@ --libdir=%{_libdir} \ --mandir=%{_mandir} \ --docdir=%{_docdir}/dbus-python -make %{?jobs:-j %jobs} +make %{?_smp_mflags} %install %{__rm} -rf %{buildroot} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ConsoleKit for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package ConsoleKit for openSUSE:Factory checked in at Tue Nov 2 10:55:59 CET 2010. -------- --- ConsoleKit/ConsoleKit.changes 2010-09-10 12:52:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/ConsoleKit/ConsoleKit.changes 2010-10-31 13:39:35.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- ConsoleKit-doc.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.gkO7Ri/_old 2010-11-02 10:55:45.000000000 +0100 +++ /var/tmp/diff_new_pack.gkO7Ri/_new 2010-11-02 10:55:45.000000000 +0100 @@ -37,7 +37,7 @@ %endif Summary: System daemon for tracking users, sessions and seats Version: 0.4.2 -Release: 2 +Release: 3 License: GPLv2+ Group: System/Daemons AutoReqProv: on @@ -100,7 +100,7 @@ --enable-docbook-docs \ %endif --docdir=%{_datadir}/doc/packages/ConsoleKit -make %{?jobs:-j%jobs}; +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install ConsoleKit.spec: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Tue Nov 2 10:53:04 CET 2010. -------- --- xorg-x11/xorg-x11.changes 2010-10-24 11:59:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-11-02 01:06:51.000000000 +0100 @@ -1,0 +2,174 @@ +Mon Nov 1 23:40:43 UTC 2010 - sndirsch(a)novell.com + +- xdbedizzy 1.1.0 + * Previous versions included code interacting with the XPrint + extension as well, but as a double buffered spinning printer + spewing animated output is one of the clearest signs of demonic + possession ever seen, that code has been exorcised from this + release. Should anyone desire to dance with that demon, the + proper git incantations could be invoked to call forth a new + 1.0.x branch from the depths of the repository. + Aside from that, this release also includes assorted other work + by the X.Org janitors to scrub the build configuration and + purify the code since the 1.0.2 release in 2006. So what's for + dessert? +- xf86dga 1.0.3 + * This release raises the dependency on libXxf86dga to require a + minimum of version 1.1.0 to get the new Xxf86dga.h header + instead of the now deprecated xf86dga.h. However, it also + removes unused dependencies on libXaw, libXt, and libXmu that + were previously declared. + It also delivers the build configuration improvements and other + janitorial cleanups that have built up since the 1.0.2 release + in 2006. +- appres 1.0.3 + * This minor maintenance release provides the specified collection + of build configuration improvements and janitorial cleanup + instances. + +------------------------------------------------------------------- +Sun Oct 31 03:06:11 UTC 2010 - sndirsch(a)novell.com + +- beforelight 1.0.4 + * This minor maintenance release provides the usual recent collection of + build configuration improvements and janitorial cleanups, plus a bunch + more from years past that had been sitting in git for a long time. +- editres 1.0.5 + * This minor maintenance release provides the usual recent collection of + build configuration improvements and janitorial cleanups. +- fslsfonts 1.0.3 + * This minor maintenance release provides several years worth of accumulated + build configuration improvements and janitorial cleanups. +- fstobdf 1.0.4 + * This minor maintenance release provides a few years worth of accumulated + build configuration improvements and janitorial cleanups. +- ico 1.0.3 + * This minor maintenance release includes a bugfix for handling expose + events in multiple threads, along with multiple years worth of accumulated + build configuration improvements and janitorial cleanups. +- proxymngr 1.0.2 + * First new release of xproxymngr since X11R7.0, with 5 years worth of + accumulated build configuration improvements and janitorial cleanups. +- rstart 1.0.4 + * This release moves the protocol specification document from xorg-docs to + this module, though it's still in troff format, and not built or + translated as part of the build process. +- showfont 1.0.3 + * This minor maintenance release provides a couple years worth of build + configuration improvements and janitorial cleanups. +- twm 1.0.5 + * This minor maintenance release provides the last two years' Worth of build + configuration improvements, janitorial cleanups, & Makefile.am support for + automake-1.11 silent builds. +- viewres 1.0.3 + * This minor maintenance release provides the usual recent collection of + build configuration improvements and janitorial cleanups. +- xcursor-themes 1.0.3 + * This minor maintenance release provides the usual recent collection of + build configuration improvements and janitorial cleanups. +- xedit 1.2.0 + * This release includes bug fixes, removal of support for Xprint/Xaw8, and + several years worth of build configuration improvements and janitorial + cleanups. +- xev 1.1.0 + * This release adds the -root option to specify monitoring root window + events. +- xfs 1.1.1 + * This release includes a couple bug fixes in the code, improved handling of + the included DocBook XML documentation, and the usual recent collection of + build configuration improvements and janitorial cleanups. +- xfsinfo 1.0.3 + * This minor maintenance release provides the usual recent collection of + build configuration improvements and janitorial cleanups, plus a small + tweak to default to "unix/:-1" when no font server address is specified. +- xgc 1.0.3 + * This minor maintenance release provides the usual recent collection of + build configuration improvements and janitorial cleanups. +- xhost 1.0.4 + * This release updates the man page to clarify the /etc/X*.hosts files, as + well as delivering the usual recent collection of build configuration + improvements and janitorial cleanups. +- xinit 1.3.0 + * This release adds support for an xinitrc.d directory to contain startup + script snippets on all systems. It also features a number of + modernizations and cleanups of the code base. +- xkbcomp 1.2.0 + * This release provides performance improvements and bug fixes, mixed in + with the usual recent collection of build configuration improvements and + janitorial cleanups. +- xkbevd 1.1.1 + * This minor maintenance release helps show our appreciation for the hard + work of the janitors cleaning the code base, so they don't "accidentally" + lock me in the broom closet again. +- xkbutils 1.0.3 + * This minor maintenance release provides a filled-in COPYING file for the + benefit of packagers who use that to pass on the notices required by the + MIT license to their users, and uses more accurate lists of the + dependencies required to build these programs. + Oh, and of course, it also includes the usual recent collection of build + configuration improvements and janitorial cleanups, but you could probably + guess that after the last twenty mails to xorg-announce. +- xlogo 1.0.3 + * This minor maintenance release provides the usual recent collection of + build configuration improvements and janitorial cleanups. +- xmag 1.0.4 + * If you look closely at this tiny little release, you might find the usual + collection of recent build configuration improvements and janitorial + cleanups. +- xman 1.1.1 + * This minor maintenance release provides the usual recent collection of + manually generated build configuration improvements and janitorial + cleanups. +- xmh 1.0.2 + * Just in case anyone might still be using this program, this release + provides compatibility with a world without Xaw8, and provides five years + worth of build configuration improvements and janitorial cleanups in its + first release since the original X11R7.0 katamari. +- xprop 1.2.0 + * This release adds support for printing UTF8_STRING properties as UTF-8 + strings in appropriate locales, including a new "u" specifier for the + -format option. +- xrandr 1.3.4 + * This release corrects a mistake in the man page, and fixes the reporting + of missing RandR extension support when connecting to servers not + supporting it (such as Xorg releases with the Xinerama extension enabled). +- xrx 1.0.4 + * This minor maintenance release provides some of the usual recent build + configuration improvements and janitorial cleanups. +- xsetroot 1.1.0 + * This release adds the ability to load an arbitrary ARGB cursor file via + the new -xcf command line flag. In Keith's words: + Instead of having to construct a whole cursor theme and play with the + environment variables in Xlib to set a random ARGB cursor, this lets the + user set whatever they like directly from a file. +- xwininfo 1.1.1 + * This bug-fix release corrects two issues introduced in the xcb port in the + 1.1.0 release: a build issue with the optional support for the xcb-icccm + library, and a runtime issue with reporting coordinates for windows + extending into the negative parts of the coordinate space. +- xscope 1.3 + * This version adds basic support for decoding GLX extension requests and + improved transport layer selection/fallback. +- adjusted patches + * proxymngr.diff + * rstart.diff + * xinit-client-session.patch +- new Buildrequires: bison + +------------------------------------------------------------------- +Sat Oct 30 15:53:37 UTC 2010 - sndirsch(a)novell.com + +- bdftopcf 1.0.3 + * This minor maintenance release unsurprisingly provides the + usual recent collection of build configuration improvements + and janitorial cleanups. +- iceauth 1.0.4 + * In this minor maintenance release you may find the usual recent + collection of build configuration improvements and janitorial + cleanups. +- mkfontscale 1.0.8 + * This minor maintenance release provides the usual recent + collection of janitorial cleanups and build configuration + improvements. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- appres-1.0.2.tar.bz2 bdftopcf-1.0.2.tar.bz2 beforelight-1.0.3.tar.bz2 editres-1.0.4.tar.bz2 fslsfonts-1.0.2.tar.bz2 fstobdf-1.0.3.tar.bz2 iceauth-1.0.3.tar.bz2 ico-1.0.2.tar.bz2 mkfontscale-1.0.7.tar.bz2 proxymngr-X11R7.0-1.0.1.tar.bz2 rstart-1.0.3.tar.bz2 showfont-1.0.2.tar.bz2 twm-1.0.4.tar.bz2 viewres-1.0.2.tar.bz2 xcursor-themes-1.0.2.tar.bz2 xdbedizzy-1.0.2.tar.bz2 xedit-1.1.2.tar.bz2 xev-1.0.4.tar.bz2 xf86dga-1.0.2.tar.bz2 xfs-1.1.0.tar.bz2 xfsinfo-1.0.2.tar.bz2 xgc-1.0.2.tar.bz2 xhost-1.0.3.tar.bz2 xinit-1.2.1.tar.bz2 xkbcomp-1.1.1.tar.bz2 xkbevd-1.1.0.tar.bz2 xkbutils-1.0.2.tar.bz2 xlogo-1.0.2.tar.bz2 xmag-1.0.3.tar.bz2 xman-1.1.0.tar.bz2 xmh-X11R7.0-1.0.1.tar.bz2 xprop-1.1.0.tar.bz2 xrandr-1.3.3.tar.bz2 xrx-1.0.3.tar.bz2 xscope-1.2.tar.bz2 xsetroot-1.0.3.tar.bz2 xwininfo-1.1.0.tar.bz2 New: ---- appres-1.0.3.tar.bz2 bdftopcf-1.0.3.tar.bz2 beforelight-1.0.4.tar.bz2 editres-1.0.5.tar.bz2 fslsfonts-1.0.3.tar.bz2 fstobdf-1.0.4.tar.bz2 iceauth-1.0.4.tar.bz2 ico-1.0.3.tar.bz2 mkfontscale-1.0.8.tar.bz2 proxymngr-1.0.2.tar.bz2 rstart-1.0.4.tar.bz2 showfont-1.0.3.tar.bz2 twm-1.0.5.tar.bz2 viewres-1.0.3.tar.bz2 xcursor-themes-1.0.3.tar.bz2 xdbedizzy-1.1.0.tar.bz2 xedit-1.2.0.tar.bz2 xev-1.1.0.tar.bz2 xf86dga-1.0.3.tar.bz2 xfs-1.1.1.tar.bz2 xfsinfo-1.0.3.tar.bz2 xgc-1.0.3.tar.bz2 xhost-1.0.4.tar.bz2 xinit-1.3.0.tar.bz2 xkbcomp-1.2.0.tar.bz2 xkbevd-1.1.1.tar.bz2 xkbutils-1.0.3.tar.bz2 xlogo-1.0.3.tar.bz2 xmag-1.0.4.tar.bz2 xman-1.1.1.tar.bz2 xmh-1.0.2.tar.bz2 xprop-1.2.0.tar.bz2 xrandr-1.3.4.tar.bz2 xrx-1.0.4.tar.bz2 xscope-1.3.tar.bz2 xsetroot-1.1.0.tar.bz2 xwininfo-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.oEKr7h/_old 2010-11-02 10:52:34.000000000 +0100 +++ /var/tmp/diff_new_pack.oEKr7h/_new 2010-11-02 10:52:34.000000000 +0100 @@ -20,9 +20,10 @@ Name: xorg-x11 BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel +BuildRequires: bison Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 27 +Release: 28 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -32,32 +33,32 @@ Provides: XFree86 xcompmgr xrestop Obsoletes: xcompmgr xrestop Summary: X.Org core and sample applications -Source0: appres-1.0.2.tar.bz2 -Source1: bdftopcf-1.0.2.tar.bz2 -Source2: beforelight-1.0.3.tar.bz2 +Source0: appres-1.0.3.tar.bz2 +Source1: bdftopcf-1.0.3.tar.bz2 +Source2: beforelight-1.0.4.tar.bz2 Source3: bitmap-1.0.5.tar.bz2 -Source4: editres-1.0.4.tar.bz2 +Source4: editres-1.0.5.tar.bz2 Source5: fonttosfnt-1.0.4.tar.bz2 -Source6: fslsfonts-1.0.2.tar.bz2 -Source7: fstobdf-1.0.3.tar.bz2 -Source8: iceauth-1.0.3.tar.bz2 -Source9: ico-1.0.2.tar.bz2 +Source6: fslsfonts-1.0.3.tar.bz2 +Source7: fstobdf-1.0.4.tar.bz2 +Source8: iceauth-1.0.4.tar.bz2 +Source9: ico-1.0.3.tar.bz2 Source10: lbxproxy-1.0.2.tar.bz2 Source11: listres-1.0.2.tar.bz2 Source12: luit-1.1.0.tar.bz2 Source14: mkfontdir-1.0.5.tar.bz2 -Source15: mkfontscale-1.0.7.tar.bz2 +Source15: mkfontscale-1.0.8.tar.bz2 Source16: oclock-1.0.2.tar.bz2 -Source17: proxymngr-X11R7.0-1.0.1.tar.bz2 +Source17: proxymngr-1.0.2.tar.bz2 Source18: rgb-1.0.4.tar.bz2 -Source19: rstart-1.0.3.tar.bz2 +Source19: rstart-1.0.4.tar.bz2 Source20: scripts-X11R7.0-1.0.1.tar.bz2 Source21: sessreg-1.0.6.tar.bz2 Source22: setxkbmap-1.2.0.tar.bz2 -Source23: showfont-1.0.2.tar.bz2 +Source23: showfont-1.0.3.tar.bz2 Source24: smproxy-1.0.4.tar.bz2 -Source25: twm-1.0.4.tar.bz2 -Source26: viewres-1.0.2.tar.bz2 +Source25: twm-1.0.5.tar.bz2 +Source26: viewres-1.0.3.tar.bz2 Source27: x11perf-1.5.2.tar.bz2 Source28: xauth-1.0.5.tar.bz2 Source29: xbiff-1.0.2.tar.bz2 @@ -66,61 +67,61 @@ Source32: xclock-1.0.5.tar.bz2 Source33: xcmsdb-1.0.3.tar.bz2 Source34: xconsole-1.0.4.tar.bz2 -Source35: xcursor-themes-1.0.2.tar.bz2 +Source35: xcursor-themes-1.0.3.tar.bz2 Source36: xcursorgen-1.0.4.tar.bz2 -Source37: xdbedizzy-1.0.2.tar.bz2 +Source37: xdbedizzy-1.1.0.tar.bz2 Source38: xditview-1.0.2.tar.bz2 Source39: xdm-1.1.10.tar.bz2 Source40: xdpyinfo-1.2.0.tar.bz2 -Source42: xedit-1.1.2.tar.bz2 -Source43: xev-1.0.4.tar.bz2 +Source42: xedit-1.2.0.tar.bz2 +Source43: xev-1.1.0.tar.bz2 Source44: xeyes-1.1.0.tar.bz2 -Source45: xf86dga-1.0.2.tar.bz2 +Source45: xf86dga-1.0.3.tar.bz2 Source46: xfd-1.1.0.tar.bz2 Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2 Source48: xfontsel-1.0.3.tar.bz2 -Source49: xfs-1.1.0.tar.bz2 -Source50: xfsinfo-1.0.2.tar.bz2 +Source49: xfs-1.1.1.tar.bz2 +Source50: xfsinfo-1.0.3.tar.bz2 Source51: xfwp-X11R7.0-1.0.1.tar.bz2 Source52: xgamma-1.0.3.tar.bz2 -Source53: xgc-1.0.2.tar.bz2 -Source54: xhost-1.0.3.tar.bz2 -Source55: xinit-1.2.1.tar.bz2 -Source56: xkbcomp-1.1.1.tar.bz2 -Source57: xkbevd-1.1.0.tar.bz2 +Source53: xgc-1.0.3.tar.bz2 +Source54: xhost-1.0.4.tar.bz2 +Source55: xinit-1.3.0.tar.bz2 +Source56: xkbcomp-1.2.0.tar.bz2 +Source57: xkbevd-1.1.1.tar.bz2 Source58: xkbprint-1.0.2.tar.bz2 -Source59: xkbutils-1.0.2.tar.bz2 +Source59: xkbutils-1.0.3.tar.bz2 Source60: xkill-1.0.2.tar.bz2 Source61: xload-1.1.0.tar.bz2 -Source62: xlogo-1.0.2.tar.bz2 +Source62: xlogo-1.0.3.tar.bz2 Source63: xlsatoms-1.1.0.tar.bz2 Source64: xlsclients-1.1.1.tar.bz2 Source65: xlsfonts-1.0.3.tar.bz2 -Source66: xmag-1.0.3.tar.bz2 -Source67: xman-1.1.0.tar.bz2 +Source66: xmag-1.0.4.tar.bz2 +Source67: xman-1.1.1.tar.bz2 Source68: xmessage-1.0.3.tar.bz2 -Source69: xmh-X11R7.0-1.0.1.tar.bz2 +Source69: xmh-1.0.2.tar.bz2 Source70: xmodmap-1.0.5.tar.bz2 Source71: xmore-1.0.2.tar.bz2 Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2 Source74: xpr-1.0.3.tar.bz2 Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2 -Source76: xprop-1.1.0.tar.bz2 -Source77: xrandr-1.3.3.tar.bz2 +Source76: xprop-1.2.0.tar.bz2 +Source77: xrandr-1.3.4.tar.bz2 Source78: xrdb-1.0.6.tar.bz2 Source79: xrefresh-1.0.3.tar.bz2 -Source80: xrx-1.0.3.tar.bz2 +Source80: xrx-1.0.4.tar.bz2 Source81: xset-1.2.0.tar.bz2 Source82: xsetmode-X11R7.0-1.0.0.tar.bz2 Source83: xsetpointer-1.0.1.tar.bz2 -Source84: xsetroot-1.0.3.tar.bz2 +Source84: xsetroot-1.1.0.tar.bz2 Source85: xsm-1.0.2.tar.bz2 Source86: xstdcmap-1.0.2.tar.bz2 Source87: xtrap-X11R7.1-1.0.2.tar.bz2 Source88: xvidtune-1.0.2.tar.bz2 Source89: xvinfo-1.1.0.tar.bz2 Source90: xwd-1.0.3.tar.bz2 -Source91: xwininfo-1.1.0.tar.bz2 +Source91: xwininfo-1.1.1.tar.bz2 Source92: xwud-1.0.2.tar.bz2 Source93: mkcomposecache-1.2.1.tar.bz2 Source94: rendercheck-1.3.tar.bz2 @@ -128,7 +129,7 @@ Source97: xinput-1.5.2.tar.bz2 Source98: xcompmgr-1.1.5.tar.bz2 Source99: xrestop-0.4.tar.bz2 -Source100: xscope-1.2.tar.bz2 +Source100: xscope-1.3.tar.bz2 Source200: misc.tar.bz2 Source201: twm.tar.bz2 Source202: xdm.tar.bz2 ++++++ appres-1.0.2.tar.bz2 -> appres-1.0.3.tar.bz2 ++++++ ++++ 8628 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/appres-1.0.2/appres.c new/appres-1.0.3/appres.c --- old/appres-1.0.2/appres.c 2009-01-22 16:08:45.000000000 +0100 +++ new/appres-1.0.3/appres.c 2010-10-07 05:30:03.000000000 +0200 @@ -1,6 +1,4 @@ /* - * $Xorg: appres.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,8 +25,6 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/appres/appres.c,v 1.3 2001/01/17 23:44:49 dawes Exp $ */ - #include <X11/Intrinsic.h> #include <stdio.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.2/appres.man new/appres-1.0.3/appres.man --- old/appres-1.0.2/appres.man 2007-01-02 22:41:08.000000000 +0100 +++ new/appres-1.0.3/appres.man 2010-10-07 05:30:03.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: appres.man,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,8 +22,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/appres/appres.man,v 1.8 2001/12/14 20:00:38 dawes Exp $ -.\" .TH APPRES 1 __xorgversion__ .SH NAME appres \- list X application resource database 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/appres-1.0.2/ChangeLog new/appres-1.0.3/ChangeLog --- old/appres-1.0.2/ChangeLog 2009-09-22 03:11:29.000000000 +0200 +++ new/appres-1.0.3/ChangeLog 2010-10-31 19:51:23.000000000 +0100 @@ -1,3 +1,132 @@ +commit 65538c8269ac6d29affa47ef54fa7f606174257a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 11:50:55 2010 -0700 + + appres 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 9fe02e07bc234b7f11f45142d4eac5aa0d20180a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 11:46:29 2010 -0700 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM sttaements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 86071577ed5f809b7b415b5a706dbd5d84de277c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 11:43:28 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 108950ed5f2c3774e8ebdb2bb2fe74ff071c56ef +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Oct 31 11:42:21 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 60497f02ed0adc3fbda4457f93f50e0fdba44af2 +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:48 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit c58c7269e6dc3c7f78d76ef7a1606331dcf05b5a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 23:25:03 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e6ef21fbc81183828c14e89f686a5e21dcde5156 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit db1d9daa9c8527f1cbcab941c72f7b923343b188 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:08:40 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit e427b7282cb07885b9be98ee238c544bfc9e40b0 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit ccc0bb4529524b9570621af2be47d524eb65fd78 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:37 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 89f99df94a4b2fd2836b639e9df162a8c7afe5e5 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:33:38 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 05aaa3eb156ac0fc2eb0cb449d7c3b903614f857 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Sep 27 15:22:36 2009 -0400 + + Makefile.am: do not include autogen.sh in distribution #24183 + + This is a private build script that should not be distributed + commit a42a18d12a23c763acabea045b22a9efbac3e569 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Sep 21 18:10:39 2009 -0700 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/appres-1.0.2/config.h.in new/appres-1.0.3/config.h.in --- old/appres-1.0.2/config.h.in 2009-09-22 03:11:10.000000000 +0200 +++ new/appres-1.0.3/config.h.in 2010-10-31 19:51:18.000000000 +0100 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/appres-1.0.2/configure.ac new/appres-1.0.3/configure.ac --- old/appres-1.0.2/configure.ac 2009-09-22 03:10:28.000000000 +0200 +++ new/appres-1.0.3/configure.ac 2010-10-31 19:50:51.000000000 +0100 @@ -21,25 +21,24 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(appres,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],appres) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([appres], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [appres]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) -# Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) - -AC_PROG_CC -AC_PROG_INSTALL +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(APPRES, x11 xt) -AC_SUBST(APPRES_CFLAGS) -AC_SUBST(APPRES_LIBS) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.2/INSTALL new/appres-1.0.3/INSTALL --- old/appres-1.0.2/INSTALL 2006-07-11 04:50:24.000000000 +0200 +++ new/appres-1.0.3/INSTALL 2010-10-31 19:51:23.000000000 +0100 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/appres-1.0.2/Makefile.am new/appres-1.0.3/Makefile.am --- old/appres-1.0.2/Makefile.am 2009-09-22 03:06:50.000000000 +0200 +++ new/appres-1.0.3/Makefile.am 2010-07-02 03:40:57.000000000 +0200 @@ -34,38 +34,23 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh +EXTRA_DIST = $(appman_PRE) autogen.sh +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES=ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +dist-hook: ChangeLog INSTALL SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ ++++++ bdftopcf-1.0.2.tar.bz2 -> bdftopcf-1.0.3.tar.bz2 ++++++ ++++ 8782 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/bdftopcf-1.0.2/bdftopcf.c new/bdftopcf-1.0.3/bdftopcf.c --- old/bdftopcf-1.0.2/bdftopcf.c 2007-04-25 05:04:09.000000000 +0200 +++ new/bdftopcf-1.0.3/bdftopcf.c 2010-10-07 05:31:05.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: bdftopcf.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1991, 1993, 1998 The Open Group @@ -27,8 +26,6 @@ */ -/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.4 2001/08/01 00:45:00 tsi Exp $ */ - #include <X11/X.h> #include <X11/Xproto.h> #include <X11/fonts/fontmisc.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bdftopcf-1.0.2/bdftopcf.man new/bdftopcf-1.0.3/bdftopcf.man --- old/bdftopcf-1.0.2/bdftopcf.man 2006-07-11 04:50:27.000000000 +0200 +++ new/bdftopcf-1.0.3/bdftopcf.man 2010-10-07 05:31:05.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: bdftopcf.man,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,8 +22,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/bdftopcf/bdftopcf.man,v 1.7 2001/01/27 18:21:00 dawes Exp $ -.\" .TH BDFTOPCF 1 __xorgversion__ .SH NAME bdftopcf \- convert X font from Bitmap Distribution Format to Portable 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/bdftopcf-1.0.2/ChangeLog new/bdftopcf-1.0.3/ChangeLog --- old/bdftopcf-1.0.2/ChangeLog 2009-09-22 04:58:17.000000000 +0200 +++ new/bdftopcf-1.0.3/ChangeLog 2010-10-30 04:54:17.000000000 +0200 @@ -1,3 +1,118 @@ +commit bd6356693855f22de4fa50696c19f5bd8103aa88 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 29 19:53:54 2010 -0700 + + bdftopcf 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 423c3438394aa762feb9038e54e061f1761be252 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 29 19:52:06 2010 -0700 + + Remove unnecessary calls from configure.ac + + XORG_DEFAULT_OPTIONS calls AC_PROG_CC + PKG_CHECK_MODULES calls AC_SUBST for CFLAGS and LIBS + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 89573e80d65db01ff12426781394969857bad715 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 7de8e74341322be5e6f4830478d477ef17c13a4a +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:48 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + +commit 9615bfc454af6cb489e9572895ef00af022303b1 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Jul 22 19:10:24 2010 -0700 + + Use AM_CFLAGS instead of bdftopcf_CFLAGS since there's only one target + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ff16701d9054e47f1205e6ba4372077bd136062c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Jul 22 19:07:08 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit b29030dd85de4dee5d756390b1d15b3187bbb6d0 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit fbce46de46b4c13098dc0590cf077150af3a470c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 8a6a1f4b7bde74b6df62ac949e75b4ba0aedff97 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 8021c657bcc6f27b99ed7a61f4036d614c47367d +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:37 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 6c1e289e0dcdd02b47d09547a8c5f9c8f0f50221 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit 74b5dca54052c778d49e96b92fc2ef888a80cf8f Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Sep 21 19:57:36 2009 -0700 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/bdftopcf-1.0.2/config.h.in new/bdftopcf-1.0.3/config.h.in --- old/bdftopcf-1.0.2/config.h.in 2009-09-22 04:58:17.000000000 +0200 +++ new/bdftopcf-1.0.3/config.h.in 2010-10-30 04:54:13.000000000 +0200 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/bdftopcf-1.0.2/configure.ac new/bdftopcf-1.0.3/configure.ac --- old/bdftopcf-1.0.2/configure.ac 2009-09-22 04:56:13.000000000 +0200 +++ new/bdftopcf-1.0.3/configure.ac 2010-10-30 04:53:41.000000000 +0200 @@ -20,26 +20,24 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(bdftopcf, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] bdftopcf) -AM_INIT_AUTOMAKE([dist-bzip2 foreign]) +AC_PREREQ([2.60]) +AC_INIT([bdftopcf], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [bdftopcf]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS -AC_PROG_CC AC_PROG_INSTALL -XORG_DEFAULT_OPTIONS - # Checks for pkg-config packages PKG_CHECK_MODULES(BDFTOPCF, xfont) -AC_SUBST(BDFTOPCF_CFLAGS) -AC_SUBST(BDFTOPCF_LIBS) XORG_WITH_LINT 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/bdftopcf-1.0.2/INSTALL new/bdftopcf-1.0.3/INSTALL --- old/bdftopcf-1.0.2/INSTALL 2009-09-22 04:55:08.000000000 +0200 +++ new/bdftopcf-1.0.3/INSTALL 2010-10-30 04:54:17.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/bdftopcf-1.0.2/Makefile.am new/bdftopcf-1.0.3/Makefile.am --- old/bdftopcf-1.0.2/Makefile.am 2009-09-22 04:44:31.000000000 +0200 +++ new/bdftopcf-1.0.3/Makefile.am 2010-07-23 04:08:46.000000000 +0200 @@ -21,7 +21,7 @@ bin_PROGRAMS = bdftopcf -bdftopcf_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@ bdftopcf_LDADD = @BDFTOPCF_LIBS@ bdftopcf_SOURCES = bdftopcf.c @@ -32,39 +32,25 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++++++ beforelight-1.0.3.tar.bz2 -> beforelight-1.0.4.tar.bz2 ++++++ ++++ 15477 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/beforelight-1.0.3/app-defaults/Beforelight new/beforelight-1.0.4/app-defaults/Beforelight --- old/beforelight-1.0.3/app-defaults/Beforelight 1970-01-01 01:00:00.000000000 +0100 +++ new/beforelight-1.0.4/app-defaults/Beforelight 2009-10-16 23:38:03.000000000 +0200 @@ -0,0 +1 @@ +*label.label: Before Light - Keith's hack... 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/beforelight-1.0.3/b4light.c new/beforelight-1.0.4/b4light.c --- old/beforelight-1.0.3/b4light.c 2007-09-08 22:07:14.000000000 +0200 +++ new/beforelight-1.0.4/b4light.c 2010-07-10 06:07:59.000000000 +0200 @@ -32,7 +32,9 @@ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> #include <X11/Shell.h> +#ifdef NOTDEF #include <X11/Xaw/Label.h> +#endif #include <X11/Xaw/Cardinals.h> #include <X11/extensions/scrnsaver.h> #include <X11/Xcms.h> @@ -289,7 +291,7 @@ XID kill_id; Atom kill_type; int i; - int (*oldHandler)(); + int (*oldHandler)(Display*, XErrorEvent*); Window r; int x, y; unsigned int w, h, b, d; @@ -348,9 +350,9 @@ AllocateColors(); blank_pix = XCreatePixmap (display, root, 1, 1, 1); XScreenSaverRegister (display, screen, (XID) blank_pix, XA_PIXMAP); - bit_0_gc = XCreateGC (display, blank_pix, 0, 0); + bit_0_gc = XCreateGC (display, blank_pix, 0, NULL); XSetForeground (display, bit_0_gc, 0); - bit_1_gc = XCreateGC (display, blank_pix, 0, 0); + bit_1_gc = XCreateGC (display, blank_pix, 0, NULL); XSetForeground (display, bit_1_gc, ~0); XFillRectangle (display, blank_pix, bit_0_gc, 0, 0, 1, 1); info = XScreenSaverAllocInfo (); @@ -364,14 +366,14 @@ mask |= CWCursor; XScreenSaverSetAttributes (display, root, 0, 0, DisplayWidth (display, screen), DisplayHeight(display, screen), 0, - CopyFromParent, CopyFromParent, CopyFromParent, mask, &attr); + CopyFromParent, CopyFromParent, (Visual *)CopyFromParent, mask, &attr); XSync (display, False); - gc = XCreateGC (display, root, 0, 0); - black_gc = XCreateGC (display, root, 0, 0); + gc = XCreateGC (display, root, 0, NULL); + black_gc = XCreateGC (display, root, 0, NULL); XSetForeground (display, black_gc, black_pixel); if (filled) { - erase_gc = XCreateGC (display, root, 0, 0); + erase_gc = XCreateGC (display, root, 0, NULL); XSetBackground (display, erase_gc, 0); XSetFunction (display, erase_gc, GXxor); XSetGraphicsExposures (display, erase_gc, False); 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/beforelight-1.0.3/Beforelight.ad new/beforelight-1.0.4/Beforelight.ad --- old/beforelight-1.0.3/Beforelight.ad 2007-09-08 22:07:14.000000000 +0200 +++ new/beforelight-1.0.4/Beforelight.ad 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -*label.label: Before Light - Keith's hack... 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/beforelight-1.0.3/ChangeLog new/beforelight-1.0.4/ChangeLog --- old/beforelight-1.0.3/ChangeLog 2007-09-08 22:07:14.000000000 +0200 +++ new/beforelight-1.0.4/ChangeLog 2010-10-30 21:13:13.000000000 +0200 @@ -1,41 +1,425 @@ -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit bbbf430d5a41fcecfe245a5d82f026afb0696f87 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:12:39 2010 -0700 - * configure.ac: - Update package version for X11R7 release. + beforelight 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1c1a11e0e0b1e17ba19a4a9976658f3f1659b41e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:11:21 2010 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 5bd2cf1909b38a7d7b6a455583ebe0be323baf50 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 12:10:50 2010 -0700 - * Makefile.am: - * configure.ac: - Change to use the app-defaults default dir configured in libXt. + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 061cabcb6a62f03c75f1a239cd501654abeee97e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 23:25:03 2010 -0700 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 61703aea4a92b9ee177c1c4bd01123629fa9510c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 23:15:52 2010 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Don't link against libXaw since the calls to it are #ifdef NOTDEF + + We still need it in CFLAGS for #defines from <X11/Xaw/Cardinals.h> + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 5d542724fde2d3bea856ae0b4b98b3e07afafb7c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:06 2010 -0500 - * configure.ac: - Update package version number for X11R7 RC2 release. + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 3397e3f8e223441a38920f5e6ddf53793d6ac210 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Dec 19 20:48:47 2009 -0500 - * configure.ac: - Update pkgcheck depedencies to work with separate build roots. + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 593a04134c911400b1ad088c5cec3bce4810b44b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 - * configure.ac: - Update package version number for RC1 release. + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. +commit f269d56d6adf9096c3e9991b13efd3c616a7b4a7 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit e6fd4338f722d5e2c797cddf52292f56739b29e7 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 7226356ab0ae93f6f9645525fcb894a98dd10187 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:37 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit b552d7cd85bf23203c3ac272fb727591fc00d1f8 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 9d4ce3ac48e2cefcc6f2d448e4420addb56fbc2e +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:16 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 6648b49e4fb8461975eff8002e4c84f04b698a5e +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Tue Jan 13 20:01:33 2009 -0200 + + Ansification and compile warning fixes. + + This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects + make distcheck. + +commit 712cd2c1909dd7a10a5ca98d48605d170321c025 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Sun Nov 9 08:29:50 2008 -0800 + + Added app-defaults/Beforelight.ad + which didn't get committed in the last commit... + +commit f069453dde853812267eacad6f07f0569ad4888c +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Sat Nov 8 15:29:39 2008 -0800 + + Buildfix for case insensitive file systems + +commit 5644e27cc492491b746ba59571b1b40d10909aa5 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Thu Dec 6 16:36:56 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 22350f7bc7dec5d516989ace9d5ca89a033abb4b +Author: Matthieu Herrb <matthieu(a)bluenote.herrb.com> +Date: Sat Sep 8 22:18:52 2007 +0200 + + update to 1.0.3 + +commit a128061d44211b847d4c23860c4d542b3da3a164 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Mon Sep 3 05:50:59 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit b50ba3bfa200d146402ba7ea0fa68a52dff957c9 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Thu Aug 23 19:24:20 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 828e9cab677f38961628f74c8bfa77bef587e10f +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 00:25:26 2006 +0200 + + bump to 1.0.2 + +commit 3bd9d369e233c203108eb0baa5bac570789b7f90 +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Sat Dec 16 00:25:20 2006 +0200 + + Makefile.am: make appdefaultdir respect DESTDIR + ... even if it won't be relative to $(prefix) or $(sysconfdir). + +commit 6b4c7575f42499f84d0b71078539f059f7b9da1c +Author: Daniel Stone <daniel(a)fooishbar.org> +Date: Fri Dec 15 23:49:03 2006 +0200 + + remove config.h from _SOURCES + Remove config.h from beforelight_SOURCES, which was breaking the build. + +commit 5d3be36ed0b1b1a8148a05dc009a747035b2994f +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Dec 21 02:29:42 2005 +0000 + + Update package version for X11R7 release. + +commit 4bb868f16df0f78a2cd15680c00055a29d0f8a9f +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Mon Dec 19 16:22:39 2005 +0000 + + Stub COPYING files + +commit 6be5799196c6aa1c9d2b1198c826f1b8f657b2a0 +Author: Kevin E Martin <kem(a)kem.org> +Date: Thu Dec 15 00:24:01 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit f6cbfad7b7598895413a0c3b23e07940c0c5f776 +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Dec 7 16:17:57 2005 +0000 + + Change to use the app-defaults default dir configured in libXt. + +commit 1fde86615a00efff3145097740f0460871802637 +Author: Kevin E Martin <kem(a)kem.org> +Date: Tue Dec 6 22:48:15 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit ce2485521d44673191554f10f33f1f5e9a7fe698 +Author: Kevin E Martin <kem(a)kem.org> +Date: Sat Dec 3 05:49:14 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit b183300c245ee08ebcd39b2840ba269f69f83eb4 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Nov 28 22:01:36 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit cab074fa4c99e9da2e2e8217c1fdba20a5e134a7 +Author: Eric Anholt <anholt(a)freebsd.org> +Date: Mon Nov 21 10:34:55 2005 +0000 + + Another pass at .cvsignores for apps. + +commit a174983051f0079fc20985aeee1c49ce547c5e2a +Author: Eric Anholt <anholt(a)freebsd.org> +Date: Sun Nov 20 22:08:47 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit a729a69063ffa76f0fb6551d5bec5697a2cd4272 +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Nov 9 21:09:19 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit 3d6cc1229f8c04cdd1342932f546505653522e25 +Author: Kevin E Martin <kem(a)kem.org> +Date: Tue Nov 1 15:05:18 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 05fa342c442d1c05338c6fe4b7e27f42ee4415b0 +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Oct 19 02:47:47 2005 +0000 + + Update package version number for RC1 release. + +commit b49b3e79cb2ead41f5172a69d887212cc5e16729 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Tue Oct 18 00:32:53 2005 +0000 + + Change default install dir for app-default files from + $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match + the monolith & allow localization + +commit 94aa3aed9016a31f7f946d43412de948857c22ae +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Oct 17 23:56:19 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit 06cd2b759e3ee77d3e014c25766e00d1eeb104ff +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Fri Oct 14 00:25:40 2005 +0000 + + Use sed to fill in variables in man page + +commit 34c65d7c3c6bfc36903084f3f0cccac5937c60a3 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Thu Oct 13 20:10:59 2005 +0000 + + Fix app-default files to install under the same names as in the monolith + instead of their short names used only for 14-character filename length + limited ancient filesystems + +commit 71df4f2d183321d5ca643e9eb2258d1e599ffc4a +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Thu Oct 6 03:47:12 2005 +0000 + + Fix file names of beforelight, x11perfcomp, and xlsclients man pages + +commit f854069623c3f4d511cd1206532d19960490e4f4 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Aug 1 20:25:27 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit 6f43ddee92ac8eddc1b42ff1eb5bc570d065fef2 +Author: Kevin E Martin <kem(a)kem.org> +Date: Fri Jul 29 21:22:28 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 9d4b8016df4fd9246dec80905935385ee918e515 +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Wed Jul 20 19:31:48 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit 333ef4d5389bc8dcdb4ddc8b68ed286c02332721 +Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> +Date: Sun Jul 17 18:38:04 2005 +0000 + + Convert app-defaults rules to work with non-GNU make + +commit c8cf93cc24bcdcc401af5845a0ae69f952cce53d +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Fri Jul 1 16:55:14 2005 +0000 + + More freedestkop->freedesktop typo fixes + +commit 09d6aaa4292e2a9017cc1f4a91e1b062e5766a87 +Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> +Date: Thu Jun 23 21:32:26 2005 +0000 + + Do .ad files in a more convoluted way (strip .ad when installing) + +commit 5bed580a99a1eb5c30624ffc76593292c0cd3d66 +Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> +Date: Thu Jun 23 20:19:16 2005 +0000 + + Use $(sysconfdir), not /etc + +commit 2264bd39793459e3794154ce9027f724f91e1a86 +Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> +Date: Thu Jun 23 20:04:35 2005 +0000 + + - Install B4light.ad + - make sure distcheck works + +commit 78d7d8bac5b1f756c102d9052484663c57671e61 +Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> +Date: Thu Jun 23 18:10:35 2005 +0000 + + Add build system for beforelight + +commit 53adf02732a08a609757ec8ce633dc6ad2683c07 +Author: Egbert Eich <eich(a)suse.de> +Date: Fri Apr 23 19:54:31 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 55c78aaf1363ca7afba441470fe0e87bb0a6214a +Author: Egbert Eich <eich(a)suse.de> +Date: Sun Mar 14 08:34:49 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 153b573ca1169f4b21c63f01a9c117b28ccf0b35 +Author: Egbert Eich <eich(a)suse.de> +Date: Wed Mar 3 12:12:50 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit d2274daa654b60765317f9a5677c9e6d32c10ac5 +Author: Egbert Eich <eich(a)suse.de> +Date: Thu Feb 26 13:36:15 2004 +0000 + + readding XFree86's cvs IDs + +commit ebae7b4b32a355acaf1ed66f624c74577a8dcdbe +Author: Egbert Eich <eich(a)suse.de> +Date: Thu Feb 26 09:23:53 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit accddd883e25b4899dfe6945d87f11724accbd78 +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Tue Nov 25 19:29:01 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit b6c4d1d1a6d7dd2f2501557ec34746f3f8bb99d7 +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Fri Nov 14 16:48:57 2003 +0000 + + XFree86 4.3.0.1 + +commit 0750e89e4a2b1e5d9f909eeaa4dd2c0294a3947e +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Fri Nov 14 16:48:57 2003 +0000 + + Initial revision 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/beforelight-1.0.3/compile new/beforelight-1.0.4/compile --- old/beforelight-1.0.3/compile 2007-09-08 22:19:54.000000000 +0200 +++ new/beforelight-1.0.4/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey(a)cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake(a)gnu.org> or send patches to -# <automake-patches(a)gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake(a)gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-1.0.3/config.h.in new/beforelight-1.0.4/config.h.in --- old/beforelight-1.0.3/config.h.in 2007-09-08 22:19:52.000000000 +0200 +++ new/beforelight-1.0.4/config.h.in 2010-10-30 21:13:06.000000000 +0200 @@ -1,5 +1,32 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + /* Name of package */ #undef PACKAGE @@ -15,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -27,5 +57,8 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* 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/beforelight-1.0.3/configure.ac new/beforelight-1.0.4/configure.ac --- old/beforelight-1.0.3/configure.ac 2007-09-08 22:15:48.000000000 +0200 +++ new/beforelight-1.0.4/configure.ac 2010-10-30 21:12:23.000000000 +0200 @@ -21,26 +21,32 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(beforelight,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],beforelight) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([beforelight], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] + [beforelight]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_INSTALL +AM_CONFIG_HEADER(config.h) # Checks for pkg-config packages -PKG_CHECK_MODULES(BEFORELIGHT, x11 xscrnsaver xt xaw7) -AC_SUBST(BEFORELIGHT_CFLAGS) -AC_SUBST(BEFORELIGHT_LIBS) +PKG_CHECK_MODULES(BEFORELIGHT, x11 xscrnsaver xt) +PKG_CHECK_MODULES(XAW, xaw7) PKG_CHECK_MODULES(APPDEFS, xt) -appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` +AC_ARG_WITH(appdefaultdir, + AC_HELP_STRING([--with-appdefaultdir=<pathname>], + [specify directory for app-defaults files (default is autodetected)]), + [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-1.0.3/INSTALL new/beforelight-1.0.4/INSTALL --- old/beforelight-1.0.3/INSTALL 2007-09-08 22:19:54.000000000 +0200 +++ new/beforelight-1.0.4/INSTALL 2010-10-30 21:13:13.000000000 +0200 @@ -1,16 +1,19 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives + This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== -These are generic installation instructions. + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,42 +67,57 @@ all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -125,7 +140,7 @@ Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,14 +152,36 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -170,9 +207,9 @@ Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -181,7 +218,7 @@ Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -190,21 +227,29 @@ ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -231,6 +276,16 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. 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/beforelight-1.0.3/Makefile.am new/beforelight-1.0.4/Makefile.am --- old/beforelight-1.0.3/Makefile.am 2007-09-08 22:07:14.000000000 +0200 +++ new/beforelight-1.0.4/Makefile.am 2010-07-01 08:22:57.000000000 +0200 @@ -22,7 +22,7 @@ bin_PROGRAMS = beforelight -beforelight_CFLAGS = $(BEFORELIGHT_CFLAGS) +AM_CFLAGS = $(BEFORELIGHT_CFLAGS) $(XAW_CFLAGS) $(CWARNFLAGS) beforelight_LDADD = $(BEFORELIGHT_LIBS) beforelight_SOURCES = \ @@ -31,50 +31,36 @@ appman_PRE = \ beforelight.man -# App default files (*.ad) +# App default files -EXTRA_DIST = \ - Beforelight.ad +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults -APPDEFAULTFILES = \ - Beforelight +appdefaultdir = @appdefaultdir@ -SUFFIXES = .ad +dist_appdefault_DATA = \ + app-defaults/Beforelight -.ad: - cp $< $@ +appmandir = $(APP_MAN_DIR) -appdefault_DATA = $(APPDEFAULTFILES) +appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -CLEANFILES = $(APPDEFAULTFILES) +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL +CLEANFILES = $(appman_DATA) -appmandir = $(APP_MAN_DIR) +SUFFIXES = .$(APP_MAN_SUFFIX) .man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) -SED = sed +.PHONY: ChangeLog INSTALL -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +INSTALL: + $(INSTALL_CMD) -SUFFIXES += .$(APP_MAN_SUFFIX) .man +ChangeLog: + $(CHANGELOG_CMD) -.man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ +dist-hook: ChangeLog INSTALL 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/beforelight-1.0.3/missing new/beforelight-1.0.4/missing --- old/beforelight-1.0.3/missing 2007-09-08 22:19:54.000000000 +0200 +++ new/beforelight-1.0.4/missing 2010-10-30 21:13:06.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +44,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +77,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -86,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -103,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -135,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -145,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -154,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -164,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -184,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -192,8 +203,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -207,80 +218,78 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -289,11 +298,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -303,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -317,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -356,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/beforelight-1.0.3/README new/beforelight-1.0.4/README --- old/beforelight-1.0.3/README 2007-09-08 22:07:14.000000000 +0200 +++ new/beforelight-1.0.4/README 2009-10-16 23:38:03.000000000 +0200 @@ -0,0 +1,29 @@ +The beforelight program is a sample implementation of a screen saver +for X servers supporting the MIT-SCREEN-SAVER extension. It is only +recommended for use as a code sample, as it does not include features +such as screen locking or configurability, and relies on the legacy Xaw +toolkit. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/beforelight + + http://cgit.freedesktop.org/xorg/app/beforelight + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + ++++++ editres-1.0.4.tar.bz2 -> editres-1.0.5.tar.bz2 ++++++ ++++ 8829 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/editres-1.0.4/ChangeLog new/editres-1.0.5/ChangeLog --- old/editres-1.0.4/ChangeLog 2009-09-23 05:12:26.000000000 +0200 +++ new/editres-1.0.5/ChangeLog 2010-10-30 21:43:40.000000000 +0200 @@ -1,3 +1,130 @@ +commit 17332856a27d27f4ea08b99d58b8e4167b7d815f +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:43:00 2010 -0700 + + editres 1.0.5 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 9aa7a02bafe1a56837484c0122cb96f86b08c20e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:41:18 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit bc60bafbf6ec232bd006e38312c200900cc63034 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:40:44 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 737c0d053505a8ece24f41320cd2bd5ecb3a212b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 12:39:00 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit c04cfb209c6da039728f15d0b9211557a2cb556d +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Aug 7 21:07:30 2010 -0400 + + config: consolidate dependencies checking + + One single equivalent statement will do the job. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 00839b44d635eb3c5d5a3d1b1d764838af22d252 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Dec 19 20:48:47 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 0d9b687b1eef24ba64f8dc15febb296cae727d30 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 1cfbbce10833e7902b30c50fe1da3dc83d40b8fe +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 9d6212392730f5cdec9906eb90385c766a87de9c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 49f5b0c58b5c2efa23dde717c52be5e4161e3993 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:37 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit be42557f3db73875b9789f5fc7457703e97face0 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 86eb733aaddc362427d533b7cf157447690152a5 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Sep 27 15:43:39 2009 -0400 + + Makefile.am: do not include autogen.sh in distribution #24183 + + This is a private build script that should not be distributed + commit aebe52fd87925353c687fbd26c5547410d4b96c1 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Tue Sep 22 20:05:21 2009 -0700 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/editres-1.0.4/config.h.in new/editres-1.0.5/config.h.in --- old/editres-1.0.4/config.h.in 2009-09-23 05:05:45.000000000 +0200 +++ new/editres-1.0.5/config.h.in 2010-10-30 21:43:36.000000000 +0200 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/editres-1.0.4/configure.ac new/editres-1.0.5/configure.ac --- old/editres-1.0.4/configure.ac 2009-09-23 05:05:12.000000000 +0200 +++ new/editres-1.0.5/configure.ac 2010-10-30 21:42:27.000000000 +0200 @@ -21,32 +21,25 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(editres,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],editres) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([editres], [1.0.5], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [editres]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - -XORG_DEFAULT_OPTIONS - -# Checks for pkg-config packages -PKG_CHECK_MODULES(XAW, xaw7) -PKG_CHECK_MODULES(EDITRES, x11 xt xmu) -EDITRES_CFLAGS="$EDITRES_CFLAGS $XAW_CFLAGS" -EDITRES_LIBS="$EDITRES_LIBS $XAW_LIBS" -AC_SUBST(EDITRES_CFLAGS) -AC_SUBST(EDITRES_LIBS) +# Obtain compiler/linker options from depedencies +PKG_CHECK_MODULES(EDITRES, xaw7 x11 xt xmu) PKG_CHECK_MODULES(APPDEFS, xt) -xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` AC_ARG_WITH(appdefaultdir, AC_HELP_STRING([--with-appdefaultdir=<pathname>], [specify directory for app-defaults files (default is autodetected)]), 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/editres-1.0.4/INSTALL new/editres-1.0.5/INSTALL --- old/editres-1.0.4/INSTALL 2006-07-11 04:50:46.000000000 +0200 +++ new/editres-1.0.5/INSTALL 2010-10-30 21:43:40.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/editres-1.0.4/Makefile.am new/editres-1.0.5/Makefile.am --- old/editres-1.0.4/Makefile.am 2009-09-23 05:03:23.000000000 +0200 +++ new/editres-1.0.5/Makefile.am 2010-10-30 21:40:24.000000000 +0200 @@ -50,44 +50,28 @@ app-defaults/Editres-color \ app-defaults/Editres -EXTRA_DIST = ChangeLog autogen.sh -MAINTAINERCLEANFILES=ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST += $(appman_PRE) +EXTRA_DIST = $(appman_PRE) autogen.sh +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ ++++++ fslsfonts-1.0.2.tar.bz2 -> fslsfonts-1.0.3.tar.bz2 ++++++ ++++ 12204 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/fslsfonts-1.0.2/ChangeLog new/fslsfonts-1.0.3/ChangeLog --- old/fslsfonts-1.0.2/ChangeLog 2008-05-24 01:32:07.000000000 +0200 +++ new/fslsfonts-1.0.3/ChangeLog 2010-10-30 21:49:16.000000000 +0200 @@ -1,3 +1,150 @@ +commit 56623bd3f69af13b5ea7952fc2539c0757c1da9a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:48:31 2010 -0700 + + fslsfonts 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ccd2fecaa7a8f32cef6c5c1620a23e09aa50b1f5 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:47:25 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 52a0ed576354ba1de736904af1a6b17981b0090e +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:49 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + +commit 942a8c3c84ced13f396f17a96313ee82c7c79d83 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Oct 6 19:00:52 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit dbbd43a4b2065e64d17227aed63e4189dc75134e +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit e187c1e1bc4c58236346573ddf6c58ede438cc72 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 19:53:14 2010 -0700 + + fslsfonts only depends on x11proto (for Xos.h) not x11 + + No need to link against libX11 when no functions in it are ever called, + nor any headers from it ever used, since fslsfonts is a pure font-server + protocol client. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 57eb4c0f642da8547bb505231a1251d9662fb192 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:06 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 2930e9f179d1abf9fb276226dd6a527a07d42d39 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit fc89bf51b4a24d03f4c0aad5cb4c9566b4493723 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 7fb18a2404b434f7c81932b6bb3a59087b67ae42 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit fff5c40b8422204938c8f56cc02cdbbbe24c49ae +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:38 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 038c76cbbc20400ac19877f50f1a69a738d87cf7 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit b837f89eba8f374c2b24f84138c1305fd5d9507b +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:16 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 014ec6084387c77f211832ee7c0c95ad56fbb1af +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Thu Jan 15 18:30:21 2009 -0200 + + Ansification and compile warning fixes. + + This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects + make distcheck and all gcc 4.3 and sparse warnings. + commit 449643fa6811de4539c498d43f3af777a0a7c037 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri May 23 16:31:20 2008 -0700 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/fslsfonts-1.0.2/config.h.in new/fslsfonts-1.0.3/config.h.in --- old/fslsfonts-1.0.2/config.h.in 2008-05-24 01:32:00.000000000 +0200 +++ new/fslsfonts-1.0.3/config.h.in 2010-10-30 21:49:09.000000000 +0200 @@ -1,5 +1,32 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + /* Name of package */ #undef PACKAGE @@ -15,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -27,5 +57,8 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* 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/fslsfonts-1.0.2/configure.ac new/fslsfonts-1.0.3/configure.ac --- old/fslsfonts-1.0.2/configure.ac 2008-05-24 01:26:53.000000000 +0200 +++ new/fslsfonts-1.0.3/configure.ac 2010-10-30 21:47:50.000000000 +0200 @@ -21,22 +21,21 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(fslsfonts,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fslsfonts) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([fslsfonts], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [fslsfonts]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_INSTALL +AM_CONFIG_HEADER(config.h) # Checks for pkg-config packages -PKG_CHECK_MODULES(FSLSFONTS, x11 libfs) -AC_SUBST(FSLSFONTS_CFLAGS) -AC_SUBST(FSLSFONTS_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION +PKG_CHECK_MODULES(FSLSFONTS, xproto libfs) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fslsfonts-1.0.2/fslsfonts.c new/fslsfonts-1.0.3/fslsfonts.c --- old/fslsfonts-1.0.2/fslsfonts.c 2006-07-11 04:50:51.000000000 +0200 +++ new/fslsfonts-1.0.3/fslsfonts.c 2010-10-07 05:32:05.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: fslsfonts.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -43,7 +42,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.7 2001/08/27 17:41:01 dawes Exp $ */ #include <X11/fonts/FSlib.h> #include <stdio.h> @@ -54,20 +52,20 @@ #define N_START 1000 /* Maximum # of fonts to start with */ #endif -int max_output_line_width = 79; -int output_line_padding = 3; -int columns = 0; +static int max_output_line_width = 79; +static int output_line_padding = 3; +static int columns = 0; #define L_SHORT 0 #define L_MEDIUM 1 #define L_LONG 2 #define L_VERYLONG 3 -Bool sort_output = True; -int long_list = L_SHORT; -int nnames = N_START; -int font_cnt; -int min_max; +static Bool sort_output = True; +static int long_list = L_SHORT; +static int nnames = N_START; +static int font_cnt; +static int min_max; typedef struct { char *name; FSXFontInfoHeader *info; @@ -75,11 +73,11 @@ FSPropOffset *po; unsigned char *pd; } FontList; -FontList *font_list; +static FontList *font_list; -FSServer *svr; +static FSServer *svr; -char *program_name; +static char *program_name; static void usage ( void ); static void get_list ( char *pattern ); 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/fslsfonts-1.0.2/fslsfonts.man new/fslsfonts-1.0.3/fslsfonts.man --- old/fslsfonts-1.0.2/fslsfonts.man 2008-05-24 01:25:42.000000000 +0200 +++ new/fslsfonts-1.0.3/fslsfonts.man 2010-10-07 05:32:05.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: fslsfonts.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ .\" Copyright 1991, Network Computing Devices, Inc .\" Copyright 1993, 1994, 1998 The Open Group .\" @@ -24,8 +23,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.6 2001/01/27 18:21:01 dawes Exp $ -.\" .TH FSLSFONTS 1 __xorgversion__ .SH NAME fslsfonts \- list fonts served by X font server 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/fslsfonts-1.0.2/INSTALL new/fslsfonts-1.0.3/INSTALL --- old/fslsfonts-1.0.2/INSTALL 2006-07-11 04:50:51.000000000 +0200 +++ new/fslsfonts-1.0.3/INSTALL 2010-10-30 21:49:16.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/fslsfonts-1.0.2/Makefile.am new/fslsfonts-1.0.3/Makefile.am --- old/fslsfonts-1.0.2/Makefile.am 2007-12-08 02:34:45.000000000 +0100 +++ new/fslsfonts-1.0.3/Makefile.am 2010-10-07 04:00:42.000000000 +0200 @@ -21,7 +21,7 @@ bin_PROGRAMS = fslsfonts -AM_CFLAGS = $(FSLSFONTS_CFLAGS) +AM_CFLAGS = $(FSLSFONTS_CFLAGS) $(CWARNFLAGS) fslsfonts_LDADD = $(FSLSFONTS_LIBS) fslsfonts_SOURCES = \ @@ -36,38 +36,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/fslsfonts-1.0.2/missing new/fslsfonts-1.0.3/missing --- old/fslsfonts-1.0.2/missing 2008-05-24 01:32:01.000000000 +0200 +++ new/fslsfonts-1.0.3/missing 2010-10-30 21:49:10.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fslsfonts-1.0.2/README new/fslsfonts-1.0.3/README --- old/fslsfonts-1.0.2/README 2006-07-11 04:50:51.000000000 +0200 +++ new/fslsfonts-1.0.3/README 2009-10-16 23:38:12.000000000 +0200 @@ -0,0 +1,25 @@ +fslsfonts produces a list of fonts served by an X font server. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/fslsfonts + + http://cgit.freedesktop.org/xorg/app/fslsfonts + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + ++++++ fstobdf-1.0.3.tar.bz2 -> fstobdf-1.0.4.tar.bz2 ++++++ ++++ 12207 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/fstobdf-1.0.3/ChangeLog new/fstobdf-1.0.4/ChangeLog --- old/fstobdf-1.0.3/ChangeLog 2008-05-24 01:54:53.000000000 +0200 +++ new/fstobdf-1.0.4/ChangeLog 2010-10-30 22:03:12.000000000 +0200 @@ -1,3 +1,139 @@ +commit ec9bcf172012b360663b3916c3fcd74bff263fd6 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:00:46 2010 -0700 + + fstobdf 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e5a6da16b73693c384715045705d6392ef0b4519 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:59:42 2010 -0700 + + Purge CVS version tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 119b36c4591155c905f4776be41ecf660ecf78ef +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:55:05 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 049d4f1b9c2e1997693986d3c6cd5093e5553dbe +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 12:54:26 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 18f7bf1985e501fe3614ba935151ccafa258d2e3 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 12:53:55 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 1ca676f3939f1c7430d412294034110690205834 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:06 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit eaaec4ecdd160d3adf8a4d0c1049e6791debb0b3 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 92a49ab745c6f991d8dd869d86cc96dd49963b80 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit c379b54fc33c3c70247412f32f610b43f1f53066 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 176ccf88401f26cd272e34aa3db6ac7ff81cd7b1 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:38 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 594e00a6276875ffe8bd75cea8a4923f577eddfe +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 1979ff3ca19af4633df02d4eb4f636492afefe44 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:17 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 4d6dc1290de14f23fe40e61b37d4c9b96e517958 +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Thu Jan 15 18:33:52 2009 -0200 + + Ansification and compile warning fixes. + + This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects + make distcheck. There weren't any gcc 4.3 and sparse warnings. + commit 3c13b4d1e7d143149cfb34e1771cb28f903be2e2 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri May 23 16:54:12 2008 -0700 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/fstobdf-1.0.3/chars.c new/fstobdf-1.0.4/chars.c --- old/fstobdf-1.0.3/chars.c 2008-05-23 05:09:31.000000000 +0200 +++ new/fstobdf-1.0.4/chars.c 2010-10-30 21:59:11.000000000 +0200 @@ -1,5 +1,3 @@ -/* $Xorg: chars.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ -/* $XdotOrg: app/fstobdf/chars.c,v 1.3 2005/10/31 16:05:45 alanc Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -44,7 +42,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/chars.c,v 3.7 2001/03/04 00:16:31 tsi Exp $ */ /* Morten Storgaard Nielsen: chars.c,v 3.2-1 2000/01/30 14:11:19 kat Exp */ 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/fstobdf-1.0.3/config.h.in new/fstobdf-1.0.4/config.h.in --- old/fstobdf-1.0.3/config.h.in 2008-05-24 01:54:47.000000000 +0200 +++ new/fstobdf-1.0.4/config.h.in 2010-10-30 22:03:05.000000000 +0200 @@ -1,5 +1,32 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + /* Name of package */ #undef PACKAGE @@ -15,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -27,5 +57,8 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* 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/fstobdf-1.0.3/configure.ac new/fstobdf-1.0.4/configure.ac --- old/fstobdf-1.0.3/configure.ac 2008-05-24 01:50:19.000000000 +0200 +++ new/fstobdf-1.0.4/configure.ac 2010-10-30 22:00:21.000000000 +0200 @@ -21,22 +21,21 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(fstobdf,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fstobdf) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([fstobdf], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [fstobdf]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_INSTALL +AM_CONFIG_HEADER(config.h) # Checks for pkg-config packages PKG_CHECK_MODULES(FSTOBDF, x11 libfs) -AC_SUBST(FSTOBDF_CFLAGS) -AC_SUBST(FSTOBDF_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fstobdf-1.0.3/fstobdf.c new/fstobdf-1.0.4/fstobdf.c --- old/fstobdf-1.0.3/fstobdf.c 2006-07-11 04:50:54.000000000 +0200 +++ new/fstobdf-1.0.4/fstobdf.c 2010-10-30 21:59:11.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: fstobdf.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -43,7 +42,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.6tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fstobdf-1.0.3/fstobdf.h new/fstobdf-1.0.4/fstobdf.h --- old/fstobdf-1.0.3/fstobdf.h 2008-05-23 05:10:13.000000000 +0200 +++ new/fstobdf-1.0.4/fstobdf.h 2010-10-30 21:59:11.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/fstobdf/fstobdf.h,v 1.2 2001/08/27 17:41:01 dawes Exp $ */ /* * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * 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/fstobdf-1.0.3/fstobdf.man new/fstobdf-1.0.4/fstobdf.man --- old/fstobdf-1.0.3/fstobdf.man 2008-05-23 05:05:33.000000000 +0200 +++ new/fstobdf-1.0.4/fstobdf.man 2010-10-30 21:59:11.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: fstobdf.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ .\" Copyright 1990, Network Computing Devices .\" Copyright 1990, 1998 The Open Group .\" @@ -24,7 +23,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.6 2001/01/27 18:21:02 dawes Exp $ .\" .TH FSTOBDF __appmansuffix__ __xorgversion__ .SH NAME 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/fstobdf-1.0.3/header.c new/fstobdf-1.0.4/header.c --- old/fstobdf-1.0.3/header.c 2006-07-11 04:50:54.000000000 +0200 +++ new/fstobdf-1.0.4/header.c 2010-10-30 21:59:11.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: header.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -43,7 +42,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/header.c,v 3.6 2001/07/25 15:05:13 dawes Exp $ */ #include <stdio.h> #include <X11/Xosdefs.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fstobdf-1.0.3/INSTALL new/fstobdf-1.0.4/INSTALL --- old/fstobdf-1.0.3/INSTALL 2006-07-11 04:50:54.000000000 +0200 +++ new/fstobdf-1.0.4/INSTALL 2010-10-30 22:03:12.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/fstobdf-1.0.3/Makefile.am new/fstobdf-1.0.4/Makefile.am --- old/fstobdf-1.0.3/Makefile.am 2007-12-08 02:34:50.000000000 +0100 +++ new/fstobdf-1.0.4/Makefile.am 2010-10-30 21:54:15.000000000 +0200 @@ -21,7 +21,7 @@ bin_PROGRAMS = fstobdf -AM_CFLAGS = $(FSTOBDF_CFLAGS) +AM_CFLAGS = $(FSTOBDF_CFLAGS) $(CWARNFLAGS) fstobdf_LDADD = $(FSTOBDF_LIBS) fstobdf_SOURCES = \ @@ -40,38 +40,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/fstobdf-1.0.3/missing new/fstobdf-1.0.4/missing --- old/fstobdf-1.0.3/missing 2008-05-24 01:54:47.000000000 +0200 +++ new/fstobdf-1.0.4/missing 2010-10-30 22:03:06.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fstobdf-1.0.3/props.c new/fstobdf-1.0.4/props.c --- old/fstobdf-1.0.3/props.c 2006-07-11 04:50:54.000000000 +0200 +++ new/fstobdf-1.0.4/props.c 2010-10-30 21:59:11.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: props.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group @@ -43,7 +42,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/props.c,v 1.5 2001/01/17 23:44:54 dawes Exp $ */ #include <stdio.h> #include <string.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fstobdf-1.0.3/README new/fstobdf-1.0.4/README --- old/fstobdf-1.0.3/README 2006-07-11 04:50:54.000000000 +0200 +++ new/fstobdf-1.0.4/README 2009-10-16 23:38:13.000000000 +0200 @@ -0,0 +1,28 @@ +The fstobdf program reads a font from a font server and prints a BDF +file on the standard output that may be used to recreate the font. +This is useful in testing servers, debugging font metrics, and +reproducing lost BDF files. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/fstobdf + + http://cgit.freedesktop.org/xorg/app/fstobdf + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + ++++++ iceauth-1.0.3.tar.bz2 -> iceauth-1.0.4.tar.bz2 ++++++ ++++ 8827 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/iceauth-1.0.3/ChangeLog new/iceauth-1.0.4/ChangeLog --- old/iceauth-1.0.3/ChangeLog 2009-10-11 04:59:30.000000000 +0200 +++ new/iceauth-1.0.4/ChangeLog 2010-10-30 06:46:42.000000000 +0200 @@ -1,3 +1,137 @@ +commit b39fab5b9af70282ab640a8a9d6b56671aeda78b +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 29 21:46:07 2010 -0700 + + iceauth 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3c1b044f63d4865378a2307dd0024afca7196b42 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Oct 21 15:01:29 2010 -0700 + + Remove unnecessary AC_SUBST of ICEAUTH_LIBS & ICEAUTH_CFLAGS + + PKG_CHECK_MODULES automatically handles those for us + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit a33fa043dfd5e84b9afd39842d848265b16ac5d7 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Oct 21 14:59:42 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 5f79bb90cd0e3c18c184f7beb75c83e31aae6951 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit f2b54a282333be841099773ee8788a2a7e2fea3b +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:49 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + +commit 1944291c5f541796b1ac9f036a51cb1dae0cdd81 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jan 7 17:46:31 2010 -0500 + + COPYING: replace stub with actual Copyright notice + + Refer to iceauth.c + Copyright 1989, 1998 The Open Group + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 5f29af7ab19398501f2f2b6729a806b814534801 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 8c19177d9937196f19975f4145e6377b1b4b17e8 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 3277a2349dcf9400f67dc3f91d4b6097a56d7faa +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:38 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 9eaace4030847a25af7759c6f052e01250febdd6 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 2ae7affc9be66652240219e42abdc63c693369e0 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Sep 27 15:55:52 2009 -0400 + + Makefile.am: do not include autogen.sh in distribution #24183 + + This is a private build script that should not be distributed + +commit eff30656f880bb3c362d7db4b82345b70b7282ee +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:19 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + commit 42a269e9d35234306d3208eef9c8bdb2c04caf08 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Sat Oct 10 19:58:20 2009 -0700 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/iceauth-1.0.3/config.h.in new/iceauth-1.0.4/config.h.in --- old/iceauth-1.0.3/config.h.in 2009-10-11 04:59:20.000000000 +0200 +++ new/iceauth-1.0.4/config.h.in 2010-10-30 06:46:39.000000000 +0200 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/iceauth-1.0.3/configure.ac new/iceauth-1.0.4/configure.ac --- old/iceauth-1.0.3/configure.ac 2009-10-11 04:58:00.000000000 +0200 +++ new/iceauth-1.0.4/configure.ac 2010-10-30 06:45:17.000000000 +0200 @@ -21,17 +21,18 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(iceauth,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],iceauth) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([iceauth], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [iceauth]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AC_PROG_CC AC_PROG_INSTALL @@ -42,8 +43,6 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(ICEAUTH, xproto ice) -AC_SUBST(ICEAUTH_CFLAGS) -AC_SUBST(ICEAUTH_LIBS) XORG_WITH_LINT 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/iceauth-1.0.3/COPYING new/iceauth-1.0.4/COPYING --- old/iceauth-1.0.3/COPYING 2006-07-11 04:50:59.000000000 +0200 +++ new/iceauth-1.0.4/COPYING 2010-01-14 18:20:28.000000000 +0100 @@ -1,12 +1,22 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1989, 1998 The Open Group -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. -http://lists.freedesktop.org/mailman/listinfo/xorg 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/iceauth-1.0.3/iceauth.c new/iceauth-1.0.4/iceauth.c --- old/iceauth-1.0.3/iceauth.c 2007-05-18 00:54:59.000000000 +0200 +++ new/iceauth-1.0.4/iceauth.c 2010-10-07 05:32:19.000000000 +0200 @@ -1,6 +1,4 @@ /* - * $Xorg: iceauth.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ - * * xauth - manipulate authorization file * * @@ -29,7 +27,6 @@ * Original Author of "xauth" : Jim Fulton, MIT X Consortium * Modified into "iceauth" : Ralph Mor, X Consortium */ -/* $XFree86: xc/programs/iceauth/iceauth.c,v 1.4 2001/01/17 23:44:54 dawes Exp $ */ #include "iceauth.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iceauth-1.0.3/iceauth.h new/iceauth-1.0.4/iceauth.h --- old/iceauth-1.0.3/iceauth.h 2007-05-18 00:55:10.000000000 +0200 +++ new/iceauth-1.0.4/iceauth.h 2010-10-07 05:32:19.000000000 +0200 @@ -1,6 +1,4 @@ /* - * $Xorg: iceauth.h,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,8 +25,6 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/iceauth/iceauth.h,v 3.4 2001/07/25 15:05:13 dawes Exp $ */ - #ifdef HAVE_CONFIG_H # include "config.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/iceauth-1.0.3/iceauth.man new/iceauth-1.0.4/iceauth.man --- old/iceauth-1.0.3/iceauth.man 2007-05-18 21:55:48.000000000 +0200 +++ new/iceauth-1.0.4/iceauth.man 2010-10-07 05:32:19.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,8 +22,6 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86: xc/programs/iceauth/iceauth.man,v 3.6 2001/01/27 18:21:03 dawes Exp $ -.\" .TH ICEAUTH 1 __xorgversion__ .SH NAME iceauth \- ICE authority file utility 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/iceauth-1.0.3/INSTALL new/iceauth-1.0.4/INSTALL --- old/iceauth-1.0.3/INSTALL 2006-07-11 04:50:59.000000000 +0200 +++ new/iceauth-1.0.4/INSTALL 2010-10-30 06:46:42.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/iceauth-1.0.3/Makefile.am new/iceauth-1.0.4/Makefile.am --- old/iceauth-1.0.3/Makefile.am 2009-10-11 04:55:41.000000000 +0200 +++ new/iceauth-1.0.4/Makefile.am 2010-10-21 23:59:25.000000000 +0200 @@ -37,39 +37,24 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh +EXTRA_DIST = $(appman_PRE) autogen.sh +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES=ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +dist-hook: ChangeLog INSTALL SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/iceauth-1.0.3/process.c new/iceauth-1.0.4/process.c --- old/iceauth-1.0.3/process.c 2007-05-18 00:53:12.000000000 +0200 +++ new/iceauth-1.0.4/process.c 2010-10-07 05:32:19.000000000 +0200 @@ -1,6 +1,4 @@ /* - * $Xorg: process.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ - * $XdotOrg: $ * Copyright 1989, 1998 The Open Group @@ -28,8 +26,6 @@ * Modified into "iceauth" : Ralph Mor, X Consortium */ -/* $XFree86: xc/programs/iceauth/process.c,v 3.7 2001/12/14 20:00:49 dawes Exp $ */ - #include "iceauth.h" #include <ctype.h> #include <errno.h> ++++++ ico-1.0.2.tar.bz2 -> ico-1.0.3.tar.bz2 ++++++ ++++ 12514 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/ico-1.0.2/ChangeLog new/ico-1.0.3/ChangeLog --- old/ico-1.0.2/ChangeLog 2007-07-21 02:17:21.000000000 +0200 +++ new/ico-1.0.3/ChangeLog 2010-10-30 22:12:13.000000000 +0200 @@ -1,3 +1,163 @@ +commit 849d04b09a12e51fb4e17269e2e3a61ce205a014 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:11:36 2010 -0700 + + ico 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 9ac61910d314a548176a96565f29d986cae7f8b0 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:10:33 2010 -0700 + + Purge CVS version tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 4a3421c6cb3e8571c07156e6756fd3d537978b42 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:09:38 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 1a36145e7a8d11b4d80688c942427cfc48c63272 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:09:06 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 1e579cb7be71750e1d1fba0eaed58bc3bd428024 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 13:07:01 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit dc14f85015ed4f8ad1dd9456f3daa59d1b0edddf +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:06 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 1decffa0f6fad067770c5b4de5a112993951f099 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit dbb254953e81d445e62ead7fddad9ebcbb068cb7 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit ae203a1bfd75964cc6b0ce95b702ec7e97eafc91 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit e641baa6ffa24aec30fd773606b61b4895dbadd9 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:38 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit bf4388c86ae8a7ce8e6471f272d299d353ce77a5 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit ea16526cf2fa968a47715cee48d60d3a0e925094 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:17 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 5ca33a50e4a643b8ed7a525e39ecec9b34f1900a +Author: Jens Stroebel <dr-xorg(a)bcsoft.de> +Date: Wed Jan 14 06:23:35 2009 -0800 + + Correcting a typo in configure.ac preventing the Xorg headers from being found + + Signed-off-by: Dan Nicholson <dbn.lists(a)gmail.com> + +commit 874f71ca6bb7134d1b9172a28bda6146dd2c608e +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Mon Jan 12 18:20:06 2009 -0200 + + Ansification and compile warning fixes. + + This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects + make distcheck and all gcc 4.3 and sparse warnings. + Note that "ico" appears to be broken, and only work with the + -r option, that causes it to not use XThreads, and only draw in + the root screen (with "-threads 1" option, the default, it + still use XThreads). + +commit c0227e77a62a422332edda6c8d8113fb4980ac7d +Author: Keith Packard <keithp(a)keithp.com> +Date: Sat Oct 11 21:19:00 2008 -0700 + + Make sure each thread sees its expose event. + + Having a thread call XNextEvent may cause other threads to miss their + initial expose event, blocking them for a long time. Use the existing + predicate function and XIfEvent to wait for precisely the right expose event. + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + commit 11308c41fe4c1bf99a6654fca294f3e098075a33 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri Jul 20 16:28:38 2007 -0700 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/ico-1.0.2/config.h.in new/ico-1.0.3/config.h.in --- old/ico-1.0.2/config.h.in 2007-07-21 02:16:36.000000000 +0200 +++ new/ico-1.0.3/config.h.in 2010-10-30 22:12:09.000000000 +0200 @@ -1,5 +1,32 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + /* Name of package */ #undef PACKAGE @@ -15,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -27,5 +57,8 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* 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/ico-1.0.2/configure.ac new/ico-1.0.3/configure.ac --- old/ico-1.0.2/configure.ac 2007-07-21 01:17:57.000000000 +0200 +++ new/ico-1.0.3/configure.ac 2010-10-30 22:11:23.000000000 +0200 @@ -21,24 +21,25 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(ico,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],ico) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([ico], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [ico]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_INSTALL +AM_CONFIG_HEADER(config.h) # Checks for pkg-config packages PKG_CHECK_MODULES(ICO, x11 >= 0.99.1) -AC_SUBST(ICO_CFLAGS) -AC_SUBST(ICO_LIBS) + XTHREADLIB=`$PKG_CONFIG --variable=xthreadlib x11` AC_SUBST(XTHREADLIB) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.2/ico.c new/ico-1.0.3/ico.c --- old/ico-1.0.2/ico.c 2006-07-11 04:51:02.000000000 +0200 +++ new/ico-1.0.3/ico.c 2010-10-30 22:10:14.000000000 +0200 @@ -1,5 +1,3 @@ -/* $XConsortium: ico.c,v 1.47 94/04/17 20:45:15 gildea Exp $ */ -/* $XdotOrg: $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -47,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/ico/ico.c,v 1.9tsi Exp $ */ /****************************************************************************** * Description @@ -108,7 +105,7 @@ #include "polyinfo.h" /* define format of one polyhedron */ /* Now include all the files which define the actual polyhedra */ -Polyinfo polygons[] = { +static Polyinfo polygons[] = { #include "allobjs.h" }; #define NumberPolygons sizeof(polygons)/sizeof(polygons[0]) @@ -164,25 +161,25 @@ /* The display is shared and writable, but Xlib locks it as necessary */ -Display *dpy; +static Display *dpy; /* This atom will be used to catch the ICCCM "delete window" message. It will * be allocated once and used in read-only mode by threads, so it can be a * global variable */ -Atom wm_delete_window; +static Atom wm_delete_window; /* * variables that are not set except maybe in initialization before * any additional threads are created */ -char *Primaries[] = { +static char *Primaries[] = { "red", "green", "blue", "yellow", "cyan", "magenta" }; #define NumberPrimaries 6 -const char *help_message[] = { +static const char *help_message[] = { "where options include:", "-display host:dpy X server to use", " -geometry geom geometry of window to use", @@ -214,40 +211,40 @@ #endif NULL}; -const char *ProgramName; /* argv[0] */ +static const char *ProgramName; /* argv[0] */ /* * variables set by command-line options */ -const char *geom = NULL; /* -geometry: window geometry */ -int useRoot = 0; /* -r */ -int dash = 0; /* -d: dashed line pattern */ -char **colornames; /* -colors (points into argv) */ +static const char *geom = NULL; /* -geometry: window geometry */ +static int useRoot = 0; /* -r */ +static int dash = 0; /* -d: dashed line pattern */ +static char **colornames; /* -colors (points into argv) */ #ifdef MULTIBUFFER -int update_action = MultibufferUpdateActionBackground; +static int update_action = MultibufferUpdateActionBackground; #endif -int linewidth = 0; /* -lw */ -int multibufext = 0; /* -dbl: use Multi-Buffering extension */ -int dblbuf = 0; /* -dbl or -softdbl: double buffering */ -int numcolors = 0; /* -p: number of primary colors to use */ -const char *background_colorname = NULL; /* -bg */ -int doedges = 1; /* -noedges turns this off */ -int dofaces = 0; /* -faces */ -int invert = 0; /* -i */ -const char *ico_geom = NULL; /* -size: size of object in window */ -const char *delta_geom = NULL; /* -delta: amount by which to move object */ -Polyinfo *poly; /* -obj: the poly to draw */ -int dsync = 0; /* -dsync */ -int xsync = 0; /* -sync */ -int msleepcount = 0; /* -sleep value in milliseconds*/ +static int linewidth = 0; /* -lw */ +static int multibufext = 0; /* -dbl: use Multi-Buffering extension */ +static int dblbuf = 0; /* -dbl or -softdbl: double buffering */ +static int numcolors = 0; /* -p: number of primary colors to use */ +static const char *background_colorname = NULL; /* -bg */ +static int doedges = 1; /* -noedges turns this off */ +static int dofaces = 0; /* -faces */ +static int invert = 0; /* -i */ +static const char *ico_geom = NULL; /* -size: size of object in window */ +static const char *delta_geom = NULL; /* -delta: amount by which to move object */ +static Polyinfo *poly; /* -obj: the poly to draw */ +static int dsync = 0; /* -dsync */ +static int xsync = 0; /* -sync */ +static int msleepcount = 0; /* -sleep value in milliseconds*/ #ifdef MULTITHREAD -int thread_count; +static int thread_count; #ifdef XMUTEX_INITIALIZER -xmutex_rec count_mutex = XMUTEX_INITIALIZER; +static xmutex_rec count_mutex = XMUTEX_INITIALIZER; #else -xmutex_rec count_mutex; +static xmutex_rec count_mutex; #endif -xcondition_rec count_cond; /* Xthreads doesn't define an equivalent to +static xcondition_rec count_cond;/* Xthreads doesn't define an equivalent to * PTHREAD_COND_INITIALIZER, so we must call * xcondition_init later */ #endif @@ -920,7 +917,7 @@ printf("thread %x waiting for Expose\n", xthread_self()); #endif for (;;) { - XNextEvent(dpy, &xev); + XIfEvent(dpy, &xev, predicate, (XPointer) closure->draw_window); if (xev.type == Expose) break; } @@ -1151,9 +1148,7 @@ icoFatal("can't find object %s", name); } -int main(argc, argv) - int argc; - char **argv; +int main(int argc, char **argv) { const char *display = NULL; #ifdef MULTIBUFFER 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/ico-1.0.2/ico.man new/ico-1.0.3/ico.man --- old/ico-1.0.2/ico.man 2007-04-12 00:34:57.000000000 +0200 +++ new/ico-1.0.3/ico.man 2010-10-30 22:10:14.000000000 +0200 @@ -1,5 +1,3 @@ -.\" $XConsortium: ico.man,v 1.14 94/04/17 20:45:16 gildea Exp $ -.\" $XFree86: xc/programs/ico/ico.man,v 1.4 2003/03/19 01:49:28 dawes Exp $ .TH ICO 1 __xorgversion__ .SH NAME ico \- animate an icosahedron or other polyhedron 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/ico-1.0.2/INSTALL new/ico-1.0.3/INSTALL --- old/ico-1.0.2/INSTALL 2006-07-11 04:51:02.000000000 +0200 +++ new/ico-1.0.3/INSTALL 2010-10-30 22:12:13.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/ico-1.0.2/Makefile.am new/ico-1.0.3/Makefile.am --- old/ico-1.0.2/Makefile.am 2007-07-21 01:12:29.000000000 +0200 +++ new/ico-1.0.3/Makefile.am 2010-10-30 22:08:47.000000000 +0200 @@ -21,7 +21,7 @@ bin_PROGRAMS = ico -AM_CFLAGS = $(ICO_CFLAGS) +AM_CFLAGS = $(ICO_CFLAGS) $(CWARNFLAGS) ico_LDADD = $(ICO_LIBS) $(XTHREADLIB) -lm ico_SOURCES = \ @@ -43,37 +43,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL -ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) - -dist-hook: ChangeLog +INSTALL: + $(INSTALL_CMD) -SED = sed +ChangeLog: + $(CHANGELOG_CMD) -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +dist-hook: ChangeLog INSTALL SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/ico-1.0.2/missing new/ico-1.0.3/missing --- old/ico-1.0.2/missing 2007-07-21 02:16:37.000000000 +0200 +++ new/ico-1.0.3/missing 2010-10-30 22:12:10.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ico-1.0.2/polyinfo.h new/ico-1.0.3/polyinfo.h --- old/ico-1.0.2/polyinfo.h 2006-07-11 04:51:02.000000000 +0200 +++ new/ico-1.0.3/polyinfo.h 2010-10-30 22:10:14.000000000 +0200 @@ -1,7 +1,6 @@ /* polyinfo.h * This is the description of one polyhedron file */ -/* $XFree86$ */ #define MAXVERTS 120 /* great rhombicosidodecahedron has 120 vertices */ 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/ico-1.0.2/README new/ico-1.0.3/README --- old/ico-1.0.2/README 2006-07-11 04:51:02.000000000 +0200 +++ new/ico-1.0.3/README 2009-10-16 23:38:19.000000000 +0200 @@ -0,0 +1,28 @@ +ico is a simple animation program that may be used for testing various +X11 operations and extensions. It displays a wire-frame rotating +polyhedron, with hidden lines removed, or a solid-fill polyhedron with +hidden faces removed. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/ico + + http://cgit.freedesktop.org/xorg/app/ico + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + ++++++ mkfontscale-1.0.7.tar.bz2 -> mkfontscale-1.0.8.tar.bz2 ++++++ ++++ 9182 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/mkfontscale-1.0.7/ChangeLog new/mkfontscale-1.0.8/ChangeLog --- old/mkfontscale-1.0.7/ChangeLog 2009-10-11 07:33:06.000000000 +0200 +++ new/mkfontscale-1.0.8/ChangeLog 2010-10-30 08:05:05.000000000 +0200 @@ -1,3 +1,104 @@ +commit 7a1e1e64c171ae95339bbd327806f892816850d7 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 29 23:03:40 2010 -0700 + + mkfontscale 1.0.8 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 6a013e3524c0bdee54a33b0e9a255f3a7580603f +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 29 23:01:47 2010 -0700 + + Remove unnecessary calls from configure.ac + + XORG_DEFAULT_OPTIONS calls AC_PROG_CC and AC_PROG_INSTALL + PKG_CHECK_MODULES calls AC_SUBST on LIBS & CFLAGS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ae4a7325cf30dda566391b37d9ce7ffb946b842e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 29 22:58:07 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 332cbd76cf14a567a75589e85d82a7d3278d1c8b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 64b1f54bcebc6ed628f74f0204d9ec7242e6e9ce +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 29 22:57:04 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit a697d45a4b7e265654a1cb64d5af0e05b377a040 +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:49 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + +commit 0ba1bdaf1db3391c5501fb687df8395fb23b7f6a +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Jan 14 22:01:58 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 570c7b11f38355be8e126d21dbc2ae91428dd7c0 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 54698669d9cd1fba4918ad76edd994ecf7a6aa11 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit a96b22739ed1204b55a0eb00dc15a3bf7d3c77f4 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit 34a5a7ae5dc6c8d5f8cb50755d16ef0f573ff2f2 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Sat Oct 10 22:31:00 2009 -0700 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/mkfontscale-1.0.7/config.h.in new/mkfontscale-1.0.8/config.h.in --- old/mkfontscale-1.0.7/config.h.in 2009-10-11 07:31:38.000000000 +0200 +++ new/mkfontscale-1.0.8/config.h.in 2010-10-30 08:05:02.000000000 +0200 @@ -48,6 +48,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/mkfontscale-1.0.7/configure.ac new/mkfontscale-1.0.8/configure.ac --- old/mkfontscale-1.0.7/configure.ac 2009-10-11 07:29:34.000000000 +0200 +++ new/mkfontscale-1.0.8/configure.ac 2010-10-30 08:04:36.000000000 +0200 @@ -20,21 +20,19 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(mkfontscale, [1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] mkfontscale) -AM_INIT_AUTOMAKE([dist-bzip2 foreign]) +AC_PREREQ([2.60]) +AC_INIT([mkfontscale], [1.0.8], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] + [mkfontscale]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) - -AC_PROG_CC -AC_PROG_INSTALL - + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AC_CHECK_LIB(z, gzopen, [], @@ -52,11 +50,7 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(MKFONTSCALE, fontenc freetype2) -AC_SUBST(MKFONTSCALE_CFLAGS) -AC_SUBST(MKFONTSCALE_LIBS) - PKG_CHECK_MODULES(X11, xproto) -AC_SUBST(X11_CFLAGS) dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT 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/mkfontscale-1.0.7/COPYING new/mkfontscale-1.0.8/COPYING --- old/mkfontscale-1.0.7/COPYING 2008-11-05 18:11:56.000000000 +0100 +++ new/mkfontscale-1.0.8/COPYING 2010-10-30 07:55:59.000000000 +0200 @@ -18,30 +18,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Copyright 2008 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -of the copyright holder. - +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. 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/mkfontscale-1.0.7/data.h new/mkfontscale-1.0.8/data.h --- old/mkfontscale-1.0.7/data.h 2009-01-22 16:09:20.000000000 +0100 +++ new/mkfontscale-1.0.8/data.h 2010-10-07 05:33:03.000000000 +0200 @@ -19,7 +19,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/data.h,v 1.3 2003/04/30 20:39:43 herrb Exp $ */ #ifndef _MKS_DATA_H_ #define _MKS_DATA_H_ 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/mkfontscale-1.0.7/hash.h new/mkfontscale-1.0.8/hash.h --- old/mkfontscale-1.0.7/hash.h 2006-07-11 04:51:21.000000000 +0200 +++ new/mkfontscale-1.0.8/hash.h 2010-10-07 05:33:03.000000000 +0200 @@ -19,7 +19,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86$ */ #ifndef _MKS_HASH_H_ #define _MKS_HASH_H_ 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/mkfontscale-1.0.7/ident.c new/mkfontscale-1.0.8/ident.c --- old/mkfontscale-1.0.7/ident.c 2008-11-05 18:14:35.000000000 +0100 +++ new/mkfontscale-1.0.8/ident.c 2010-10-30 07:56:35.000000000 +0200 @@ -19,34 +19,28 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* Copyright 2008 Sun Microsystems, Inc. All rights reserved. +/* + * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL - * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - */ -/* $XFree86: xc/programs/mkfontscale/ident.c,v 1.3tsi Exp $ */ + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ /* The function identifyBitmap returns -1 if filename is definitively not a font file, 1 if it is a single-face bitmap font with a XLFD name, 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/mkfontscale-1.0.7/ident.h new/mkfontscale-1.0.8/ident.h --- old/mkfontscale-1.0.7/ident.h 2008-08-22 03:48:06.000000000 +0200 +++ new/mkfontscale-1.0.8/ident.h 2010-10-07 05:33:03.000000000 +0200 @@ -20,8 +20,6 @@ THE SOFTWARE. */ -/* $XFree86$ */ - #ifndef _MKS_IDENT_H_ #define _MKS_IDENT_H_ 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/mkfontscale-1.0.7/INSTALL new/mkfontscale-1.0.8/INSTALL --- old/mkfontscale-1.0.7/INSTALL 2006-07-11 04:51:21.000000000 +0200 +++ new/mkfontscale-1.0.8/INSTALL 2010-10-30 08:05:05.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/mkfontscale-1.0.7/list.c new/mkfontscale-1.0.8/list.c --- old/mkfontscale-1.0.7/list.c 2006-07-11 04:51:21.000000000 +0200 +++ new/mkfontscale-1.0.8/list.c 2010-10-07 05:33:03.000000000 +0200 @@ -19,7 +19,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/list.c,v 1.5 2003/07/04 16:24:30 eich Exp $ */ #include <stdlib.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.7/list.h new/mkfontscale-1.0.8/list.h --- old/mkfontscale-1.0.7/list.h 2006-07-11 04:51:21.000000000 +0200 +++ new/mkfontscale-1.0.8/list.h 2010-10-07 05:33:03.000000000 +0200 @@ -19,7 +19,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/list.h,v 1.2 2003/06/20 15:49:52 eich Exp $ */ #ifndef _MKS_LIST_H_ #define _MKS_LIST_H_ 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/mkfontscale-1.0.7/Makefile.am new/mkfontscale-1.0.8/Makefile.am --- old/mkfontscale-1.0.7/Makefile.am 2009-10-11 07:23:20.000000000 +0200 +++ new/mkfontscale-1.0.8/Makefile.am 2010-10-30 07:58:07.000000000 +0200 @@ -42,38 +42,24 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 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/mkfontscale-1.0.7/mkfontscale.c new/mkfontscale-1.0.8/mkfontscale.c --- old/mkfontscale-1.0.7/mkfontscale.c 2009-01-22 16:09:20.000000000 +0100 +++ new/mkfontscale-1.0.8/mkfontscale.c 2010-10-07 05:33:03.000000000 +0200 @@ -19,8 +19,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.2 2004/04/23 19:54:36 eich Exp $ */ -/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.21 2003/12/10 02:58:07 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> ++++++ proxymngr-X11R7.0-1.0.1.tar.bz2 -> proxymngr-1.0.2.tar.bz2 ++++++ ++++ 19990 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/proxymngr-X11R7.0-1.0.1/ChangeLog new/proxymngr-1.0.2/ChangeLog --- old/proxymngr-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:44.000000000 +0100 +++ new/proxymngr-1.0.2/ChangeLog 2010-10-30 22:29:56.000000000 +0200 @@ -1,25 +1,295 @@ -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 3c65ddd9f0717ef330513bdabb7d3ce8bcd6dc32 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:29:13 2010 -0700 - * configure.ac: - Update package version for X11R7 release. + proxymngr 1.0.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a391c0e5b64ec59fd67d66cb170e9fe5c6ceaec1 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:25:51 2010 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + Purge CVS version tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d3741512c86b72941f73e3454ddeaeafe6efbd84 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 13:24:22 2010 -0700 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 5bed8fd5578c5269f84e491e2bb9a7f8ac58e34a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:23:45 2010 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + config: Remove unnecessary calls from configure.ac + + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit de168a959e2b06eea53d14b536d9e53c4758b79a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:21:14 2010 -0700 - * configure.ac: - Update package version number for RC1 release. + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> +commit 23565e2abdf835262fce10129af6bb9e40139d0b +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 13:20:19 2010 -0700 + + Deploy the new XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 1e7b65ae3753c2e0c4f059cd1b1edd7fb0d8556c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Aug 6 08:13:31 2010 -0700 + + Fill in COPYING file with copyright notices from source code + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 11df7b3daa70b8e03dc9a450d888fe324a67415a +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:18 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit b45d6dc185344c5959204e47ec14a489b8a575d5 +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Fri Jan 16 20:35:29 2009 -0200 + + Ansification and compile warning fixes. + + This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects + make distcheck and most gcc 4.3 and sparse warnings. + +commit 97a85d8ff807798802badfb3e8c51ebcd42fab6f +Author: James Cloos <cloos(a)jhcloos.com> +Date: Thu Dec 6 16:37:04 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 971668ff7ad589224a7f0c26392e156b40084739 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Mon Sep 3 05:51:07 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 7b7798457b30a10d9405c031245779d4e191e536 +Author: James Cloos <cloos(a)jhcloos.com> +Date: Thu Aug 23 19:24:33 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 17814174f47a82d9b1d6f7d2411553cc34bd9858 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Jun 26 18:02:07 2006 +0000 + + From Patch #6046 <https://bugs.freedesktop.org/attachment.cgi?id=6046> + Remove redundant setting of ai to NULL. (Peter Breitenlohner) + +commit 64737c86e16c67e702e496215fe00999ef340858 +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Dec 21 02:29:44 2005 +0000 + + Update package version for X11R7 release. + +commit b8f53e8974f8fe70dbc03ded51c8c34487702612 +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Mon Dec 19 16:22:41 2005 +0000 + + Stub COPYING files + +commit e336ad6a37078b242ee0b6c42b9b5bc0c30b4d2f +Author: Kevin E Martin <kem(a)kem.org> +Date: Thu Dec 15 00:24:03 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit b60604f5467ca7bf459466b1c536f002145fe117 +Author: Kevin E Martin <kem(a)kem.org> +Date: Tue Dec 6 22:48:17 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit cfb0801e94810da37d65f317266196d3e72d2c2f +Author: Kevin E Martin <kem(a)kem.org> +Date: Sat Dec 3 05:49:17 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 5405cadfa20e168d04e8ee62add70f1e308ab5b1 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Nov 28 22:01:38 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 7c356b595be65c3455412f1e1526ce1ddf250a44 +Author: Eric Anholt <anholt(a)freebsd.org> +Date: Mon Nov 21 10:34:57 2005 +0000 + + Another pass at .cvsignores for apps. + +commit 97bff17d71231aa6202c013f96a47007295f22c5 +Author: Eric Anholt <anholt(a)freebsd.org> +Date: Sun Nov 20 22:08:49 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit ad28faa1bad6322878293dea60ad0f32dcd82ed3 +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Oct 19 02:47:49 2005 +0000 + + Update package version number for RC1 release. + +commit e6d29757decc145dd0ccdcae745f9014773cbd24 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Oct 17 23:56:20 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit 0598cb2feb00e486857fd4d37da3b9e5bb9ea14e +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Fri Oct 14 00:25:42 2005 +0000 + + Use sed to fill in variables in man page + +commit 3a571f788e2fa65628fa3e831a4d5046752a864d +Author: Kevin E Martin <kem(a)kem.org> +Date: Thu Aug 25 01:50:29 2005 +0000 + + Partial clean up of symlink.sh script Remove dup protocol files in + app/proxymngr (found during symlink.sh cleanup) + +commit 030d77b439d488e8669afc866bf06ef72e553d59 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Sat Aug 13 02:45:45 2005 +0000 + + Add #ifdef HAVE_CONFIG_H/#include "xconfig.h" for modularization. + +commit 128923d6768feaec2216db4770e22c282a9606d2 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Sat Aug 13 02:26:33 2005 +0000 + + Add checks for strcasecmp & IPv6 + +commit dbca1d64327d8473c48e99605ab828359ba19c89 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Aug 1 20:25:28 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit e05a2b227007c3527933e9d2efea9a5d5fa93d8d +Author: Kevin E Martin <kem(a)kem.org> +Date: Fri Jul 29 21:22:30 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 6bea90f954b122c65c98b93908b6789684ac5959 +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Wed Jul 20 19:31:50 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit ff0444aac27e7a33a68871de65dc429ee2c44c47 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Sat Jul 16 17:50:50 2005 +0000 + + - lbxproxy/configure.ac: Add XTRANS_CONNECTION_FLAGS so lbxtransport.c + builds + - proxymngr/Makefile.am: Replace $< with portable construct + - lbxproxy/configure.ac: + - proxymngr/configure.ac: + - xfwp/configure.ac: Add xproxymngproto to PKG_CHECK_MODULES + +commit 3f1f5e4efd919e0ef2fa7f562b9527c540e03736 +Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> +Date: Tue Jun 28 18:16:44 2005 +0000 + + Build system for proxymngr + +commit 99b5a17471487105d3a2f092b0b1b98cd827c33c +Author: Egbert Eich <eich(a)suse.de> +Date: Fri Apr 23 19:54:36 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit e94bb05d084af4b50100f1925c91e2e41ce1f0f4 +Author: Egbert Eich <eich(a)suse.de> +Date: Sun Mar 14 08:34:55 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 570f571c9e842f2af53190f384388153b48ea044 +Author: Egbert Eich <eich(a)suse.de> +Date: Wed Mar 3 12:12:53 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 3def640e507ba1b42f5cf69ec51d3c00401ff9d0 +Author: Egbert Eich <eich(a)suse.de> +Date: Thu Feb 26 13:36:15 2004 +0000 + + readding XFree86's cvs IDs + +commit 14c6a08fa247e9fbe28f47c8b78101e4d01b154e +Author: Egbert Eich <eich(a)suse.de> +Date: Thu Feb 26 09:23:57 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 8aabaadcdab5bcbaa88583377aac04d130e56605 +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Tue Nov 25 19:29:02 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit b05807f4088054b704dc8854ce08822bea72c161 +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Fri Nov 14 16:48:57 2003 +0000 + + XFree86 4.3.0.1 + +commit dffaba3a2b5c9ba6db9fc9d866f39647dfae7d08 +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Fri Nov 14 15:54:53 2003 +0000 + + R6.6 is the Xorg base-line 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/proxymngr-X11R7.0-1.0.1/compile new/proxymngr-1.0.2/compile --- old/proxymngr-X11R7.0-1.0.1/compile 2005-12-21 08:22:22.000000000 +0100 +++ new/proxymngr-1.0.2/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -#! /bin/sh - -# Wrapper for compilers which do not understand `-c -o'. - -# Copyright 1999, 2000 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey(a)cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. - -prog=$1 -shift - -ofile= -cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we do something ugly here. - ofile=$2 - shift - case "$ofile" in - *.o | *.obj) - ;; - *) - args="$args -o $ofile" - ofile= - ;; - esac - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$prog" $args -fi - -# Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 - -# Run the compile. -"$prog" $args -status=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -fi - -rmdir $lockdir -exit $status 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/proxymngr-X11R7.0-1.0.1/config.c new/proxymngr-1.0.2/config.c --- old/proxymngr-X11R7.0-1.0.1/config.c 2004-04-23 21:54:36.000000000 +0200 +++ new/proxymngr-1.0.2/config.c 2010-10-30 22:24:56.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: config.c,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -25,7 +24,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/config.c,v 1.6 2001/01/17 23:45:02 dawes Exp $ */ #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/proxymngr-X11R7.0-1.0.1/config.h new/proxymngr-1.0.2/config.h --- old/proxymngr-X11R7.0-1.0.1/config.h 2003-11-14 17:48:57.000000000 +0100 +++ new/proxymngr-1.0.2/config.h 2010-10-30 22:24:56.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: config.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group 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/proxymngr-X11R7.0-1.0.1/configure.ac new/proxymngr-1.0.2/configure.ac --- old/proxymngr-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:44.000000000 +0100 +++ new/proxymngr-1.0.2/configure.ac 2010-10-30 22:28:49.000000000 +0200 @@ -21,42 +21,37 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(proxymngr,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],proxymngr) +AC_PREREQ([2.60]) +AC_INIT([proxymngr], [1.0.2], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [proxymngr]) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS + # The program itself has a header called config.h so # we have to choose a different name AM_CONFIG_HEADER(xconfig.h) AC_PROG_CPP -AC_PROG_CC -AC_PROG_INSTALL AC_PATH_PROG(LBXPROXY, lbxproxy) if [[ -z $LBXPROXY ]] ; then AC_MSG_ERROR([lbxproxy is needed]) fi -AC_PATH_PROG(SED, sed) -if [[ -z $SED ]] ; then - AC_MSG_ERROR([sed is needed]) -fi - # Checks for pkg-config packages PKG_CHECK_MODULES(PROXYMNGR, ice xt x11 xproxymngproto) -AC_SUBST(PROXYMNGR_CFLAGS) -AC_SUBST(PROXYMNGR_LIBS) AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP],1, - [Define to 1 if you do not have the `strcasecmp' function.])) + [Define to 1 if you do not have the "strcasecmp" function.])) # Needed to check for IPv6 support and set flags appropriately XTRANS_TCP_FLAGS -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/proxymngr-X11R7.0-1.0.1/COPYING new/proxymngr-1.0.2/COPYING --- old/proxymngr-X11R7.0-1.0.1/COPYING 2005-12-19 17:22:41.000000000 +0100 +++ new/proxymngr-1.0.2/COPYING 2010-10-30 22:24:56.000000000 +0200 @@ -1,12 +1,23 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1996, 1998 The Open Group -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. 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/proxymngr-X11R7.0-1.0.1/main.c new/proxymngr-1.0.2/main.c --- old/proxymngr-X11R7.0-1.0.1/main.c 2004-04-23 21:54:36.000000000 +0200 +++ new/proxymngr-1.0.2/main.c 2010-10-30 22:24:56.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: main.c,v 1.6 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -25,7 +24,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/main.c,v 1.8tsi Exp $ */ #include <stdlib.h> #include "pmint.h" @@ -56,10 +54,10 @@ static int PMAcceptorOpcode; static int PMOriginatorOpcode; -int PMversionCount = 1; -IcePaVersionRec PMReplyVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION, +static int PMversionCount = 1; +static IcePaVersionRec PMReplyVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION, PMReplyProcessMessages}}; -IcePoVersionRec PMSetupVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION, +static IcePoVersionRec PMSetupVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION, PMSetupProcessMessages}}; char *PM_VENDOR_STRING = XVENDORNAME; @@ -67,22 +65,21 @@ int verbose = 0; -XtAppContext appContext; +static XtAppContext appContext; #define PM_PORT "6500" -char *configFile = NULL; +static char *configFile = NULL; void -Usage () +Usage(void) { fprintf (stderr, "Usage: proxymngr [-config file] [-verbose]\n"); exit (1); } void -SetCloseOnExec (fd) - int fd; +SetCloseOnExec(int fd) { #ifdef F_SETFD #ifdef FD_CLOEXEC @@ -216,12 +213,7 @@ /* ARGSUSED */ void -NewConnectionXtProc (client_data, source, id) - -XtPointer client_data; -int *source; -XtInputId *id; - +NewConnectionXtProc(XtPointer client_data, int *source, XtInputId *id) { IceConn ice_conn; char *connstr; @@ -271,17 +263,9 @@ * See ConnectToProxy() if you change any of the pmConn structure */ static Status -PMprotocolSetupProc (iceConn, - majorVersion, minorVersion, vendor, release, - clientDataRet, failureReasonRet) - -IceConn iceConn; -int majorVersion; -int minorVersion; -char *vendor; -char *release; -IcePointer *clientDataRet; -char **failureReasonRet; +PMprotocolSetupProc(IceConn iceConn, int majorVersion, int minorVersion, + char *vendor, char *release, IcePointer *clientDataRet, + char **failureReasonRet) { /* @@ -405,13 +389,8 @@ void -PMReplyProcessMessages (iceConn, clientData, opcode, length, swap) - -IceConn iceConn; -IcePointer clientData; -int opcode; -unsigned long length; -Bool swap; +PMReplyProcessMessages(IceConn iceConn, IcePointer clientData, int opcode, + unsigned long length, Bool swap) { PMconn *pmConn = (PMconn *) clientData; @@ -518,8 +497,6 @@ hints.ai_flags = AI_CANONNAME; if (getaddrinfo(hostname, NULL, &hints, &ai) == 0) { canonname = ai->ai_canonname; - } else { - ai = NULL; } } #else @@ -909,16 +886,9 @@ } void -PMSetupProcessMessages (iceConn, clientData, opcode, length, swap, - replyWait, replyReadyRet) - -IceConn iceConn; -IcePointer clientData; -int opcode; -unsigned long length; -Bool swap; -IceReplyWaitInfo *replyWait; -Bool *replyReadyRet; +PMSetupProcessMessages(IceConn iceConn, IcePointer clientData, int opcode, + unsigned long length, Bool swap, + IceReplyWaitInfo *replyWait, Bool *replyReadyRet) { assert (replyWait == NULL); @@ -928,12 +898,9 @@ void -ForwardRequest( requestor, serviceName, serverAddress, hostAddress, - startOptions, authLen, authName, authData ) - PMconn *requestor; - char *serviceName, *serverAddress, *hostAddress, *startOptions; - int authLen; - char *authName, *authData; +ForwardRequest(PMconn *requestor, char *serviceName, char *serverAddress, + char *hostAddress, char *startOptions, int authLen, + char *authName, char *authData) { running_proxy_list *proxyList; running_proxy *runningProxy = NULL; @@ -1027,12 +994,7 @@ /* ARGSUSED */ void -_XtProcessIceMsgProc (client_data, source, id) - -XtPointer client_data; -int *source; -XtInputId *id; - +_XtProcessIceMsgProc(XtPointer client_data, int *source, XtInputId *id) { IceConn ice_conn = (IceConn) client_data; IceProcessMessagesStatus status; @@ -1051,12 +1013,8 @@ void -_XtIceWatchProc (ice_conn, client_data, opening, watch_data) - -IceConn ice_conn; -IcePointer client_data; -Bool opening; -IcePointer *watch_data; +_XtIceWatchProc(IceConn ice_conn, IcePointer client_data, + Bool opening, IcePointer *watch_data) { if (opening) @@ -1078,9 +1036,7 @@ Status -InitWatchProcs (appContext) - -XtAppContext appContext; +InitWatchProcs(XtAppContext appContext) { return (IceAddConnectionWatch (_XtIceWatchProc, (IcePointer) appContext)); @@ -1108,18 +1064,14 @@ static IceIOErrorHandler prev_handler; void -MyIoErrorHandler (ice_conn) - -IceConn ice_conn; - +MyIoErrorHandler(IceConn ice_conn) { if (prev_handler) (*prev_handler) (ice_conn); } void -InstallIOErrorHandler () - +InstallIOErrorHandler(void) { IceIOErrorHandler default_handler; @@ -1136,10 +1088,7 @@ */ Bool -HostBasedAuthProc (hostname) - -char *hostname; - +HostBasedAuthProc(char *hostname) { 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/proxymngr-X11R7.0-1.0.1/Makefile.am new/proxymngr-1.0.2/Makefile.am --- old/proxymngr-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:17.000000000 +0100 +++ new/proxymngr-1.0.2/Makefile.am 2010-10-30 22:24:56.000000000 +0200 @@ -23,8 +23,9 @@ CONFIG_DIR = $(libdir)/X11/proxymngr -proxymngr_CFLAGS = \ - $(PROXYMNGR_CFLAGS) \ +AM_CFLAGS = \ + $(CWARNFLAGS) \ + $(PROXYMNGR_CFLAGS) \ -DXVENDORNAME=\"The\ X\.Org\ Foundation\" \ -DXORG_RELEASE=\"Release\ $(VERSION)\" \ -DCONFIG_FILE=\"$(CONFIG_DIR)/proxymngr/pmconfig\" @@ -58,26 +59,18 @@ EXTRA_DIST += $(appman_PRE) CLEANFILES += $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog 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/proxymngr-X11R7.0-1.0.1/missing new/proxymngr-1.0.2/missing --- old/proxymngr-X11R7.0-1.0.1/missing 2005-12-21 08:22:22.000000000 +0100 +++ new/proxymngr-1.0.2/missing 2010-10-30 22:29:50.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + +Send bug reports to <bug-automake(a)gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/proxymngr-X11R7.0-1.0.1/pmconfig.cpp new/proxymngr-1.0.2/pmconfig.cpp --- old/proxymngr-X11R7.0-1.0.1/pmconfig.cpp 2003-11-14 17:48:57.000000000 +0100 +++ new/proxymngr-1.0.2/pmconfig.cpp 2010-10-30 22:24:56.000000000 +0200 @@ -1,4 +1,3 @@ -! $Xorg: pmconfig.cpp,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ ! proxy manager config file ! ! Each line has the format: 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/proxymngr-X11R7.0-1.0.1/pmdb.c new/proxymngr-1.0.2/pmdb.c --- old/proxymngr-X11R7.0-1.0.1/pmdb.c 2004-04-23 21:54:36.000000000 +0200 +++ new/proxymngr-1.0.2/pmdb.c 2010-10-30 22:24:56.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: pmdb.c,v 1.5 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -25,7 +24,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/pmdb.c,v 1.7 2001/12/14 20:01:02 dawes Exp $ */ #include "pmint.h" #include "pmdb.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/proxymngr-X11R7.0-1.0.1/pmdb.h new/proxymngr-1.0.2/pmdb.h --- old/proxymngr-X11R7.0-1.0.1/pmdb.h 2003-11-14 17:48:57.000000000 +0100 +++ new/proxymngr-1.0.2/pmdb.h 2010-10-30 22:24:56.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: pmdb.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group 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/proxymngr-X11R7.0-1.0.1/pmint.h new/proxymngr-1.0.2/pmint.h --- old/proxymngr-X11R7.0-1.0.1/pmint.h 2005-08-13 04:45:45.000000000 +0200 +++ new/proxymngr-1.0.2/pmint.h 2010-10-30 22:24:56.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: pmint.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -25,7 +24,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/pmint.h,v 1.5 2001/12/14 20:01:02 dawes Exp $ */ #ifdef HAVE_CONFIG_H # include "xconfig.h" @@ -58,7 +56,6 @@ } PMconn; -/* main.c: $TOG: main.c /main/36 1998/03/04 11:30:05 barstow $ */ extern void ForwardRequest ( PMconn *requestor, char *serviceName, char *serverAddress, char *hostAddress, char *startOptions, int authLen, char *authName, char *authData ); extern int HostBasedAuthProc ( char *hostname ); 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/proxymngr-X11R7.0-1.0.1/proxymngr.man new/proxymngr-1.0.2/proxymngr.man --- old/proxymngr-X11R7.0-1.0.1/proxymngr.man 2004-04-23 21:54:36.000000000 +0200 +++ new/proxymngr-1.0.2/proxymngr.man 2010-10-30 22:24:56.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: proxymngr.man,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +23,6 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/proxymngr/proxymngr.man,v 1.8 2003/02/20 03:27:32 dawes Exp $ .\" .TH PROXYMNGR 1 __xorgversion__ .SH NAME 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/proxymngr-X11R7.0-1.0.1/README new/proxymngr-1.0.2/README --- old/proxymngr-X11R7.0-1.0.1/README 2005-06-28 20:16:44.000000000 +0200 +++ new/proxymngr-1.0.2/README 2010-10-30 22:24:56.000000000 +0200 @@ -0,0 +1,30 @@ +X proxy manager service: + +The proxy manager (proxymngr) is responsible for resolving requests from +xfindproxy (and other similar clients), starting new proxies when +appropriate, and keeping track of all of the available proxy services. +The proxy manager strives to reuse existing proxies whenever possible. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/proxymngr + + http://cgit.freedesktop.org/xorg/app/proxymngr + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + 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/proxymngr-X11R7.0-1.0.1/xconfig.h.in new/proxymngr-1.0.2/xconfig.h.in --- old/proxymngr-X11R7.0-1.0.1/xconfig.h.in 2005-12-21 08:22:21.000000000 +0100 +++ new/proxymngr-1.0.2/xconfig.h.in 2010-10-30 22:29:49.000000000 +0200 @@ -3,10 +3,43 @@ /* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ #undef BSD44SOCKETS +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ +#undef HAVE_LIBWS2_32 + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if the system has the type `socklen_t'. */ +#undef HAVE_SOCKLEN_T + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + /* Support IPv6 for TCP connections */ #undef IPv6 -/* Define to 1 if you do not have the `strcasecmp' function. */ +/* Define to 1 if you do not have the "strcasecmp" function. */ #undef NEED_STRCASECMP /* Name of package */ @@ -24,8 +57,23 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* Version number of package */ #undef VERSION ++++++ proxymngr.diff ++++++ --- /var/tmp/diff_new_pack.oEKr7h/_old 2010-11-02 10:52:35.000000000 +0100 +++ /var/tmp/diff_new_pack.oEKr7h/_new 2010-11-02 10:52:35.000000000 +0100 @@ -1,7 +1,5 @@ -Index: Makefile.am -=================================================================== ---- Makefile.am.orig -+++ Makefile.am +--- Makefile.am.orig 2010-10-30 22:24:56.000000000 +0200 ++++ Makefile.am 2010-10-31 04:09:47.000000000 +0100 @@ -21,7 +21,7 @@ bin_PROGRAMS = proxymngr @@ -9,5 +7,5 @@ -CONFIG_DIR = $(libdir)/X11/proxymngr +CONFIG_DIR = /etc/X11/proxymngr - proxymngr_CFLAGS = \ - $(PROXYMNGR_CFLAGS) \ + AM_CFLAGS = \ + $(CWARNFLAGS) \ ++++++ rstart-1.0.3.tar.bz2 -> rstart-1.0.4.tar.bz2 ++++++ ++++ 15069 lines of diff (skipped) ++++++ rstart.diff ++++++ --- /var/tmp/diff_new_pack.oEKr7h/_old 2010-11-02 10:52:36.000000000 +0100 +++ /var/tmp/diff_new_pack.oEKr7h/_new 2010-11-02 10:52:36.000000000 +0100 @@ -1,5 +1,5 @@ ---- Makefile.am.orig 2009-11-14 01:44:28.000000000 +0000 -+++ Makefile.am 2009-11-14 01:44:56.000000000 +0000 +--- Makefile.am.orig 2010-10-30 23:36:38.000000000 +0200 ++++ Makefile.am 2010-10-31 04:12:51.000000000 +0100 @@ -21,12 +21,12 @@ # rstartd server @@ -8,7 +8,7 @@ +rstart_serverdir = /etc/X11/rstart rstart_server_PROGRAMS = rstartd.real - rstartd_real_CFLAGS = $(RSTART_CFLAGS) \ + AM_CFLAGS = $(CWARNFLAGS) $(RSTART_CFLAGS) \ -DSERVERNAME=\"rstart\" \ - -DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\" + -DDEFAULT_CONFIG=\"/etc/X11/rstart/config\" @@ -24,7 +24,7 @@ config_DATA = config config: config.cpp -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ # FIXME: Someone who cares about rstart may want to look into sanitizing # the stuff below. ++++++ showfont-1.0.2.tar.bz2 -> showfont-1.0.3.tar.bz2 ++++++ ++++ 12465 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/showfont-1.0.2/ChangeLog new/showfont-1.0.3/ChangeLog --- old/showfont-1.0.2/ChangeLog 2008-05-24 02:13:42.000000000 +0200 +++ new/showfont-1.0.3/ChangeLog 2010-10-30 23:57:05.000000000 +0200 @@ -1,3 +1,139 @@ +commit b6d168ed36dd2f8ce217c4cbbe5666a509cfcc87 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 14:56:44 2010 -0700 + + showfont 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 00daddf94edbc0b53ece7a9edded50c051c5ab53 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 14:55:01 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 71b506240a22a3927bfe6d8183b1edf7297391ce +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 14:52:21 2010 -0700 + + Purge CVS version tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d9c7b8544d7ab3f9564a552cd30d130f4c4275f7 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 14:51:40 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 433fdb34febc639231c48febe6446f024548453d +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 14:51:25 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 72644adfa9acb85e8a777c61a561953b208b9fa7 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:06 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit acdba9809861c054988eb0139d9544aefbea5b05 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 3f7a6681d48a9901f4a3aef14a054f465f8e2bec +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:07 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 72408025c0e903fd786b9d3f7997fb06cae09d57 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 4c9cf38d4788db369d04d03bfd5a510b681a2948 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:38 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 2fca1196563e9ec066224ed8ccebf06f97aad3bb +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:14 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 3bbe76bcf45060b32b76d8e8ad74f119ba0b79e1 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:19 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit ef8d98c555f3735dc7362873b45e06a8fd4c7c2d +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Mon Jan 19 16:06:40 2009 -0200 + + Ansification and compile warning fixes. + + This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects + make distcheck and all gcc 4.3 and sparse warnings. + commit 916040fd10cd5cc1a5fe576e4ea967108d388e32 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri May 23 17:12:36 2008 -0700 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/showfont-1.0.2/compile new/showfont-1.0.3/compile --- old/showfont-1.0.2/compile 2008-05-24 02:13:36.000000000 +0200 +++ new/showfont-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey(a)cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake(a)gnu.org> or send patches to -# <automake-patches(a)gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake(a)gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/showfont-1.0.2/config.h.in new/showfont-1.0.3/config.h.in --- old/showfont-1.0.2/config.h.in 2008-05-24 02:13:36.000000000 +0200 +++ new/showfont-1.0.3/config.h.in 2010-10-30 23:57:01.000000000 +0200 @@ -1,7 +1,31 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H /* Name of package */ #undef PACKAGE @@ -18,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -30,5 +57,8 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* 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/showfont-1.0.2/configure.ac new/showfont-1.0.3/configure.ac --- old/showfont-1.0.2/configure.ac 2008-05-24 02:07:22.000000000 +0200 +++ new/showfont-1.0.3/configure.ac 2010-10-30 23:56:29.000000000 +0200 @@ -21,23 +21,21 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(showfont,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],showfont) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([showfont], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [showfont]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL +AM_CONFIG_HEADER(config.h) # Checks for pkg-config packages PKG_CHECK_MODULES(SHOWFONT, libfs) -AC_SUBST(SHOWFONT_CFLAGS) -AC_SUBST(SHOWFONT_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/showfont-1.0.2/INSTALL new/showfont-1.0.3/INSTALL --- old/showfont-1.0.2/INSTALL 2006-07-11 04:51:43.000000000 +0200 +++ new/showfont-1.0.3/INSTALL 2010-10-30 23:57:05.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/showfont-1.0.2/Makefile.am new/showfont-1.0.3/Makefile.am --- old/showfont-1.0.2/Makefile.am 2008-05-23 03:35:57.000000000 +0200 +++ new/showfont-1.0.3/Makefile.am 2010-10-30 23:51:57.000000000 +0200 @@ -21,7 +21,7 @@ bin_PROGRAMS = showfont -AM_CFLAGS = $(SHOWFONT_CFLAGS) +AM_CFLAGS = $(SHOWFONT_CFLAGS) $(CWARNFLAGS) showfont_LDADD = $(SHOWFONT_LIBS) showfont_SOURCES = \ @@ -36,38 +36,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/showfont-1.0.2/missing new/showfont-1.0.3/missing --- old/showfont-1.0.2/missing 2008-05-24 02:13:36.000000000 +0200 +++ new/showfont-1.0.3/missing 2010-10-30 23:57:02.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/showfont-1.0.2/README new/showfont-1.0.3/README --- old/showfont-1.0.2/README 2006-07-11 04:51:43.000000000 +0200 +++ new/showfont-1.0.3/README 2010-10-30 23:51:57.000000000 +0200 @@ -0,0 +1,27 @@ +showfont displays data about a font from an X font server. +The information shown includes font information, font properties, +character metrics, and character bitmaps. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/showfont + + http://cgit.freedesktop.org/xorg/app/showfont + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + 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/showfont-1.0.2/showfont.c new/showfont-1.0.3/showfont.c --- old/showfont-1.0.2/showfont.c 2008-05-23 03:38:17.000000000 +0200 +++ new/showfont-1.0.3/showfont.c 2010-10-30 23:51:57.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XConsortium: showfont.c,v 1.13 94/04/17 20:44:07 gildea Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -49,7 +48,6 @@ from the X Consortium. */ -/* $XFree86: xc/programs/showfont/showfont.c,v 1.3 2000/02/18 12:20:17 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -68,23 +66,23 @@ :(nbytes) == 8 ? ((((bits)+63)>>3)&~7) /* pad to 8 bytes */ \ : 0) -int byteorder = MSBFirst; /* -LSB or -MSB */ -int bitorder = MSBFirst; /* -lsb or -msb */ -int bitmap_pad = 0; /* -bitmap_pad: ImageRect bitmap format */ -int scan_pad = 8; /* -pad: ScanlinePad */ -int scan_unit = 8; /* -unit: ScanlineUnit */ -int first_ch = 0; /* -start: first character*/ -int end_ch = ~0; /* -end: end character */ -const char *ProgramName; -Bool no_props = False; /* -noprops: don't show font properties */ -Bool extents_only = False; /* -extents_only */ +static int byteorder = MSBFirst; /* -LSB or -MSB */ +static int bitorder = MSBFirst; /* -lsb or -msb */ +static int bitmap_pad = 0; /* -bitmap_pad: ImageRect bitmap format */ +static int scan_pad = 8; /* -pad: ScanlinePad */ +static int scan_unit = 8; /* -unit: ScanlineUnit */ +static int first_ch = 0; /* -start: first character*/ +static int end_ch = ~0; /* -end: end character */ +static const char *ProgramName; +static Bool no_props = False; /* -noprops: don't show font properties */ +static Bool extents_only = False; /* -extents_only */ -FSServer *svr; +static FSServer *svr; /* set from bitmap_pad to ImageRectMin, ImageMaxWidth, or ImageMax */ -int bitmap_format; +static int bitmap_format; -static FSBitmapFormat +static FSBitmapFormat make_format(void) { FSBitmapFormat format; 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/showfont-1.0.2/showfont.man new/showfont-1.0.3/showfont.man --- old/showfont-1.0.2/showfont.man 2008-05-23 04:35:09.000000000 +0200 +++ new/showfont-1.0.3/showfont.man 2010-10-30 23:51:57.000000000 +0200 @@ -1,5 +1,3 @@ -.\" $XConsortium: showfont.man,v 1.3 94/04/11 14:29:57 gildea Exp $ -.\" $XFree86: xc/programs/showfont/showfont.man,v 1.3 2000/02/17 14:00:33 dawes Exp $ .TH SHOWFONT __appmansuffix__ __xorgversion__ .SH NAME showfont \- font dumper for X font server ++++++ twm-1.0.4.tar.bz2 -> twm-1.0.5.tar.bz2 ++++++ ++++ 15982 lines of diff (skipped) ++++++ viewres-1.0.2.tar.bz2 -> viewres-1.0.3.tar.bz2 ++++++ ++++ 4803 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/viewres-1.0.2/ChangeLog new/viewres-1.0.3/ChangeLog --- old/viewres-1.0.2/ChangeLog 2009-12-17 03:31:00.000000000 +0100 +++ new/viewres-1.0.3/ChangeLog 2010-10-31 00:17:56.000000000 +0200 @@ -1,3 +1,83 @@ +commit a9c50ba456bb60d3ecb4c74cf9a7e3e2b4965e65 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 15:17:31 2010 -0700 + + viewres 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 6feac70d18949d787aa7b9aa7911c3dfd757fa94 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 15:15:07 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 0f94067e5185bda3f9f56937ad777bf62fd46d18 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 15:14:40 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit eb5d2cb97c8c77ca625685c813ffc22795262358 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Jul 1 16:17:56 2010 -0700 + + viewres calls Xmu functions directly so include it in PKG_CHECK_MODULES + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3cdcd33384ae8a5885a38d932d3ad6f48e782c26 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 23:25:03 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use XORG_DEFAULT_OPTIONS provided $(SED) + Use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 44b1029b8c28c50768e08651b736c7137ce885df +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:06 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 4d72e30530e1ff768999d495aa8c82e8691eaaec +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Dec 19 20:48:47 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + commit bb1b70f140f31d17d7ec4744afa379bdd744bcb0 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Wed Dec 16 18:30:22 2009 -0800 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/viewres-1.0.2/configure.ac new/viewres-1.0.3/configure.ac --- old/viewres-1.0.2/configure.ac 2009-12-17 03:30:07.000000000 +0100 +++ new/viewres-1.0.3/configure.ac 2010-10-31 00:17:19.000000000 +0200 @@ -21,30 +21,23 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(viewres, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],viewres) +AC_PREREQ([2.60]) +AC_INIT([viewres], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [viewres]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL +PKG_CHECK_MODULES(VIEWRES, xaw7 xmu xt) - -PKG_CHECK_MODULES(VIEWRES, xaw7) -VIEWRES_CFLAGS="$CWARNFLAGS $VIEWRES_CFLAGS" -AC_SUBST(VIEWRES_CFLAGS) -AC_SUBST(VIEWRES_LIBS) - -PKG_CHECK_MODULES(APPDEFS, xt) -xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` AC_ARG_WITH(appdefaultdir, AC_HELP_STRING([--with-appdefaultdir=<pathname>], [specify directory for app-defaults files (default is autodetected)]), 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/viewres-1.0.2/Makefile.am new/viewres-1.0.3/Makefile.am --- old/viewres-1.0.2/Makefile.am 2009-12-17 03:26:49.000000000 +0100 +++ new/viewres-1.0.3/Makefile.am 2010-07-02 01:13:36.000000000 +0200 @@ -21,7 +21,7 @@ bin_PROGRAMS = viewres -AM_CFLAGS = $(VIEWRES_CFLAGS) +AM_CFLAGS = $(VIEWRES_CFLAGS) $(CWARNFLAGS) viewres_LDADD = $(VIEWRES_LIBS) viewres_SOURCES = \ @@ -47,27 +47,9 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ ++++++ xcursor-themes-1.0.2.tar.bz2 -> xcursor-themes-1.0.3.tar.bz2 ++++++ ++++ 11560 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/xcursor-themes-1.0.2/ChangeLog new/xcursor-themes-1.0.3/ChangeLog --- old/xcursor-themes-1.0.2/ChangeLog 2009-09-25 02:18:29.000000000 +0200 +++ new/xcursor-themes-1.0.3/ChangeLog 2010-10-30 17:57:58.000000000 +0200 @@ -1,3 +1,102 @@ +commit 287d4bac2826de32365afcb2cbe0ec24abd2eecd +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 08:57:22 2010 -0700 + + xcursor-themes 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit fd7401bab073b95c2e8d4d45569f03afffda8ee2 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 08:54:40 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 2c8a072222d0cbb7ccf63470af76738b33f1b11f +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Jan 1 13:33:12 2010 -0500 + + configure: use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 1eabbd976f21f5922e4a2c125c6ed51ebf936763 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Dec 19 17:35:07 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit c43cf46600ae8c93b85d4e3c956864691e55395e +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Nov 29 19:31:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 3cc6cb2fe3142b22931e411e3df5d495f3f57ff5 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Nov 29 19:29:06 2009 -0500 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Automake 'foreign' option is specified in configure.ac. + Remove from Makefile.am + +commit b6cb39282a530930672da3c58132a8cabe54a05b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:09 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 9c250e804fbf7042acc1ab972d93f7f9cf2a128c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 3ece73c962880db4913100211cb9bbe4c02a6b6f +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:40 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 52f78d845879524d66e733e75ef27fec7898bc6e +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:44:09 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit a0209fb0eb221bc72af78f238ad69372d3b2a8d2 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Thu Sep 24 17:12:31 2009 -0700 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/xcursor-themes-1.0.2/configure.ac new/xcursor-themes-1.0.3/configure.ac --- old/xcursor-themes-1.0.2/configure.ac 2009-09-25 02:17:14.000000000 +0200 +++ new/xcursor-themes-1.0.3/configure.ac 2010-10-30 17:57:03.000000000 +0200 @@ -1,11 +1,15 @@ -AC_PREREQ([2.57]) -AC_INIT(xcursor-themes, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xcursor-themes) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xcursor-themes], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] + [xcursor-themes]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_PROG_INSTALL @@ -16,7 +20,7 @@ AC_SUBST([XCURSORGEN]) PKG_CHECK_MODULES(ICONDEFS, xcursor) -pkg_cursordir=$(pkg-config --variable=icondir xcursor) +pkg_cursordir=`$PKG_CONFIG --variable=icondir xcursor` AC_ARG_WITH(cursordir, AC_HELP_STRING([--with-cursordir=<pathname>], [specify directory for cursor files (default is autodetected)]), @@ -27,8 +31,6 @@ AM_CONDITIONAL(REDGLASS, true) AM_CONDITIONAL(HANDHELDS, true) -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([ Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcursor-themes-1.0.2/INSTALL new/xcursor-themes-1.0.3/INSTALL --- old/xcursor-themes-1.0.2/INSTALL 1970-01-01 01:00:00.000000000 +0100 +++ new/xcursor-themes-1.0.3/INSTALL 2010-10-30 17:57:58.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xcursor-themes-1.0.2/Makefile.am new/xcursor-themes-1.0.3/Makefile.am --- old/xcursor-themes-1.0.2/Makefile.am 2009-01-28 03:22:00.000000000 +0100 +++ new/xcursor-themes-1.0.3/Makefile.am 2009-11-30 08:06:08.000000000 +0100 @@ -2,13 +2,15 @@ SUBDIRS = handhelds redglass whiteglass -EXTRA_DIST = genmakefile.sh ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL +EXTRA_DIST = genmakefile.sh -AUTOMAKE_OPTIONS = foreign +.PHONY: ChangeLog INSTALL -dist-hook: ChangeLog - -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) + +dist-hook: ChangeLog INSTALL ++++++ xdbedizzy-1.0.2.tar.bz2 -> xdbedizzy-1.1.0.tar.bz2 ++++++ ++++ 16819 lines of diff (skipped) ++++++ xedit-1.1.2.tar.bz2 -> xedit-1.2.0.tar.bz2 ++++++ ++++ 19481 lines of diff (skipped) ++++++ xev-1.0.4.tar.bz2 -> xev-1.1.0.tar.bz2 ++++++ ++++ 8645 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/xev-1.0.4/ChangeLog new/xev-1.1.0/ChangeLog --- old/xev-1.0.4/ChangeLog 2009-10-13 03:48:02.000000000 +0200 +++ new/xev-1.1.0/ChangeLog 2010-10-30 18:03:38.000000000 +0200 @@ -1,3 +1,129 @@ +commit 01e2993e2563285ee22f18accecb5d65009a49a1 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 09:03:09 2010 -0700 + + xev 1.1.0 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit b5de9e7a4554e678d909757a38f6347f13a90a9f +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:49 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + +commit ab0e3e38f25d02c8f5cacd0b9b9e57bf61377cd6 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Sep 23 20:12:00 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit a4f73b5cc6b357911683907b1038b0deeaeab9a6 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Sep 23 20:10:43 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 03a9a643d8a58539d6e6e08dfcd2e60abdc4d41b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 743eb7755bb50bccffb0840af44e67a4d635d1c1 +Author: Kim Woelders <kim(a)woelders.dk> +Date: Sat Jan 16 19:09:28 2010 +0100 + + Add -root option to specify monitoring root window events. + + Signed-off-by: Kim Woelders <kim(a)woelders.dk> + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit f16f31d5e9a1c379d4a3077bf578ad86faac50f9 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:53 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 25621719b10fa2e9378d2ae46a964a4c25fff9f2 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit a828ad4a1881134c30886534a8879870ded15318 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:38 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 264bcc9d1df3fc069042494a95883015cfa4a0e4 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 46ce6c0f79b4493163d9b8c6de20d1308c40a330 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:20 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + commit 7616febda25a1c6dd1f5458de60286ba6099104c Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Oct 12 18:45:55 2009 -0700 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/xev-1.0.4/config.h.in new/xev-1.1.0/config.h.in --- old/xev-1.0.4/config.h.in 2009-10-13 03:46:12.000000000 +0200 +++ new/xev-1.1.0/config.h.in 2010-10-30 18:03:35.000000000 +0200 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xev-1.0.4/configure.ac new/xev-1.1.0/configure.ac --- old/xev-1.0.4/configure.ac 2009-10-13 03:45:41.000000000 +0200 +++ new/xev-1.1.0/configure.ac 2010-10-30 18:02:51.000000000 +0200 @@ -20,26 +20,22 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xev, [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xev) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xev], [1.1.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xev]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) - -AC_PROG_CC -AC_PROG_INSTALL + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XEV, x11) -AC_SUBST(XEV_CFLAGS) -AC_SUBST(XEV_LIBS) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xev-1.0.4/INSTALL new/xev-1.1.0/INSTALL --- old/xev-1.0.4/INSTALL 2006-07-11 04:52:36.000000000 +0200 +++ new/xev-1.1.0/INSTALL 2010-10-30 18:03:38.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xev-1.0.4/Makefile.am new/xev-1.1.0/Makefile.am --- old/xev-1.0.4/Makefile.am 2009-10-13 03:35:54.000000000 +0200 +++ new/xev-1.1.0/Makefile.am 2010-09-24 05:09:50.000000000 +0200 @@ -35,37 +35,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES = ChangeLog - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/xev-1.0.4/xev.c new/xev-1.1.0/xev.c --- old/xev-1.0.4/xev.c 2008-11-19 07:29:21.000000000 +0100 +++ new/xev-1.1.0/xev.c 2010-10-07 05:35:24.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XConsortium: xev.c,v 1.15 94/04/17 20:45:20 keith Exp $ */ /* Copyright (c) 1988 X Consortium @@ -28,7 +27,6 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xev/xev.c,v 1.13 2003/10/24 20:38:17 tsi Exp $ */ /* * Author: Jim Fulton, MIT X Consortium @@ -690,6 +688,7 @@ " -bw pixels border width in pixels", " -bs {NotUseful,WhenMapped,Always} backingstore attribute", " -id windowid use existing window", +" -root use root window", " -s set save-unders attribute", " -name string window name", " -rv reverse video", @@ -739,6 +738,7 @@ int done; char *name = "Event Tester"; Bool reverse = False; + Bool use_root = False; unsigned long back, fore; XIM xim; XIMStyles *xim_styles; @@ -793,8 +793,17 @@ if (++i >= argc) usage (); name = argv[i]; continue; - case 'r': /* -rv */ - reverse = True; + case 'r': + switch (arg[2]) { + case 'o': /* -root */ + use_root = True; + continue; + case 'v': /* -rv */ + reverse = True; + continue; + default: + usage (); + } continue; case 's': /* -s */ attr.save_under = True; @@ -865,6 +874,9 @@ FocusChangeMask | PropertyChangeMask | ColormapChangeMask | OwnerGrabButtonMask; + if (use_root) + w = RootWindow(dpy, screen); + if (w) { XGetWindowAttributes(dpy, w, &wattr); if (wattr.all_event_masks & ButtonPressMask) 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/xev-1.0.4/xev.man new/xev-1.1.0/xev.man --- old/xev-1.0.4/xev.man 2006-07-11 04:52:36.000000000 +0200 +++ new/xev-1.1.0/xev.man 2010-10-07 05:35:24.000000000 +0200 @@ -1,7 +1,3 @@ -.\" $XConsortium: xev.man,v 1.10 94/04/17 20:45:20 gildea Exp $ -.\" -.\" $XFree86: xc/programs/xev/xev.man,v 1.3 2001/01/27 18:21:11 dawes Exp $ -.\" .TH XEV 1 __xorgversion__ .SH NAME xev - print contents of X events @@ -9,7 +5,7 @@ .B "xev" [\-display \fIdisplayname\fP] [\-geometry \fIgeom\fP] [\-bw \fIpixels\fP] [\-bs \fI{NotUseful,WhenMapped,Always}\fP] -[\-id \fIwindowid\fP] [\-s] [\-name \fIstring\fP] [\-rv] +[\-id \fIwindowid\fP] [\-root] [\-s] [\-name \fIstring\fP] [\-rv] .SH DESCRIPTION .PP \fIXev\fP creates a window and then asks the X server to send it @@ -40,6 +36,10 @@ This option specifies that the window with the given id should be monitored, instead of creating a new window. .TP 8 +.B \-root +This option specifies that the root window should be +monitored, instead of creating a new window. +.TP 8 .B \-s This option specifies that save-unders should be enabled on the window. Save unders are similar to backing store, but they refer rather to the saving of ++++++ xf86dga-1.0.2.tar.bz2 -> xf86dga-1.0.3.tar.bz2 ++++++ ++++ 16125 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/xf86dga-1.0.2/ChangeLog new/xf86dga-1.0.3/ChangeLog --- old/xf86dga-1.0.2/ChangeLog 2006-10-12 00:15:31.000000000 +0200 +++ new/xf86dga-1.0.3/ChangeLog 2010-10-31 19:19:39.000000000 +0100 @@ -1,40 +1,335 @@ -2006-06-20 Matthieu Herrb <matthieu.herrb(a)laas.fr> +commit d2f47149264cd2050f5c442cd8765998a4f936c4 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 11:19:13 2010 -0700 - * dga.c: - Check setuid() return value. Bugzilla #7116. + xf86dga 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 8838a27cb7d1c1be42166569ebfd0c75626752aa +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 11:14:30 2010 -0700 - * configure.ac: - Update package version for X11R7 release. + include Xxf86dga.h instead of the deprecated xf86dga.h + + Requires libXxf86dga 1.1.0 or newer for the new header. + + Clears compiler warnings of: + "X11/extensions/xf86dga.h", line 9: #warning: "xf86dga.h is obsolete and may be removed in the future." + "X11/extensions/xf86dga.h", line 10: #warning: "include <X11/extensions/Xxf86dga.h> instead." + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fba7d03bee848b38a4d6a295244cda4c80605ef2 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 11:10:03 2010 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM sttaements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 07211348999cfbc02da6e89230ae3af89cbb8f07 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 11:06:36 2010 -0700 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 493b51689a87742f9c57b386d2809075792f4e98 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Oct 31 11:04:26 2010 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 89c9806a5d8a470e820c2b1dfa1580df50da4996 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 11:04:09 2010 -0700 - * configure.ac: - Update package version number for X11R7 RC2 release. + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit e865e52bf772021b5c2e6ba9b41850ce7618d584 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:53 2009 -0500 - * configure.ac: - Update pkgcheck depedencies to work with separate build roots. + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b2e2fa245b26757ce693a8b3909a8d590b16ee08 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 - * configure.ac: - Update package version number for RC1 release. + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. +commit cf6f9eb2ac56cb0e8ccc7c935e5ba6a5725f999d +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:38 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 56ddc9ac4b3e80cd70a42b31047690eb68cfbc84 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit b21606e278defaebc458519d1d65d3acfe6ef8a1 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Mon Oct 12 20:50:14 2009 -0700 + + Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 3b900ab3755f6b2b7013297cb3e01735d83cbdcb +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:23 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 1f86766e33e9184486e19408522a1d80df82119f +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Tue Jan 20 20:23:04 2009 -0200 + + Correct make distchek and sparse warnings. + +commit 4e4c9f023d84e37de412f1f484615edca6628549 +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Sun Mar 16 20:33:57 2008 -0300 + + xf86dga doesn't require Xt, Xmu and Xaw. + + Remove inclusion of Xt/Xmu/Xaw headers and update includes to match + missing libc and libX11 protypes. + +commit a31ee1c025235c4052d2731ed47cf4c6030e3a3e +Author: James Cloos <cloos(a)jhcloos.com> +Date: Thu Dec 6 16:37:13 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 3e89bf651e3f69fe225f1b09685710e6ae5b4fac +Author: James Cloos <cloos(a)jhcloos.com> +Date: Mon Sep 3 05:51:21 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit d9b5f9145b843ee27bd3285f399cbd9d293e1d7b +Author: James Cloos <cloos(a)jhcloos.com> +Date: Thu Aug 23 19:24:46 2007 -0400 + + Rename .cvsignore to .gitignore + +commit fb6fe1e9f94b6e693503b18a7abe8403f7646319 +Author: Adam Jackson <ajax(a)benzedrine.nwnk.net> +Date: Fri Oct 13 17:50:32 2006 -0400 + + Bump to 1.0.2 + +commit 9710f429583c1a1911faa1f3f0a094f05f91e30f +Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> +Date: Tue Jun 20 19:25:51 2006 +0000 + + Check setuid() return value. Bugzilla #7116. + +commit 06af2bdc1793c5012a5d6760189127866677733d +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Dec 21 02:29:50 2005 +0000 + + Update package version for X11R7 release. + +commit bfa4e2519fd90eda56b34e6a6a874b8240c29830 +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Mon Dec 19 16:22:43 2005 +0000 + + Stub COPYING files + +commit aa673fd9e34995f8d7ac04a7f757305ad0762d33 +Author: Kevin E Martin <kem(a)kem.org> +Date: Thu Dec 15 00:24:06 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 9bb501c359c31e66c4e6b172409a56a2b345bad1 +Author: Kevin E Martin <kem(a)kem.org> +Date: Tue Dec 6 22:48:21 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 2bbc6e0fe77614f4dcf5d7c791afb593dea0946d +Author: Kevin E Martin <kem(a)kem.org> +Date: Sat Dec 3 05:49:20 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 386e1c0e467e8b11c9f3918eafedd779e634ae42 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Nov 28 22:01:41 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit fdd70f9b2cf51ccfccf138ba1372071ea5f91f4d +Author: Eric Anholt <anholt(a)freebsd.org> +Date: Mon Nov 21 10:35:00 2005 +0000 + + Another pass at .cvsignores for apps. + +commit ad147acd0c47b63a88ea76dec30b55a47b696f5f +Author: Eric Anholt <anholt(a)freebsd.org> +Date: Sun Nov 20 22:08:52 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit 1bd4b5e9dd81cae245a2d7e979841dd7e4928b0d +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Nov 9 21:09:21 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit a5ab4691142599cf1783231807d586d15678c89f +Author: Kevin E Martin <kem(a)kem.org> +Date: Tue Nov 1 15:05:18 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit c8123b3ea5792507173973152d694c50b58c9c2e +Author: Kevin E Martin <kem(a)kem.org> +Date: Wed Oct 19 02:47:53 2005 +0000 + + Update package version number for RC1 release. + +commit 21b3cc4e8052a3cbd558aed4decc6a961a4b93cb +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Oct 17 23:56:22 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit 20a095fc71f31fb6014d224b1dc8520939341b35 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Fri Oct 14 00:25:45 2005 +0000 + + Use sed to fill in variables in man page + +commit 18bc37aa7d7219954f1346aca5007b34e0f31f6a +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Tue Aug 2 00:59:03 2005 +0000 + + Fix installed program name to match monolith (Donnie Berkholz) + +commit d303b10308917f2b27764c8d945e387b98041c73 +Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com> +Date: Mon Aug 1 20:25:29 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit ac92d88a46f30c3d1dc2aea9e4c4cfe628e75bb3 +Author: Kevin E Martin <kem(a)kem.org> +Date: Fri Jul 29 21:22:32 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 8117e998355db1ad9de75b11d7b490f9a3975db5 +Author: Adam Jackson <ajax(a)nwnk.net> +Date: Wed Jul 20 19:31:55 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit 1d29eb6502bce57efcecd9ed1186ed2cb3de7586 +Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk> +Date: Wed Jul 6 15:01:53 2005 +0000 + + Build system for xf86dga + +commit e74a9a93173f3a94363d5171ac5e82abfcf2d443 +Author: Egbert Eich <eich(a)suse.de> +Date: Fri Apr 23 19:54:47 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 1d3c77d0370b9b78bedff5a3b8a9e4efc4f9e3ae +Author: Egbert Eich <eich(a)suse.de> +Date: Sun Mar 14 08:35:20 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 72df2fd3d1a1d5c0d8ea0515ef232cf559f149c0 +Author: Egbert Eich <eich(a)suse.de> +Date: Wed Mar 3 12:13:05 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 86a037230a762589ac45a2010207edd849893d1e +Author: Egbert Eich <eich(a)suse.de> +Date: Thu Feb 26 13:36:24 2004 +0000 + + readding XFree86's cvs IDs + +commit df024065be496bb11a0a86c929dc691e05554632 +Author: Egbert Eich <eich(a)suse.de> +Date: Thu Feb 26 09:24:07 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 2cc8443c254189554b55ef3e3105e1e9ecaaca79 +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Fri Nov 14 16:49:22 2003 +0000 + + XFree86 4.3.0.1 + +commit c59961240eb13fe721832a04de999d5752432454 +Author: Kaleb Keithley <kaleb(a)freedesktop.org> +Date: Fri Nov 14 16:49:22 2003 +0000 + + Initial revision 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/xf86dga-1.0.2/compile new/xf86dga-1.0.3/compile --- old/xf86dga-1.0.2/compile 2006-10-13 03:44:24.000000000 +0200 +++ new/xf86dga-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey(a)cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake(a)gnu.org> or send patches to -# <automake-patches(a)gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake(a)gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86dga-1.0.2/config.h.in new/xf86dga-1.0.3/config.h.in --- old/xf86dga-1.0.2/config.h.in 2006-10-13 23:50:29.000000000 +0200 +++ new/xf86dga-1.0.3/config.h.in 2010-10-31 19:19:35.000000000 +0100 @@ -1,5 +1,32 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + /* Name of package */ #undef PACKAGE @@ -15,8 +42,23 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* 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/xf86dga-1.0.2/configure.ac new/xf86dga-1.0.3/configure.ac --- old/xf86dga-1.0.2/configure.ac 2006-10-13 23:29:19.000000000 +0200 +++ new/xf86dga-1.0.3/configure.ac 2010-10-31 19:18:57.000000000 +0100 @@ -21,22 +21,24 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xf86dga,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xf86dga) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([xf86dga], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xf86dga]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) -AM_CONFIG_HEADER(config.h) +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE -AC_PROG_CC -AC_PROG_INSTALL +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XF86DGA, x11 xxf86dga xt xaw7 xmu) -AC_SUBST(XF86DGA_CFLAGS) -AC_SUBST(XF86DGA_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION +PKG_CHECK_MODULES(XF86DGA, [x11 xxf86dga >= 1.1]) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86dga-1.0.2/dga.c new/xf86dga-1.0.3/dga.c --- old/xf86dga-1.0.2/dga.c 2006-10-12 00:15:31.000000000 +0200 +++ new/xf86dga-1.0.3/dga.c 2010-10-31 19:12:22.000000000 +0100 @@ -1,26 +1,16 @@ /* $XFree86: xc/programs/xf86dga/dga.c,v 3.19 2001/10/28 03:34:32 tsi Exp $ */ -#include <X11/Xos.h> -#include <X11/Intrinsic.h> -#include <X11/Shell.h> -#include <X11/StringDefs.h> -#include <X11/Xatom.h> -#include <X11/Xaw/Form.h> -#include <X11/Xaw/Scrollbar.h> -#include <X11/Xaw/Label.h> -#include <X11/Xaw/Command.h> -#include <X11/Xaw/AsciiText.h> -#include <X11/Xaw/Box.h> -#include <X11/Xaw/Toggle.h> -#include <X11/Xmu/StdSel.h> -#include <X11/Xmd.h> -#include <X11/extensions/xf86dga.h> +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/extensions/Xxf86dga.h> +#include <sys/time.h> #include <ctype.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <signal.h> - +#include <unistd.h> #define MINMAJOR 0 @@ -32,7 +22,7 @@ { struct timeval tp; - gettimeofday(&tp, 0); + gettimeofday(&tp, NULL); return(tp.tv_sec * 1000) + (tp.tv_usec / 1000); } 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/xf86dga-1.0.2/INSTALL new/xf86dga-1.0.3/INSTALL --- old/xf86dga-1.0.2/INSTALL 2006-10-12 00:15:31.000000000 +0200 +++ new/xf86dga-1.0.3/INSTALL 2010-10-31 19:19:39.000000000 +0100 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xf86dga-1.0.2/Makefile.am new/xf86dga-1.0.3/Makefile.am --- old/xf86dga-1.0.2/Makefile.am 2006-10-12 00:15:31.000000000 +0200 +++ new/xf86dga-1.0.3/Makefile.am 2010-10-31 19:04:09.000000000 +0100 @@ -21,7 +21,7 @@ bin_PROGRAMS = dga -dga_CFLAGS = $(XF86DGA_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XF86DGA_CFLAGS) dga_LDADD = $(XF86DGA_LIBS) dga_SOURCES = \ @@ -36,28 +36,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + + +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog INSTALL 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/xf86dga-1.0.2/missing new/xf86dga-1.0.3/missing --- old/xf86dga-1.0.2/missing 2006-10-13 03:44:24.000000000 +0200 +++ new/xf86dga-1.0.3/missing 2010-10-31 19:19:36.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +44,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +77,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -86,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -103,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -135,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -145,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -154,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -164,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -184,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -192,8 +203,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -207,80 +218,78 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -289,11 +298,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -303,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -317,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -356,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86dga-1.0.2/README new/xf86dga-1.0.3/README --- old/xf86dga-1.0.2/README 2006-10-12 00:15:31.000000000 +0200 +++ new/xf86dga-1.0.3/README 2009-10-16 23:39:17.000000000 +0200 @@ -0,0 +1,25 @@ +dga is a simple test client for the XFree86-DGA extension. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/xf86dga + + http://cgit.freedesktop.org/xorg/app/xf86dga + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + ++++++ xfs-1.1.0.tar.bz2 -> xfs-1.1.1.tar.bz2 ++++++ ++++ 21781 lines of diff (skipped) ++++++ xfsinfo-1.0.2.tar.bz2 -> xfsinfo-1.0.3.tar.bz2 ++++++ ++++ 12450 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/xfsinfo-1.0.2/ChangeLog new/xfsinfo-1.0.3/ChangeLog --- old/xfsinfo-1.0.2/ChangeLog 2008-05-24 01:14:16.000000000 +0200 +++ new/xfsinfo-1.0.3/ChangeLog 2010-10-31 00:56:12.000000000 +0200 @@ -1,3 +1,150 @@ +commit 42adfc3d4fda8dfd3aac1329e86af9201dca7c03 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 15:52:02 2010 -0700 + + xfsinfo 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d8b0170c376b4b67d5fb10f409fcf868a2722934 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 15:50:15 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e31137e82915b31cb283794a08b82cce94187d05 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 15:49:47 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 9bd59da2351ef82916317a8a7d3f54a9ffd13853 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 15:49:18 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 8dbe9dd6ebfb85b2e41e592edce9ed78726a126d +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 19:29:53 2010 -0700 + + xfsinfo only depends on x11proto (for Xos.h) not x11 + + No need to link against libX11 when no functions in it are ever called, + nor any headers from it ever used, since xfsinfo is a pure font-server + protocol client. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 6804576a195b14b3b9753b6884fe0b9d57a9a374 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:07 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 889886811da171c16562fb26ed7cffb51e18c798 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 0af1b914f3a4976afb332be0d2c58110b8246575 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit dde7ecba3cddc98565b21032f216581d8ce3e4fc +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 0f7d1a066861a57c9fa34da37059af08a0cb0d7c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit ea5d94aa839dc2b7633b8e1802d13edf5227ba1c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 831836a029dbd747e9d91a94cabd784af6f9b7c9 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:24 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit be1c0624824ab7bd52d9f417a73a80dd8bb0820d +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Wed Jan 21 18:21:03 2009 -0200 + + Query the "default" local server if none specified. + + If no server specified, and the documented environment variable is + not set, attempt to connect to the local font server, as configured + by most Linux distributions for several years. + +commit 4115bdcae1a73543900118230a421da2710af836 +Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br> +Date: Wed Jan 21 18:17:20 2009 -0200 + + Correct make distcheck and sparse warnings. + commit 2212c7ad4386dcddfa2910b0cbf7497d2ac60654 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri May 23 16:13:43 2008 -0700 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/xfsinfo-1.0.2/compile new/xfsinfo-1.0.3/compile --- old/xfsinfo-1.0.2/compile 2008-05-24 01:14:09.000000000 +0200 +++ new/xfsinfo-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <tromey(a)cygnus.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <bug-automake(a)gnu.org> or send patches to -# <automake-patches(a)gnu.org>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <bug-automake(a)gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.2/config.h.in new/xfsinfo-1.0.3/config.h.in --- old/xfsinfo-1.0.2/config.h.in 2008-05-24 01:14:08.000000000 +0200 +++ new/xfsinfo-1.0.3/config.h.in 2010-10-31 00:56:08.000000000 +0200 @@ -1,7 +1,31 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H /* Name of package */ #undef PACKAGE @@ -18,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -30,5 +57,8 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* 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/xfsinfo-1.0.2/configure.ac new/xfsinfo-1.0.3/configure.ac --- old/xfsinfo-1.0.2/configure.ac 2008-05-24 00:52:04.000000000 +0200 +++ new/xfsinfo-1.0.3/configure.ac 2010-10-31 00:51:46.000000000 +0200 @@ -21,23 +21,21 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xfsinfo,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfsinfo) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xfsinfo], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xfsinfo]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_INSTALL +AM_CONFIG_HEADER(config.h) # Checks for pkg-config packages -PKG_CHECK_MODULES(XFSINFO, x11 libfs) -AC_SUBST(XFSINFO_CFLAGS) -AC_SUBST(XFSINFO_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION +PKG_CHECK_MODULES(XFSINFO, xproto libfs) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.2/INSTALL new/xfsinfo-1.0.3/INSTALL --- old/xfsinfo-1.0.2/INSTALL 2006-07-11 04:52:54.000000000 +0200 +++ new/xfsinfo-1.0.3/INSTALL 2010-10-31 00:56:12.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xfsinfo-1.0.2/Makefile.am new/xfsinfo-1.0.3/Makefile.am --- old/xfsinfo-1.0.2/Makefile.am 2008-05-23 05:01:01.000000000 +0200 +++ new/xfsinfo-1.0.3/Makefile.am 2010-10-31 00:49:09.000000000 +0200 @@ -21,7 +21,7 @@ bin_PROGRAMS = xfsinfo -AM_CFLAGS = $(XFSINFO_CFLAGS) +AM_CFLAGS = $(XFSINFO_CFLAGS) $(CWARNFLAGS) xfsinfo_LDADD = $(XFSINFO_LIBS) xfsinfo_SOURCES = \ @@ -36,38 +36,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/xfsinfo-1.0.2/missing new/xfsinfo-1.0.3/missing --- old/xfsinfo-1.0.2/missing 2008-05-24 01:14:09.000000000 +0200 +++ new/xfsinfo-1.0.3/missing 2010-10-31 00:56:09.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.2/README new/xfsinfo-1.0.3/README --- old/xfsinfo-1.0.2/README 2006-07-11 04:52:54.000000000 +0200 +++ new/xfsinfo-1.0.3/README 2009-10-16 23:39:22.000000000 +0200 @@ -0,0 +1,29 @@ +xfsinfo is a utility for displaying information about an X font +server. It is used to examine the capabilities of a server, the +predefined values for various parameters used in communicating between +clients and the server, and the font catalogues and alternate servers +that are available. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/xfsinfo + + http://cgit.freedesktop.org/xorg/app/xfsinfo + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + 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/xfsinfo-1.0.2/xfsinfo.c new/xfsinfo-1.0.3/xfsinfo.c --- old/xfsinfo-1.0.2/xfsinfo.c 2008-05-24 00:36:44.000000000 +0200 +++ new/xfsinfo-1.0.3/xfsinfo.c 2009-10-16 23:39:22.000000000 +0200 @@ -68,7 +68,7 @@ static void print_extension_info(FSServer *svr); static void print_alternate_info(FSServer *svr); -char *progname; +static char *progname; static void usage(void) @@ -100,12 +100,16 @@ if (!svr) { if (FSServerName(servername) == NULL) { - fprintf(stderr, "%s: no font server defined\n", progname); + if ((svr = FSOpenServer("unix/:-1")) == NULL) { + fprintf(stderr, "%s: no font server defined\n", progname); + exit(1); + } + } + if (!svr) { + fprintf(stderr, "%s: unable to open server \"%s\"\n", + progname, FSServerName(servername)); exit(1); } - fprintf(stderr, "%s: unable to open server \"%s\"\n", - progname, FSServerName(servername)); - exit(1); } print_server_info(svr); FSCloseServer(svr); ++++++ xgc-1.0.2.tar.bz2 -> xgc-1.0.3.tar.bz2 ++++++ ++++ 10942 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/xgc-1.0.2/ChangeLog new/xgc-1.0.3/ChangeLog --- old/xgc-1.0.2/ChangeLog 2009-11-11 07:55:49.000000000 +0100 +++ new/xgc-1.0.3/ChangeLog 2010-10-31 01:09:52.000000000 +0200 @@ -1,3 +1,175 @@ +commit 76ba19a5b0f1ec9515ac802c3c3efaad87f3079f +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 16:09:30 2010 -0700 + + xgc 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 66718aca54618f65abbe99ace710d3d4899d2f62 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 16:08:20 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3425a0f5319a0602a809f7ece099b1d8235cadd0 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 16:05:45 2010 -0700 + + Purge CVS version tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 28dc5acd02f7e20354f3dc7c6aae0b7e685d24db +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 16:04:37 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 370e37a3a02ef8100c048c1a39af325662009970 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 16:03:39 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ebd3e2400d05f779c0be6f1db352fe0e55a2c435 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Jul 18 09:38:40 2010 -0400 + + config: allow to build tarball when yacc is missingmaster + Autoconf does not handle this scenario as well as Automake does. + If gram.c is already there, do not abort the configuration + if yacc is missing as it is not needed. + + If both xkbparse.c and yacc are missing, abort configuration. + Yacc is a required tool to build the package. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 79eee2354907010045d64c05b3a008cffda2c952 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Jul 1 18:07:39 2010 -0700 + + Call snprintf directly, instead of via XmuSnprintf + + We could add an autoconf check to fix the old #ifdef HAS_SNPRINTF test + here, but all platforms we support today have a native snprintf anyway. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 2dd98f64c53a6353716982d2e69c3c493a6b9f78 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 23:25:03 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use XORG_DEFAULT_OPTIONS provided $(SED) + Use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e1d1a9f5b65691338e7a6d41dbbf05bc7073740a +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Jun 4 14:03:55 2010 -0400 + + config: add check for yacc to insure it is installed #27973 + + Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" + as a last resort, even if no programs have been found. Improve error + checking by issuing an error message if yacc is not found. The module + cannot build anyway. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 301f7d91b74bd1ef625ba1d82e877294ed283210 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Jan 14 22:12:21 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit b788ecebe37fffc96856481a6e239123214540e9 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Dec 19 20:48:48 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 3f4012aecec63dee6858797d0c893472877ac027 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit bb9d4ca9f616c24fcda388749a9ec7fbe7ea6f55 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 6daab486099dc404bf0b88546fd3091855c01c89 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit bd327d662f16987b11bbcfbda5451008da300d5e +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit abdc601cdbdfaf106bb94e9052e14acee5eca04b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit e3247097e61ddd8432921f8d52b73f09f6bf23c4 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Tue Nov 10 22:55:23 2009 -0800 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/xgc-1.0.2/choice.c new/xgc-1.0.3/choice.c --- old/xgc-1.0.2/choice.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/choice.c 2010-10-31 01:04:59.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* ** xgc ** 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/xgc-1.0.2/config.h.in new/xgc-1.0.3/config.h.in --- old/xgc-1.0.2/config.h.in 2009-11-11 07:55:32.000000000 +0100 +++ new/xgc-1.0.3/config.h.in 2010-10-31 01:09:47.000000000 +0200 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xgc-1.0.2/configure.ac new/xgc-1.0.3/configure.ac --- old/xgc-1.0.2/configure.ac 2009-11-11 07:54:47.000000000 +0100 +++ new/xgc-1.0.3/configure.ac 2010-10-31 01:09:15.000000000 +0200 @@ -1,4 +1,3 @@ - dnl Copyright 2005 Red Hat, Inc. dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -21,29 +20,27 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xgc, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xgc) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xgc], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xgc]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AC_PROG_LEX AC_PROG_YACC -AC_PROG_CC -AC_PROG_INSTALL - -PKG_CHECK_MODULES(XGC, xaw7) -AC_SUBST(XGC_CFLAGS) -AC_SUBST(XGC_LIBS) +AC_PATH_PROG([YACC_INST], $YACC) +AC_CHECK_FILE([$srcdir/gram.c], [], + [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile gram.y])]) -PKG_CHECK_MODULES(APPDEFS, xt) -xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +PKG_CHECK_MODULES(XGC, xaw7 xt) +xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` AC_ARG_WITH(appdefaultdir, AC_HELP_STRING([--with-appdefaultdir=<pathname>], [specify directory for app-defaults files (default is autodetected)]), 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/xgc-1.0.2/COPYING new/xgc-1.0.3/COPYING --- old/xgc-1.0.2/COPYING 2009-11-11 07:52:44.000000000 +0100 +++ new/xgc-1.0.3/COPYING 2010-10-31 01:04:59.000000000 +0200 @@ -24,30 +24,23 @@ other dealings in this Software without prior written authorization from the X Consortium. -Copyright 2009 Sun Microsystems, Inc. All rights reserved. +Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -of the copyright holder. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. 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/xgc-1.0.2/dashlist.c new/xgc-1.0.3/dashlist.c --- old/xgc-1.0.2/dashlist.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/dashlist.c 2010-10-31 01:04:59.000000000 +0200 @@ -7,7 +7,6 @@ ** functions to create more than one of these dashlist choice things ** will fail in a big way. */ -/* $XFree86: xc/programs/xgc/dashlist.c,v 1.3 2001/07/29 21:23:21 tsi Exp $ */ #include <stdio.h> #include <X11/Xos.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgc-1.0.2/getfile.c new/xgc-1.0.3/getfile.c --- old/xgc-1.0.2/getfile.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/getfile.c 2010-10-31 01:04:59.000000000 +0200 @@ -2,7 +2,6 @@ ** getfilename.c ** */ -/* $XFree86: xc/programs/xgc/getfile.c,v 1.4tsi Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgc-1.0.2/gram.c new/xgc-1.0.3/gram.c --- old/xgc-1.0.2/gram.c 2009-11-11 07:55:49.000000000 +0100 +++ new/xgc-1.0.3/gram.c 2010-10-31 01:09:52.000000000 +0200 @@ -130,7 +130,7 @@ /* Copy the first part of user declarations. */ -#line 6 "gram.y" +#line 5 "gram.y" #define YYDEBUG 1 @@ -163,7 +163,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 19 "gram.y" +#line 18 "gram.y" { int num; char *ptr; @@ -475,9 +475,9 @@ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 41, 41, 44, 45, 46, 49, 50, 52, 54, - 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, - 76, 78, 80, 82, 84, 86, 88 + 0, 40, 40, 43, 44, 45, 48, 49, 51, 53, + 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, + 75, 77, 79, 81, 83, 85, 87 }; #endif @@ -1406,102 +1406,102 @@ switch (yyn) { case 7: -#line 51 "gram.y" +#line 50 "gram.y" { run_test(); } break; case 8: -#line 53 "gram.y" +#line 52 "gram.y" { change_test ((yyvsp[(2) - (2)].num), TRUE); } break; case 9: -#line 55 "gram.y" +#line 54 "gram.y" { GC_change_function ((yyvsp[(2) - (2)].num), TRUE); } break; case 10: -#line 57 "gram.y" +#line 56 "gram.y" { GC_change_linestyle ((yyvsp[(2) - (2)].num), TRUE); } break; case 11: -#line 59 "gram.y" +#line 58 "gram.y" { GC_change_linestyle (LineSolid, TRUE); } break; case 12: -#line 61 "gram.y" +#line 60 "gram.y" { GC_change_capstyle ((yyvsp[(2) - (2)].num), TRUE); } break; case 13: -#line 63 "gram.y" +#line 62 "gram.y" { GC_change_capstyle (CapRound, TRUE); } break; case 14: -#line 65 "gram.y" +#line 64 "gram.y" { GC_change_joinstyle ((yyvsp[(2) - (2)].num), TRUE); } break; case 15: -#line 67 "gram.y" +#line 66 "gram.y" { GC_change_joinstyle (JoinRound, TRUE); } break; case 16: -#line 69 "gram.y" +#line 68 "gram.y" { GC_change_fillstyle ((yyvsp[(2) - (2)].num), TRUE); } break; case 17: -#line 71 "gram.y" +#line 70 "gram.y" { GC_change_fillstyle (FillSolid, TRUE); } break; case 18: -#line 73 "gram.y" +#line 72 "gram.y" { GC_change_fillrule ((yyvsp[(2) - (2)].num), TRUE); } break; case 19: -#line 75 "gram.y" +#line 74 "gram.y" { GC_change_arcmode ((yyvsp[(2) - (2)].num), TRUE); } break; case 20: -#line 77 "gram.y" +#line 76 "gram.y" { GC_change_foreground ((yyvsp[(2) - (2)].num), TRUE); } break; case 21: -#line 79 "gram.y" +#line 78 "gram.y" { GC_change_background ((yyvsp[(2) - (2)].num), TRUE); } break; case 22: -#line 81 "gram.y" +#line 80 "gram.y" { GC_change_linewidth ((yyvsp[(2) - (2)].num), TRUE); } break; case 23: -#line 83 "gram.y" +#line 82 "gram.y" { GC_change_planemask ((yyvsp[(2) - (2)].num), TRUE); } break; case 24: -#line 85 "gram.y" +#line 84 "gram.y" { GC_change_dashlist ((yyvsp[(2) - (2)].num), TRUE); } break; case 25: -#line 87 "gram.y" +#line 86 "gram.y" { GC_change_font ((yyvsp[(2) - (2)].ptr), TRUE); } break; case 26: -#line 89 "gram.y" +#line 88 "gram.y" { change_percent ((yyvsp[(2) - (2)].num), TRUE); } break; @@ -1721,7 +1721,7 @@ } -#line 92 "gram.y" +#line 91 "gram.y" void yyerror(const char *s) 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/xgc-1.0.2/gram.h new/xgc-1.0.3/gram.h --- old/xgc-1.0.2/gram.h 2009-11-11 07:55:49.000000000 +0100 +++ new/xgc-1.0.3/gram.h 2010-10-31 01:09:52.000000000 +0200 @@ -104,7 +104,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 19 "gram.y" +#line 18 "gram.y" { int num; char *ptr; 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/xgc-1.0.2/gram.y new/xgc-1.0.3/gram.y --- old/xgc-1.0.2/gram.y 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/gram.y 2010-10-31 01:04:59.000000000 +0200 @@ -1,7 +1,6 @@ /* ** grammar for xgc syntax */ -/* $XFree86: xc/programs/xgc/gram.y,v 1.3 2000/02/17 14:00:36 dawes Exp $ */ %{ #define YYDEBUG 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/xgc-1.0.2/INSTALL new/xgc-1.0.3/INSTALL --- old/xgc-1.0.2/INSTALL 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/INSTALL 2010-10-31 01:09:52.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xgc-1.0.2/interpret.c new/xgc-1.0.3/interpret.c --- old/xgc-1.0.2/interpret.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/interpret.c 2010-10-31 01:04:59.000000000 +0200 @@ -3,7 +3,6 @@ ** ** interprets and executes lines in the Xgc syntax. */ -/* $XFree86: xc/programs/xgc/interpret.c,v 1.4 2002/01/07 20:38:30 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgc-1.0.2/lex.c new/xgc-1.0.3/lex.c --- old/xgc-1.0.2/lex.c 2009-11-11 07:55:49.000000000 +0100 +++ new/xgc-1.0.3/lex.c 2010-10-31 01:09:52.000000000 +0200 @@ -707,13 +707,11 @@ #define YY_RESTORE_YY_MORE_OFFSET char *yytext; #line 1 "lex.l" -/* $XConsortium: lex.l,v 1.8 94/03/31 20:40:44 rws Exp $ */ -/* $XFree86: xc/programs/xgc/lex.l,v 1.3 2000/04/05 18:14:07 dawes Exp $ */ /* ** lex file for xgc syntax */ /* Lots of stuff stolen from gwm's wool.lex */ -#line 10 "lex.l" +#line 8 "lex.l" #include <X11/X.h> #include <stdlib.h> @@ -722,7 +720,7 @@ #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__) int yylineno; #endif -#line 726 "lex.c" +#line 724 "lex.c" #define INITIAL 0 @@ -904,10 +902,10 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 27 "lex.l" +#line 25 "lex.l" -#line 911 "lex.c" +#line 909 "lex.c" if ( !(yy_init) ) { @@ -992,419 +990,419 @@ case 1: YY_RULE_SETUP -#line 29 "lex.l" +#line 27 "lex.l" { return (RUN); } YY_BREAK case 2: YY_RULE_SETUP -#line 31 "lex.l" +#line 29 "lex.l" { return (FUNCTION); } YY_BREAK case 3: YY_RULE_SETUP -#line 32 "lex.l" +#line 30 "lex.l" { yylval.num = GXclear; return (FUNCTIONTYPE); } YY_BREAK case 4: YY_RULE_SETUP -#line 34 "lex.l" +#line 32 "lex.l" { yylval.num = GXand; return (FUNCTIONTYPE); } YY_BREAK case 5: YY_RULE_SETUP -#line 36 "lex.l" +#line 34 "lex.l" { yylval.num = GXandReverse; return (FUNCTIONTYPE); } YY_BREAK case 6: YY_RULE_SETUP -#line 38 "lex.l" +#line 36 "lex.l" { yylval.num = GXcopy; return (FUNCTIONTYPE); } YY_BREAK case 7: YY_RULE_SETUP -#line 40 "lex.l" +#line 38 "lex.l" { yylval.num = GXandInverted; return (FUNCTIONTYPE); } YY_BREAK case 8: YY_RULE_SETUP -#line 42 "lex.l" +#line 40 "lex.l" { yylval.num = GXnoop; return (FUNCTIONTYPE); } YY_BREAK case 9: YY_RULE_SETUP -#line 44 "lex.l" +#line 42 "lex.l" { yylval.num = GXxor; return (FUNCTIONTYPE); } YY_BREAK case 10: YY_RULE_SETUP -#line 46 "lex.l" +#line 44 "lex.l" { yylval.num = GXor; return (FUNCTIONTYPE); } YY_BREAK case 11: YY_RULE_SETUP -#line 48 "lex.l" +#line 46 "lex.l" { yylval.num = GXnor; return (FUNCTIONTYPE); } YY_BREAK case 12: YY_RULE_SETUP -#line 50 "lex.l" +#line 48 "lex.l" { yylval.num = GXequiv; return (FUNCTIONTYPE); } YY_BREAK case 13: YY_RULE_SETUP -#line 52 "lex.l" +#line 50 "lex.l" { yylval.num = GXinvert; return (FUNCTIONTYPE); } YY_BREAK case 14: YY_RULE_SETUP -#line 54 "lex.l" +#line 52 "lex.l" { yylval.num = GXorReverse; return (FUNCTIONTYPE); } YY_BREAK case 15: YY_RULE_SETUP -#line 56 "lex.l" +#line 54 "lex.l" { yylval.num = GXcopyInverted; return (FUNCTIONTYPE); } YY_BREAK case 16: YY_RULE_SETUP -#line 58 "lex.l" +#line 56 "lex.l" { yylval.num = GXorInverted; return (FUNCTIONTYPE); } YY_BREAK case 17: YY_RULE_SETUP -#line 60 "lex.l" +#line 58 "lex.l" { yylval.num = GXnand; return (FUNCTIONTYPE); } YY_BREAK case 18: YY_RULE_SETUP -#line 62 "lex.l" +#line 60 "lex.l" { yylval.num = GXset; return (FUNCTIONTYPE); } YY_BREAK case 19: YY_RULE_SETUP -#line 65 "lex.l" +#line 63 "lex.l" { return (TEST); } YY_BREAK case 20: YY_RULE_SETUP -#line 66 "lex.l" +#line 64 "lex.l" { yylval.num = CopyArea; return (TESTTYPE); } YY_BREAK case 21: YY_RULE_SETUP -#line 68 "lex.l" +#line 66 "lex.l" { yylval.num = CopyPlane; return (TESTTYPE); } YY_BREAK case 22: YY_RULE_SETUP -#line 70 "lex.l" +#line 68 "lex.l" { yylval.num = PolyPoint; return (TESTTYPE); } YY_BREAK case 23: YY_RULE_SETUP -#line 72 "lex.l" +#line 70 "lex.l" { yylval.num = PolyLine; return (TESTTYPE); } YY_BREAK case 24: YY_RULE_SETUP -#line 74 "lex.l" +#line 72 "lex.l" { yylval.num = PolySegment; return (TESTTYPE); } YY_BREAK case 25: YY_RULE_SETUP -#line 76 "lex.l" +#line 74 "lex.l" { yylval.num = PolyRectangle; return (TESTTYPE); } YY_BREAK case 26: YY_RULE_SETUP -#line 78 "lex.l" +#line 76 "lex.l" { yylval.num = PolyArc; return (TESTTYPE); } YY_BREAK case 27: YY_RULE_SETUP -#line 80 "lex.l" +#line 78 "lex.l" { yylval.num = FillPolygon; return (TESTTYPE); } YY_BREAK case 28: YY_RULE_SETUP -#line 82 "lex.l" +#line 80 "lex.l" { yylval.num = PolyFillRect; return (TESTTYPE); } YY_BREAK case 29: YY_RULE_SETUP -#line 84 "lex.l" +#line 82 "lex.l" { yylval.num = PolyFillArc; return (TESTTYPE); } YY_BREAK case 30: YY_RULE_SETUP -#line 86 "lex.l" +#line 84 "lex.l" { yylval.num = PutImage; return (TESTTYPE); } YY_BREAK case 31: YY_RULE_SETUP -#line 88 "lex.l" +#line 86 "lex.l" { yylval.num = GetImage; return (TESTTYPE); } YY_BREAK case 32: YY_RULE_SETUP -#line 90 "lex.l" +#line 88 "lex.l" { yylval.num = PolyText8; return (TESTTYPE); } YY_BREAK case 33: YY_RULE_SETUP -#line 92 "lex.l" +#line 90 "lex.l" { yylval.num = ImageText8; return (TESTTYPE); } YY_BREAK case 34: YY_RULE_SETUP -#line 94 "lex.l" +#line 92 "lex.l" { yylval.num = PolyText16; return (TESTTYPE); } YY_BREAK case 35: YY_RULE_SETUP -#line 96 "lex.l" +#line 94 "lex.l" { yylval.num = ImageText16; return (TESTTYPE); } YY_BREAK case 36: YY_RULE_SETUP -#line 99 "lex.l" +#line 97 "lex.l" { return (LINESTYLE); } YY_BREAK case 37: YY_RULE_SETUP -#line 100 "lex.l" +#line 98 "lex.l" { yylval.num = LineOnOffDash; return (LINESTYLETYPE); } YY_BREAK case 38: YY_RULE_SETUP -#line 102 "lex.l" +#line 100 "lex.l" { yylval.num = LineDoubleDash; return (LINESTYLETYPE); } YY_BREAK case 39: YY_RULE_SETUP -#line 105 "lex.l" +#line 103 "lex.l" { return (CAPSTYLE); } YY_BREAK case 40: YY_RULE_SETUP -#line 106 "lex.l" +#line 104 "lex.l" { yylval.num = CapNotLast; return (CAPSTYLETYPE); } YY_BREAK case 41: YY_RULE_SETUP -#line 108 "lex.l" +#line 106 "lex.l" { yylval.num = CapButt; return (CAPSTYLETYPE); } YY_BREAK case 42: YY_RULE_SETUP -#line 110 "lex.l" +#line 108 "lex.l" { yylval.num = CapProjecting; return (CAPSTYLETYPE); } YY_BREAK case 43: YY_RULE_SETUP -#line 113 "lex.l" +#line 111 "lex.l" { return (JOINSTYLE); } YY_BREAK case 44: YY_RULE_SETUP -#line 114 "lex.l" +#line 112 "lex.l" { yylval.num = JoinMiter; return (JOINSTYLETYPE); } YY_BREAK case 45: YY_RULE_SETUP -#line 116 "lex.l" +#line 114 "lex.l" { yylval.num = JoinBevel; return (JOINSTYLETYPE); } YY_BREAK case 46: YY_RULE_SETUP -#line 119 "lex.l" +#line 117 "lex.l" { return (ROUND); } YY_BREAK case 47: YY_RULE_SETUP -#line 121 "lex.l" +#line 119 "lex.l" { return (FILLSTYLE); } YY_BREAK case 48: YY_RULE_SETUP -#line 122 "lex.l" +#line 120 "lex.l" { yylval.num = FillTiled; return (FILLSTYLETYPE); } YY_BREAK case 49: YY_RULE_SETUP -#line 124 "lex.l" +#line 122 "lex.l" { yylval.num = FillStippled; return (FILLSTYLETYPE); } YY_BREAK case 50: YY_RULE_SETUP -#line 126 "lex.l" +#line 124 "lex.l" { yylval.num = FillOpaqueStippled; return (FILLSTYLETYPE); } YY_BREAK case 51: YY_RULE_SETUP -#line 129 "lex.l" +#line 127 "lex.l" { return (SOLID); } YY_BREAK case 52: YY_RULE_SETUP -#line 131 "lex.l" +#line 129 "lex.l" { return (FILLRULE); } YY_BREAK case 53: YY_RULE_SETUP -#line 132 "lex.l" +#line 130 "lex.l" { yylval.num = EvenOddRule; return (FILLRULETYPE); } YY_BREAK case 54: YY_RULE_SETUP -#line 134 "lex.l" +#line 132 "lex.l" { yylval.num = WindingRule; return (FILLRULETYPE); } YY_BREAK case 55: YY_RULE_SETUP -#line 137 "lex.l" +#line 135 "lex.l" { return (ARCMODE); } YY_BREAK case 56: YY_RULE_SETUP -#line 138 "lex.l" +#line 136 "lex.l" { yylval.num = ArcChord; return (ARCMODETYPE); } YY_BREAK case 57: YY_RULE_SETUP -#line 140 "lex.l" +#line 138 "lex.l" { yylval.num = ArcPieSlice; return (ARCMODETYPE); } YY_BREAK case 58: YY_RULE_SETUP -#line 143 "lex.l" +#line 141 "lex.l" { return (FOREGROUND); } YY_BREAK case 59: YY_RULE_SETUP -#line 144 "lex.l" +#line 142 "lex.l" { return (BACKGROUND); } YY_BREAK case 60: YY_RULE_SETUP -#line 145 "lex.l" +#line 143 "lex.l" { return (LINEWIDTH); } YY_BREAK case 61: YY_RULE_SETUP -#line 146 "lex.l" +#line 144 "lex.l" { return (PLANEMASK); } YY_BREAK case 62: YY_RULE_SETUP -#line 147 "lex.l" +#line 145 "lex.l" { return (DASHLIST); } YY_BREAK case 63: YY_RULE_SETUP -#line 148 "lex.l" +#line 146 "lex.l" { return (FONT); } YY_BREAK case 64: YY_RULE_SETUP -#line 149 "lex.l" +#line 147 "lex.l" { return (PERCENT); } YY_BREAK case 65: YY_RULE_SETUP -#line 151 "lex.l" +#line 149 "lex.l" { (void) sscanf ((char *)yytext, "%d", &yylval.num); return (NUMBER); } YY_BREAK case 66: /* rule 66 can match eol */ YY_RULE_SETUP -#line 153 "lex.l" +#line 151 "lex.l" { yylval.ptr = (char *) yytext; return (STRING); } YY_BREAK case 67: /* rule 67 can match eol */ YY_RULE_SETUP -#line 155 "lex.l" +#line 153 "lex.l" { ; } YY_BREAK case 68: YY_RULE_SETUP -#line 156 "lex.l" +#line 154 "lex.l" { ; } YY_BREAK case 69: /* rule 69 can match eol */ YY_RULE_SETUP -#line 157 "lex.l" +#line 155 "lex.l" { return ('\n'); } YY_BREAK case 70: YY_RULE_SETUP -#line 159 "lex.l" +#line 157 "lex.l" { yylval.ptr = (char *) yytext; return (STRING); } YY_BREAK case 71: YY_RULE_SETUP -#line 162 "lex.l" +#line 160 "lex.l" { fprintf(stderr, "xgc: bad character `%s', line %d\n", yytext, yylineno); } YY_BREAK case 72: YY_RULE_SETUP -#line 166 "lex.l" +#line 164 "lex.l" ECHO; YY_BREAK -#line 1408 "lex.c" +#line 1406 "lex.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2402,7 +2400,7 @@ #define YYTABLES_NAME "yytables" -#line 166 "lex.l" +#line 164 "lex.l" 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/xgc-1.0.2/lex.l new/xgc-1.0.3/lex.l --- old/xgc-1.0.2/lex.l 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/lex.l 2010-10-31 01:04:59.000000000 +0200 @@ -1,5 +1,3 @@ -/* $XConsortium: lex.l,v 1.8 94/03/31 20:40:44 rws Exp $ */ -/* $XFree86: xc/programs/xgc/lex.l,v 1.3 2000/04/05 18:14:07 dawes Exp $ */ /* ** lex file for xgc syntax */ 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/xgc-1.0.2/main.c new/xgc-1.0.3/main.c --- old/xgc-1.0.2/main.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/main.c 2010-10-31 01:04:59.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XConsortium: main.c,v 1.22 94/04/17 20:45:30 rws Exp $ */ /* Copyright (c) 1991 X Consortium @@ -28,7 +27,6 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xgc/main.c,v 1.6tsi Exp $ */ /* xgc ** 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/xgc-1.0.2/Makefile.am new/xgc-1.0.3/Makefile.am --- old/xgc-1.0.2/Makefile.am 2009-11-11 07:31:17.000000000 +0100 +++ new/xgc-1.0.3/Makefile.am 2010-10-31 01:04:59.000000000 +0200 @@ -46,7 +46,8 @@ xgc.man BUILT_SOURCES = gram.h gram.c lex.c -MAINTAINERCLEANFILES = $(BUILT_SOURCES) +MAINTAINERCLEANFILES = ChangeLog INSTALL +MAINTAINERCLEANFILES += $(BUILT_SOURCES) gram.h: gram.c @@ -77,36 +78,19 @@ EXTRA_DIST += $(appman_PRE) CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES += ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/xgc-1.0.2/planemask.c new/xgc-1.0.3/planemask.c --- old/xgc-1.0.2/planemask.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/planemask.c 2010-10-31 01:04:59.000000000 +0200 @@ -7,7 +7,6 @@ ** functions to create more than one of these planemask choice things ** will fail in a big way. */ -/* $XFree86: xc/programs/xgc/planemask.c,v 1.3 2000/02/17 14:00:37 dawes Exp $ */ #include <X11/Xos.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgc-1.0.2/record.c new/xgc-1.0.3/record.c --- old/xgc-1.0.2/record.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/record.c 2010-10-31 01:04:59.000000000 +0200 @@ -3,7 +3,6 @@ ** ** record.c */ -/* $XFree86: xc/programs/xgc/record.c,v 1.3 2000/02/17 14:00:37 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgc-1.0.2/testfrac.c new/xgc-1.0.3/testfrac.c --- old/xgc-1.0.2/testfrac.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/testfrac.c 2010-10-31 01:04:59.000000000 +0200 @@ -4,7 +4,6 @@ ** How to make a widget to choose the fraction of tests to be run. ** */ -/* $XFree86: xc/programs/xgc/testfrac.c,v 1.4 2003/05/07 21:02:07 herrb Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgc-1.0.2/tests.c new/xgc-1.0.3/tests.c --- old/xgc-1.0.2/tests.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/tests.c 2010-10-31 01:04:59.000000000 +0200 @@ -1,6 +1,4 @@ /* -** $XConsortium: tests.c,v 1.20 91/06/08 18:57:07 rws Exp $ -** $XFree86: xc/programs/xgc/tests.c,v 1.11tsi Exp $ ** */ 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/xgc-1.0.2/text.c new/xgc-1.0.3/text.c --- old/xgc-1.0.2/text.c 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/text.c 2010-10-31 01:04:59.000000000 +0200 @@ -6,7 +6,6 @@ ** How to make a text widget that returns a string when the cursor ** leaves its window. */ -/* $XFree86: xc/programs/xgc/text.c,v 1.3 2000/02/17 14:00:37 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgc-1.0.2/tile new/xgc-1.0.3/tile --- old/xgc-1.0.2/tile 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/tile 2010-10-31 01:04:59.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XFree86$ */ #if !defined(tile_width) && !defined(tile_height) 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/xgc-1.0.2/xgc.h new/xgc-1.0.3/xgc.h --- old/xgc-1.0.2/xgc.h 2009-10-16 23:39:25.000000000 +0200 +++ new/xgc-1.0.3/xgc.h 2010-10-31 01:04:59.000000000 +0200 @@ -3,7 +3,6 @@ ** ** xgc.h */ -/* $XFree86: xc/programs/xgc/xgc.h,v 1.5 2003/05/07 21:17:06 herrb Exp $ */ #include "constants.h" @@ -61,11 +60,6 @@ WidgetList widgets; } ChoiceDesc; -#ifndef HAS_SNPRINTF -#include <X11/Xmu/SysUtil.h> -#define snprintf XmuSnprintf -#endif - /************/ extern XStuff X; 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/xgc-1.0.2/xgc.man new/xgc-1.0.3/xgc.man --- old/xgc-1.0.2/xgc.man 2009-11-11 07:19:33.000000000 +0100 +++ new/xgc-1.0.3/xgc.man 2010-10-31 01:04:59.000000000 +0200 @@ -24,32 +24,26 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" Copyright 2009 Sun Microsystems, Inc. All rights reserved. +.\" Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the -.\" "Software"), to deal in the Software without restriction, including -.\" without limitation the rights to use, copy, modify, merge, publish, -.\" distribute, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, provided that the above -.\" copyright notice(s) and this permission notice appear in all copies of -.\" the Software and that both the above copyright notice(s) and this -.\" permission notice appear in supporting documentation. +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: .\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. .\" -.\" Except as contained in this notice, the name of a copyright holder -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" of the copyright holder. +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .\" .TH XGC 1 __xorgversion__ .SH NAME ++++++ xhost-1.0.3.tar.bz2 -> xhost-1.0.4.tar.bz2 ++++++ ++++ 9991 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/xhost-1.0.3/ChangeLog new/xhost-1.0.4/ChangeLog --- old/xhost-1.0.3/ChangeLog 2009-10-14 02:37:54.000000000 +0200 +++ new/xhost-1.0.4/ChangeLog 2010-10-30 18:50:15.000000000 +0200 @@ -1,3 +1,149 @@ +commit 76c0049c33330e5b454e7f563333a6d847092c65 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 09:49:40 2010 -0700 + + xhost 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit cb4a3d7f9ba598d38e9b17371146bd496c671246 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 09:47:20 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f390503a4ed8617a7e4f56828e78715e06823ff4 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 09:46:42 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 7b9927113c7b647d5ea2403ead68b2b3bf5dc470 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 09:45:58 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 93c1508449eb3d389ddf7bd40d0362b8b9fc2967 +Author: Jeremy Huddleston <jeremyhu(a)apple.com> +Date: Mon Oct 11 08:34:26 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Use the appropriate platform version of sed + + Based on patches in other modules from Gaetan Nadon <memsize(a)videotron.ca> + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)apple.com> + +commit 622150c9dc9136dbee3a6682dc400ece7f909725 +Author: Jeremy Huddleston <jeremyhu(a)apple.com> +Date: Thu Oct 7 15:12:23 2010 -0700 + + Remove the references to /etc/X*.hosts + + xhost(1) doesn't use these files, so the refernece to Xserver(1) is sufficient. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)apple.com> + Signed-off-by: Patrick E. Kane <pekane52 at gmail.com> + +commit 817ee597587852683935d9b2cd31e6b22572d7e5 +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:49 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + +commit 1035fb157cbbf75c6f8d31ba9df6c2e876538627 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Jan 14 22:15:06 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 74b20bee2563427cf32bf35dc531a9ba321cc533 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 5aa33f27a2867668bf80f6484bdca78919410952 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit aa14be48f8aac4da5e761d7341066e782062038b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit d089d697f53f892684c1c7640decbeb7ebf939aa +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit c8b11b9e04dae51ab7f39386af77bff66843a26d +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:20 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + commit 887b3da0c2cf25b1239b200fa82935cff61edc74 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Tue Oct 13 17:37:15 2009 -0700 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/xhost-1.0.3/config.h.in new/xhost-1.0.4/config.h.in --- old/xhost-1.0.3/config.h.in 2009-10-14 02:37:32.000000000 +0200 +++ new/xhost-1.0.4/config.h.in 2010-10-30 18:50:07.000000000 +0200 @@ -63,6 +63,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xhost-1.0.3/configure.ac new/xhost-1.0.4/configure.ac --- old/xhost-1.0.3/configure.ac 2009-10-14 02:37:00.000000000 +0200 +++ new/xhost-1.0.4/configure.ac 2010-10-30 18:49:20.000000000 +0200 @@ -1,28 +1,24 @@ # $XdotOrg: app/xhost/configure.ac,v 1.10 2005/12/15 00:24:07 kem Exp $ -AC_PREREQ([2.57]) -AC_INIT(xhost,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xhost) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xhost], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xhost]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - AC_TYPE_SIGNAL XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XHOST, x11 xmuu xau) -AC_SUBST(XHOST_CFLAGS) -AC_SUBST(XHOST_LIBS) # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS 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/xhost-1.0.3/COPYING new/xhost-1.0.4/COPYING --- old/xhost-1.0.3/COPYING 2006-07-11 04:53:04.000000000 +0200 +++ new/xhost-1.0.4/COPYING 2010-10-30 18:45:44.000000000 +0200 @@ -1,5 +1,25 @@ +Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + Copyright 1985, 1986, 1987, 1998 The Open Group -Copyright 2004 Sun Microsystems, Inc. All rights reserved. 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/xhost-1.0.3/INSTALL new/xhost-1.0.4/INSTALL --- old/xhost-1.0.3/INSTALL 2009-01-22 16:10:28.000000000 +0100 +++ new/xhost-1.0.4/INSTALL 2010-10-30 18:50:15.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xhost-1.0.3/Makefile.am new/xhost-1.0.4/Makefile.am --- old/xhost-1.0.3/Makefile.am 2009-10-14 02:15:32.000000000 +0200 +++ new/xhost-1.0.4/Makefile.am 2010-10-20 23:01:00.000000000 +0200 @@ -11,35 +11,19 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +dist-hook: ChangeLog INSTALL SUFFIXES = .$(APP_MAN_SUFFIX) .man 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/xhost-1.0.3/xhost.c new/xhost-1.0.4/xhost.c --- old/xhost-1.0.3/xhost.c 2009-01-22 16:10:28.000000000 +0100 +++ new/xhost-1.0.4/xhost.c 2010-10-30 18:45:28.000000000 +0200 @@ -1,9 +1,28 @@ -/* $Xorg: xhost.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */ -/* $XdotOrg: app/xhost/xhost.c,v 1.4 2005/06/18 08:03:35 alanc Exp $ */ +/* + * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ /* Copyright 1985, 1986, 1987, 1998 The Open Group -Copyright 2004 Sun Microsystems, Inc. All rights reserved. @@ -35,7 +54,6 @@ X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xhost/xhost.c,v 3.26 2003/07/27 14:05:45 herrb Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xhost-1.0.3/xhost.man new/xhost-1.0.4/xhost.man --- old/xhost-1.0.3/xhost.man 2007-04-11 23:51:16.000000000 +0200 +++ new/xhost-1.0.4/xhost.man 2010-10-30 18:45:05.000000000 +0200 @@ -1,8 +1,25 @@ -.\" $Xorg: xhost.man,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ -.\" $XdotOrg$ +.\" Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: +.\" +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .\" .\" Copyright 1988, 1998 The Open Group -.\" Copyright 2004 Sun Microsystems, Inc. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the @@ -31,8 +48,6 @@ .\" .\" X Window System is a trademark of The Open Group. .\" -.\" $XFree86: xc/programs/xhost/xhost.man,v 1.8tsi Exp $ -.\" .TH XHOST 1 __xorgversion__ .SH NAME xhost \- server access control program for X @@ -122,6 +137,11 @@ with a value of \fIalmas\fP. For more information on the available forms of server interpreted addresses, see the \fIXsecurity\fP(__miscmansuffix__) manual page. +.PP +The initial access control list for display number \fBn\fP +may be set by the file \fI/etc/X\fBn\fI.hosts\fR, where +\fBn\fP is the display number of the server. See \fIXserver\fP(1) +for details. .SH DIAGNOSTICS For each name added to the access control list, a line of the form "\fIname\fP being added to access control list" @@ -129,8 +149,6 @@ For each name removed from the access control list, a line of the form "\fIname\fP being removed from access control list" is printed. -.SH FILES -/etc/X*.hosts .SH "SEE ALSO" X(__miscmansuffix__), Xsecurity(__miscmansuffix__), Xserver(1), xdm(1), xauth(1), getaddrinfo(3) .SH ENVIRONMENT ++++++ xinit-1.2.1.tar.bz2 -> xinit-1.3.0.tar.bz2 ++++++ ++++ 12561 lines of diff (skipped) ++++++ xinit-client-session.patch ++++++ --- /var/tmp/diff_new_pack.oEKr7h/_old 2010-11-02 10:52:38.000000000 +0100 +++ /var/tmp/diff_new_pack.oEKr7h/_new 2010-11-02 10:52:38.000000000 +0100 @@ -1,27 +1,38 @@ -Index: xinit-1.1.1/xinit.c -=================================================================== ---- xinit-1.1.1.orig/xinit.c -+++ xinit-1.1.1/xinit.c -@@ -761,11 +761,21 @@ startClient(char *client[]) +--- xinit-1.3.0/xinit.c.orig 2010-06-12 03:14:10.000000000 +0200 ++++ xinit-1.3.0/xinit.c 2010-10-31 04:32:20.000000000 +0100 +@@ -91,6 +91,7 @@ char xserverrcbuf[256]; + + #define TRUE 1 + #define FALSE 0 ++#define ERR_EXIT 1 + + static char *default_server = "X"; + static char *default_display = ":0"; /* choose most efficient */ +@@ -562,6 +562,8 @@ startClient(char *client[]) { - setWindowPath(); - if ((clientpid = vfork()) == 0) { -+ int fd; - if (setuid(getuid()) == -1) { - Error("cannot change uid: %s\n", strerror(errno)); - _exit(ERR_EXIT); - } -- setpgid(0, getpid()); -+ fd = open ("/dev/null", O_RDONLY); + clientpid = fork(); + if (clientpid == 0) { ++ int fd; + -+ if (fd < 0) { -+ Error("cannot open /dev/null: %s\n", strerror(errno)); -+ _exit(ERR_EXIT); -+ } -+ close (STDIN_FILENO); -+ dup2 (fd, STDIN_FILENO); -+ close (fd); -+ setsid(); - environ = newenviron; - #ifdef __UNIXOS2__ - #undef environ + set_environment(); + setWindowPath(); + +@@ -569,7 +571,17 @@ startClient(char *client[]) + Error("cannot change uid"); + _exit(EXIT_FAILURE); + } +- setpgid(0, getpid()); ++ ++ fd = open ("/dev/null", O_RDONLY); ++ if (fd < 0) { ++ Error("cannot open /dev/null: %s\n", strerror(errno)); ++ _exit(ERR_EXIT); ++ } ++ close (STDIN_FILENO); ++ dup2 (fd, STDIN_FILENO); ++ close (fd); ++ setsid(); ++ + Execute(client); + Error("Unable to run program \"%s\"", client[0]); + ++++++ xkbcomp-1.1.1.tar.bz2 -> xkbcomp-1.2.0.tar.bz2 ++++++ ++++ 12573 lines of diff (skipped) ++++++ xkbevd-1.1.0.tar.bz2 -> xkbevd-1.1.1.tar.bz2 ++++++ ++++ 8891 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/xkbevd-1.1.0/ChangeLog new/xkbevd-1.1.1/ChangeLog --- old/xkbevd-1.1.0/ChangeLog 2009-10-17 03:31:44.000000000 +0200 +++ new/xkbevd-1.1.1/ChangeLog 2010-10-30 19:07:11.000000000 +0200 @@ -1,3 +1,128 @@ +commit 14e12f714eead3f0185ab7996d6a1a38897c25cc +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 10:06:46 2010 -0700 + + xkbevd 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit aeecae39e02786202e7a2567b8a73f12a1b0bc55 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Sep 23 20:40:35 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 63777386ce5be4f7f66ed36f5972cfc9238a6f90 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Sep 23 20:10:43 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 668a4e9b00e559c554a14a268fecc17683ce1f47 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit c8a5caedff1fd2ac6c542f4542009ff6eb3c2076 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Jul 18 10:07:41 2010 -0400 + + config: allow to build tarball when yacc is missing + + Autoconf does not handle this scenario as well as Automake does. + If cfgparse.c is already there, do not abort the configuration + if yacc is missing as it is not needed. + + If both cfgparse.c and yacc are missing, abort configuration. + Yacc is a required tool to build the package. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit cb6b4bc515442fa5e910e45c030e1382ae44468c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Jun 4 13:07:23 2010 -0400 + + config: add check for yacc to insure it is installed #27973 + + Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" + as a last resort, even if no programs have been found. Improve error + checking by issuing an error message if yacc is not found. The module + cannot build anyway. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 737bfb709a910795a827491459427b09e971643c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jan 7 21:54:30 2010 -0500 + + COPYING: replace stub with actual copyright notice + + Refer to xkbevd.c + Copyright (c) 1995 by Silicon Graphics Computer Systems + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 0358d3085622cb6af2639e0add7f69b3fdde1154 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit dc54248582dda953e6c0d8e9f357f644ef691319 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit c3ad5b8624255e32a391ffb463fea3f1b08f6410 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 8b0b5f5bc1ed1903e4eb18730250cb55066302d7 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit 9e80c1a80d0c741d31cf0e66c483a2d78700b2d3 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri Oct 16 18:30:52 2009 -0700 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/xkbevd-1.1.0/config.h.in new/xkbevd-1.1.1/config.h.in --- old/xkbevd-1.1.0/config.h.in 2009-10-17 03:31:17.000000000 +0200 +++ new/xkbevd-1.1.1/config.h.in 2010-10-30 19:07:07.000000000 +0200 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xkbevd-1.1.0/configure.ac new/xkbevd-1.1.1/configure.ac --- old/xkbevd-1.1.0/configure.ac 2009-10-17 03:30:44.000000000 +0200 +++ new/xkbevd-1.1.1/configure.ac 2010-10-30 19:06:34.000000000 +0200 @@ -20,27 +20,27 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xkbevd, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbevd) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xkbevd], [1.1.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xkbevd]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL AC_PROG_YACC +AC_PATH_PROG([YACC_INST], $YACC) +AC_CHECK_FILE([$srcdir/cfgparse.c], [], + [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y])]) XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XKBEVD, xkbfile x11) -AC_SUBST(XKBEVD_CFLAGS) -AC_SUBST(XKBEVD_LIBS) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbevd-1.1.0/COPYING new/xkbevd-1.1.1/COPYING --- old/xkbevd-1.1.0/COPYING 2006-07-11 04:53:13.000000000 +0200 +++ new/xkbevd-1.1.1/COPYING 2010-01-14 18:25:07.000000000 +0100 @@ -1,12 +1,22 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, and distribute this +software and its documentation for any purpose and without +fee is hereby granted, provided that the above copyright +notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution +of the software without specific prior written permission. +Silicon Graphics makes no representation about the suitability +of this software for any purpose. It is provided "as is" +without any express or implied warranty. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -All licensing questions regarding this software should be directed at the -Xorg mailing list: - -http://lists.freedesktop.org/mailman/listinfo/xorg +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +THE USE OR PERFORMANCE OF THIS SOFTWARE. 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/xkbevd-1.1.0/INSTALL new/xkbevd-1.1.1/INSTALL --- old/xkbevd-1.1.0/INSTALL 2006-07-11 04:53:13.000000000 +0200 +++ new/xkbevd-1.1.1/INSTALL 2010-10-30 19:07:11.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xkbevd-1.1.0/Makefile.am new/xkbevd-1.1.1/Makefile.am --- old/xkbevd-1.1.0/Makefile.am 2009-10-14 02:52:53.000000000 +0200 +++ new/xkbevd-1.1.1/Makefile.am 2010-09-24 05:39:47.000000000 +0200 @@ -39,7 +39,8 @@ xkbevd.man BUILT_SOURCES = cfgparse.c -MAINTAINERCLEANFILES = $(BUILT_SOURCES) +MAINTAINERCLEANFILES = ChangeLog INSTALL +MAINTAINERCLEANFILES += $(BUILT_SOURCES) # Sample configuration files EXTRA_DIST = example.cf xkbevd.cf @@ -51,36 +52,19 @@ EXTRA_DIST += $(appman_PRE) CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES += ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL ++++++ xkbutils-1.0.2.tar.bz2 -> xkbutils-1.0.3.tar.bz2 ++++++ ++++ 9616 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/xkbutils-1.0.2/ChangeLog new/xkbutils-1.0.3/ChangeLog --- old/xkbutils-1.0.2/ChangeLog 2009-10-17 03:47:31.000000000 +0200 +++ new/xkbutils-1.0.3/ChangeLog 2010-10-30 19:15:07.000000000 +0200 @@ -1,3 +1,182 @@ +commit 820d9be7cf4e501c931c4e31b38ddd2d55209ce2 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 10:14:38 2010 -0700 + + xkbutils 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 19b8c1dfc637245e306b34a3aef69370cfe8059b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Oct 1 17:36:33 2010 -0400 + + config: update direct dependencies for xkbvleds and xkbwatch + + Depends on xproto through the inclusion of X.h. + Depends on x11 through the inclusion of Xlib.h. + Depends on Xaw through the inclusion of XawInit.h + Depends on Xt through the inclusion of IntrinsicP.h + + Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 73401c0d6679ff6a1c06d732c192a69cf70a27fc +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Oct 1 17:34:53 2010 -0400 + + config: update direct dependencies for xkbbell + + Depends on xproto through the inclusion of Xproto.h. + Depends on inputproto through the inclusion of XI.h + Depends on x11 through the inclusion of Xlib.h. + Does not depend on xkbfile for headers or libs. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 5778996d90d7ddee169e1dbf48a11896ee2fd34c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Aug 8 10:55:06 2010 -0400 + + LED.c: remove unrequired X11/Xmu includes + + This removes a direct dependencies which was not reflected + in configure.ac. + Xaw privatly requires Xmu. + + Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 1f08410c81e7b9bb1fc5ac9e40e37c26906bfd0c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Sep 23 20:46:12 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit b7de2aa690fbf033e74427d1d37ffa49cbfd031a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Sep 23 20:10:43 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 03459ea3c60c19703c958b1f7199021168c49cdd +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 5b5542b8a581754a87ba0d466e403e1f47e17103 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Aug 6 09:19:28 2010 -0700 + + Sun copyrights are now owned by Oracle + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 7aa41989a5aede80b97a1306bd782842baf35bce +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Aug 6 09:17:10 2010 -0700 + + Add DEC notice from utils.c to COPYING + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit bd94930d9082095886f469965264dc352f0bbbb2 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Jan 14 22:46:10 2010 -0800 + + Add missing notices to COPYING file + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 5bed941fa0064823bfbe21c37729df02a5aa9b97 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Jan 14 22:18:41 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit d2d6d39c60fa224752066b9d0791306c5fd4efad +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jan 7 21:58:57 2010 -0500 + + COPYING: replace stub with actual copyright notice + + Refer to xkbwatch.c + Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit a8b01ac9a898ba8a5f273f1a0b50485b4ff61e2a +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 81f74707c1d2638c911067ba81356696f73c6d0c +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 5786d1deeab8fe6c6ed0481220e487e9ec5cfdf4 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit fac7fddbd5df94789d78cd0847dcd8684486d668 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 2ad523460c93e29d24a531894a7719b3b0b87e90 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit 33383dca28dc60473f677a302962413d504fc4f3 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri Oct 16 18:46:53 2009 -0700 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/xkbutils-1.0.2/compile new/xkbutils-1.0.3/compile --- old/xkbutils-1.0.2/compile 2009-10-17 03:47:13.000000000 +0200 +++ new/xkbutils-1.0.3/compile 2010-10-30 19:15:00.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2009-04-28.21; # UTC +scriptversion=2009-10-06.20; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software # Foundation, Inc. @@ -124,9 +124,9 @@ ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" 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/xkbutils-1.0.2/config.h.in new/xkbutils-1.0.3/config.h.in --- old/xkbutils-1.0.2/config.h.in 2009-10-17 03:47:11.000000000 +0200 +++ new/xkbutils-1.0.3/config.h.in 2010-10-30 19:15:00.000000000 +0200 @@ -45,6 +45,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xkbutils-1.0.2/configure.ac new/xkbutils-1.0.3/configure.ac --- old/xkbutils-1.0.2/configure.ac 2009-10-17 03:46:34.000000000 +0200 +++ new/xkbutils-1.0.3/configure.ac 2010-10-30 19:14:09.000000000 +0200 @@ -21,41 +21,29 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xkbutils, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbutils) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xkbutils], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xkbutils]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC AM_PROG_CC_C_O -AC_PROG_INSTALL - -XORG_DEFAULT_OPTIONS # xkbvleds checks -PKG_CHECK_MODULES(XKBVLEDS, xaw7) -AC_SUBST(XKBVLEDS_CFLAGS) -AC_SUBST(XKBVLEDS_LIBS) +PKG_CHECK_MODULES(XKBVLEDS, xproto xaw7 xt x11) # xkbbell checks -PKG_CHECK_MODULES(XKBBELL, xkbfile x11 inputproto) -AC_SUBST(XKBBELL_CFLAGS) -AC_SUBST(XKBBELL_LIBS) +PKG_CHECK_MODULES(XKBBELL, xproto inputproto x11) # xkbwatch checks -PKG_CHECK_MODULES(XKBWATCH, xaw7) -AC_SUBST(XKBWATCH_CFLAGS) -AC_SUBST(XKBWATCH_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG +PKG_CHECK_MODULES(XKBWATCH, xproto xaw7 xt x11) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkbutils-1.0.2/COPYING new/xkbutils-1.0.3/COPYING --- old/xkbutils-1.0.2/COPYING 2006-07-11 04:53:17.000000000 +0200 +++ new/xkbutils-1.0.3/COPYING 2010-08-06 18:17:57.000000000 +0200 @@ -1,12 +1,68 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (c) 1993, 1995 by Silicon Graphics Computer Systems, Inc. -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, and distribute this +software and its documentation for any purpose and without +fee is hereby granted, provided that the above copyright +notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution +of the software without specific prior written permission. +Silicon Graphics makes no representation about the suitability +of this software for any purpose. It is provided "as is" +without any express or implied warranty. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +THE USE OR PERFORMANCE OF THIS SOFTWARE. -All licensing questions regarding this software should be directed at the -Xorg mailing list: -http://lists.freedesktop.org/mailman/listinfo/xorg + COPYRIGHT 1990 + DIGITAL EQUIPMENT CORPORATION + MAYNARD, MASSACHUSETTS + ALL RIGHTS RESERVED. + +THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND +SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION. +DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE +FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED +WARRANTY. + +IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT +RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN +ADDITION TO THAT SET FORTH ABOVE. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Digital Equipment Corporation not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + + +Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. 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/xkbutils-1.0.2/INSTALL new/xkbutils-1.0.3/INSTALL --- old/xkbutils-1.0.2/INSTALL 2006-07-11 04:53:17.000000000 +0200 +++ new/xkbutils-1.0.3/INSTALL 2010-10-30 19:15:07.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xkbutils-1.0.2/LED.c new/xkbutils-1.0.3/LED.c --- old/xkbutils-1.0.2/LED.c 2008-12-01 19:08:14.000000000 +0100 +++ new/xkbutils-1.0.3/LED.c 2010-10-05 02:53:55.000000000 +0200 @@ -31,8 +31,6 @@ #include <X11/Xos.h> #include <X11/Xaw/XawInit.h> #include "LEDP.h" -#include <X11/Xmu/Converters.h> -#include <X11/Xmu/Drawing.h> #include <stdio.h> #include <ctype.h> /* needed for abs() */ 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/xkbutils-1.0.2/Makefile.am new/xkbutils-1.0.3/Makefile.am --- old/xkbutils-1.0.2/Makefile.am 2009-10-17 03:41:41.000000000 +0200 +++ new/xkbutils-1.0.3/Makefile.am 2010-09-24 05:44:52.000000000 +0200 @@ -50,37 +50,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES = ChangeLog - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -SED = sed - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/xkbutils-1.0.2/xkbbell.man new/xkbutils-1.0.3/xkbbell.man --- old/xkbutils-1.0.2/xkbbell.man 2008-08-19 00:48:34.000000000 +0200 +++ new/xkbutils-1.0.3/xkbbell.man 2010-08-06 18:18:48.000000000 +0200 @@ -1,30 +1,23 @@ -.\" Copyright 2008 Sun Microsystems, Inc. All rights reserved. -.\" Use subject to license terms. +.\" Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the -.\" "Software"), to deal in the Software without restriction, including -.\" without limitation the rights to use, copy, modify, merge, publish, -.\" distribute, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, provided that the above -.\" copyright notice(s) and this permission notice appear in all copies of -.\" the Software and that both the above copyright notice(s) and this -.\" permission notice appear in supporting documentation. +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: .\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. .\" -.\" Except as contained in this notice, the name of a copyright holder -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" of the copyright holder. +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .TH xkbbell __appmansuffix__ __xorgversion__ .SH NAME xkbbell - XKB extension user utility 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/xkbutils-1.0.2/xkbvleds.man new/xkbutils-1.0.3/xkbvleds.man --- old/xkbutils-1.0.2/xkbvleds.man 2008-08-19 00:49:25.000000000 +0200 +++ new/xkbutils-1.0.3/xkbvleds.man 2010-08-06 18:18:48.000000000 +0200 @@ -1,30 +1,23 @@ -.\" Copyright 2008 Sun Microsystems, Inc. All rights reserved. -.\" Use subject to license terms. +.\" Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the -.\" "Software"), to deal in the Software without restriction, including -.\" without limitation the rights to use, copy, modify, merge, publish, -.\" distribute, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, provided that the above -.\" copyright notice(s) and this permission notice appear in all copies of -.\" the Software and that both the above copyright notice(s) and this -.\" permission notice appear in supporting documentation. +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: .\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. .\" -.\" Except as contained in this notice, the name of a copyright holder -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" of the copyright holder. +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .TH xkbvleds __appmansuffix__ __xorgversion__ .SH NAME xkbvleds \- XKB extension user utility 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/xkbutils-1.0.2/xkbwatch.man new/xkbutils-1.0.3/xkbwatch.man --- old/xkbutils-1.0.2/xkbwatch.man 2008-08-19 00:45:07.000000000 +0200 +++ new/xkbutils-1.0.3/xkbwatch.man 2010-08-06 18:18:48.000000000 +0200 @@ -1,30 +1,23 @@ -.\" Copyright 2008 Sun Microsystems, Inc. All rights reserved. -.\" Use subject to license terms. +.\" Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the -.\" "Software"), to deal in the Software without restriction, including -.\" without limitation the rights to use, copy, modify, merge, publish, -.\" distribute, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, provided that the above -.\" copyright notice(s) and this permission notice appear in all copies of -.\" the Software and that both the above copyright notice(s) and this -.\" permission notice appear in supporting documentation. +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: .\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. .\" -.\" Except as contained in this notice, the name of a copyright holder -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" of the copyright holder. +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .TH xkbwatch __appmansuffix__ __xorgversion__ .SH NAME xkbwatch - XKB extension user utility ++++++ xlogo-1.0.2.tar.bz2 -> xlogo-1.0.3.tar.bz2 ++++++ ++++ 5042 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/xlogo-1.0.2/ChangeLog new/xlogo-1.0.3/ChangeLog --- old/xlogo-1.0.2/ChangeLog 2009-12-11 07:33:40.000000000 +0100 +++ new/xlogo-1.0.3/ChangeLog 2010-10-31 01:59:17.000000000 +0200 @@ -1,3 +1,105 @@ +commit 6d8da24e45c124162b06529290366d465f1df499 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 16:58:57 2010 -0700 + + xlogo 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit b7d9388a51cc90d4ed72aa6fc28c3673c15d3a18 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Sep 24 08:12:50 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 81aec653b14836ca0588166fb826171fb118adca +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit f407f555d4ac750199be8c460e2c30228e8588ac +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Aug 6 11:22:34 2010 -0700 + + Fill in COPYING file with copyright notices from source code + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 0f9f099172329dfcb254d2ce1394eae064ad88f9 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Jul 1 18:26:43 2010 -0700 + + Combine dependencies into a single call to PKG_CHECK_MODULES + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit da7d99707d0ee12c583fe2b083f6ec7abaaab8fb +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Jul 1 18:20:01 2010 -0700 + + Xmu functions are called directly, so include it in PKG_CHECK_MODULES + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 9e0e31869b90f031605ca77f5645014c6de3705b +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 23:25:03 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use XORG_DEFAULT_OPTIONS provided $(SED) + Use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f7f0ba3c8fff55c8a38b0786828a372c1dc72715 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Apr 16 15:59:54 2010 -0700 + + Add dependency on libSM since xlogo calls SmcCloseConnection + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 5a6a92096883c1618ffb0bfc8c44509e42003044 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:07 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 1ba50ffb7746f902a678865584eb1fd0c946bda5 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Dec 19 20:48:48 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + commit f826c5af5514da12ee146c61698d4545af391434 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Thu Dec 10 22:33:05 2009 -0800 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/xlogo-1.0.2/configure.ac new/xlogo-1.0.3/configure.ac --- old/xlogo-1.0.2/configure.ac 2009-12-11 07:32:50.000000000 +0100 +++ new/xlogo-1.0.3/configure.ac 2010-10-31 01:58:46.000000000 +0200 @@ -20,25 +20,23 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xlogo, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xlogo) +AC_PREREQ([2.60]) +AC_INIT([xlogo], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xlogo]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - -# Checks for pkg-config packages -PKG_CHECK_MODULES(XLOGO, xaw7 xt) +# Base set of required pkg-config packages +XLOGO_DEPS="sm xaw7 xmu xt xext x11" # Use render & xft2 to draw logo? @@ -51,25 +49,15 @@ fi if test "x$USE_RENDER" = "xyes" ; then - PKG_CHECK_MODULES(XRENDER, xrender) - PKG_CHECK_MODULES(XFT, xft) + XLOGO_DEPS="xft xrender $XLOGO_DEPS" AC_DEFINE(XRENDER, 1, [Define to 1 to use Xrender & Xft2 to draw logo]) - - XLOGO_CFLAGS="$XLOGO_CFLAGS $XRENDER_CFLAGS $XFT_CFLAGS" - XLOGO_LIBS="$XLOGO_LIBS $XRENDER_LIBS $XFT_LIBS" fi -PKG_CHECK_MODULES(XEXT, xext) -XLOGO_CFLAGS="$XLOGO_CFLAGS $XEXT_CFLAGS" -XLOGO_LIBS="$XLOGO_LIBS $XEXT_LIBS" - -XLOGO_CFLAGS="$CWARNFLAGS $XLOGO_CFLAGS" -AC_SUBST(XLOGO_CFLAGS) -AC_SUBST(XLOGO_LIBS) +PKG_CHECK_MODULES(XLOGO, $XLOGO_DEPS) PKG_CHECK_MODULES(APPDEFS, xt) -xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` AC_ARG_WITH(appdefaultdir, AC_HELP_STRING([--with-appdefaultdir=<pathname>], [specify directory for app-defaults files (default is autodetected)]), 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/xlogo-1.0.2/COPYING new/xlogo-1.0.3/COPYING --- old/xlogo-1.0.2/COPYING 2009-10-16 23:39:41.000000000 +0200 +++ new/xlogo-1.0.3/COPYING 2010-08-06 20:21:40.000000000 +0200 @@ -1,12 +1,24 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1988, 1990, 1993 1994, 1998 The Open Group +Copyright 2004 Roland Mainz <roland.mainz(a)nrubsig.org> -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. 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/xlogo-1.0.2/Makefile.am new/xlogo-1.0.3/Makefile.am --- old/xlogo-1.0.2/Makefile.am 2009-12-11 07:32:50.000000000 +0100 +++ new/xlogo-1.0.3/Makefile.am 2010-07-02 03:17:42.000000000 +0200 @@ -20,7 +20,7 @@ bin_PROGRAMS = xlogo -AM_CFLAGS = $(XLOGO_CFLAGS) +AM_CFLAGS = $(XLOGO_CFLAGS) $(CWARNFLAGS) xlogo_LDADD = $(XLOGO_LIBS) xlogo_SOURCES = \ @@ -53,27 +53,9 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ ++++++ xmag-1.0.3.tar.bz2 -> xmag-1.0.4.tar.bz2 ++++++ ++++ 13734 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/xmag-1.0.3/app-defaults/Xmag new/xmag-1.0.4/app-defaults/Xmag --- old/xmag-1.0.3/app-defaults/Xmag 2009-01-13 06:48:03.000000000 +0100 +++ new/xmag-1.0.4/app-defaults/Xmag 2010-10-31 02:18:29.000000000 +0200 @@ -1,5 +1,3 @@ -! $Xorg: Xmag.ad,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ -! $XFree86$ *Font: fixed *pane2*orientation: horizontal *pane2*showGrip: False 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/xmag-1.0.3/ChangeLog new/xmag-1.0.4/ChangeLog --- old/xmag-1.0.3/ChangeLog 2009-08-03 20:20:16.000000000 +0200 +++ new/xmag-1.0.4/ChangeLog 2010-10-31 02:23:13.000000000 +0200 @@ -1,3 +1,155 @@ +commit 63cee7f38dc37fda89dc5aa689634bd8aeffabda +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:22:41 2010 -0700 + + xmag 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d41f3ae0b0e383ba2e622e3dd9999d3c09f90091 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:20:18 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 9475bf19a6544f522357f59bd1b04ec7685e3eb8 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:19:07 2010 -0700 + + Purge CVS version tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit cc7172d187ad35a1b851961cc9c588e56c3894fa +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 17:17:49 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 36ac8aaf057d0ae35d63e568667f1aebcfa2e56e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Aug 6 15:04:26 2010 -0700 + + Fill in COPYING file with copyright notices from source code + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e9a1886d9e2a89995c2094b37000e12da4791cbf +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Jul 1 18:29:03 2010 -0700 + + Xmu functions are called directly, so include it in PKG_CHECK_MODULES + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit b7544beaad218b5799018fe1dca84815a14bbfa4 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 23:25:03 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f7ef4087a4bf87618e9b84ff7726f3f08fd018ca +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Feb 11 10:08:07 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit b20bf366aa045549221c6b0fb3aa7b7fda43b3a5 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Dec 19 20:48:48 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 3e597fcfe489f9eb9057b0b8a7fe3f75925b23d2 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit a060a628982782ca24e2a4cfa5654b068b935e61 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit c1642cd3036e03c8f42c833d2f321b51a62083df +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 91ce3b21ef889d857bfb898bbd85f774721bb26b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 6802cc3ec6357529605ec994c9d531f3ca9e3561 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit de39a50709190e16a6f357e0be673db04d26b4a6 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Oct 1 14:54:26 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + commit f1f2af7a65d6531814a06b292a28bdc46580e590 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Aug 3 11:19:07 2009 -0700 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/xmag-1.0.3/config.h.in new/xmag-1.0.4/config.h.in --- old/xmag-1.0.3/config.h.in 2009-08-03 20:20:06.000000000 +0200 +++ new/xmag-1.0.4/config.h.in 2010-10-31 02:23:06.000000000 +0200 @@ -51,6 +51,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xmag-1.0.3/configure.ac new/xmag-1.0.4/configure.ac --- old/xmag-1.0.3/configure.ac 2009-08-03 20:18:44.000000000 +0200 +++ new/xmag-1.0.4/configure.ac 2010-10-31 02:22:25.000000000 +0200 @@ -21,40 +21,31 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xmag, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmag) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xmag], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xmag]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - -XORG_CWARNFLAGS - AC_CHECK_FUNCS([nanosleep poll select]) # Checks for pkg-config packages -PKG_CHECK_MODULES(XMAG, xaw7) -XMAG_CFLAGS="$CWARNFLAGS $XMAG_CFLAGS" -AC_SUBST(XMAG_CFLAGS) -AC_SUBST(XMAG_LIBS) +PKG_CHECK_MODULES(XMAG, xaw7 xmu xt x11) -PKG_CHECK_MODULES(APPDEFS, xt) -xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` AC_ARG_WITH(appdefaultdir, AC_HELP_STRING([--with-appdefaultdir=<pathname>], [specify directory for app-defaults files (default is autodetected)]), [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmag-1.0.3/COPYING new/xmag-1.0.4/COPYING --- old/xmag-1.0.3/COPYING 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/COPYING 2010-10-31 02:17:29.000000000 +0200 @@ -1,12 +1,48 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1989, 1990, 1991, 1993, 1994, 1998 The Open Group -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. + + +Copyright (C) 1999 The XFree86 Project, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from the +XFree86 Project. 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/xmag-1.0.3/CutPaste.c new/xmag-1.0.4/CutPaste.c --- old/xmag-1.0.3/CutPaste.c 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/CutPaste.c 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: CutPaste.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/CutPaste.c,v 1.5 2001/01/17 23:46:19 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium */ 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/xmag-1.0.3/CutPaste.h new/xmag-1.0.4/CutPaste.h --- old/xmag-1.0.3/CutPaste.h 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/CutPaste.h 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/xmag/CutPaste.h,v 1.1 1999/03/07 11:41:12 dawes Exp $ */ /* * Copyright (C) 1999 The XFree86 Project, Inc. All Rights Reserved. * 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/xmag-1.0.3/INSTALL new/xmag-1.0.4/INSTALL --- old/xmag-1.0.3/INSTALL 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/INSTALL 2010-10-31 02:23:13.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xmag-1.0.3/Makefile.am new/xmag-1.0.4/Makefile.am --- old/xmag-1.0.3/Makefile.am 2009-01-13 06:48:03.000000000 +0100 +++ new/xmag-1.0.4/Makefile.am 2010-10-31 02:17:29.000000000 +0200 @@ -21,7 +21,7 @@ bin_PROGRAMS = xmag -AM_CFLAGS = $(XMAG_CFLAGS) +AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS) xmag_LDADD = $(XMAG_LIBS) -lm xmag_SOURCES = \ @@ -57,38 +57,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/xmag-1.0.3/missing new/xmag-1.0.4/missing --- old/xmag-1.0.3/missing 2009-08-03 20:20:07.000000000 +0200 +++ new/xmag-1.0.4/missing 2010-10-31 02:23:06.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmag-1.0.3/README new/xmag-1.0.4/README --- old/xmag-1.0.3/README 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/README 2010-10-31 02:17:29.000000000 +0200 @@ -0,0 +1,25 @@ +xmag displays a magnified snapshot of a portion of an X11 screen. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/xmag + + http://cgit.freedesktop.org/xorg/app/xmag + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + 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/xmag-1.0.3/RootWin.c new/xmag-1.0.4/RootWin.c --- old/xmag-1.0.3/RootWin.c 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/RootWin.c 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: RootWin.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,7 +25,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/RootWin.c,v 1.4 2001/01/17 23:46:20 dawes Exp $ */ #include <X11/IntrinsicP.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmag-1.0.3/RootWin.h new/xmag-1.0.4/RootWin.h --- old/xmag-1.0.3/RootWin.h 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/RootWin.h 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: RootWin.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group 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/xmag-1.0.3/RootWinP.h new/xmag-1.0.4/RootWinP.h --- old/xmag-1.0.3/RootWinP.h 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/RootWinP.h 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: RootWinP.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group 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/xmag-1.0.3/Scale.c new/xmag-1.0.4/Scale.c --- old/xmag-1.0.3/Scale.c 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/Scale.c 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: Scale.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/Scale.c,v 3.8 2001/07/25 15:05:26 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium 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/xmag-1.0.3/Scale.h new/xmag-1.0.4/Scale.h --- old/xmag-1.0.3/Scale.h 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/Scale.h 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: Scale.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/Scale.h,v 1.4 2001/01/17 23:46:20 dawes Exp $ */ #ifndef _XawScale_h #define _XawScale_h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmag-1.0.3/ScaleP.h new/xmag-1.0.4/ScaleP.h --- old/xmag-1.0.3/ScaleP.h 2006-07-11 04:53:36.000000000 +0200 +++ new/xmag-1.0.4/ScaleP.h 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: ScaleP.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group 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/xmag-1.0.3/xmag.c new/xmag-1.0.4/xmag.c --- old/xmag-1.0.3/xmag.c 2009-01-13 06:48:03.000000000 +0100 +++ new/xmag-1.0.4/xmag.c 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: xmag.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +25,6 @@ from The Open Group. */ -/* $XFree86: xmag.c,v 1.13 2003/05/27 22:27:07 tsi Exp $ */ #include "config.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmag-1.0.3/xmag.man new/xmag-1.0.4/xmag.man --- old/xmag-1.0.3/xmag.man 2007-05-19 09:03:39.000000000 +0200 +++ new/xmag-1.0.4/xmag.man 2010-10-31 02:17:29.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: xmag.man,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ .\" Copyright 1991, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xmag/xmag.man,v 1.6 2001/01/27 18:21:18 dawes Exp $ .\" .TH XMAG 1 __xorgversion__ .SH NAME ++++++ xman-1.1.0.tar.bz2 -> xman-1.1.1.tar.bz2 ++++++ ++++ 9401 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/xman-1.1.0/ChangeLog new/xman-1.1.1/ChangeLog --- old/xman-1.1.0/ChangeLog 2009-10-16 23:10:19.000000000 +0200 +++ new/xman-1.1.1/ChangeLog 2010-10-31 02:32:13.000000000 +0200 @@ -1,3 +1,144 @@ +commit bee5d67ab054decda85e2ba2fc70cf8a53b74fcd +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:31:47 2010 -0700 + + xman 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 689cb1e03b0feb46bf198a468e4cc5c91ff59aa6 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:29:22 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 98f366e764334a853b291b84856996e3dfad8959 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:28:38 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 8d75f5d9e4c2c1f819dfc4e523ad88a2a0b0e251 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 17:28:03 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit fd30b754d17685ad971294ce31e34de5fede5a25 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Aug 8 12:00:53 2010 -0400 + + config: update direct dependencies for xman + + Depends on xproto through the inclusion of X.h. + Depends on Xaw through the inclusion of List.h + Depends on Xmu through the inclusion of Xmu/Misc.h + Depends on Xt through the inclusion of Intrinsic.h + + PKG_CHECK_MODULES calls AC_SUBST for CFLAGS and LIBS + + Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 96224f67f30830c2b49045313dfa746d155c56bf +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Aug 6 15:08:24 2010 -0700 + + Fill in COPYING file with copyright notices from source code + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 522ee7a23d31a0a0e359922d1194214db215bb6f +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Feb 10 17:28:55 2010 -0500 + + make: remove version.h from xman_SOURCES + + Commit cac7f814053ddbc8ec14666cfe85adc34344220f + removed the file from git. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit b36ab48574afae17c7701bc55a3a0d6a971c3ced +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Dec 19 20:48:48 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 9b52967330f1c6466a5b8729ad36a0a96b3dcd62 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 05e1d899bc5df593b2fff79753aa7a53a8cc18aa +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 8cdd724d38f63ca07b75e106db3d087c53f67eed +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 350724e6ee4a77586fcd8f026305a72cb3a9d3ca +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit cac7f814053ddbc8ec14666cfe85adc34344220f +Author: Matthieu Herrb <matthieu.herrb(a)laas.fr> +Date: Tue Oct 27 22:45:12 2009 +0100 + + Fix version display. + + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + + Signed-off-by: Matthieu Herrb <matthieu.herrb(a)laas.fr> + commit b82eb1279acc60f9ebb93730ac002dfde2118a4b Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri Oct 16 14:10:04 2009 -0700 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/xman-1.1.0/config.h.in new/xman-1.1.1/config.h.in --- old/xman-1.1.0/config.h.in 2009-10-16 23:09:14.000000000 +0200 +++ new/xman-1.1.1/config.h.in 2010-10-31 02:32:09.000000000 +0200 @@ -63,6 +63,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -75,6 +78,9 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL +/* Release version string if set */ +#undef RELEASE_VERSION + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS 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/xman-1.1.0/configure.ac new/xman-1.1.1/configure.ac --- old/xman-1.1.0/configure.ac 2009-10-16 23:09:03.000000000 +0200 +++ new/xman-1.1.1/configure.ac 2010-10-31 02:31:35.000000000 +0200 @@ -21,24 +21,22 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xman, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xman) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xman], [1.1.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xman]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL AC_CANONICAL_HOST -XORG_DEFAULT_OPTIONS - AC_CHECK_FUNC([mkstemp], AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.])) @@ -67,8 +65,8 @@ [Default local man page search path (default: none)]) fi -# Checks for pkg-config packages -PKG_CHECK_MODULES(XMAN, xaw7) +# Obtain compiler/linker options from depedencies +PKG_CHECK_MODULES(XMAN, xproto xaw7 xmu xt) AC_ARG_WITH(manconfig, AC_HELP_STRING([--with-manconfig=<filename>], @@ -130,15 +128,17 @@ AC_MSG_ERROR([Could not determine man page file config format.]) esac fi -AC_SUBST(XMAN_CFLAGS) -AC_SUBST(XMAN_LIBS) PKG_CHECK_MODULES(APPDEFS, xt) -xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` AC_ARG_WITH(appdefaultdir, AC_HELP_STRING([--with-appdefaultdir=<pathname>], [specify directory for app-defaults files (default is autodetected)]), [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) +if test "x$RELEASE_VERSION" != "x"; then + AC_DEFINE_UNQUOTED([RELEASE_VERSION], "$RELEASE_VERSION", + [Release version string if set]) +fi AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xman-1.1.0/COPYING new/xman-1.1.1/COPYING --- old/xman-1.1.0/COPYING 2006-07-11 04:53:39.000000000 +0200 +++ new/xman-1.1.1/COPYING 2010-08-07 00:08:15.000000000 +0200 @@ -1,12 +1,47 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (c) 1987, 1988, 1989, 1991 X Consortium -Please submit updated COPYING files to the Xorg bugzilla: +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg +Except as contained in this notice, the name of the X Consortium shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from the X Consortium. + +Copyright 2004 Roland Mainz <roland.mainz(a)nrubsig.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. 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/xman-1.1.0/handler.c new/xman-1.1.1/handler.c --- old/xman-1.1.0/handler.c 2009-01-14 00:32:22.000000000 +0100 +++ new/xman-1.1.1/handler.c 2009-11-07 02:58:29.000000000 +0100 @@ -35,6 +35,9 @@ * Author: Chris D. Peterson, MIT Project Athena * Created: October 29, 1987 */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include <sys/types.h> #include <sys/stat.h> @@ -45,6 +48,12 @@ #include "print.h" #endif /* INCLUDE_XPRINT_SUPPORT */ +#ifdef RELEASE_VERSION +#define XMAN_VERSION "Xman Version " PACKAGE_VERSION " - X11R" RELEASE_VERSION +#else +#define XMAN_VERSION "Xman Version " PACKAGE_VERSION +#endif + static void PutUpManpage(ManpageGlobals * man_globals, FILE * file); static void ToggleBothShownState(ManpageGlobals * man_globals); 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/xman-1.1.0/INSTALL new/xman-1.1.1/INSTALL --- old/xman-1.1.0/INSTALL 2006-07-11 04:53:39.000000000 +0200 +++ new/xman-1.1.1/INSTALL 2010-10-31 02:32:13.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xman-1.1.0/Makefile.am new/xman-1.1.1/Makefile.am --- old/xman-1.1.0/Makefile.am 2009-10-16 03:19:05.000000000 +0200 +++ new/xman-1.1.1/Makefile.am 2010-10-31 02:28:24.000000000 +0200 @@ -48,8 +48,7 @@ search.c \ tkfuncs.c \ vendor.c \ - vendor.h \ - version.h + vendor.h appman_PRE = \ xman.man @@ -67,38 +66,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL 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/xman-1.1.0/man.h new/xman-1.1.1/man.h --- old/xman-1.1.0/man.h 2009-01-14 00:32:22.000000000 +0100 +++ new/xman-1.1.1/man.h 2009-11-07 02:58:29.000000000 +0100 @@ -70,7 +70,6 @@ #include "ScrollByL.h" -#include "version.h" #include "defs.h" /* Turn a NULL pointer string into an empty string */ 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/xman-1.1.0/version.h new/xman-1.1.1/version.h --- old/xman-1.1.0/version.h 2006-07-11 04:53:39.000000000 +0200 +++ new/xman-1.1.1/version.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -/* $XConsortium: version.h,v 1.11 94/04/17 20:44:00 gildea Exp $ */ -/* - -Copyright (c) 1987, 1988 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from the X Consortium. - -*/ - -#define XMAN_VERSION "Xman Version 3.2.0 - X11R7.0" ++++++ xmh-X11R7.0-1.0.1.tar.bz2 -> xmh-1.0.2.tar.bz2 ++++++ ++++ 19194 lines of diff (skipped) ++++++ xprop-1.1.0.tar.bz2 -> xprop-1.2.0.tar.bz2 ++++++ ++++ 9405 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/xprop-1.1.0/ChangeLog new/xprop-1.2.0/ChangeLog --- old/xprop-1.1.0/ChangeLog 2009-10-12 22:36:44.000000000 +0200 +++ new/xprop-1.2.0/ChangeLog 2010-10-30 20:19:12.000000000 +0200 @@ -1,3 +1,152 @@ +commit b8f740b195888cf530e4982ba3e9a3760b40f3bc +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:06:48 2010 -0700 + + xprop 1.2.0 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 1640fcc34a9883898b07789949e3a3af9d398c15 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:04:08 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 509973583996c7bd279ea9276731fb00dd104861 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:03:24 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit aa09594696443397b723e441050012cada351210 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 11:02:43 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 4488937f380d775290e84b720007a736d4390c25 +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:50 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 64045bdb44d0e026a76ce1ebb00671e622b74ae6 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Jan 7 22:10:50 2010 -0500 + + COPYING: replace stub with copyright notices + + Refer to xprop.c clientwin.h + Copyright 1990, 1998 The Open Group + Copyright (c) 2000 The XFree86 Project, Inc. + Copyright 2007 Kim woelders + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit bff28ee6ca1fa714797d5e675616e71ff6f2c9db +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 418f388067aa8650bf88410a7f82894225c1d77d +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 8cb541fa176d88415b5b7032f19cedd389697a22 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 6d322cf0d7799e63291665cb8a708f2b22e99ec2 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:16 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit d32aaf2131358fe3f8a0a6f376568f5109279660 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:21 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + +commit eb64005382abf6262c913a46e6186e019a179d59 +Author: Yang Zhao <yang(a)yangman.ca> +Date: Tue Oct 20 19:50:28 2009 -0400 + + Print UTF8_STRING type as UTF-8 when locale supports it + + Introduces 'u' format character, which behaves like 's', but leaves + UTF-8 encoding intact. + + Property value is checked for UTF-8 validity according to RFC 3629. + If invalid, an error string is printed, followed by the string formatted + using 's'. ie: + + PROP(UTF8_STRING) = <Invalid UTF-8 string: Forbidden value> "\374\233" + + Signed-off-by: Yang Zhao <yang(a)yangman.ca> + Signed-off-by: James Cloos <cloos(a)jhcloos.com> + commit 681d16ec9843b5c001cff1c9bc0637b8ba0c9abd Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Oct 12 13:35:11 2009 -0700 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/xprop-1.1.0/config.h.in new/xprop-1.2.0/config.h.in --- old/xprop-1.1.0/config.h.in 2009-10-12 22:35:32.000000000 +0200 +++ new/xprop-1.2.0/config.h.in 2010-10-30 20:19:05.000000000 +0200 @@ -51,6 +51,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xprop-1.1.0/configure.ac new/xprop-1.2.0/configure.ac --- old/xprop-1.1.0/configure.ac 2009-10-12 22:35:00.000000000 +0200 +++ new/xprop-1.2.0/configure.ac 2010-10-30 20:06:17.000000000 +0200 @@ -20,29 +20,24 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xprop,[1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xprop) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xprop], [1.2.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xprop]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) - -AC_PROG_CC -AC_PROG_INSTALL - + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AC_CHECK_HEADERS([wchar.h wctype.h langinfo.h]) # Checks for pkg-config packages PKG_CHECK_MODULES(XPROP, x11) -AC_SUBST(XPROP_CFLAGS) -AC_SUBST(XPROP_LIBS) XORG_WITH_LINT 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/xprop-1.1.0/COPYING new/xprop-1.2.0/COPYING --- old/xprop-1.1.0/COPYING 2006-07-11 04:54:02.000000000 +0200 +++ new/xprop-1.2.0/COPYING 2010-01-14 18:26:21.000000000 +0100 @@ -1,12 +1,44 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1990, 1998 The Open Group +Copyright (c) 2000 The XFree86 Project, Inc. -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. -http://lists.freedesktop.org/mailman/listinfo/xorg +Copyright 2007 Kim woelders + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of the copyright holders not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holders make no representations +about the suitability of this software for any purpose. It is provided "as +is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. 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/xprop-1.1.0/dsimple.c new/xprop-1.2.0/dsimple.c --- old/xprop-1.1.0/dsimple.c 2009-05-07 16:21:46.000000000 +0200 +++ new/xprop-1.2.0/dsimple.c 2010-10-07 05:37:51.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: dsimple.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.6 2001/12/14 20:02:09 dawes Exp $ */ #include <X11/Xos.h> #include <X11/Xlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xprop-1.1.0/dsimple.h new/xprop-1.2.0/dsimple.h --- old/xprop-1.1.0/dsimple.h 2009-05-07 16:21:46.000000000 +0200 +++ new/xprop-1.2.0/dsimple.h 2010-10-07 05:37:51.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: dsimple.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.8 2002/12/24 17:43:01 tsi Exp $ */ /* * Just_display.h: This file contains the definitions needed to use the 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/xprop-1.1.0/INSTALL new/xprop-1.2.0/INSTALL --- old/xprop-1.1.0/INSTALL 2006-07-11 04:54:02.000000000 +0200 +++ new/xprop-1.2.0/INSTALL 2010-10-30 20:19:12.000000000 +0200 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + 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/xprop-1.1.0/Makefile.am new/xprop-1.2.0/Makefile.am --- old/xprop-1.1.0/Makefile.am 2009-10-12 22:06:22.000000000 +0200 +++ new/xprop-1.2.0/Makefile.am 2010-10-30 20:03:07.000000000 +0200 @@ -39,38 +39,23 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +dist-hook: ChangeLog INSTALL SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xprop-1.1.0/xprop.c new/xprop-1.2.0/xprop.c --- old/xprop-1.1.0/xprop.c 2009-05-07 16:21:46.000000000 +0200 +++ new/xprop-1.2.0/xprop.c 2010-10-07 05:37:51.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: xprop.c,v 1.6 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -27,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */ #include "config.h" @@ -409,6 +407,7 @@ {"RECTANGLE", XA_RECTANGLE, "16iicc", RECTANGLE_DFORMAT }, {"RGB_COLOR_MAP", XA_RGB_COLOR_MAP,"32xcccccccxx",RGB_COLOR_MAP_DFORMAT}, {"STRING", XA_STRING, "8s", 0 }, + {"UTF8_STRING", 0, "8u", 0 }, {"WINDOW", XA_WINDOW, "32x", ": window id # $0+\n" }, {"VISUALID", XA_VISUALID, "32x", ": visual id # $0\n" }, {"WM_COLORMAP_WINDOWS", 0, "32x", ": window id # $0+\n"}, @@ -683,7 +682,7 @@ } static void -_format_char (char c) +_format_char (char c, int unicode) { switch (c) { case '\\': @@ -701,17 +700,21 @@ break; default: if (!c_isprint(c)) { - _put_char('\\'); - snprintf(_buf_ptr, _buf_len, "%03o", (unsigned char) c); - _buf_ptr += 3; - _buf_len -= 3; + if (unicode && (c & 0x80)) { + _put_char(c); + } else { + _put_char('\\'); + snprintf(_buf_ptr, _buf_len, "%03o", (unsigned char) c); + _buf_ptr += 3; + _buf_len -= 3; + } } else _put_char(c); } } static const char * -Format_String (const char *string) +Format_String (const char *string, int unicode) { char c; @@ -720,7 +723,7 @@ _put_char('\"'); while ((c = string++[0])) - _format_char(c); + _format_char(c, unicode); *_buf_ptr++ = '"'; *_buf_ptr++ = '\0'; @@ -738,7 +741,7 @@ memcpy(data, string, len); data[len] = '\0'; - result = Format_String(data); + result = Format_String(data, 0); free(data); return result; @@ -905,6 +908,129 @@ } /* + * Validate a string as UTF-8 encoded according to RFC 3629 + * + * Simply, a unicode code point (up to 21-bits long) is encoded as follows: + * + * Char. number range | UTF-8 octet sequence + * (hexadecimal) | (binary) + * --------------------+--------------------------------------------- + * 0000 0000-0000 007F | 0xxxxxxx + * 0000 0080-0000 07FF | 110xxxxx 10xxxxxx + * 0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx + * 0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + * + * Validation is done left-to-right, and an error condition, if any, refers to + * only the left-most problem in the string. + * + * Return values: + * UTF8_VALID: Valid UTF-8 encoded string + * UTF8_OVERLONG: Using more bytes than needed for a code point + * UTF8_SHORT_TAIL: Not enough bytes in a multi-byte sequence + * UTF8_LONG_TAIL: Too many bytes in a multi-byte sequence + * UTF8_FORBIDDEN_VALUE: Forbidden prefix or code point outside 0x10FFFF + */ +#define UTF8_VALID 0 +#define UTF8_FORBIDDEN_VALUE 1 +#define UTF8_OVERLONG 2 +#define UTF8_SHORT_TAIL 3 +#define UTF8_LONG_TAIL 4 +static int +is_valid_utf8 (const char *string, int len) +{ + unsigned long codepoint; + int rem, i; + unsigned char c; + + rem = 0; + for (i = 0; i < len; i++) { + c = (unsigned char) string[i]; + + /* Order of type check: + * - Single byte code point + * - Non-starting byte of multi-byte sequence + * - Start of 2-byte sequence + * - Start of 3-byte sequence + * - Start of 4-byte sequence + */ + if (!(c & 0x80)) { + if (rem > 0) return UTF8_SHORT_TAIL; + rem = 0; + codepoint = c; + } else if ((c & 0xC0) == 0x80) { + if (rem == 0) return UTF8_LONG_TAIL; + rem--; + codepoint |= (c & 0x3F) << (rem * 6); + if (codepoint == 0) return UTF8_OVERLONG; + } else if ((c & 0xE0) == 0xC0) { + if (rem > 0) return UTF8_SHORT_TAIL; + rem = 1; + codepoint = (c & 0x1F) << 6; + if (codepoint == 0) return UTF8_OVERLONG; + } else if ((c & 0xF0) == 0xE0) { + if (rem > 0) return UTF8_SHORT_TAIL; + rem = 2; + codepoint = (c & 0x0F) << 12; + } else if ((c & 0xF8) == 0xF0) { + if (rem > 0) return UTF8_SHORT_TAIL; + rem = 3; + codepoint = (c & 0x07) << 18; + if (codepoint > 0x10FFFF) return UTF8_FORBIDDEN_VALUE; + } else + return UTF8_FORBIDDEN_VALUE; + } + + return UTF8_VALID; +} + +static const char * +Format_Len_Unicode (const char *string, int len) +{ + char *data; + const char *result, *error; + int len2; + + int validity = is_valid_utf8(string, len); + + if (validity != UTF8_VALID) { + switch (validity) { + case UTF8_FORBIDDEN_VALUE: + error = "<Invalid UTF-8 string: Forbidden value> "; break; + case UTF8_OVERLONG: + error = "<Invalid UTF-8 string: Overlong encoding> "; break; + case UTF8_SHORT_TAIL: + error = "<Invalid UTF-8 string: Tail too short> "; break; + case UTF8_LONG_TAIL: + error = "<Invalid UTF-8 string: Tail too long> "; break; + } + + result = Format_Len_String(string, len); + len2 = strlen(result); + data = (char *) Malloc(len2+1); + memcpy(data, result, len2+1); + + memcpy(_formatting_buffer, error, strlen(error)+1); + strcat(_formatting_buffer, data); + free(data); + + return _formatting_buffer; + } + + if (!is_utf8_locale()) + return Format_Len_String(string, len); + + data = (char *) Malloc(len+1); + + memcpy(data, string, len); + data[len] = '\0'; + + result = Format_String(data, 1); + free(data); + + return result; +} + +/* * * The Format Manager: a group of routines to manage "formats" * @@ -956,6 +1082,8 @@ switch (format_char) { case 's': return Format_Len_String(t.extra_value, (int)t.value); + case 'u': + return Format_Len_Unicode(t.extra_value, (int)t.value); case 't': return Format_Len_Text(t.extra_value, (int)t.value, t.extra_encoding); case 'x': @@ -1252,7 +1380,7 @@ while (length >= size/8) { format_char = Get_Format_Char(format, i); - if (format_char == 's') + if (format_char == 's' || format_char == 'u') t.value = Extract_Len_String(&pointer,&length,size,&t.extra_value); else if (format_char == 't') { t.extra_encoding = type; 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/xprop-1.1.0/xprop.man new/xprop-1.2.0/xprop.man --- old/xprop-1.1.0/xprop.man 2009-10-12 22:01:07.000000000 +0200 +++ new/xprop-1.2.0/xprop.man 2010-10-07 05:37:51.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: xprop.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" Copyright \(co 2000 The XFree86 Project, Inc. .\" @@ -24,8 +23,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xprop/xprop.man,v 1.8 2001/01/27 18:21:21 dawes Exp $ -.\" .TH XPROP 1 __vendorversion__ .SH NAME xprop - property displayer for X @@ -234,6 +231,14 @@ compliant encoding and is converted to the current locale encoding before being output. .TP +u +This field and the next ones until either a 0 or the end of the property +represent an UTF-8 encoded unicode string. This format character is only +usable with a field size of 8. If the string is found to be an invalid +character, the type of encoding violation is printed instead, followed by +the string formatted using 's'. When in an environment not capable of +displaying UTF-8 encoded string, behaviour is identical to 's'. +.TP x The field is a hex number (like 'c' but displayed in hex - most useful for displaying window ids and the like) ++++++ xrandr-1.3.3.tar.bz2 -> xrandr-1.3.4.tar.bz2 ++++++ ++++ 7418 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/xrandr-1.3.3/ChangeLog new/xrandr-1.3.4/ChangeLog --- old/xrandr-1.3.3/ChangeLog 2010-07-24 13:28:52.000000000 +0200 +++ new/xrandr-1.3.4/ChangeLog 2010-10-30 20:29:00.000000000 +0200 @@ -1,3 +1,75 @@ +commit 2b67c3d80d1e7736cf4fe9f093ab604dc02ad7be +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:28:41 2010 -0700 + + xrandr 1.3.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 46c3cb9103ecd6f73a2908bb93004658069639c5 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:26:40 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 52016812038732a3aabc6dfb63ded9d07de703ee +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:25:53 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 5b74ff83949432b8abb9453415426a515e45eb20 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 11:24:14 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit c7b90939f0ffcad17a5cc6cf1e28f7b027feeba5 +Author: Julien Cristau <jcristau(a)debian.org> +Date: Tue Oct 12 21:20:18 2010 +0200 + + Call QueryExtension before any other RandR function (bug#30806) + + Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Tested-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Signed-off-by: Julien Cristau <jcristau(a)debian.org> + +commit 051f912f1c009a2c318214e6b3e86fa5f576d0ff +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Sep 22 19:39:27 2010 -0700 + + Bug 29348 - dot clock parameter missing from --newmode in man page + + https://bugs.freedesktop.org/show_bug.cgi?id=29348 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Julien Cristau <jcristau(a)debian.org> + commit a06506ca5df0a69e0ca27845855187ff62b78a9d Author: Julien Cristau <jcristau(a)debian.org> Date: Mon Jul 19 18:07:56 2010 +0100 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/xrandr-1.3.3/configure.ac new/xrandr-1.3.4/configure.ac --- old/xrandr-1.3.3/configure.ac 2010-07-19 19:07:30.000000000 +0200 +++ new/xrandr-1.3.4/configure.ac 2010-10-30 20:28:30.000000000 +0200 @@ -20,27 +20,23 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xrandr,[1.3.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrandr) +AC_PREREQ([2.60]) +AC_INIT([xrandr], [1.3.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xrandr]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.4) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - AC_CHECK_LIB(m,floor) + # Checks for pkg-config packages PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3 xrender x11) -AC_SUBST(XRANDR_CFLAGS) -AC_SUBST(XRANDR_LIBS) - AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrandr-1.3.3/Makefile.am new/xrandr-1.3.4/Makefile.am --- old/xrandr-1.3.3/Makefile.am 2010-04-28 18:49:10.000000000 +0200 +++ new/xrandr-1.3.4/Makefile.am 2010-10-30 20:24:43.000000000 +0200 @@ -47,29 +47,11 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ .PHONY: ChangeLog INSTALL 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/xrandr-1.3.3/xrandr.c new/xrandr-1.3.4/xrandr.c --- old/xrandr-1.3.3/xrandr.c 2010-04-28 18:49:10.000000000 +0200 +++ new/xrandr-1.3.4/xrandr.c 2010-10-13 00:13:37.000000000 +0200 @@ -2679,7 +2679,8 @@ root = RootWindow (dpy, screen); - if (!XRRQueryVersion (dpy, &major, &minor)) + if (!XRRQueryExtension (dpy, &event_base, &error_base) || + !XRRQueryVersion (dpy, &major, &minor)) { fprintf (stderr, "RandR extension missing\n"); exit (1); @@ -3372,8 +3373,6 @@ root, (SizeID) size, (Rotation) (rotation | reflection), rate, CurrentTime); - XRRQueryExtension(dpy, &event_base, &error_base); - if (setit && !dryrun && status == RRSetConfigFailed) { printf ("Failed to change the screen configuration!\n"); ret = 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/xrandr-1.3.3/xrandr.man new/xrandr-1.3.4/xrandr.man --- old/xrandr-1.3.3/xrandr.man 2010-07-19 19:04:49.000000000 +0200 +++ new/xrandr-1.3.4/xrandr.man 2010-09-23 04:38:48.000000000 +0200 @@ -225,7 +225,7 @@ .IP "\-\-newmode \fIname\fP \fImode\fP" New modelines can be added to the server and then associated with outputs. This option does the former. The \fImode\fP is specified using the ModeLine -syntax for xorg.conf: hdisp hsyncstart hsyncend htotal vdisp vsyncstart +syntax for xorg.conf: clock hdisp hsyncstart hsyncend htotal vdisp vsyncstart vsyncend vtotal \fIflags\fP. \fIflags\fP can be zero or more of +HSync, -HSync, +VSync, -VSync, Interlace, DoubleScan, CSync, +CSync, -CSync. Several tools permit to compute the usual modeline from a height, width, and refresh ++++++ xrx-1.0.3.tar.bz2 -> xrx-1.0.4.tar.bz2 ++++++ ++++ 67374 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/xrx-1.0.3/ChangeLog new/xrx-1.0.4/ChangeLog --- old/xrx-1.0.3/ChangeLog 2009-08-03 20:13:40.000000000 +0200 +++ new/xrx-1.0.4/ChangeLog 2010-10-31 02:14:38.000000000 +0100 @@ -1,3 +1,104 @@ +commit ee043df61402643f3031c51cc0635b3281fafe2e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 18:13:02 2010 -0700 + + xrx 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit a962d5e612ad8452dc9523bacfc08b039d4deb20 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 18:11:47 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit c372c4b1de21fc0a93589c707cfef24533487dbf +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 18:07:41 2010 -0700 + + Get rid of extra configure message when mozilla/firefox-plugin not found + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 6fefbf58f3698b8aa25cc6682e78fb884d5afe6d +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 18:03:23 2010 -0700 + + Add $(CWARNFLAGS) to CFLAGS in Makefile.am instead of in configure.ac + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit bd30c0733e40cc46395e53c2c738e01e65796010 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:58:21 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 1bbc287440845d23265a775c5b722e8cb42368bd +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:56:53 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3ecb1138d04e6ee17419a7b67dfccea20fc4872b +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 17:53:31 2010 -0700 + + Replace individual XORG_* macro calls with XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f082794e42b17ffa77981fd9112718b0e3eb9a6e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Aug 6 15:12:29 2010 -0700 + + Fill in COPYING file with copyright notices from source code + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 449b447c85ac772772cd2cf9fecef93c3ae88e01 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Jun 18 14:43:26 2010 -0700 + + Add explicit dependency on libICE to PKG_CHECK_MODULES + + Allows building against libXt versions that moved ice to Requires.private + in the xt.pc file, since xrx calls Ice* functions directly. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit c2545396940919ae2bc5edccade3796bca396183 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Apr 29 17:48:08 2010 -0700 + + Mark plugins as loadable modules so we don't waste time building lib*.a + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + commit ccd463bb2d143ad785b2388b058dc53e49ec1870 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Aug 3 09:00:17 2009 -0700 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/xrx-1.0.3/config.h.in new/xrx-1.0.4/config.h.in --- old/xrx-1.0.3/config.h.in 2009-08-03 20:13:06.000000000 +0200 +++ new/xrx-1.0.4/config.h.in 2010-10-31 02:14:33.000000000 +0100 @@ -51,6 +51,10 @@ /* Support os-specific local connections */ #undef LOCALCONN +/* 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 the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xrx-1.0.3/configure.ac new/xrx-1.0.4/configure.ac --- old/xrx-1.0.3/configure.ac 2009-08-03 17:59:42.000000000 +0200 +++ new/xrx-1.0.4/configure.ac 2010-10-31 02:12:09.000000000 +0100 @@ -21,20 +21,21 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xrx, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrx) +AC_PREREQ([2.60]) +AC_INIT([xrx], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xrx]) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS + AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL AM_PROG_LIBTOOL -XORG_CWARNFLAGS dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro dnl was not expanded, since libX11 with no transport types is rather useless. @@ -49,19 +50,16 @@ XTRANS_CONNECTION_FLAGS # Checks for pkg-config packages -PKG_CHECK_MODULES(XRX, x11 xt xext xtrans xproxymngproto xau) -XRX_CFLAGS="$CWARNFLAGS $XRX_CFLAGS" -AC_SUBST(XRX_CFLAGS) -AC_SUBST(XRX_LIBS) +PKG_CHECK_MODULES(XRX, x11 xt xext xtrans xproxymngproto xau ice) # Check for mozilla/firefox plugin headers via pkg-config. if test "x$PLUGIN_CFLAGS" = x ; then PKG_CHECK_MODULES([MOZILLA_PLUGIN], [mozilla-plugin], - [PLUGIN_CFLAGS=${MOZILLA_PLUGIN_CFLAGS}], [AC_MSG_RESULT([no])]) + [PLUGIN_CFLAGS="${MOZILLA_PLUGIN_CFLAGS}"], [:]) if test "x$PLUGIN_CFLAGS" = x ; then PKG_CHECK_MODULES([FIREFOX_PLUGIN], [firefox-plugin], - [PLUGIN_CFLAGS=${FIREFOX_PLUGIN_CFLAGS}], [AC_MSG_RESULT([no])]) + [PLUGIN_CFLAGS="${FIREFOX_PLUGIN_CFLAGS}"], [:]) fi fi @@ -80,12 +78,6 @@ PKG_CHECK_MODULES(XRX_PLUGIN, xaw7) -AC_SUBST(XRX_PLUGIN_CFLAGS) -AC_SUBST(XRX_PLUGIN_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([ Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrx-1.0.3/COPYING new/xrx-1.0.4/COPYING --- old/xrx-1.0.3/COPYING 2006-07-11 04:54:15.000000000 +0200 +++ new/xrx-1.0.4/COPYING 2010-08-07 00:11:42.000000000 +0200 @@ -1,12 +1,27 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +***************************************************************************** +* Copyright 1996 Netscape Communications. All rights reserved. +***************************************************************************** -Please submit updated COPYING files to the Xorg bugzilla: +Copyright 1996, 1998 The Open Group -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -http://lists.freedesktop.org/mailman/listinfo/xorg +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. 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/xrx-1.0.3/helper/Makefile.am new/xrx-1.0.4/helper/Makefile.am --- old/xrx-1.0.3/helper/Makefile.am 2006-07-11 04:54:15.000000000 +0200 +++ new/xrx-1.0.4/helper/Makefile.am 2010-10-31 02:59:58.000000000 +0200 @@ -23,8 +23,8 @@ INCLUDES = -I$(top_srcdir)/rx -AM_CFLAGS = @XRX_CFLAGS@ -LDADD = @XRX_LIBS@ +AM_CFLAGS = $(CWARNFLAGS) $(XRX_CFLAGS) +LDADD = $(XRX_LIBS) xrx_SOURCES = \ GetUrl.c \ @@ -48,26 +48,6 @@ EXTRA_DIST = $(appman_PRE) CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xrx-1.0.3/missing new/xrx-1.0.4/missing --- old/xrx-1.0.3/missing 2009-08-03 20:13:08.000000000 +0200 +++ new/xrx-1.0.4/missing 2010-10-31 02:14:33.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrx-1.0.3/plugin/Makefile.am new/xrx-1.0.4/plugin/Makefile.am --- old/xrx-1.0.3/plugin/Makefile.am 2008-06-21 05:14:28.000000000 +0200 +++ new/xrx-1.0.4/plugin/Makefile.am 2010-10-31 02:01:18.000000000 +0100 @@ -32,10 +32,11 @@ DEFINES = -DNETSCAPE_PLUGIN $(PLUGIN_DEFINES) AM_CPPFLAGS = $(DEFINES) -AM_CFLAGS = -DXP_UNIX @XRX_CFLAGS@ @XRX_PLUGIN_CFLAGS@ @PLUGIN_CFLAGS@ +AM_CFLAGS = -DXP_UNIX $(CWARNFLAGS) \ + $(XRX_CFLAGS) $(XRX_PLUGIN_CFLAGS) $(PLUGIN_CFLAGS) -libxrx_la_LIBADD = @XRX_LIBS@ @XRX_PLUGIN_LIBS@ -libxrx_la_LDFLAGS = -avoid-version +libxrx_la_LIBADD = $(XRX_LIBS) $(XRX_PLUGIN_LIBS) +libxrx_la_LDFLAGS = -avoid-version -module PARAMS_SRCS = $(RXSRC)/PRead.c $(RXSRC)/PParse.c $(RXSRC)/BuildReq.c XMISC_SRCS = $(RXSRC)/XUrls.c $(RXSRC)/XAuth.c $(RXSRC)/XDpyName.c \ @@ -61,26 +62,8 @@ EXTRA_DIST = $(appman_PRE) CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xrx-1.0.3/xnest-plugin/Makefile.am new/xrx-1.0.4/xnest-plugin/Makefile.am --- old/xrx-1.0.3/xnest-plugin/Makefile.am 2008-06-21 05:25:57.000000000 +0200 +++ new/xrx-1.0.4/xnest-plugin/Makefile.am 2010-10-31 02:02:24.000000000 +0100 @@ -46,7 +46,7 @@ $(XMISC_SRCS) \ $(PLUGIN_SRCS) -AM_CFLAGS = @XRX_CFLAGS@ @XRX_PLUGIN_CFLAGS@ @PLUGIN_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) $(XRX_CFLAGS) $(XRX_PLUGIN_CFLAGS) $(PLUGIN_CFLAGS) -libxrxnest_la_LIBADD = @XRX_LIBS@ @XRX_PLUGIN_LIBS@ -libxrxnest_la_LDFLAGS = -avoid-version +libxrxnest_la_LIBADD = $(XRX_LIBS) $(XRX_PLUGIN_LIBS) +libxrxnest_la_LDFLAGS = -avoid-version -module ++++++ xscope-1.2.tar.bz2 -> xscope-1.3.tar.bz2 ++++++ ++++ 14893 lines of diff (skipped) ++++++ xsetroot-1.0.3.tar.bz2 -> xsetroot-1.1.0.tar.bz2 ++++++ ++++ 8811 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/xsetroot-1.0.3/ChangeLog new/xsetroot-1.1.0/ChangeLog --- old/xsetroot-1.0.3/ChangeLog 2009-10-17 04:33:26.000000000 +0200 +++ new/xsetroot-1.1.0/ChangeLog 2010-10-30 20:47:29.000000000 +0200 @@ -1,3 +1,141 @@ +commit 0c55a8f8edabef5ccd9930048df7d3aecd551d54 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:47:05 2010 -0700 + + xsetroot 1.1.0 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit a2a23d1ca4ae7940465d525f2219cb97e1f5efe7 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:46:31 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 047e49cad119109378c97436f2fe77b93e747376 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:45:03 2010 -0700 + + Add -xcf option to man page + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 0be4a12c29687e26a5fd77a6f8df2d6eca5fea20 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:37:00 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit b86dc97d437b16a9384c2c2b9799918c9f7d1e6a +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Oct 30 11:35:16 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 8cf3ceab5cf2f2a583bdbe13a2f23061c6458546 +Author: Keith Packard <keithp(a)keithp.com> +Date: Thu Oct 21 17:51:35 2010 -0700 + + Add -xcf flag to load arbitrary ARGB cursor file + + Instead of having to construct a whole cursor theme and play with the + environment variables in Xlib to set a random ARGB cursor, this lets + the user set whatever they like directly from a file. + + Signed-off-by: Keith Packard <keithp(a)keithp.com> + +commit e5430a15a0eed9c209f0df1b19ac79eca195088e +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:50 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 978cc1aa7944debb4a8eb8c928825eb28041d51a +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:55 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit cebcf0ab7f59e3e261d410b85f3433974de3cbf8 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:09 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit dcff32ec5fb57783a1bb315de14b9548b4806682 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit f9ec4ed5b9422cd59d51b608466fbc7834041a64 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:16 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit fc3c90aa5b77645198450c32b4e1f054674dd547 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:22 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + commit 1a978aec136389c13fcdda31b34cb58d4dd3bf25 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri Oct 16 19:32:50 2009 -0700 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/xsetroot-1.0.3/config.h.in new/xsetroot-1.1.0/config.h.in --- old/xsetroot-1.0.3/config.h.in 2009-10-17 04:33:12.000000000 +0200 +++ new/xsetroot-1.1.0/config.h.in 2010-10-30 20:47:22.000000000 +0200 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_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/xsetroot-1.0.3/configure.ac new/xsetroot-1.1.0/configure.ac --- old/xsetroot-1.0.3/configure.ac 2009-10-17 04:32:38.000000000 +0200 +++ new/xsetroot-1.1.0/configure.ac 2010-10-30 20:46:50.000000000 +0200 @@ -21,27 +21,23 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xsetroot, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetroot) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xsetroot], [1.1.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xsetroot]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XSETROOT, xmuu x11 xbitmaps) -AC_SUBST(XSETROOT_CFLAGS) -AC_SUBST(XSETROOT_LIBS) +PKG_CHECK_MODULES(XSETROOT, xmuu x11 xbitmaps xcursor) XORG_WITH_LINT 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/xsetroot-1.0.3/INSTALL new/xsetroot-1.1.0/INSTALL --- old/xsetroot-1.0.3/INSTALL 2007-08-01 18:36:51.000000000 +0200 +++ new/xsetroot-1.1.0/INSTALL 2010-10-30 20:47:29.000000000 +0200 @@ -1,16 +1,19 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives + This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== -These are generic installation instructions. + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,42 +67,57 @@ all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -125,7 +140,7 @@ Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,14 +152,36 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -170,9 +207,9 @@ Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -181,7 +218,7 @@ Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -190,21 +227,29 @@ ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -231,6 +276,16 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. 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/xsetroot-1.0.3/Makefile.am new/xsetroot-1.1.0/Makefile.am --- old/xsetroot-1.0.3/Makefile.am 2009-10-17 04:28:21.000000000 +0200 +++ new/xsetroot-1.1.0/Makefile.am 2010-10-30 20:36:25.000000000 +0200 @@ -35,39 +35,24 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +dist-hook: ChangeLog INSTALL SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xsetroot-1.0.3/xsetroot.c new/xsetroot-1.1.0/xsetroot.c --- old/xsetroot-1.0.3/xsetroot.c 2009-01-28 03:21:41.000000000 +0100 +++ new/xsetroot-1.1.0/xsetroot.c 2010-10-22 03:00:40.000000000 +0200 @@ -1,5 +1,4 @@ /* - * $Xorg: xsetroot.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ * Copyright 1987, 1998 The Open Group @@ -32,12 +31,12 @@ * Author: Mark Lillibridge, MIT Project Athena * 11-Jun-87 */ -/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.7 2001/04/01 14:00:24 tsi Exp $ */ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> #include <X11/Xmu/CurUtil.h> +#include <X11/Xcursor/Xcursor.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -81,6 +80,7 @@ fprintf(stderr, " -name <string>\n"); fprintf(stderr, " -cursor <cursor file> <mask file>\n"); fprintf(stderr, " -cursor_name <cursor-font name>\n"); + fprintf(stderr, " -xcf <ARGB cursor file> <cursor size>\n"); fprintf(stderr, " -solid <color>\n"); fprintf(stderr, " -gray or -grey\n"); fprintf(stderr, " -bitmap <filename>\n"); @@ -102,6 +102,8 @@ char *cursor_mask = NULL; char *cursor_name = NULL; char *solid_color = NULL; + char *xcf = NULL; + int xcf_size = 32; Cursor cursor; int gray = 0; char *bitmap_file = NULL; @@ -146,6 +148,16 @@ nonexcl++; continue; } + if (!strcmp("-xcf", argv[i])) { + if (++i>=argc) usage(); + xcf = argv[i]; + if (++i>=argc) usage(); + xcf_size = atoi(argv[i]); + if (xcf_size <= 0) + xcf_size = 32; + nonexcl++; + continue; + } if (!strcmp("-fg",argv[i]) || !strcmp("-foreground",argv[i])) { if (++i>=argc) usage(); fore_color = argv[i]; @@ -225,6 +237,19 @@ XFreeCursor (dpy, cursor); } } + if (xcf) { + XcursorImages *images = XcursorFilenameLoadImages(xcf, xcf_size); + if (!images) { + fprintf(stderr, "Invalid cursor file \"%s\"\n", xcf); + } else { + cursor = XcursorImagesLoadCursor(dpy, images); + if (cursor) + { + XDefineCursor (dpy, root, cursor); + XFreeCursor (dpy, cursor); + } + } + } /* Handle -gray and -grey options */ if (gray) { bitmap = XCreateBitmapFromData(dpy, root, gray_bits, 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/xsetroot-1.0.3/xsetroot.man new/xsetroot-1.1.0/xsetroot.man --- old/xsetroot-1.0.3/xsetroot.man 2007-08-01 18:36:51.000000000 +0200 +++ new/xsetroot-1.1.0/xsetroot.man 2010-10-30 20:43:36.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: xsetroot.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,8 +22,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.7 2001/01/27 18:21:23 dawes Exp $ -.\" .TH XSETROOT 1 __xorgversion__ .SH NAME xsetroot \- root window parameter setting utility for X @@ -33,6 +30,7 @@ [-help] [-def] [-display \fIdisplay\fP] [-cursor \fIcursorfile maskfile\fP] [-cursor_name \fIcursorname\fP] +[-xcf \fIcursorfile\fP \fIcursorsize\fP] [-bitmap \fIfilename\fP] [-mod \fIx y\fP] [-gray] [-grey] [-fg \fIcolor\fP] [-bg \fIcolor\fP] [-rv] [-solid \fIcolor\fP] [-name \fIstring\fP] @@ -74,6 +72,9 @@ This lets you change the pointer cursor to one of the standard cursors from the cursor font. Refer to appendix B of the X protocol for the names (except that the XC_ prefix is elided for this option). +.IP "\fB-xcf\fP \fIcursorfile\fP \fIcursorsize\fP" +This lets you change the pointer cursor to one loaded from an Xcursor file +as defined by libXcursor, at the specified size. .IP "\fB-bitmap\fP \fIfilename\fP" Use the bitmap specified in the file to set the window pattern. You can make your own bitmap files (little pictures) using the @@ -107,6 +108,6 @@ .IP "\fB-display\fP \fIdisplay\fP" Specifies the server to connect to; see \fIX(__miscmansuffix__)\fP. .SH "SEE ALSO" -X(__miscmansuffix__), xset(1), xrdb(1) +X(__miscmansuffix__), xset(1), xrdb(1), Xcursor(__libmansuffix__) .SH AUTHOR Mark Lillibridge, MIT Project Athena ++++++ xwininfo-1.1.0.tar.bz2 -> xwininfo-1.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwininfo-1.1.0/aclocal.m4 new/xwininfo-1.1.1/aclocal.m4 --- old/xwininfo-1.1.0/aclocal.m4 2010-09-27 03:36:31.000000000 +0200 +++ new/xwininfo-1.1.1/aclocal.m4 2010-10-30 20:58:53.000000000 +0200 @@ -1067,7 +1067,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.10.1]) +m4_define([vers_have], [1.11.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1376,15 +1376,17 @@ AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK -# XORG_WITH_XMLTO([MIN-VERSION]) +# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-xmlto option, it allows maximum flexibilty in making decisions -# as whether or not to use the xmlto package. +# as whether or not to use the xmlto package. When DEFAULT is not specified, +# --with-xmlto assumes 'auto'. # # Interface to module: # HAVE_XMLTO: used in makefiles to conditionally generate documentation @@ -1401,10 +1403,12 @@ # AC_DEFUN([XORG_WITH_XMLTO],[ AC_ARG_VAR([XMLTO], [Path to xmlto command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(xmlto, AS_HELP_STRING([--with-xmlto], - [Use xmlto to regenerate documentation (default: yes, if installed)]), - [use_xmlto=$withval], [use_xmlto=auto]) + [Use xmlto to regenerate documentation (default: ]_defopt[)]), + [use_xmlto=$withval], [use_xmlto=]_defopt) +m4_undefine([_defopt]) if test "x$use_xmlto" = x"auto"; then AC_PATH_PROG([XMLTO], [xmlto]) @@ -1458,15 +1462,17 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ]) # XORG_WITH_XMLTO -# XORG_WITH_ASCIIDOC([MIN-VERSION]) +# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-asciidoc option, it allows maximum flexibilty in making decisions -# as whether or not to use the asciidoc package. +# as whether or not to use the asciidoc package. When DEFAULT is not specified, +# --with-asciidoc assumes 'auto'. # # Interface to module: # HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation @@ -1479,10 +1485,12 @@ # AC_DEFUN([XORG_WITH_ASCIIDOC],[ AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(asciidoc, AS_HELP_STRING([--with-asciidoc], - [Use asciidoc to regenerate documentation (default: yes, if installed)]), - [use_asciidoc=$withval], [use_asciidoc=auto]) + [Use asciidoc to regenerate documentation (default: ]_defopt[)]), + [use_asciidoc=$withval], [use_asciidoc=]_defopt) +m4_undefine([_defopt]) if test "x$use_asciidoc" = x"auto"; then AC_PATH_PROG([ASCIIDOC], [asciidoc]) @@ -1523,15 +1531,17 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) ]) # XORG_WITH_ASCIIDOC -# XORG_WITH_DOXYGEN([MIN-VERSION]) +# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT]) # -------------------------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-doxygen option, it allows maximum flexibilty in making decisions -# as whether or not to use the doxygen package. +# as whether or not to use the doxygen package. When DEFAULT is not specified, +# --with-doxygen assumes 'auto'. # # Interface to module: # HAVE_DOXYGEN: used in makefiles to conditionally generate documentation @@ -1544,10 +1554,12 @@ # AC_DEFUN([XORG_WITH_DOXYGEN],[ AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(doxygen, AS_HELP_STRING([--with-doxygen], - [Use doxygen to regenerate documentation (default: yes, if installed)]), - [use_doxygen=$withval], [use_doxygen=auto]) + [Use doxygen to regenerate documentation (default: ]_defopt[)]), + [use_doxygen=$withval], [use_doxygen=]_defopt) +m4_undefine([_defopt]) if test "x$use_doxygen" = x"auto"; then AC_PATH_PROG([DOXYGEN], [doxygen]) @@ -1588,15 +1600,17 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) ]) # XORG_WITH_DOXYGEN -# XORG_WITH_GROFF +# XORG_WITH_GROFF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-groff option, it allows maximum flexibilty in making decisions -# as whether or not to use the groff package. +# as whether or not to use the groff package. When DEFAULT is not specified, +# --with-groff assumes 'auto'. # # Interface to module: # HAVE_GROFF: used in makefiles to conditionally generate documentation @@ -1625,10 +1639,12 @@ # AC_DEFUN([XORG_WITH_GROFF],[ AC_ARG_VAR([GROFF], [Path to groff command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(groff, AS_HELP_STRING([--with-groff], - [Use groff to regenerate documentation (default: yes, if installed)]), - [use_groff=$withval], [use_groff=auto]) + [Use groff to regenerate documentation (default: ]_defopt[)]), + [use_groff=$withval], [use_groff=]_defopt) +m4_undefine([_defopt]) if test "x$use_groff" = x"auto"; then AC_PATH_PROG([GROFF], [groff]) @@ -1691,15 +1707,17 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) ]) # XORG_WITH_GROFF -# XORG_WITH_FOP +# XORG_WITH_FOP([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-fop option, it allows maximum flexibilty in making decisions -# as whether or not to use the fop package. +# as whether or not to use the fop package. When DEFAULT is not specified, +# --with-fop assumes 'auto'. # # Interface to module: # HAVE_FOP: used in makefiles to conditionally generate documentation @@ -1712,10 +1730,12 @@ # AC_DEFUN([XORG_WITH_FOP],[ AC_ARG_VAR([FOP], [Path to fop command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(fop, AS_HELP_STRING([--with-fop], - [Use fop to regenerate documentation (default: yes, if installed)]), - [use_fop=$withval], [use_fop=auto]) + [Use fop to regenerate documentation (default: ]_defopt[)]), + [use_fop=$withval], [use_fop=]_defopt) +m4_undefine([_defopt]) if test "x$use_fop" = x"auto"; then AC_PATH_PROG([FOP], [fop]) @@ -1742,15 +1762,17 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP -# XORG_WITH_PS2PDF +# XORG_WITH_PS2PDF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-ps2pdf option, it allows maximum flexibilty in making decisions -# as whether or not to use the ps2pdf package. +# as whether or not to use the ps2pdf package. When DEFAULT is not specified, +# --with-ps2pdf assumes 'auto'. # # Interface to module: # HAVE_PS2PDF: used in makefiles to conditionally generate documentation @@ -1763,10 +1785,12 @@ # AC_DEFUN([XORG_WITH_PS2PDF],[ AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(ps2pdf, AS_HELP_STRING([--with-ps2pdf], - [Use ps2pdf to regenerate documentation (default: yes, if installed)]), - [use_ps2pdf=$withval], [use_ps2pdf=auto]) + [Use ps2pdf to regenerate documentation (default: ]_defopt[)]), + [use_ps2pdf=$withval], [use_ps2pdf=]_defopt) +m4_undefine([_defopt]) if test "x$use_ps2pdf" = x"auto"; then AC_PATH_PROG([PS2PDF], [ps2pdf]) @@ -1817,14 +1841,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DOCS],[ -default=$1 -if test "x$default" = x ; then - default="yes" -fi +m4_define([default], m4_default([$1], [yes])) AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs], - [Enable building the documentation (default: yes)]), - [build_docs=$enableval], [build_docs=$default]) + [Enable building the documentation (default: ]default[)]), + [build_docs=$enableval], [build_docs=]default) +m4_undefine([default]) AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) AC_MSG_CHECKING([whether to build documentation]) AC_MSG_RESULT([$build_docs]) @@ -1852,14 +1874,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ -devel_default=$1 -if test "x$devel_default" = x ; then - devel_default="yes" -fi +m4_define([devel_default], m4_default([$1], [yes])) AC_ARG_ENABLE(devel-docs, AS_HELP_STRING([--enable-devel-docs], - [Enable building the developer documentation (default: yes)]), - [build_devel_docs=$enableval], [build_devel_docs=$devel_default]) + [Enable building the developer documentation (default: ]devel_default[)]), + [build_devel_docs=$enableval], [build_devel_docs=]devel_default) +m4_undefine([devel_default]) AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) AC_MSG_CHECKING([whether to build developer documentation]) AC_MSG_RESULT([$build_devel_docs]) @@ -1887,14 +1907,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_SPECS],[ -spec_default=$1 -if test "x$spec_default" = x ; then - spec_default="yes" -fi +m4_define([spec_default], m4_default([$1], [yes])) AC_ARG_ENABLE(specs, AS_HELP_STRING([--enable-specs], - [Enable building the specs (default: yes)]), - [build_specs=$enableval], [build_specs=$spec_default]) + [Enable building the specs (default: ]spec_default[)]), + [build_specs=$enableval], [build_specs=]spec_default) +m4_undefine([spec_default]) AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) AC_MSG_CHECKING([whether to build functional specifications]) AC_MSG_RESULT([$build_specs]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwininfo-1.1.0/ChangeLog new/xwininfo-1.1.1/ChangeLog --- old/xwininfo-1.1.0/ChangeLog 2010-09-27 03:36:50.000000000 +0200 +++ new/xwininfo-1.1.1/ChangeLog 2010-10-30 20:58:59.000000000 +0200 @@ -1,3 +1,47 @@ +commit 98d5614d4688013e2fe7447eab723e0a43ee27b8 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:58:33 2010 -0700 + + xwininfo 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ca6412a29ec5b7b646b8a48bac940af2762ed54d +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Oct 30 11:53:28 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3a3003dcd0737c721e8f35953a5871a50209b5d4 +Author: Julien Cristau <jcristau(a)debian.org> +Date: Thu Oct 21 12:59:11 2010 +0200 + + Work around xcb_translate_coordinates sign bug + + xcb_translate_coordinates_reply_t has unsigned dst_{x,y}, so explicitly + cast them to int16_t to get the right values. + Reported on irc by frostwork. + + xcb-proto was fixed in commit 661fe8dd. + + Signed-off-by: Julien Cristau <jcristau(a)debian.org> + Acked-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 4ec65f24a0abaaf6ec1a0c930fc79b3fc5e1baf6 +Author: Tomas Chvatal <scarabeus(a)gentoo.org> +Date: Mon Sep 27 14:56:14 2010 +0200 + + Fix build error when building --with-xcb-icccm + + xwininfo.c:633:34: error: incompatible types when assigning to type xcb_get_property_cookie_t from type int + + Signed-off-by: Tomas Chvatal <scarabeus(a)gentoo.org> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + commit aac89e8e81faca5d6eb830cd65591619a26ec17a Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Sun Sep 26 18:35:40 2010 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwininfo-1.1.0/configure new/xwininfo-1.1.1/configure --- old/xwininfo-1.1.0/configure 2010-09-27 03:36:32.000000000 +0200 +++ new/xwininfo-1.1.1/configure 2010-10-30 20:58:54.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for xwininfo 1.1.0. +# Generated by GNU Autoconf 2.68 for xwininfo 1.1.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -561,8 +561,8 @@ # Identity of this package. PACKAGE_NAME='xwininfo' PACKAGE_TARNAME='xwininfo' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='xwininfo 1.1.0' +PACKAGE_VERSION='1.1.1' +PACKAGE_STRING='xwininfo 1.1.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1287,7 +1287,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 xwininfo 1.1.0 to adapt to many kinds of systems. +\`configure' configures xwininfo 1.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1357,7 +1357,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xwininfo 1.1.0:";; + short | recursive ) echo "Configuration of xwininfo 1.1.1:";; esac cat <<\_ACEOF @@ -1463,7 +1463,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xwininfo configure 1.1.0 +xwininfo configure 1.1.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1878,7 +1878,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xwininfo $as_me 1.1.0, which was +It was created by xwininfo $as_me 1.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2693,7 +2693,7 @@ # Define the identity of the package. PACKAGE='xwininfo' - VERSION='1.1.0' + VERSION='1.1.1' cat >>confdefs.h <<_ACEOF @@ -4212,675 +4212,6 @@ -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -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 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; } if ${ac_cv_prog_cc_c99+:} false; then : @@ -5989,10 +5320,6 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -6402,7 +5729,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xwininfo $as_me 1.1.0, which was +This file was extended by xwininfo $as_me 1.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6468,7 +5795,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xwininfo config.status 1.1.0 +xwininfo config.status 1.1.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwininfo-1.1.0/configure.ac new/xwininfo-1.1.1/configure.ac --- old/xwininfo-1.1.0/configure.ac 2010-09-27 03:34:54.000000000 +0200 +++ new/xwininfo-1.1.1/configure.ac 2010-10-30 20:58:13.000000000 +0200 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([xwininfo], [1.1.0], +AC_INIT([xwininfo], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xwininfo]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -36,9 +36,6 @@ AC_USE_SYSTEM_EXTENSIONS -AC_PROG_CC -AC_PROG_INSTALL - XORG_DEFAULT_OPTIONS AC_CHECK_FUNCS([strlcat]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xwininfo-1.1.0/xwininfo.c new/xwininfo-1.1.1/xwininfo.c --- old/xwininfo-1.1.0/xwininfo.c 2010-07-15 04:46:48.000000000 +0200 +++ new/xwininfo-1.1.1/xwininfo.c 2010-10-25 09:44:04.000000000 +0200 @@ -630,8 +630,9 @@ w->wm_pid_cookie = xcb_get_property (dpy, False, window, atom_net_wm_pid, XCB_ATOM_CARDINAL, 0, BUFSIZ); - w->wm_client_machine_cookie = - GET_TEXT_PROPERTY(dpy, window, XCB_ATOM_WM_CLIENT_MACHINE); + w->wm_client_machine_cookie = xcb_get_property + (dpy, False, window, XCB_ATOM_WM_CLIENT_MACHINE, + XCB_GET_PROPERTY_TYPE_ANY, 0, BUFSIZ); } atom_net_frame_extents = Get_Atom (dpy, "_NET_FRAME_EXTENTS"); @@ -939,8 +940,8 @@ if (!trans_coords) Fatal_Error ("Can't get translated coordinates."); - rx = trans_coords->dst_x; - ry = trans_coords->dst_y; + rx = (int16_t)trans_coords->dst_x; + ry = (int16_t)trans_coords->dst_y; free (trans_coords); xright = (dw - rx - w->geometry->border_width * 2 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gobject-introspection for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package gobject-introspection for openSUSE:Factory checked in at Tue Nov 2 10:48:51 CET 2010. -------- --- GNOME/gobject-introspection/gobject-introspection.changes 2010-10-09 11:30:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gobject-introspection/gobject-introspection.changes 2010-10-27 15:32:55.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Oct 27 09:23:15 EDT 2010 - vuntz(a)opensuse.org + +- Add a rpmlintrc file: the devel-file-in-non-devel-package errors + for gir and source files are wrong here, because + gobject-introspection is, by definition, a devel package (in the + same way as gcc is). +- Add an extra % to a macro in a comment to make rpmlint happy (and + to make sure that the macro won't get expanded). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gobject-introspection-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gobject-introspection.spec ++++++ --- /var/tmp/diff_new_pack.30bYeR/_old 2010-11-02 10:48:14.000000000 +0100 +++ /var/tmp/diff_new_pack.30bYeR/_new 2010-11-02 10:48:14.000000000 +0100 @@ -19,13 +19,14 @@ Name: gobject-introspection Version: 0.9.12 -Release: 1 +Release: 2 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel License: LGPLv2.1+ Summary: GObject Introspection Tools Url: http://live.gnome.org/GObjectIntrospection Group: Development/Libraries/GNOME -Source: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM gobject-introspection-keyring-workaround.patch bgo#629426 vuntz(a)opensuse.org -- Workaround for libgnome-keyring Patch0: gobject-introspection-keyring-workaround.patch # PATCH-FIX-UPSTREAM gobject-introspection-libgda-workaround.patch bgo#629779 vuntz(a)opensuse.org -- Workaround for libgda @@ -101,7 +102,7 @@ %doc %{_mandir}/man1/g-ir-scanner.1* %{_datadir}/aclocal/introspection.m4 %{_datadir}/gir-1.0/*.gir -# We don't include directly %{_libdir}/gobject-introspection since there might +# We don't include directly %%{_libdir}/gobject-introspection since there might # be files there in the future that belong to the library package %dir %{_libdir}/gobject-introspection %{_libdir}/gobject-introspection/giscanner/ ++++++ gobject-introspection-rpmlintrc ++++++ addFilter(".*devel-file-in-non-devel-package.*/usr/share/gir-.*/*\.gir") addFilter(".*devel-file-in-non-devel-package.*/usr/share/gobject-introspection-.*/*\.[ch]") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

Jump to page: