x11-apps: Changes to 'debian-unstable'
debian/changelog | 1
xlogo/ChangeLog | 559 +++
xlogo/INSTALL | 143
xlogo/Logo.c | 57
xlogo/Logo.h | 2
xlogo/LogoP.h | 2
xlogo/Makefile.am | 56
xlogo/Makefile.in | 539 +--
xlogo/README | 25
xlogo/RenderLogo.c | 7
xlogo/RenderLogo.h | 2
xlogo/XLogo-color.ad | 5
xlogo/XLogo.ad | 4
xlogo/aclocal.m4 | 1930 ++++++-----
xlogo/app-defaults/XLogo | 4
xlogo/app-defaults/XLogo-color | 5
xlogo/compile | 142
xlogo/config.guess | 291 -
xlogo/config.h.in | 42
xlogo/config.sub | 161
xlogo/configure | 6674 ++++++++++++++++++++++++-----------------
xlogo/configure.ac | 30
xlogo/depcomp | 172 -
xlogo/install-sh | 517 ++-
xlogo/missing | 104
xlogo/mkinstalldirs | 158
xlogo/print.c | 260 -
xlogo/print.h | 41
xlogo/xlogo.c | 96
xlogo/xlogo.h | 5
xlogo/xlogo.man | 19
31 files changed, 6933 insertions(+), 5120 deletions(-)
New commits:
commit 960480b40fc370f0dd3460e01da34c1a3e25985a
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Dec 11 07:44:48 2009 +0100
xlogo 1.0.2
diff --git a/debian/changelog b/debian/changelog
index 04a1112..ed47529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-apps (7.5+2) UNRELEASED; urgency=low
* Update debian/copyright and package description according
to ico and xedit additions.
* x11pref 1.5.1.
+ * xlogo 1.0.2.
-- Brice Goglin <bgoglin@debian.org> Sun, 06 Dec 2009 20:54:44 +0100
diff --git a/xlogo/AUTHORS b/xlogo/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/xlogo/ChangeLog b/xlogo/ChangeLog
index d293dda..240f198 100644
--- a/xlogo/ChangeLog
+++ b/xlogo/ChangeLog
@@ -1,41 +1,550 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f826c5af5514da12ee146c61698d4545af391434
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 10 22:33:05 2009 -0800
- * configure.ac:
- Update package version for X11R7 release.
+ xlogo 1.0.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3166b7e2e3013ca0d0c5b1679cdcb88f21384398
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 10 22:32:35 2009 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Add direct dependency on libXt, since xlogo calls Xt functions
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 02220d224d457aa070daf7603461b5d359780de4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 10 22:25:24 2009 -0800
- * Makefile.am:
- * configure.ac:
- Change to use the app-defaults default dir configured in libXt.
+ Remove more leftover Xprint bits
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit fed17089fc586b6e762d121a34f2dbf95dd6433b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 10 22:23:18 2009 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Strip old CVS id tags and trailing whitespaces
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a3223e295cf840b7854a91c7e5577812edb11e62
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Dec 10 22:10:27 2009 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Use AM_V_GEN to silence man page generation output
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-2005-11-19 Alan Coopersmith <alan.coopersmith@sun.com>
+commit 39313841d56ebe935d55190cc239ac66d072bb32
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Nov 26 09:19:54 2009 -0500
- * configure.ac:
- Add dependency on xp module when building with Xprint support.
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0f388329378b5e5fb4cbce3e76e0f7661ac326eb
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:08 2009 -0400
- * configure.ac:
- Update dependencies to work with separate build roots.
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit cc1220ace1ce5ff89e089603d912d9dd456066bf
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 27 15:07:25 2009 -0400
- * configure.ac:
- Update package version number for RC1 release.
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+commit 7e3e8c7f74d9ca2286001d53510668b02e75e25f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:39 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit e5230ea7372b2d9672579f65752a1d2c7e65dab5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:15 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 8e40f73c2a36680aec587b4be5971cea5141e13a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Oct 21 12:47:21 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 8510be4defc2a6d291ac87439abfffcdd4214f7b
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Oct 1 14:54:26 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 982d3b53606238b4602bbdbc4f0f1f9c1bd0563b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Thu Oct 1 14:10:15 2009 -0700
+
+ Require macros 1.3 for XORG_DEFAULT_OPTIONS
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>>
+
+commit 12f6dde9f5cd64773ccd907deb8600533e7b958f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Thu Oct 1 14:06:44 2009 -0700
+
+ Fixed compiler warning
+
+ xlogo.c:153: warning: format not a string literal and no format arguments
+
+commit 9bb8ad30520e9e9d688e844e18590b371a2ac1a9
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Thu Jan 22 15:40:27 2009 -0200
+
+ Correct make distcheck and sparse warnings.
+
+commit 15a8c8d5c3db1945a3ba6876241d04f0027e9dcd
+Author: Julien Cristau <jcristau@debian.org>
+Date: Thu Aug 21 00:30:29 2008 +0200
+
+ Build fix, XAW_USE_XPRINT is no more
+
+commit 44ca3b95b355af966044132fab8b5e1616aa7303
+Author: James Cloos <cloos@jhcloos.com>
+Date: Wed Aug 20 10:32:52 2008 -0400
+
+ xaw8 is gone, use xaw7
+
+commit f426787beaad60cee9c116613ddde540c310038a
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 16 14:25:24 2008 +0200
+
+ $(builddir) is the current directory
+
+ Apparently automake doesn't always export the builddir variable.
+ This fixes my previous commit.
+
+commit 7c427dcbce96d6cb445ed73e08805524b593e1ea
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Apr 20 19:51:43 2008 +0200
+
+ Use AM_CFLAGS instead of xlogo_CFLAGS and remove AM_PROG_CC_C_O
+
+commit 79c7a3d87978c253105603b8ac6b5d48a0b2b476
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Apr 20 19:49:24 2008 +0200
+
+ Fix build with builddir != srcdir
+
+commit 1b7e7cf9ec4723afa3e9bed0825fbc8adca6408f
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Thu Mar 27 20:30:08 2008 -0700
+
+ Added missing AM_PROG_CC_C_O
+
+commit 2ddbb1bf87af90f0fcf1d78992b3783374831614
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Thu Mar 27 20:07:50 2008 -0700
+
+ Build fix for file systems that are not case sensitive
+
+commit 7c07c38b263902fef9e2962c1946ad493718c2e6
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:37:21 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 2875b41b3e619315821b603ef56b1d29657469c2
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:51:31 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit dc7d96bec5665c64da74da75e0710a7b57b9173a
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:24:58 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit a88e031e6c81857edc404f7b5d52c0c39cdd3146
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:51 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit d8f94db09d68dc59dfe8d183cd0c1f3b9eff3004
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:45 2005 +0000
+
+ Stub COPYING files
+
+commit ae1b1194d57cb1a1089cffe61137e67c9e8b6b20
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:08 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit be590c64bc8df224154347ab5f6c32fe60bf0e67
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 7 16:18:00 2005 +0000
+
+ Change to use the app-defaults default dir configured in libXt.
+
+commit 2ad19d20118c07d369ef67dd9ff8bd094d8e5864
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:23 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 6ea22dc485341e30ac906e3559b104326ab90178
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:25 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 7f3821c5e6815bbb59a9298d2671b150cf89615f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:44 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 601ec0670c548caed335352295bbcb058968aa50
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:35:02 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 09d3bc9867032ee89503914bc7e731c48a470dfb
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:53 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit a5ed76fbde1c8195951b41a0372a0b5caeeaebfa
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun Nov 20 04:13:45 2005 +0000
+
+ Add dependency on xp module when building with Xprint support.
+
+commit ddcaa857470b13840b8a3c3e1748c0154f76b9c2
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:37 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 f3e7ab0f031b9ff8968596667616e79ec05f9b62
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:55 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 1b4c1658fc24b851a7f83e9190ecc6aacbc9f23b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:32:54 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 0b90073689ab1745bb2277485687521f564a1939
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:23 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 0813f5229d48b9a0ed3dec5438db338dae71dfd9
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Oct 15 01:04:15 2005 +0000
+
+ Add #include <config.h> for modularization.
+
+commit fd78790af2a87e999b0f01d1c8f8ecce849a2384
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:46 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 70298627f76aaf18ab4e63e297a0f42a8809d9bb
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+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 42f1737418b0c1d7e2ceaaaf3ddbcb2db7ab614b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Aug 16 15:52:25 2005 +0000
+
+ Fix render checks to check for both Xrender & Xft2, and to define XRENDER
+
+commit 2eae29c6f837bd6f8ab383f0d4e61742c063291a
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 20:25:30 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 345a950cebdb8717e08fb878de0307a2611ba846
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:35 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 28cbacfd0b809ce1614d177b10dd11ff1ab4b9d0
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Jul 26 15:44:02 2005 +0000
+
+ Replace more GNU make-ism's with more portable macros
+
+commit e3721beb3d51bd53527639afb4185f8fda24101e
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Jul 23 16:41:40 2005 +0000
+
+ Fix remaining DEP_{CFLAGS,LIB} references
+
+commit 19cf02998290cc99fcbc94feb03647386ef595f9
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Jul 23 16:40:58 2005 +0000
+
+ fix GNU-make only app-default rule
+
+commit b7533f8eb9cea84603a80e5207b4a589d3dfd444
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Jul 20 19:31:58 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 6fc943cfccd96e6ad0fec6a2e1b836fa0d0d7d3a
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 5 22:51:09 2005 +0000
+
+ Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage,
+ xmh, xmore. lib/Xaw/xaw.m4: Add an AM_CONDITIONAL and a shell variable
+ xaw_use_xprint symlink.sh: add some extra files for xgc, xinit,
+ xkbcomp, xlogo, xmb, and xmodmap xc/programs/xmore/xmore.c:
+ Conditionalize use of xprint
+
+commit 4d8b36adf2024e6c28ecd266fb3585fdbc2c66f2
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date: Mon Apr 11 01:06:15 2005 +0000
+
+ xc/programs/Xserver/Xprint/attributes.c
+ xc/programs/glxgears/glxgears.c
+ xc/programs/xdbedizzy/xdbedizzy.c
+ xc/programs/xedit/Imakefile
+ xc/programs/xedit/Xedit-xprint.ad
+ xc/programs/xedit/util.c
+ xc/programs/xedit/xedit.h
+ xc/programs/xlogo/print.c
+ xc/programs/xlogo/xlogo.c
+ xc/programs/xlogo/xlogo.h
+ xc/programs/xman/Imakefile
+ xc/programs/xman/print.h
+ xc/programs/xmore/Imakefile
+ xc/programs/xmore/print.c
+ xc/programs/xmore/print.h
+ xc/programs/xmore/printdialog.c
+ xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
+ xc/programs/xphelloworld/xphelloworld/xphelloworld.c
+ xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
+ xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
+ //bugs.freedesktop.org/show_bug.cgi?id=790) attachment #2379
+ (https://bugs.freedesktop.org/attachment.cgi?id=2379) Implement support
+ client+Xserver support for passing output (stdout+stderr) of the
+ spooler command started by the Xprint server back to the application
+ using the "xp-spooler-command-results" XPJobAttr attribute
+ (applications can fetch the attribute value after the XPEndJobNotify
+ event was received; more details can be found in
+ http://xprint.mozdev.org/docs/dtprint_fspec.ps).
+
+commit c4d739517989871ad786fd0f5e0ae6a683f7e92f
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date: Mon Jan 3 01:06:35 2005 +0000
+
+ xc/lib/XprintAppUtil/xpapputil.c
+ xc/lib/XprintAppUtil/xpapputil.h
+ xc/lib/XprintUtil/xprintutil.c
+ xc/lib/XprintUtil/xprintutil.h
+ xc/programs/glxgears/glxgears.c
+ xc/programs/xdbedizzy/xdbedizzy.c
+ xc/programs/xedit/Xedit-xprint.ad
+ xc/programs/xedit/commands.c
+ xc/programs/xlogo/print.c
+ xc/programs/xlsfonts/xlsfonts.c
+ xc/programs/xlsfonts/xlsfonts.man
+ xc/programs/xlsfonts/xlsfonts.sgml
+ xc/programs/xman/Xman-xprint.ad
+ xc/programs/xman/handler.c
+ xc/programs/xman/print.c
+ xc/programs/xman/print.h
+ xc/programs/xmore/XMore.ad
+ xc/programs/xmore/print.c
+ xc/programs/xmore/print.h
+ xc/programs/xmore/printdialog.c
+ xc/programs/xmore/printdialog.h
+ xc/programs/xmore/printdialogprivates.h
+ xc/programs/xmore/xmore.c
+ xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
+ xc/programs/xphelloworld/xphelloworld/xphelloworld.c
+ xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
+ xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
+ xc/programs/xphelloworld/xpxthelloworld/xpxthelloworld.c
+ xc/programs/xplsprinters/xplsprinters.c
+ //bugs.freedesktop.org/show_bug.cgi?id=1706) attachment #1615
+ (https://bugs.freedesktop.org/attachment.cgi?id=1615): XprintUtils
+ 2004/Q3 update. This adds various new features to the XprintUtils
+ library including support for page resolutions where
+ X_resolution!=Y_resolution, listfonts-mode control and initial
+ framework for the COLORSPACE extension. Patch by Roland Mainz
+ <roland.mainz@nrubsig.org> and Julien Lafon <julien.lafon@gmail.com>.
+
+commit f4149e9970ced64f8eb2e92a115ea87174de2747
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Sep 2 05:50:38 2004 +0000
+
+ Clean up defines for Xprint support and fix BuildServersOnly build for
+ libXaw.
+
+commit ac167b94611ccb2b990ff70db5957fae0bde0969
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Sep 2 01:10:30 2004 +0000
+
+ Bump major version number of libXaw (Bug #1273).
+
+commit 18ae14262f9859a2e1f2dd769a0c4dcf4e1bb344
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Aug 16 16:36:16 2004 +0000
+
+ As discussed and agreed on on the release-wranglers meeting of August 16,
+ I'm committing the patch from bug #1060 to back out unconditional
+ Xprint functionality.
+ Back out Xprint changes.
+ Revert xman to CVS of June 5, revert xlogo to CVS of May 8, revert xedit to
+ CVS of April 25, to back out unconditional Xprint support.
+ Fix up Xprint config logic to be like the rest of the extensions:
+ BuildXprint is a one-stop option for disabling everything Xprint
+ related. XprtServer controls building Xprt, BuildXprintLib controls
+ building Xprint libs and BuildXprintClients controls building clients
+ related to Xprint. BuiltXprint defaults to YES and the other options
+ respects relevant settings, i.e. BuildServer and BuildServersOnly.
+ Build Xaw regardless of BuildXprintLib setting.
+ Only build xphelloworld, xplsprinters and xprehashprinterlist when
+ BuildXprintClients it YES. Disable building xmore, it has always
+ supported XawPrintShell.
+ Make Xprint support depend on BuildXprintLib.
+
+commit 28ffd14fbae70a5e01cdcbe2cb9342d3c8816b76
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date: Sun May 9 00:36:41 2004 +0000
+
+ Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=581 -
+ Print support for XLogo.
+
+commit 8eb746981d01e0db330e8e6139300ede823037f3
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:57 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 2a3e8d4963b3a8ed53e226965ec80f749ad8d5a4
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:35:37 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit effebf964672168e99b59fdf89be48dab2f88ecd
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:13:14 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 8cc0b397fa0c771a60f58e362a69bc04e8f1510f
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 142da2b715826c9fe7dad89ee344ead2f798cf82
+Author: Egbert Eich <eich@suse.de>
+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 59a2fa66d61369dd415f1cb7c8c5d6e7640e4870
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Dec 19 20:56:01 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit 54d675d206d1dbb9901e33ccc14988daf98f97b8
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+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 05b7c570b155f167e5a7f1b804e10b870bbc762c
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit cc25207f02f9b4d630f5d6646a1815431e532ea0
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ Initial revision
+
+commit 6fc51a3195bf01d2f69b33524d27ec3bb5e17181
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:54 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/xlogo/INSTALL b/xlogo/INSTALL
index 23e5f25..8b82ade 100644
--- a/xlogo/INSTALL
+++ b/xlogo/INSTALL
@@ -1,16 +1,19 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@ debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,42 +67,57 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,14 +152,36 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -170,9 +207,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +218,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -190,21 +227,29 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -231,6 +276,16 @@ configuration-related scripts to be executed by `/bin/bash'.
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff --git a/xlogo/Logo.c b/xlogo/Logo.c
index 99d2153..da5d7ae 100644
--- a/xlogo/Logo.c
+++ b/xlogo/Logo.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: xc/programs/xlogo/Logo.c,v 1.2 2004/04/23 19:54:57 eich Exp $ */
-/* $Xorg: Logo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
/*
Copyright 1988, 1994, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/xlogo/Logo.c,v 1.6 2002/05/23 23:53:59 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -45,7 +42,7 @@ from The Open Group.
static XtResource resources[] = {
{XtNshapeWindow, XtCShapeWindow, XtRBoolean, sizeof (Boolean),
- XtOffsetOf(LogoRec,logo.shape_window), XtRImmediate,
+ XtOffsetOf(LogoRec,logo.shape_window), XtRImmediate,
(XtPointer) FALSE},
#ifdef XRENDER
{XtNrender, XtCBoolean, XtRBoolean, sizeof(Boolean),
@@ -68,14 +65,14 @@ static XtResource resources[] = {
};
static void ClassInitialize ( void );
-static void Initialize ( Widget request, Widget new, ArgList args,
+static void Initialize ( Widget request, Widget new, ArgList args,
Cardinal *num_args );
static void Destroy ( Widget gw );
-static void Realize ( Widget gw, XtValueMask *valuemaskp,
+static void Realize ( Widget gw, XtValueMask *valuemaskp,
XSetWindowAttributes *attr );
static void Resize ( Widget gw );
static void Redisplay ( Widget gw, XEvent *event, Region region );
-static Boolean SetValues ( Widget gcurrent, Widget grequest, Widget gnew,
+static Boolean SetValues ( Widget gcurrent, Widget grequest, Widget gnew,
ArgList args, Cardinal *num_args );
LogoClassRec logoClassRec = {
@@ -130,7 +127,7 @@ WidgetClass logoWidgetClass = (WidgetClass) &logoClassRec;
* *
*****************************************************************************/
-static void
+static void
create_gcs(LogoWidget w)
{
XGCValues v;
@@ -145,7 +142,7 @@ create_gcs(LogoWidget w)
w->logo.backGC = XtGetGC ((Widget) w, GCForeground, &v);
}
-static void
+static void
check_shape(LogoWidget w)
{
if (w->logo.shape_window) {
@@ -157,7 +154,7 @@ check_shape(LogoWidget w)
}
/* ARGSUSED */
-static void
+static void
unset_shape(LogoWidget w)
{
XSetWindowAttributes attr;
@@ -165,7 +162,7 @@ unset_shape(LogoWidget w)
Display *dpy = XtDisplay ((Widget) w);
Window win = XtWindow ((Widget) w);
- if (w->core.background_pixmap != None &&
+ if (w->core.background_pixmap != None &&
w->core.background_pixmap != XtUnspecifiedPixmap) {
attr.background_pixmap = w->core.background_pixmap;
mask = CWBackPixmap;
@@ -179,7 +176,7 @@ unset_shape(LogoWidget w)
w->logo.need_shaping = w->logo.shape_window;
}
-static void
+static void
set_shape(LogoWidget w)
{
GC ones, zeros;
@@ -239,7 +236,7 @@ RenderPrepare (LogoWidget w)
}
}
-XtConvertArgRec xftColorConvertArgs[] = {
+static XtConvertArgRec xftColorConvertArgs[] = {
{XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.screen),
sizeof(Screen *)},
{XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.colormap),
@@ -273,7 +270,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
Screen *screen;
Reply to: