Hello community,
here is the log from the commit of package xorg-x11
checked in at Thu Aug 9 23:07:38 CEST 2007.
--------
--- xorg-x11/xorg-x11.changes 2007-07-25 13:23:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-08-07 08:16:53.046920000 +0200
@@ -1,0 +2,12 @@
+Tue Aug 7 08:14:33 CEST 2007 - sndirsch@suse.de
+
+- xclock 1.0.3
+ * X.Org Bug 10775: xclock does not set _NET_WM_PID
+- xgamma 1.0.2
+ * X.Org Bug #10616: xgamma man page describes how to print gamma
+ poorly
+- xmodmap 1.0.3
+ * Bug 10616: manpage should note -pm is the default if no options
+ are given
+
+-------------------------------------------------------------------
Old:
----
xclock-X11R7.1-1.0.2.tar.bz2
xgamma-X11R7.0-1.0.1.tar.bz2
xmodmap-1.0.2.tar.bz2
New:
----
xclock-1.0.3.tar.bz2
xgamma-1.0.2.tar.bz2
xmodmap-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.AO5522/_old 2007-08-09 23:05:32.000000000 +0200
+++ /var/tmp/diff_new_pack.AO5522/_new 2007-08-09 23:05:32.000000000 +0200
@@ -18,7 +18,7 @@
%endif
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 101
+Release: 108
License: X11/MIT, xc/fonts/scaled/Type1/Copyright
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -61,7 +61,7 @@
Source29: xbiff-X11R7.0-1.0.1.tar.bz2
Source30: xcalc-X11R7.0-1.0.1.tar.bz2
Source31: xclipboard-X11R7.0-1.0.1.tar.bz2
-Source32: xclock-X11R7.1-1.0.2.tar.bz2
+Source32: xclock-1.0.3.tar.bz2
Source33: xcmsdb-X11R7.0-1.0.1.tar.bz2
Source34: xconsole-X11R7.1-1.0.2.tar.bz2
Source35: xcursor-themes-X11R7.0-1.0.1.tar.bz2
@@ -81,7 +81,7 @@
Source49: xfs-1.0.4.tar.bz2
Source50: xfsinfo-X11R7.0-1.0.1.tar.bz2
Source51: xfwp-X11R7.0-1.0.1.tar.bz2
-Source52: xgamma-X11R7.0-1.0.1.tar.bz2
+Source52: xgamma-1.0.2.tar.bz2
Source53: xgc-X11R7.0-1.0.1.tar.bz2
Source54: xhost-1.0.2.tar.bz2
Source55: xinit-1.0.4.tar.bz2
@@ -99,7 +99,7 @@
Source67: xman-X11R7.1-1.0.2.tar.bz2
Source68: xmessage-X11R7.0-1.0.1.tar.bz2
Source69: xmh-X11R7.0-1.0.1.tar.bz2
-Source70: xmodmap-1.0.2.tar.bz2
+Source70: xmodmap-1.0.3.tar.bz2
Source71: xmore-X11R7.0-1.0.1.tar.bz2
Source72: xphelloworld-X11R7.0-1.0.1.tar.bz2
Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2
@@ -455,6 +455,15 @@
/var/lib/xdm/authdir/
%changelog
+* Tue Aug 07 2007 - sndirsch@suse.de
+- xclock 1.0.3
+ * X.Org Bug 10775: xclock does not set _NET_WM_PID
+- xgamma 1.0.2
+ * X.Org Bug #10616: xgamma man page describes how to print gamma
+ poorly
+- xmodmap 1.0.3
+ * Bug 10616: manpage should note -pm is the default if no options
+ are given
* Wed Jul 25 2007 - sndirsch@suse.de
- iceauth 1.0.2
* Coverity #1039: Using uninitialized value "authdata"
++++++ xclock-X11R7.1-1.0.2.tar.bz2 -> xclock-1.0.3.tar.bz2 ++++++
++++ 12472 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/xclock-X11R7.1-1.0.2/ChangeLog new/xclock-1.0.3/ChangeLog
--- old/xclock-X11R7.1-1.0.2/ChangeLog 2006-04-27 01:37:10.000000000 +0200
+++ new/xclock-1.0.3/ChangeLog 2007-08-07 00:38:01.000000000 +0200
@@ -1,44 +1,335 @@
-2006-04-26 Adam Jackson
+commit 1ea56dd7d67cef80f364fafcf985fb4a6846109d
+Author: Alan Coopersmith
+Date: Mon Aug 6 15:37:11 2007 -0700
- * configure.ac:
- Bump to 1.0.2
+ Version bump: 1.0.3
-2006-03-28 Alan Coopersmith
+commit 0c458e28ff7a3f85c0041ac0f01791853c6bdf28
+Author: Alan Coopersmith
+Date: Mon Aug 6 15:36:57 2007 -0700
- * Clock.c:
- * XClock-color.ad:
- Bug #6420 https://bugs.freedesktop.org/show_bug.cgi?id=6420
- Patch #5103 https://bugs.freedesktop.org/attachment.cgi?id=5103
- xclock code contains wrong "ifdef RENDER" (Kirill Belokurov)
+ Replace static changelog with dist-hook to generate from git log
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c94628bef06ea76be371eb0dc8b60bdf0e0009e9
+Author: Alan Coopersmith
+Date: Mon Aug 6 15:32:20 2007 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Fix cast to clear sparse warning: Using plain integer as NULL pointer
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6f845b1d5516864e143113ca074e98b7be194adb
+Author: Alan Coopersmith
+Date: Mon Aug 6 15:25:57 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Change xclock_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Clears warning message:
+ Makefile.am:28: compiling `Clock.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
-2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a450fbb0f93f8bcdaabfb623fe49ddbb12468287
+Author: Alan Coopersmith
+Date: Wed Jun 13 14:45:51 2007 -0700
- * Makefile.am:
- * configure.ac:
- Change to use the app-defaults default dir configured in libXt.
+ Man page: add missing options to synopsis section
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8476e5fbddafc171903470000e86a68f66dc3958
+Author: Alan Coopersmith
+Date: Wed Jun 13 14:37:39 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Don't segfault if unable to load a usable fontset
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 41503ac2d7c84502074b3b6528478fe017060ef7
+Author: Alan Coopersmith
+Date: Tue Jun 12 19:19:32 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add pointer to Xft/fontconfig font name format to man page
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 300afc5784cec539a1a9d2babb9f73056aee52cd
+Author: Alan Coopersmith
+Date: Tue Jun 12 19:13:23 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ X.Org Bug 10775: xclock does not set _NET_WM_PID
+
+ X.Org Bugzilla #10775: https://bugs.freedesktop.org/show_bug.cgi?id=10775
+commit 861edc2009b8224d9acf77b9703a9fdb7d4903cc
+Author: Alan Coopersmith
+Date: Fri May 18 13:57:47 2007 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 38e77edd7c3cf9a3f8895e92e46debd0467ecc68
+Author: Alan Coopersmith
+Date: Fri May 18 13:57:15 2007 -0700
+
+ Make use of iconv() conditional on configure.ac finding it in libc or libiconv
+
+commit 4abb71337d740fdcca30f4f2f57b769b7f422c13
+Author: Osamu Sayama
+Date: Fri May 18 13:27:56 2007 -0700
+
+ Sun bug 6518500: Use iconv() to convert other charsets to UTF8
+
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6518500
+
+commit d335cefbbe5d23c410f8e8b7af0692559b649e67
+Author: Adam Jackson
+Date: Wed Apr 26 23:37:10 2006 +0000
+
+ Bump to 1.0.2
+
+commit a5fd7d91172970d75b1aeaa729125dbbc56615f7
+Author: Alan Coopersmith
+Date: Wed Mar 29 02:10:49 2006 +0000
+
+ Bug #6420 https://bugs.freedesktop.org/show_bug.cgi?id=6420 Patch #5103
+ https://bugs.freedesktop.org/attachment.cgi?id=5103 xclock code
+ contains wrong "ifdef RENDER" (Kirill Belokurov)
+
+commit 57647f74642e672bc7082aed84141b456659e464
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:48 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit cf4d35d1fe4750a81e6842216bf69cbc2b0616aa
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:42 2005 +0000
+
+ Stub COPYING files
+
+commit 21b8bde3c5d7c2d0c53a5abacc59ef0dad28b9cc
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:05 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 9d2ba2917eea02a77d1e50d74f7449166067d7dd
+Author: Kevin E Martin
+Date: Wed Dec 7 16:17:59 2005 +0000
+
+ Change to use the app-defaults default dir configured in libXt.
+
+commit 2b26c5434f06ee68349b41f332ff46b21bafd557
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:19 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 5a833cc25b6913ae41bd2c0263cff2bc9b63f28d
+Author: Alan Coopersmith
+Date: Tue Dec 6 16:26:51 2005 +0000
+
+ Bugzilla #5251 https://bugs.freedesktop.org/show_bug.cgi?id=5251 xclock
+ -digital only shows "20" (Egmont Koblinger)
+
+commit 78df2d5bdd53a2dd2febf18ce6c2c9d9e3e4f5f7
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:18 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit b7954fdcf2ad3298ad2b514d9e5336a9d87c9f22
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:40 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 c76fe7d3b795e61aff81672ea2ddd00fae1bd71e
+Author: Eric Anholt
+Date: Mon Nov 21 10:34:58 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 269b92bf81d7216e147ca9b95013da6bcfaf5c57
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:51 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 5b899caf3dd80e85e61d02796c87f2328f6083d4
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:52 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 9524650fad38958f6be53a65a809a77b4b0c3f12
+Author: Alan Coopersmith
+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 648d403d9f57c10c4f6f8906eb365793adc34fcd
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:21 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 3a45db6788aa23de00379fa73acd9737c6f95ba8
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:43 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 9be5366a9bd5b307fd046309ca500a5ad962a167
+Author: Alan Coopersmith
+Date: Thu Oct 13 20:11:00 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 81149c1a3710d53869bb92f1e4175a479c4204d6
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:29 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit e152093bd0a4b8e10282fcd7cbdefdf9204f1e32
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:31 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 44223cac61092b5d53ecfcd3816dc3bf113b774d
+Author: Kevin E Martin
+Date: Thu Jul 28 15:57:12 2005 +0000
+
+ Fix distcheck for remaining apps
+
+commit aec9ed75f66e67e9d9d69f04c40867577bcfdf21
+Author: Alan Coopersmith
+Date: Tue Jul 26 15:44:02 2005 +0000
+
+ Replace more GNU make-ism's with more portable macros
+
+commit ae8ef7b8f5bdd1c53e0f6cb1e1fb1e58333b27a6
+Author: Matthieu Herrb
+Date: Sat Jul 23 16:04:41 2005 +0000
+
+ Get rid of DEP_{CFLAGS,LIBS}. This is what was intended, but had a bug in
+ rev 1.2
+
+commit 05bce260dae5db93c178061d411b46b06e0c5e11
+Author: Matthieu Herrb
+Date: Sat Jul 23 15:57:38 2005 +0000
+
+ use the DEP_{CFLAGS,LIBS} that were computed in XCLOCK_{CFLAGS,LIBS}
+
+commit fe29c745207c2076cd711a23d1dbae033a192143
+Author: Adam Jackson
+Date: Wed Jul 20 19:31:52 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 575ef4d780ef152a889ee475e4875923c5244589
+Author: Alan Coopersmith
+Date: Sat Jul 16 17:31:45 2005 +0000
+
+ Add #include "config.h" for modularization Accept autoconf HAVE_STRLCPY as
+ alias for HAS_STRLCAT
+
+commit a4bcc238c730ebadb8c3c67763771bfbefed0879
+Author: Alan Coopersmith
+Date: Sat Jul 16 17:16:05 2005 +0000
+
+ Fix app-defaults rule in Makefile.am to work with non-GNU make Add checks
+ for strlcat, xkb, xft2, render, xkb Add --with-* options for XKB &
+ Xft2/Render (enabled by default)
+
+commit 80d8b6affb2ee823cf18a368ab33535cb1cf1721
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 1 17:55:48 2005 +0000
+
+ Build system for xclock
+
+commit ca43036f8cdd456ebff29860fd514248b3699bcf
+Author: Alan Coopersmith
+Date: Sat Oct 30 20:33:44 2004 +0000
+
+ Add -d flag for compilers like the Sun C compilers that produce dependency
+ lists themselves. To use with the Sun compilers, add to host.def: #
+ define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun
+ bug id #4245688 - fix by Alan Coopersmith)
+ Add Solaris to the platforms on which mprotect is run to set execute
+ permissions when necessary. (Sun bug id #6175128 - fix by Alan
+ Coopersmith)
+ Internationalize digital output (Sun bug id #4119396 - fix by Steve
+ Swales), add -bgpixmap option to set XPM file as background (originally
+ from STSF project version of xclock by Alan Coopersmith)
+ xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which
+ are one too low in error messages (Xorg bugzilla #1739, Sun bug id
+ 4637857 - fix by Sam Lau)
+
+commit 3f3b1fbe531e0c1ab3b74396bf4e78db861c8bbc
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:39 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 850f3f26301d2768b92d0d1de38e0cef467761c0
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:01 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 4227756d219279272400b4ffc7e77ace44adc600
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:55 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 61f5ea4644b373e3f8cc7c71d9f4d658707eff9a
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:16 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit fc5273bdfb2e6c21f305e9de872efa46b81c3910
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:58 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 5be867cc0e6745ddac1736441a0cc5e11dd6a523
+Author: Egbert Eich
+Date: Thu Jan 29 08:09:03 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit fd1ae903363dc0a1de353a594ab3524f0abcb0e0
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:03 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit c69802c0f421772f1b11e462e1b553e1638afc6f
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:03 2003 +0000
+
+ Initial revision
+
+commit f994ad01956aa98c99d6efd85df83fc59493c6ff
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 7fa20e0899cf53cbb6d386d0688127df8b6fb0c7
+Author: Kaleb Keithley
+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/xclock-X11R7.1-1.0.2/Clock.c new/xclock-1.0.3/Clock.c
--- old/xclock-X11R7.1-1.0.2/Clock.c 2006-03-29 04:10:49.000000000 +0200
+++ new/xclock-1.0.3/Clock.c 2007-08-07 00:31:19.000000000 +0200
@@ -1,5 +1,5 @@
/* $Xorg: Clock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */
-/* $XdotOrg: app/xclock/Clock.c,v 1.6 2006/03/29 02:10:49 alanc Exp $ */
+/* $XdotOrg: xc/programs/xclock/Clock.c,v 1.3 2004/10/30 20:33:44 alanc Exp $ */
/***********************************************************
@@ -97,6 +97,12 @@
#include
#include
#include
+#if !defined(NO_I18N) && defined(HAVE_ICONV)
+#include
+#include
+#include
+#include
+#endif
#if defined(XawVersion) && (XawVersion >= 7000002L)
#define USE_XAW_PIXMAP_CVT
@@ -230,6 +236,9 @@
static int clock_round ( double x );
static Boolean SetValues ( Widget gcurrent, Widget grequest, Widget gnew,
ArgList args, Cardinal *num_args );
+#if !defined(NO_I18N) && defined(HAVE_ICONV)
+static char *clock_to_utf8(const char *);
+#endif
ClockClassRec clockClassRec = {
{ /* core fields */
@@ -625,9 +634,19 @@
{
XGlyphInfo extents;
#ifndef NO_I18N
+# ifdef HAVE_ICONV
+ char *utf8_str;
+# endif
if (w->clock.utf8)
XftTextExtentsUtf8 (XtDisplay (w), w->clock.face,
(FcChar8 *) str, len, &extents);
+# ifdef HAVE_ICONV
+ else if ((utf8_str = clock_to_utf8(str)) != NULL) {
+ XftTextExtentsUtf8 (XtDisplay (w), w->clock.face,
+ (FcChar8 *)utf8_str, strlen(utf8_str), &extents);
+ free(utf8_str);
+ }
+# endif
else
#endif
XftTextExtents8 (XtDisplay (w), w->clock.face,
@@ -661,9 +680,12 @@
+ 2 * w->clock.padding;
min_height = fse->max_logical_extent.height +
3 * w->clock.padding;
+ } else {
+ no_locale = True;
}
}
- else
+
+ if (!no_locale)
#endif /* NO_I18N */
{
if (w->clock.font == NULL)
@@ -800,6 +822,9 @@
int x, y;
#ifndef NO_I18N
+# ifdef HAVE_ICONV
+ char *utf8_str;
+# endif
if (w->clock.utf8)
{
XftTextExtentsUtf8 (XtDisplay (w), w->clock.face,
@@ -807,6 +832,16 @@
XftTextExtentsUtf8 (XtDisplay (w), w->clock.face,
(FcChar8 *) str + off, len - off, &tail);
}
+# ifdef HAVE_ICONV
+ else if ((utf8_str = clock_to_utf8(str)) != NULL)
+ {
+ XftTextExtentsUtf8 (XtDisplay (w), w->clock.face,
+ (FcChar8 *)utf8_str, off, &head);
+ XftTextExtentsUtf8 (XtDisplay (w), w->clock.face,
+ (FcChar8 *)utf8_str + off, strlen(utf8_str) - off, &tail);
+ free(utf8_str);
+ }
+# endif
else
#endif
{
@@ -1213,7 +1248,7 @@
#endif
w->clock.prev_time_string[0] = '\0';
}
- clock_tic((XtPointer)w, (XtIntervalId)0);
+ clock_tic((XtPointer)w, (XtIntervalId *)NULL);
}
/* ARGSUSED */
@@ -1276,6 +1311,9 @@
{
XRectangle old_tail, new_tail, head;
int x, y;
+#if !defined(NO_I18N) && defined(HAVE_ICONV)
+ char *utf8_str;
+#endif
RenderTextBounds (w, w->clock.prev_time_string, i, prev_len,
&old_tail, 0, 0);
@@ -1302,7 +1340,18 @@
x, y,
(FcChar8 *) time_ptr + i, len - i);
- }
+ }
+# ifdef HAVE_ICONV
+ else if ((utf8_str =
+ clock_to_utf8(time_ptr + i)) != NULL) {
+ XftDrawStringUtf8 (w->clock.draw,
+ &w->clock.fg_color,
+ w->clock.face,
+ x, y,
+ (FcChar8 *)utf8_str, strlen(utf8_str) - i);
+ free(utf8_str);
+ }
+# endif
else
#endif
{
@@ -2046,3 +2095,51 @@
return (redisplay);
}
+
+#if !defined(NO_I18N) && defined(HAVE_ICONV)
+static char *
+clock_to_utf8(const char *str)
+{
+ iconv_t cd;
+ char *buf;
+ size_t in_len;
+ size_t buf_size;
+ size_t ileft, oleft;
+ const char *inptr;
+ char *outptr;
+ size_t ret;
+ const char *code_set = nl_langinfo(CODESET);
+
+ if (str == NULL ||code_set == NULL || strcasecmp(code_set, "646") == 0)
+ return NULL;
+
+ if (strcasecmp(code_set, "UTF-8") == 0)
+ return strdup(str);
+
+ cd = iconv_open("UTF-8", code_set);
+ if (cd == (iconv_t)-1)
+ return NULL;
+
+ in_len = strlen(str);
+ buf_size = MB_LEN_MAX * (in_len + 1);
+ if ((buf = malloc(buf_size)) == NULL) {
+ (void) iconv_close(cd);
+ return NULL;
+ }
+
+ inptr = str;
+ ileft = in_len;
+ outptr = buf;
+ oleft = buf_size;
+
+ ret = iconv(cd, &inptr, &ileft, &outptr, &oleft);
+ if (ret == (size_t)(-1) || oleft == 0 ) {
+ free(buf);
+ buf = NULL;
+ } else
+ *outptr = '\0';
+
+ (void) iconv_close(cd);
+ return buf;
+}
+#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/xclock-X11R7.1-1.0.2/compile new/xclock-1.0.3/compile
--- old/xclock-X11R7.1-1.0.2/compile 2006-05-21 03:45:24.000000000 +0200
+++ new/xclock-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 .
-#
-# 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 or send patches to
-# .
-
-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 .
-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/xclock-X11R7.1-1.0.2/config.h.in new/xclock-1.0.3/config.h.in
--- old/xclock-X11R7.1-1.0.2/config.h.in 2006-05-21 03:45:22.000000000 +0200
+++ new/xclock-1.0.3/config.h.in 2007-08-07 00:37:55.000000000 +0200
@@ -1,5 +1,11 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the `getpid' function. */
+#undef HAVE_GETPID
+
+/* Define to 1 if iconv() is available. */
+#undef HAVE_ICONV
+
/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY
@@ -21,6 +27,15 @@
/* 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
+
/* 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/xclock-X11R7.1-1.0.2/configure.ac new/xclock-1.0.3/configure.ac
--- old/xclock-X11R7.1-1.0.2/configure.ac 2006-04-27 01:37:10.000000000 +0200
+++ new/xclock-1.0.3/configure.ac 2007-08-07 00:37:01.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xclock,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclock)
+AC_INIT(xclock,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclock)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -31,7 +31,10 @@
AC_PROG_CC
AC_PROG_INSTALL
-AC_CHECK_FUNCS([strlcpy])
+AC_CHECK_FUNCS([strlcpy getpid])
+
+AC_SEARCH_LIBS([iconv], [iconv],
+ [AC_DEFINE(HAVE_ICONV, 1, [Define to 1 if iconv() is available.])])
dnl Required dependencies
PKG_CHECK_MODULES(XCLOCK_X11, x11)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclock-X11R7.1-1.0.2/Makefile.am new/xclock-1.0.3/Makefile.am
--- old/xclock-X11R7.1-1.0.2/Makefile.am 2005-12-07 17:17:59.000000000 +0100
+++ new/xclock-1.0.3/Makefile.am 2007-08-07 00:35:24.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.12 2005/12/06 22:48:19 kem Exp $
+# $Id$
#
# Copyright 2005 Red Hat, Inc.
#
@@ -22,7 +22,7 @@
bin_PROGRAMS = xclock
-xclock_CFLAGS = $(XCLOCK_CFLAGS)
+AM_CFLAGS = $(XCLOCK_CFLAGS)
xclock_LDADD = $(XCLOCK_LIBS)
xclock_SOURCES = \
@@ -51,6 +51,7 @@
appdefault_DATA = $(APPDEFAULTFILES)
EXTRA_DIST = \
+ ChangeLog \
$(APPDEFAULTFILES:%=%.ad) \
clmask.bit \
clock.bit
@@ -64,6 +65,15 @@
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+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
+
SED = sed
# Strings to replace in man pages
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclock-X11R7.1-1.0.2/missing new/xclock-1.0.3/missing
--- old/xclock-X11R7.1-1.0.2/missing 2006-05-21 03:45:23.000000000 +0200
+++ new/xclock-1.0.3/missing 2007-08-07 00:37:56.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,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 +46,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 +79,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
@@ -106,7 +109,7 @@
# 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
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,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";;
@@ -192,8 +195,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
@@ -214,25 +217,25 @@
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
;;
@@ -244,18 +247,18 @@
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
;;
@@ -267,11 +270,9 @@
\`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
@@ -289,11 +290,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
@@ -317,13 +324,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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclock-X11R7.1-1.0.2/xclock.c new/xclock-1.0.3/xclock.c
--- old/xclock-X11R7.1-1.0.2/xclock.c 2005-07-16 19:31:45.000000000 +0200
+++ new/xclock-1.0.3/xclock.c 2007-06-13 04:07:36.000000000 +0200
@@ -1,5 +1,5 @@
/* $Xorg: xclock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */
-/* $XdotOrg: app/xclock/xclock.c,v 1.4 2005/07/16 17:31:45 alanc Exp $ */
+/* $XdotOrg: $ */
/*
* xclock -- Hacked from Tony Della Fera's much hacked clock program.
@@ -57,6 +57,10 @@
Boolean no_locale = True; /* if True, use old behavior */
#endif
+#ifdef HAVE_GETPID
+# include
+#endif
+
/* Command line options table. Only resources are entered here...there is a
pass over the remaining options after XtParseCommand is let loose. */
@@ -208,6 +212,17 @@
False);
(void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel),
&wm_delete_window, 1);
+
+#ifdef HAVE_GETPID
+ {
+ pid_t pid = getpid();
+ XChangeProperty(XtDisplay(toplevel), XtWindow(toplevel),
+ XInternAtom(XtDisplay(toplevel), "_NET_WM_PID", False),
+ XA_CARDINAL, 32, PropModeReplace,
+ (unsigned char *) &pid, 1);
+ }
+#endif
+
XtAppMainLoop (app_con);
exit(0);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclock-X11R7.1-1.0.2/xclock.man new/xclock-1.0.3/xclock.man
--- old/xclock-X11R7.1-1.0.2/xclock.man 2004-04-23 21:54:39.000000000 +0200
+++ new/xclock-1.0.3/xclock.man 2007-06-13 04:29:24.000000000 +0200
@@ -30,10 +30,11 @@
xclock \- analog / digital clock for X
.SH SYNOPSIS
.ta 8n
-\fBxclock\fP [ \fB\-help\fP ] [ \fB\-analog\fP ] [ \fB\-digital\fP ]
+\fBxclock\fP [ \fB\-help\fP ] [ \fB\-analog\fP | \fB\-digital\fP ]
[ \fB\-brief\fP ] [ \fB\-chime\fP ] [ \fB\-hd\fP \fIcolor\fP ]
[ \fB\-hl\fP \fIcolor\fP ] [ \fB\-update\fP \fIseconds\fP ]
[ \fB\-strftime\fP \fIformat\fP ]
+[ \fB\-twelve\fP | \fB-twentyfour\fP | \fB-utime\fP ]
[ \fB\-padding\fP \fInumber\fP ]
[ \fB\-norender\fP ]
[ \fB\-render\fP ]
@@ -64,7 +65,7 @@
This option indicates that the digital clock should only display the hours
and minutes fields. The default is to show the full time and date information.
.TP 8
-\fB\-utime\fP or \fB\-d\fP
+\fB\-utime\fP
This option indicates that a digital clock should display seconds since
the Epoch (in format '970012340 seconds since Epoch' instead of a standard
24-hour time.
@@ -122,7 +123,11 @@
.TP 8
.B \-face \fIpattern\fP
This option specifies the font to use in digital mode when the
-Xrender extension is used.
+Xrender extension is used. Patterns are specified using the
+fontconfig face format described in the
+.I Font Names
+section of
+.IR fonts.conf (__filemansuffix__).
.SH X DEFAULTS
This program uses the
.I Clock
@@ -193,7 +198,11 @@
.TP 8
.B face (\fPclass\fB FaceName)
Specify the pattern for the font to be used for the digital clock when
-Xrender is used.
+Xrender is used. Patterns are specified using the fontconfig face format
+described in the
+.I Font Names
+section of
+.IR fonts.conf (__filemansuffix__).
.TP 8
.B sharp (\fPclass\fB Boolean)
Specifies if sharp edges should be used when rendering the clock.
@@ -249,7 +258,7 @@
.I __apploaddir__/XClock
specifies required resources
.SH "SEE ALSO"
-X(__miscmansuffix__), xrdb(1), time(3C)
+X(__miscmansuffix__), xrdb(1), time(3C), fonts.conf (__filemansuffix__).
.SH BUGS
.I Xclock
believes the system clock.
++++++ xgamma-X11R7.0-1.0.1.tar.bz2 -> xgamma-1.0.2.tar.bz2 ++++++
++++ 12758 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/xgamma-X11R7.0-1.0.1/ChangeLog new/xgamma-1.0.2/ChangeLog
--- old/xgamma-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:50.000000000 +0100
+++ new/xgamma-1.0.2/ChangeLog 2007-08-07 03:53:09.000000000 +0200
@@ -1,30 +1,193 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit fd48b87c3694d037fc8c1b9f3056677e57fd17ab
+Author: Alan Coopersmith
+Date: Mon Aug 6 18:52:14 2007 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Version bump: 1.0.2
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3d7b3e1ebcb3f14fcf5f5b7358177fe72f48291a
+Author: Alan Coopersmith
+Date: Mon Aug 6 18:46:32 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Replace COPYING stub with actual copyright/license info.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 534c77b8a405fd178283e4fa8d7eb797b5966cbc
+Author: Alan Coopersmith
+Date: Mon Aug 6 18:42:01 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit eff5594f8f68913db9ac60c9b38ec711823052ae
+Author: Alan Coopersmith
+Date: Mon Aug 6 18:39:38 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Change xgamma_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:27: compiling `xgamma.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 52251cd5c6e70a1cc3b037e976da4c8a7d8d4d5b
+Author: Alan Coopersmith
+Date: Fri May 18 23:57:13 2007 -0700
- * configure.ac:
- Update dependencies to work with separate build roots.
+ X.Org Bug #10616: xgamma man page describes how to print gamma poorly
+
+ X.Org Bugzilla #10616: https://bugs.freedesktop.org/show_bug.cgi?id=10616
+ Reported upstream from
+ Debian bug #296201 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=296021
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5453c3e32e6efb579ca407134333ffc98c0cce3a
+Author: Alan Coopersmith
+Date: Fri May 18 23:54:52 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ renamed: .cvsignore -> .gitignore
+commit 3527597ef5b7a833568b69d84693c2f2c18c99ed
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:50 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit c9bed158c8ec214e441dedf0fce8b070454f4f0d
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:44 2005 +0000
+
+ Stub COPYING files
+
+commit f2ccdd5afd59a807cb38d4a0f79070238cc3f4b8
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:07 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 69b8ad10dbc8108b54ae7a7a4883aea44fc92da1
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:22 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit c1b80f5de70f7f082279d681d6dc6c3cde82fac3
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:23 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit ab57eeffdc4a36c4da74c481ef554a045e00668a
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:42 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 bb461e96e050e4186b0301bf7677ac503b4d9914
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:01 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 759a0cef5de977a0940a2df707b209d778c8e2d7
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:52 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit a6e95476fad3b0fa51fe56e69ceb2e21e481ac66
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:36 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 3680097626a96aaacbb09b78bbe10a18893863cc
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:54 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 0251a5c704ef6062694a0cfc8e6d795b13ecb518
+Author: Alan Coopersmith
+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 e57db1a767c48697fc879b8fb13dff8f8431e2ca
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:45 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 0cae2b96bff11e4926e5334416679602fd58e83d
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:30 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 2ccb349fb788572a094bee33de4c62c49724ea4b
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:34 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 2bcdc37be05069c0fc5d3c9381d5ad65839a27ea
+Author: Adam Jackson
+Date: Wed Jul 20 19:31:56 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 0e0ad15de21add08bffc4379bde7cb0cf7e77b74
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 1 18:19:11 2005 +0000
+
+ Build system for xgamma
+
+commit f76ab59c4316564f3342e461c5c3fa22dd4b3241
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:48 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 57fac3d9878732736a47ff13fb9958ef8309a9c7
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:23 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit e752a63a88ce84f809e79382e5d9fa750f313704
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:08 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit b75dd258a9bd6e83dea2a91c87c302e391ea8f46
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:24 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 830d0520c7b83a17293587c6271c4b560e629ba3
+Author: Egbert Eich
+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 623ec47f62995d553fecbce1f4e01bd99b6090e7
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 83b8df8d51492e51eb148180306377c8b69d9dd6
+Author: Kaleb Keithley
+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/xgamma-X11R7.0-1.0.1/compile new/xgamma-1.0.2/compile
--- old/xgamma-X11R7.0-1.0.1/compile 2005-12-21 08:28:07.000000000 +0100
+++ new/xgamma-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 .
-#
-# 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/xgamma-X11R7.0-1.0.1/config.h.in new/xgamma-1.0.2/config.h.in
--- old/xgamma-X11R7.0-1.0.1/config.h.in 2005-12-21 08:28:06.000000000 +0100
+++ new/xgamma-1.0.2/config.h.in 2007-08-07 03:53:01.000000000 +0200
@@ -18,5 +18,14 @@
/* 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
+
/* 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/xgamma-X11R7.0-1.0.1/configure.ac new/xgamma-1.0.2/configure.ac
--- old/xgamma-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:50.000000000 +0100
+++ new/xgamma-1.0.2/configure.ac 2007-08-07 03:48:41.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xgamma,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xgamma)
+AC_INIT(xgamma,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xgamma)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-X11R7.0-1.0.1/COPYING new/xgamma-1.0.2/COPYING
--- old/xgamma-X11R7.0-1.0.1/COPYING 2005-12-19 17:22:44.000000000 +0100
+++ new/xgamma-1.0.2/COPYING 2007-08-07 03:46:11.000000000 +0200
@@ -1,12 +1,46 @@
-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 1999 by The XFree86 Project, Inc.
+All Rights Reserved.
-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 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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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.
+
+------------------------------------------------------------------------------
+Copyright 2005 Red Hat, Inc.
+
+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 Red Hat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Red Hat makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL RED HAT 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/xgamma-X11R7.0-1.0.1/Makefile.am new/xgamma-1.0.2/Makefile.am
--- old/xgamma-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:22.000000000 +0100
+++ new/xgamma-1.0.2/Makefile.am 2007-08-07 03:40:28.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = xgamma
-xgamma_CFLAGS = $(XGAMMA_CFLAGS)
+AM_CFLAGS = $(XGAMMA_CFLAGS)
xgamma_LDADD = $(XGAMMA_LIBS)
xgamma_SOURCES = \
@@ -35,9 +35,19 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+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
+
+
SED = sed
# Strings to replace in man pages
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xgamma-X11R7.0-1.0.1/missing new/xgamma-1.0.2/missing
--- old/xgamma-X11R7.0-1.0.1/missing 2005-12-21 08:28:07.000000000 +0100
+++ new/xgamma-1.0.2/missing 2007-08-07 03:53:02.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=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# 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.
+# 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
@@ -29,6 +33,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 +44,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 +79,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 +87,15 @@
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]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +104,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# 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)
+ # 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 $1 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."
@@ -102,13 +149,8 @@
;;
autoconf)
- 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 \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +158,8 @@
;;
autoheader)
- 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 \`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 +167,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 +177,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."
@@ -156,20 +188,15 @@
;;
autom4te)
- 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 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
@@ -185,74 +212,67 @@
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)
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
-
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
@@ -262,32 +282,36 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, 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 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)
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 +324,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 +347,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 +358,10 @@
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-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/xgamma-X11R7.0-1.0.1/xgamma.man new/xgamma-1.0.2/xgamma.man
--- old/xgamma-X11R7.0-1.0.1/xgamma.man 2004-04-23 21:54:48.000000000 +0200
+++ new/xgamma-1.0.2/xgamma.man 2007-05-19 08:51:52.000000000 +0200
@@ -32,6 +32,14 @@
.B xgamma
allows X users to query and alter the gamma correction of a monitor via
the X video mode extension (XFree86-VidModeExtension).
+.PP
+If no value for the gamma correction is given via the
+.I -gamma
+or
+.IR -rgamma / -ggamma / -bgamma
+options,
+.B xgamma
+prints the current gamma correction of the display.
.SH OPTIONS
.PP
.TP 8
@@ -56,10 +64,7 @@
.B "-gamma f.f"
The gamma correction can either be defined as a single value, or
separately for the red, green and blue components. This argument
-specifies the gamma correction as a single value. If no value for
-the gamma correction is given
-.B xgamma
-returns the current gamma correction of the display.
+specifies the gamma correction as a single value.
.PP
.TP 8
.B "-rgamma f.f"
++++++ xmodmap-1.0.2.tar.bz2 -> xmodmap-1.0.3.tar.bz2 ++++++
++++ 11566 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/xmodmap-1.0.2/autogen.sh new/xmodmap-1.0.3/autogen.sh
--- old/xmodmap-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/xmodmap-1.0.3/autogen.sh 2006-07-11 04:53:47.000000000 +0200
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.2/ChangeLog new/xmodmap-1.0.3/ChangeLog
--- old/xmodmap-1.0.2/ChangeLog 2006-10-12 00:16:27.000000000 +0200
+++ new/xmodmap-1.0.3/ChangeLog 2007-08-07 00:59:57.000000000 +0200
@@ -1,38 +1,279 @@
-2006-04-26 Adam Jackson
+commit 8d9922bdc53c5538dbfbba65f5a3e15afc8aea91
+Author: Alan Coopersmith
+Date: Mon Aug 6 15:58:57 2007 -0700
- * configure.ac:
- Bump to 1.0.1
+ Version bump: 1.0.3
-2006-03-22 Matthias Hopf
+commit 822b6bffce953041accc13f4633d2c5d4a8c8dcd
+Author: Alan Coopersmith
+Date: Tue Jul 17 15:57:10 2007 -0700
- * handle.c: (do_pointer):
- Allow changing of only a few buttons (not all).
+ Use strncasecmp if we can, instead of our own homegrown strncmp_nocase
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d76839f34692c7bc4ad1337ca23a3362534c1172
+Author: Alan Coopersmith
+Date: Tue Jul 17 15:52:39 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Change usage messages from arrays of strings to simple const strings
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 658d0022a87c5d3afe3e006e539c5c1b981a8d73
+Author: Alan Coopersmith
+Date: Tue Jul 17 13:27:50 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Constify some simple cases
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b7aafba248db5e9c3ba39e4819d0b9ae156d2c82
+Author: Alan Coopersmith
+Date: Tue Jul 17 13:03:38 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ sparse warning: non-ANSI definition of function 'process_file' & 'process_line'
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e1cb231b31be520b76aeb72acc1af9ff6682fa9d
+Author: Alan Coopersmith
+Date: Tue Jul 17 13:01:07 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ Add hooks for checking source code with lint/sparse/etc.
-2005-09-28 Kristian Høgsberg
+commit eda127631001674cd40466fddb5225e618c2a327
+Author: Alan Coopersmith
+Date: Tue Jul 17 12:54:16 2007 -0700
- * AUTHORS: Copy bits from COPYING here.
+ Remove unused code
- * README: Copy first paragraph from man page.
+commit b57637a154a40e874a6bcb351aaa8335e86ae3c0
+Author: Alan Coopersmith
+Date: Tue Jul 17 12:48:31 2007 -0700
- * Makefile.am (EXTRA_DIST): Add swap.km.
+ Coverity #678: get_keysym_list: Returned without freeing storage "keysymlist"
+
+ Free allocated memory in error path when it's not being returned
+commit 72a01c6a3bae2cf113ab0ec812df41fec9b99a51
+Author: Alan Coopersmith
+Date: Tue Jul 17 11:04:16 2007 -0700
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 4dfbd74bda684bea748fbbcbfc172f6325423d12
+Author: Alan Coopersmith
+Date: Tue Jul 17 10:37:57 2007 -0700
+
+ Use AM_CFLAGS instead of xmodmap_CFLAGS to avoid automake-1.10 warnings
+
+commit fd25acd688b86a1490198d61f66d2503a87883a0
+Author: Alan Coopersmith
+Date: Wed Apr 11 15:30:16 2007 -0700
+
+ Bug 10616: manpage should note -pm is the default if no options are given
+
+ X.Org Bugzilla #10616 https://bugs.freedesktop.org/show_bug.cgi?id=10616
+ Reported upstream from
+ Debian Bug #236918 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=236198
+
+commit 15a83b060b9b4bd7d6a64eacc7191e33eb91b269
+Author: Adam Jackson
+Date: Fri Oct 13 17:55:42 2006 -0400
+
+ Bump to 1.0.2
+
+commit 27404e37e50fe637f33f6efac2fa73c9cfc1026c
+Author: Alan Coopersmith
+Date: Wed Sep 13 15:08:59 2006 -0700
+
+ Add *~ to .gitignore to ignore emacs droppings
+
+commit 98063dc377dff55f1b057eda14ace69beed82c16
+Author: Alan Coopersmith
+Date: Wed Sep 13 15:08:19 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 86a4f2a2d66bbeb6c9deee9133eb335f593c47f9
+Author: Alan Coopersmith
+Date: Wed Sep 13 15:07:16 2006 -0700
+
+ Sun bug 6459447: Add note on reversing CapsLock/Control swap to man page
+
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6459447
+
+commit 7410e78207ca01d70d9df14eb1e4e07e7fe5f237
+Author: Adam Jackson
+Date: Wed Apr 26 23:42:50 2006 +0000
+
+ Bump to 1.0.1
+
+commit e8a5353022f9e616c22a7a1659ff4d4d968f5d88
+Author: Matthias Hopf
+Date: Wed Mar 22 15:14:31 2006 +0000
+
+ Allow changing of only a few buttons (not all).
+
+commit b9854ab5e66bf9ec8911d6573440738325cd51b4
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:09 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit a01cd5fe1c387c62b11368e3fac100e24e7d841e
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:24 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit d39efd733ad56391082b08f9f486cf147e931197
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:26 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 8a0747a21f9737212784c55b62044e86caf1fbc8
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:45 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 5e4dec81bffb5f296773c43aa45f52dc354c1886
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:05 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit f9c0b2a947ea8690ac73e8f9ce857cd195551c01
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:54 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 65fb2a168c968e486be090caad29349427e4d65e
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:56 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 4c47648e4789efe03eec74c39b2ab6b9b27230fc
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:24 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 356f26e95eb7003f9f65ffe480773f0d788dc871
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:47 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit c4483b314106bcd2bb13e49650cfd279f74da73e
+Author: Kristian Høgsberg
+Date: Wed Sep 28 19:28:15 2005 +0000
+
+ Copy bits from COPYING here.
+ Copy first paragraph from man page.
+ Add swap.km.
+
+commit 149fc373521b4ceb33e37c693834a27a702fcc2b
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:36 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 327ffdf93fd0b8f7942c08653cb644be2062428c
+Author: Kevin E Martin
+Date: Thu Jul 28 02:58:59 2005 +0000
+
+ Add build system for xmodmap Add xmodmap to build script
+
+commit 9145de293109ba96fc8b97ac59c16c51b992f416
+Author: Kristian Høgsberg
+Date: Thu Nov 11 15:37:01 2004 +0000
+
+ Fix #1818
+
+commit d9e41011e4477f581fb5592ad81fc081e0b606b9
+Author: Alan Coopersmith
+Date: Sat Oct 30 20:33:44 2004 +0000
+
+ Add -d flag for compilers like the Sun C compilers that produce dependency
+ lists themselves. To use with the Sun compilers, add to host.def: #
+ define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun
+ bug id #4245688 - fix by Alan Coopersmith)
+ Add Solaris to the platforms on which mprotect is run to set execute
+ permissions when necessary. (Sun bug id #6175128 - fix by Alan
+ Coopersmith)
+ Internationalize digital output (Sun bug id #4119396 - fix by Steve
+ Swales), add -bgpixmap option to set XPM file as background (originally
+ from STSF project version of xclock by Alan Coopersmith)
+ xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which
+ are one too low in error messages (Xorg bugzilla #1739, Sun bug id
+ 4637857 - fix by Sam Lau)
+
+commit ce64b2b312a73b9a4f266da8810ab552af4fbb1e
+Author: Søren Sandmann Pedersen
+Date: Fri Oct 15 00:44:08 2004 +0000
+
+ Thu Oct 14 20:43:03 2004 Søren Sandmann
+ Fix a write-to-constant-string issue.
+ Fix several buffer overruns.
+
+commit 8ad5d3b908d68353d407fa8f678c93320760eb12
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:59 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 536ef73f2a5310f25c99a9c3a41f71d032ef95a6
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:42 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 11073ef989618e076133b1f58be7a406ba373b1b
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:15 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit e8ce00f47c06ea1bfcfd6538a80a10b868cee19e
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 072ef0f49182d381ac7e630eccd1b5b6749334a7
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit eb9faf624f11691c4ca7344f4169117718cea9c7
+Author: Kaleb Keithley
+Date: Thu Dec 4 22:03:56 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit d678c60d8b5bede9e61f532aa1740d741b8bbe90
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:15 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit dc0f15394719e18bb9b01e70468f4d9908488d35
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit e29f1f1ed2128d7382a72ccb1684045fe4bc8183
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:54 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/xmodmap-1.0.2/compile new/xmodmap-1.0.3/compile
--- old/xmodmap-1.0.2/compile 2006-10-13 03:56:44.000000000 +0200
+++ new/xmodmap-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 .
-#
-# 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 or send patches to
-# .
-
-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 .
-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/xmodmap-1.0.2/config.h.in new/xmodmap-1.0.3/config.h.in
--- old/xmodmap-1.0.2/config.h.in 2006-10-13 23:55:38.000000000 +0200
+++ new/xmodmap-1.0.3/config.h.in 2007-08-07 00:59:51.000000000 +0200
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
/* Name of package */
#undef PACKAGE
@@ -18,5 +21,14 @@
/* 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
+
/* 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/xmodmap-1.0.2/configure.ac new/xmodmap-1.0.3/configure.ac
--- old/xmodmap-1.0.2/configure.ac 2006-10-13 23:29:32.000000000 +0200
+++ new/xmodmap-1.0.3/configure.ac 2007-08-07 00:56:34.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xmodmap,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmodmap)
+AC_INIT(xmodmap,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmodmap)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -31,11 +31,16 @@
AC_PROG_CC
AC_PROG_INSTALL
+AC_CHECK_FUNCS([strncasecmp])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(DEP, x11)
AC_SUBST(DEP_CFLAGS)
AC_SUBST(DEP_LIBS)
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_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/xmodmap-1.0.2/handle.c new/xmodmap-1.0.3/handle.c
--- old/xmodmap-1.0.2/handle.c 2006-10-12 00:16:27.000000000 +0200
+++ new/xmodmap-1.0.3/handle.c 2007-07-18 00:54:28.000000000 +0200
@@ -28,6 +28,7 @@
*/
/* $XFree86: xc/programs/xmodmap/handle.c,v 3.6 2001/07/25 15:05:27 dawes Exp $ */
+#include "config.h"
#include
#include
#include
@@ -78,7 +79,7 @@
}
static char *
-copy_to_scratch(char *s, int len)
+copy_to_scratch(const char *s, int len)
{
static char *buf = NULL;
static int buflen = 0;
@@ -121,19 +122,19 @@
static void do_keycode ( char *line, int len );
static void do_keysym ( char *line, int len );
-static void finish_keycodes ( char *line, int len, KeyCode *keycodes,
+static void finish_keycodes ( const char *line, int len, KeyCode *keycodes,
int count );
static void do_add ( char *line, int len );
static void do_remove ( char *line, int len );
static void do_clear ( char *line, int len );
static void do_pointer ( char *line, int len );
-static int get_keysym_list ( char *line, int len, int *np, KeySym **kslistp );
+static int get_keysym_list ( const char *line, int len, int *np, KeySym **kslistp );
static void print_opcode(union op *op);
-static int skip_word ( char *s, int len );
-static int skip_chars ( char *s, int len );
-static int skip_space ( char *s, int len );
+static int skip_word ( const char *s, int len );
+static int skip_chars ( const char *s, int len );
+static int skip_space ( const char *s, int len );
static struct dt {
char *command; /* name of input command */
@@ -188,7 +189,7 @@
*/
static int
-skip_word (char *s, int len)
+skip_word (const char *s, int len)
{
register int n;
@@ -197,7 +198,7 @@
}
static int
-skip_chars(char *s, int len)
+skip_chars(const char *s, int len)
{
register int i;
@@ -210,7 +211,7 @@
}
static int
-skip_space(char *s, int len)
+skip_space(const char *s, int len)
{
register int i;
@@ -224,7 +225,7 @@
static int
-skip_until_char(char *s, int len, char c)
+skip_until_char(const char *s, int len, char c)
{
register int i;
@@ -234,24 +235,6 @@
return (i);
}
-#if 0
-static int
-skip_until_chars(char *s, int len, char *cs, int cslen)
-{
- int i;
-
- for (i = 0; i < len; i++) {
- register int j;
- register char c = s[i];
-
- for (j = 0; j < cslen; j++) {
- if (c == cs[j]) goto done;
- }
- }
- done:
- return (i);
-}
-#endif
/*
* The action routines.
@@ -284,23 +267,8 @@
return;
}
-#if 0
-static char *
-copystring(char *s, int len)
-{
- char *retval;
-
- retval = (char *) malloc (len+1);
- if (retval) {
- strncpy (retval, s, len);
- retval[len] = '\0';
- }
- return (retval);
-}
-#endif
-
static Bool
-parse_number(char *str, unsigned long *val)
+parse_number(const char *str, unsigned long *val)
{
char *fmt = "%ld";
@@ -320,7 +288,7 @@
}
static Bool
-parse_keysym(char *line, int n, char **name, KeySym *keysym)
+parse_keysym(const char *line, int n, char **name, KeySym *keysym)
{
*name = copy_to_scratch (line, n);
if (!strcmp(*name, "NoSymbol")) {
@@ -433,7 +401,7 @@
}
static void
-finish_keycodes(char *line, int len, KeyCode *keycodes, int count)
+finish_keycodes(const char *line, int len, KeyCode *keycodes, int count)
{
int n;
KeySym *kslist;
@@ -824,8 +792,9 @@
add_to_work_queue (uop);
}
+#ifndef HAVE_STRNCASECMP
static int
-strncmp_nocase(char *a, char *b, int n)
+strncasecmp(const char *a, const char *b, int n)
{
int i;
int a1, b1;
@@ -842,7 +811,7 @@
}
return 0;
}
-
+#endif
/*
* do_pointer = get list of numbers of the form
@@ -884,7 +853,7 @@
line += n, len -= n;
i = 0;
- if (len < 7 || strncmp_nocase (line, "default", 7) != 0) {
+ if (len < 7 || strncasecmp (line, "default", 7) != 0) {
while (len > 0) {
n = skip_space (line, len);
line += n, len -= n;
@@ -941,7 +910,7 @@
*/
static int
-get_keysym_list(char *line, int len, int *np, KeySym **kslistp)
+get_keysym_list(const char *line, int len, int *np, KeySym **kslistp)
{
int havesofar, maxcanhave;
KeySym *keysymlist;
@@ -972,6 +941,7 @@
n = skip_chars (line, len);
if (n < 0) {
badmsg0 ("keysym name list");
+ free(keysymlist);
return (-1);
}
@@ -990,12 +960,14 @@
/* grow the list bigger if necessary */
if (havesofar >= maxcanhave) {
+ KeySym *origkeysymlist = keysymlist;
maxcanhave *= 2;
keysymlist = (KeySym *) realloc (keysymlist,
maxcanhave * sizeof (KeySym));
if (!keysymlist) {
badmsg ("attempt to grow keysym list to %ld bytes",
(long) (maxcanhave * sizeof (KeySym)));
+ free(origkeysymlist);
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/xmodmap-1.0.2/Makefile.am new/xmodmap-1.0.3/Makefile.am
--- old/xmodmap-1.0.2/Makefile.am 2006-10-12 00:16:27.000000000 +0200
+++ new/xmodmap-1.0.3/Makefile.am 2007-07-17 22:00:38.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = xmodmap
-xmodmap_CFLAGS = $(DEP_CFLAGS)
+AM_CFLAGS = $(DEP_CFLAGS)
xmodmap_LDADD = $(DEP_LIBS)
xmodmap_SOURCES = \
@@ -36,6 +36,8 @@
xmodmap.man
EXTRA_DIST = \
+ ChangeLog \
+ autogen.sh \
swap.km
appmandir = $(APP_MAN_DIR)
@@ -68,3 +70,20 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+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
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(AM_CFLAGS) $(xmodmap_SOURCES)
+endif 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/xmodmap-1.0.2/missing new/xmodmap-1.0.3/missing
--- old/xmodmap-1.0.2/missing 2006-10-13 03:56:44.000000000 +0200
+++ new/xmodmap-1.0.3/missing 2007-08-07 00:59:52.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,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 +46,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 +79,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
@@ -106,7 +109,7 @@
# 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
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,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";;
@@ -192,8 +195,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
@@ -214,25 +217,25 @@
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
;;
@@ -244,18 +247,18 @@
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
;;
@@ -267,11 +270,9 @@
\`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
@@ -289,11 +290,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
@@ -317,13 +324,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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.2/pf.c new/xmodmap-1.0.3/pf.c
--- old/xmodmap-1.0.2/pf.c 2006-10-12 00:16:27.000000000 +0200
+++ new/xmodmap-1.0.3/pf.c 2007-07-17 22:07:21.000000000 +0200
@@ -34,11 +34,10 @@
#include "xmodmap.h"
#define NOTINFILEFILENAME "commandline"
-char *inputFilename = NOTINFILEFILENAME;
+const char *inputFilename = NOTINFILEFILENAME;
int lineno = 0;
-void process_file (filename)
- char *filename; /* NULL means use stdin */
+void process_file (const char *filename) /* NULL means use stdin */
{
FILE *fp;
char buffer[BUFSIZ];
@@ -80,8 +79,7 @@
}
-void process_line (buffer)
- char *buffer;
+void process_line (char *buffer)
{
int len;
int i;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.2/xmodmap.c new/xmodmap-1.0.3/xmodmap.c
--- old/xmodmap-1.0.2/xmodmap.c 2006-10-12 00:16:27.000000000 +0200
+++ new/xmodmap-1.0.3/xmodmap.c 2007-07-18 00:47:23.000000000 +0200
@@ -35,7 +35,7 @@
#include
#include "xmodmap.h"
-char *ProgramName;
+const char *ProgramName;
Display *dpy = NULL;
int min_keycode, max_keycode;
Bool verbose = False;
@@ -62,66 +62,56 @@
return buf;
}
-static char *help_message[] = {
-"\nwhere options include:",
-" -display host:dpy X server to use",
-" -verbose, -quiet turn logging on or off",
-" -n don't execute changes, just show like make",
-" -e expression execute string",
-" -pm print modifier map",
-" -pk print keymap table",
-" -pke print keymap table as expressions",
-" -pp print pointer map",
-" -grammar print out short help on allowable input",
-" - read standard input",
-"",
-NULL};
+static const char help_message[] =
+"\nwhere options include:\n"
+" -display host:dpy X server to use\n"
+" -verbose, -quiet turn logging on or off\n"
+" -n don't execute changes, just show like make\n"
+" -e expression execute string\n"
+" -pm print modifier map\n"
+" -pk print keymap table\n"
+" -pke print keymap table as expressions\n"
+" -pp print pointer map\n"
+" -grammar print out short help on allowable input\n"
+" - read standard input\n"
+"\n";
static void
usage(void)
{
- char **cpp;
-
fprintf (stderr, "usage: %s [-options ...] [filename]\n", ProgramName);
- for (cpp = help_message; *cpp; cpp++) {
- fprintf (stderr, "%s\n", *cpp);
- }
+ fprintf (stderr, "%s\n", help_message);
Exit (1);
}
-static char *grammar_message[] = {
-" pointer = default reset pointer buttons to default",
-" pointer = NUMBER ... set pointer button codes",
-" keycode NUMBER = [KEYSYM ...] map keycode to given keysyms",
-" keysym KEYSYM = [KEYSYM ...] look up keysym and do a keycode operation",
-" clear MODIFIER remove all keys for this modifier",
-" add MODIFIER = KEYSYM ... add the keysyms to the modifier",
-" remove MODIFIER = KEYSYM ... remove the keysyms from the modifier",
-"",
-"where NUMBER is a decimal, octal, or hex constant; KEYSYM is a valid",
-"Key Symbol name; and MODIFIER is one of the eight modifier names: Shift,",
-"Lock, Control, Mod1, Mod2, Mod3, Mod4, or Mod5. Lines beginning with",
-"an exclamation mark (!) are taken as comments. Case is significant except",
-"for MODIFIER names.",
-"",
-"Keysyms on the left hand side of the = sign are looked up before any changes",
-"are made; keysyms on the right are looked up after all of those on the left",
-"have been resolved. This makes it possible to swap modifier keys.",
-"",
-NULL };
+static const char grammar_message[] =
+" pointer = default reset pointer buttons to default\n"
+" pointer = NUMBER ... set pointer button codes\n"
+" keycode NUMBER = [KEYSYM ...] map keycode to given keysyms\n"
+" keysym KEYSYM = [KEYSYM ...] look up keysym and do a keycode operation\n"
+" clear MODIFIER remove all keys for this modifier\n"
+" add MODIFIER = KEYSYM ... add the keysyms to the modifier\n"
+" remove MODIFIER = KEYSYM ... remove the keysyms from the modifier\n"
+"\n"
+"where NUMBER is a decimal, octal, or hex constant; KEYSYM is a valid\n"
+"Key Symbol name; and MODIFIER is one of the eight modifier names: Shift,\n"
+"Lock, Control, Mod1, Mod2, Mod3, Mod4, or Mod5. Lines beginning with\n"
+"an exclamation mark (!) are taken as comments. Case is significant except\n"
+"for MODIFIER names.\n"
+"\n"
+"Keysyms on the left hand side of the = sign are looked up before any changes\n"
+"are made; keysyms on the right are looked up after all of those on the left\n"
+"have been resolved. This makes it possible to swap modifier keys.\n"
+"\n";
static void
grammar_usage(void)
{
- char **cpp;
-
fprintf (stderr, "%s accepts the following input expressions:\n\n",
ProgramName);
- for (cpp = grammar_message; *cpp; cpp++) {
- fprintf (stderr, "%s\n", *cpp);
- }
+ fprintf (stderr, "%s\n", grammar_message);
Exit (0);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.2/xmodmap.h new/xmodmap-1.0.3/xmodmap.h
--- old/xmodmap-1.0.2/xmodmap.h 2006-10-12 00:16:27.000000000 +0200
+++ new/xmodmap-1.0.3/xmodmap.h 2007-07-17 22:26:56.000000000 +0200
@@ -28,17 +28,17 @@
*/
/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.4 2001/01/17 23:46:21 dawes Exp $ */
-extern char *ProgramName;
+extern const char *ProgramName;
extern Display *dpy;
extern int min_keycode, max_keycode;
extern Bool verbose;
extern Bool dontExecute;
-extern char *inputFilename;
+extern const char *inputFilename;
extern int lineno;
extern int parse_errors;
extern void initialize_map(void);
-extern void process_file(char *filename);
+extern void process_file(const char *filename);
extern void process_line(char *buffer);
extern void handle_line(char *line, int len);
extern void print_work_queue(void);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xmodmap-1.0.2/xmodmap.man new/xmodmap-1.0.3/xmodmap.man
--- old/xmodmap-1.0.2/xmodmap.man 2006-10-12 00:16:27.000000000 +0200
+++ new/xmodmap-1.0.3/xmodmap.man 2007-04-12 00:19:34.000000000 +0200
@@ -89,7 +89,8 @@
.TP 8
.B \-pm
This option indicates that the current modifier map should be printed on the
-standard output.
+standard output. This is the default mode of operation if no other mode
+options are specified.
.TP 8
.B \-pk
This option indicates that the current keymap table should be printed on the
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org