libxaw: Changes to 'upstream-experimental'
.gitignore | 65
COPYING | 32
INSTALL | 229 --
Makefile.am | 42
README | 25
configure.ac | 83
include/.gitignore | 2
include/X11/Xaw/AllWidgets.h | 1
include/X11/Xaw/AsciiSink.h | 5
include/X11/Xaw/AsciiSinkP.h | 6
include/X11/Xaw/AsciiSrc.h | 3
include/X11/Xaw/AsciiSrcP.h | 6
include/X11/Xaw/AsciiText.h | 5
include/X11/Xaw/AsciiTextP.h | 5
include/X11/Xaw/Box.h | 6
include/X11/Xaw/BoxP.h | 6
include/X11/Xaw/Cardinals.h | 1
include/X11/Xaw/Command.h | 3
include/X11/Xaw/CommandP.h | 6
include/X11/Xaw/Dialog.h | 3
include/X11/Xaw/DialogP.h | 4
include/X11/Xaw/Form.h | 4
include/X11/Xaw/FormP.h | 3
include/X11/Xaw/Grip.h | 3
include/X11/Xaw/GripP.h | 6
include/X11/Xaw/Label.h | 3
include/X11/Xaw/LabelP.h | 6
include/X11/Xaw/List.h | 3
include/X11/Xaw/ListP.h | 3
include/X11/Xaw/MenuButtoP.h | 3
include/X11/Xaw/MenuButton.h | 2
include/X11/Xaw/MultiSink.h | 3
include/X11/Xaw/MultiSinkP.h | 3
include/X11/Xaw/MultiSrc.h | 3
include/X11/Xaw/MultiSrcP.h | 3
include/X11/Xaw/Paned.h | 6
include/X11/Xaw/PanedP.h | 4
include/X11/Xaw/Panner.h | 2
include/X11/Xaw/PannerP.h | 2
include/X11/Xaw/Porthole.h | 2
include/X11/Xaw/PortholeP.h | 2
include/X11/Xaw/Print.h | 132 -
include/X11/Xaw/PrintSP.h | 135 -
include/X11/Xaw/Repeater.h | 2
include/X11/Xaw/RepeaterP.h | 2
include/X11/Xaw/Reports.h | 1
include/X11/Xaw/Scrollbar.h | 4
include/X11/Xaw/ScrollbarP.h | 6
include/X11/Xaw/Simple.h | 3
include/X11/Xaw/SimpleMenP.h | 2
include/X11/Xaw/SimpleMenu.h | 2
include/X11/Xaw/SimpleP.h | 4
include/X11/Xaw/Sme.h | 2
include/X11/Xaw/SmeBSB.h | 2
include/X11/Xaw/SmeBSBP.h | 2
include/X11/Xaw/SmeLine.h | 2
include/X11/Xaw/SmeLineP.h | 2
include/X11/Xaw/SmeP.h | 2
include/X11/Xaw/StripCharP.h | 6
include/X11/Xaw/StripChart.h | 3
include/X11/Xaw/Template.c | 3
include/X11/Xaw/Template.h | 3
include/X11/Xaw/TemplateP.h | 3
include/X11/Xaw/Text.h | 3
include/X11/Xaw/TextP.h | 8
include/X11/Xaw/TextSink.h | 5
include/X11/Xaw/TextSinkP.h | 6
include/X11/Xaw/TextSrc.h | 5
include/X11/Xaw/TextSrcP.h | 6
include/X11/Xaw/Tip.h | 2
include/X11/Xaw/TipP.h | 2
include/X11/Xaw/Toggle.h | 2
include/X11/Xaw/ToggleP.h | 3
include/X11/Xaw/Tree.h | 3
include/X11/Xaw/TreeP.h | 4
include/X11/Xaw/VendorEP.h | 3
include/X11/Xaw/Viewport.h | 3
include/X11/Xaw/ViewportP.h | 2
include/X11/Xaw/XawImP.h | 3
include/X11/Xaw/XawInit.h | 6
man/.gitignore | 3
man/Makefile.am | 58
man/Xaw.man | 7
specs/.gitignore | 4
specs/AsciiSink.xml | 141 +
specs/AsciiSource.xml | 368 ++++
specs/AsciiText.xml | 450 ++++
specs/Box.xml | 346 +++
specs/CH1.xml | 725 ++++++++
specs/CH2.xml | 1891 +++++++++++++++++++++
specs/CH3.xml | 123 +
specs/CH4.xml | 102 +
specs/CH5.xml | 397 ++++
specs/CH6.xml | 117 +
specs/CH7.xml | 167 +
specs/Command.xml | 525 +++++
specs/Dialog.xml | 692 +++++++
specs/Form.xml | 531 +++++
specs/Grip.xml | 357 +++
specs/Label.xml | 345 +++
specs/List.xml | 872 +++++++++
specs/Makefile.am | 106 +
specs/MenuButton.xml | 567 ++++++
specs/Paned.xml | 1213 +++++++++++++
specs/Panner.xml | 734 ++++++++
specs/Porthole.xml | 306 +++
specs/Repeater.xml | 558 ++++++
specs/Scrollbar.xml | 884 +++++++++
specs/Simple.xml | 252 ++
specs/SimpleMenu.xml | 790 ++++++++
specs/Sme.xml | 207 ++
specs/SmeBSB.xml | 310 +++
specs/SmeLine.xml | 148 +
specs/StripChart.xml | 435 ++++
specs/TPage_Credits.xml | 90
specs/Template.xml | 407 ++++
specs/Template_private_header_file.xml | 87
specs/Template_public_header_file.xml | 112 +
specs/Template_widget_source_file.xml | 208 ++
specs/Text.xml | 326 +++
specs/TextActions.xml | 976 ++++++++++
specs/TextActions_default_translation_bindings.xml | 85
specs/TextActions_text_widget_actions.xml | 891 +++++++++
specs/TextCustom.xml | 123 +
specs/TextFuncs.xml | 856 +++++++++
specs/TextSink.xml | 915 ++++++++++
specs/TextSource.xml | 620 ++++++
specs/Toggle.xml | 773 ++++++++
specs/Tree.xml | 404 ++++
specs/Viewport.xml | 391 ++++
specs/libXaw.xml | 88
src/.gitignore | 6
src/Actions.c | 2
src/AllWidgets.c | 10
src/AsciiSink.c | 3
src/AsciiSrc.c | 20
src/AsciiText.c | 3
src/Box.c | 3
src/Command.c | 7
src/Converters.c | 2
src/Dialog.c | 5
src/DisplayList.c | 4
src/Form.c | 4
src/Grip.c | 3
src/Label.c | 3
src/List.c | 3
src/Makefile.am | 41
src/MenuButton.c | 4
src/MultiSink.c | 3
src/MultiSrc.c | 3
src/OS.c | 13
src/Paned.c | 9
src/Panner.c | 3
src/Pixmap.c | 4
src/Porthole.c | 2
src/Private.h | 2
src/Repeater.c | 2
src/Scrollbar.c | 3
src/Simple.c | 4
src/SimpleMenu.c | 4
src/Sme.c | 3
src/SmeBSB.c | 4
src/SmeLine.c | 3
src/StripChart.c | 3
src/Text.c | 6
src/TextAction.c | 122 -
src/TextPop.c | 4
src/TextSink.c | 2
src/TextSrc.c | 5
src/TextTr.c | 5
src/Tip.c | 5
src/Toggle.c | 3
src/Tree.c | 7
src/Vendor.c | 5
src/Viewport.c | 3
src/XawI18n.c | 3
src/XawI18n.h | 10
src/XawIm.c | 3
src/XawInit.c | 3
src/sharedlib.c | 9
xaw6.pc.in | 4
xaw7.pc.in | 2
182 files changed, 22341 insertions(+), 1124 deletions(-)
New commits:
commit 8ac146ce96cfa133b788b1ffdd13fe0b648ee4fc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 11 17:07:08 2011 -0800
libXaw 1.0.9
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 687d8e5..9c99e03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXaw], [1.0.8],
+AC_INIT([libXaw], [1.0.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit e7a9b0302f7cb84015e8f612e5b65694d785b2d8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 09:33:46 2010 -0500
config: prevent config.status from being generated three times
AC_OUTPUT with parameters is deprecated, use AC_CONFIG_FILES.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d8069cb..687d8e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,16 +95,18 @@ AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
AC_CHECK_FUNCS([iswalnum getpagesize])
-AC_OUTPUT([Makefile
- include/Makefile
- man/Makefile
- specs/Makefile
- src/Makefile])
+AC_CONFIG_FILES([Makefile
+ include/Makefile
+ man/Makefile
+ specs/Makefile
+ src/Makefile])
if test "x$build_v6" = xyes; then
- AC_OUTPUT(xaw6.pc)
+ AC_CONFIG_FILES(xaw6.pc)
fi
if test "x$build_v7" = xyes; then
- AC_OUTPUT(xaw7.pc)
+ AC_CONFIG_FILES(xaw7.pc)
fi
+
+AC_OUTPUT
commit 55fc7aa22197350d9cd1039e0398132a63d3589f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 20:10:12 2010 -0800
Check for getpagesize() with autoconf instead of #ifdef osname
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 83b20b2..d8069cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
-AC_CHECK_FUNCS([iswalnum])
+AC_CHECK_FUNCS([iswalnum getpagesize])
AC_OUTPUT([Makefile
include/Makefile
diff --git a/src/OS.c b/src/OS.c
index 9c0bb45..8bc23dd 100644
--- a/src/OS.c
+++ b/src/OS.c
@@ -14,18 +14,9 @@
#if defined(linux)
/* kernel header doesn't work with -ansi */
/* #include <asm/page.h> *//* for PAGE_SIZE */
-#define HAS_GETPAGESIZE
#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
#endif
-#if defined(CSRG_BASED)
-#define HAS_GETPAGESIZE
-#endif
-
-#if defined(sun)
-#define HAS_GETPAGESIZE
-#endif
-
int
_XawGetPageSize(void)
{
@@ -45,7 +36,7 @@ _XawGetPageSize(void)
pagesize = sysconf(_SC_PAGE_SIZE);
#endif
-#ifdef HAS_GETPAGESIZE
+#ifdef HAVE_GETPAGESIZE
if (pagesize == -1)
pagesize = getpagesize();
#endif
commit b2e86875d03e349a4c85135e4cf41b26b99b083e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 20:06:04 2010 -0800
convert header checks/ifdefs to autoconf standard AC_CHECK_HEADERS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d793ea9..83b20b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,15 +90,7 @@ AM_CONDITIONAL(BUILD_XAW7, [test x$build_v7 = xyes])
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADER(wctype.h,
- AC_DEFINE([HAS_WCTYPE_H],1,
- [Define to 1 if you have the <wctype.h> header file.]))
-AC_CHECK_HEADER(wchar.h,
- AC_DEFINE([HAS_WCHAR_H],1,
- [Define to 1 if you have the <wchar.h> header file.]))
-AC_CHECK_HEADER(widec.h, [],
- AC_DEFINE([NO_WIDEC_H],1,
- [Define to 1 if you DO NOT have the <widec.h> header file.]))
+AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
AC_CHECK_FUNCS([iswalnum])
diff --git a/src/XawI18n.h b/src/XawI18n.h
index 09ab51b..d50171c 100644
--- a/src/XawI18n.h
+++ b/src/XawI18n.h
@@ -24,9 +24,9 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-#ifdef HAS_WCTYPE_H
+#ifdef HAVE_WCTYPE_H
#include <wctype.h>
-#ifndef NO_WIDEC_H
+#ifdef HAVE_WIDEC_H
#include <widec.h>
#define wcslen(c) wslen(c)
#define wcscpy(d, s) wscpy(d, s)
@@ -34,7 +34,7 @@ in this Software without prior written authorization from The Open Group.
#endif
#endif
-#ifdef HAS_WCHAR_H
+#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
commit 41bf7992c45c6766c5982b3500b03d9c1b1fab87
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 19:54:54 2010 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Regroup XORG statements under the Xorg macros section.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index e9bb45b..d793ea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,25 @@
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
+AC_INIT([libXaw], [1.0.8],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
-AC_INIT([libXaw],
- [1.0.8],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- libXaw)
-
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.10)
+XORG_DEFAULT_OPTIONS
+XORG_ENABLE_SPECS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
# Check for progs
AC_PROG_LIBTOOL
@@ -25,12 +30,6 @@ AM_PROG_CC_C_O
# is in an if statement, and later calls would break if it's skipped.
PKG_PROG_PKG_CONFIG
-XORG_DEFAULT_OPTIONS
-XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
-
#
# fix libtool to set SONAME to libXaw.so.$major
#
commit f85d4342cbfbb58764e24e202f3a7c95eaba3d77
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 19:52:41 2010 -0800
config: Remove unnecessary calls from configure.ac
AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 8779b36..e9bb45b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.10)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_AWK
AM_PROG_CC_C_O
@@ -73,8 +72,6 @@ AC_ARG_ENABLE(xaw6, AC_HELP_STRING([--disable-xaw6],
if test "x$build_v6" = xyes; then
PKG_CHECK_MODULES(XAW6, xproto x11 xext xextproto xt xmu)
- AC_SUBST(XAW6_CFLAGS)
- AC_SUBST(XAW6_LIBS)
fi
@@ -86,8 +83,6 @@ AC_ARG_ENABLE(xaw7, AC_HELP_STRING([--disable-xaw7],
if test "x$build_v7" = xyes; then
PKG_CHECK_MODULES(XAW7, xproto x11 xext xextproto xt xmu xpm)
- AC_SUBST(XAW7_CFLAGS)
- AC_SUBST(XAW7_LIBS)
fi
commit 394a0c49c849e497cbcb987154ff796eb34f4820
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 11 23:30:22 2010 -0800
specs/CH6.xml: Remove stray quote in chapter title
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/CH6.xml b/specs/CH6.xml
index 3f9d518..e8009af 100644
--- a/specs/CH6.xml
+++ b/specs/CH6.xml
@@ -1,5 +1,5 @@
<chapter id="composite_and_constraint_widgets">
-<title>"Composite and Constraint Widgets</title>
+<title>Composite and Constraint Widgets</title>
<para>
These widgets may contain arbitrary widget children. They implement a
policy for the size and location of their children.
commit e9da4e6268b2cfbda793435caedc6403b2a918f0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Nov 9 13:04:44 2010 -0500
config: HTML file generation: use the installed copy of xorg.css
Currenlty the xorg.css file is copied in each location
where a DocBook/XML file resides. This produces about
70 copies in the $(docdir) install tree.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/.gitignore b/specs/.gitignore
index 12fe512..6fa5c31 100644
--- a/specs/.gitignore
+++ b/specs/.gitignore
@@ -1,6 +1,4 @@
-# Add & Override for this directory and it's subdirectories
*.html
*.ps
*.pdf
*.txt
-*.css
diff --git a/specs/Makefile.am b/specs/Makefile.am
index bb34170..ebdbd72 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -82,11 +82,8 @@ doc_DATA += $(doc_sources:.xml=.txt)
endif
if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET)
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+XMLTO_FLAGS = -m $(XSL_STYLESHEET) \
+ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
endif
CLEANFILES = $(doc_DATA)
commit fd5ef2fb841903c0a7d59e56f8fe69d0974f964c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Nov 2 09:52:34 2010 -0700
xaw6.pc: Only list xmu in Requires.private, not Requires
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Based on earlier similar change to xaw7.pc which was:
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/xaw6.pc.in b/xaw6.pc.in
index 537df32..cee7220 100644
--- a/xaw6.pc.in
+++ b/xaw6.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: Xaw
Description: X Athena Widgets Library, version 6
Version: @PACKAGE_VERSION@
-Requires: xproto xt xmu
+Requires: xproto xt
Requires.private: x11 xext xt xmu
Cflags: -I${includedir}
Libs: -L${libdir} -lXaw6
commit 5136e2aabb73fec3c1670616bf0ebf828a1a1ca9
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Oct 28 00:29:30 2010 +0200
Fix missing <X11/Intrinsic.h> in XawInit.h
Configure scripts/test programs might have troubles detecting libXaw by
just including XawInit.h, since it doesn't include <X11/Intrinsic.h>,
even though it's needed for the Widget definition.
X.Org Bugzilla #3526 <https://bugs.freedesktop.org/show_bug.cgi?id=3526>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/Xaw/XawInit.h b/include/X11/Xaw/XawInit.h
index 3d1359c..73226b2 100644
--- a/include/X11/Xaw/XawInit.h
+++ b/include/X11/Xaw/XawInit.h
@@ -36,6 +36,7 @@ in this Software without prior written authorization from The Open Group.
typedef struct _XawDL XawDisplayList;
#endif /* OLDXAW */
+#include <X11/Intrinsic.h>
#include <X11/Xfuncproto.h>
_XFUNCPROTOBEGIN
commit 7b8196c9f7723b77b5d18fc1cc2070e557a7f767
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Oct 25 12:33:32 2010 -0700
Move -I CFLAGS to CPPFLAGS
Previously, setting CPPFLAGS at configure time could result in using the
installed headers rather than the ones included in the package.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index a77bb13..3bc4b29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,7 +56,9 @@ COMMON_SOURCES = \
XawI18n.h
COMMON_CFLAGS = \
- $(CWARNFLAGS) \
+ $(CWARNFLAGS)
+
+COMMON_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_srcdir}/include/X11/Xaw \
-DPROJECT_ROOT=\"$(prefix)\"
@@ -65,6 +67,9 @@ if BUILD_XAW6
lib_LTLIBRARIES += libXaw6.la
+libXaw6_la_CPPFLAGS = \
+ $(COMMON_CPPFLAGS)
+
libXaw6_la_CFLAGS = \
$(COMMON_CFLAGS) \
-DOLDXAW \
@@ -100,6 +105,9 @@ if BUILD_XAW7
lib_LTLIBRARIES += libXaw7.la
+libXaw7_la_CPPFLAGS = \
+ $(COMMON_CPPFLAGS)
+
libXaw7_la_CFLAGS = \
$(COMMON_CFLAGS) \
-DXAW7 \
commit 46ca2da2e8d29d7f1347c9f4e9fb3794dd99cb7a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 25 10:47:03 2010 -0700
libXaw 1.0.8
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 399b154..8779b36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
AC_INIT([libXaw],
- 1.0.7,
+ [1.0.8],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXaw)
commit b190356ebf2f0eb390ddf128edf1f0c761c3f14b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Oct 24 22:38:05 2010 -0700
Add pointer to API spec in $(docdir) to Xaw.man
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Makefile.am b/man/Makefile.am
index 8058d52..1d67cb4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -34,6 +34,8 @@ CLEANFILES = $(libman_DATA)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += -e 's|__docdir__|$(docdir)|g'
+
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/Xaw.man b/man/Xaw.man
index 3ba50bc..4c4c9f1 100644
--- a/man/Xaw.man
+++ b/man/Xaw.man
@@ -47,10 +47,13 @@
.SH DESCRIPTION
.B Xaw
is a widget set based on the X Toolkit Intrinsics (Xt) Library. This
-release by the X.org Foundation includes additions and modifications
+release by the X.Org Foundation includes additions and modifications
originally made for The XFree86 Project, Inc. This manual page describes
these changes as well as some of the common interfaces between its version
and the previous X Consortium release (Xaw6).
+.PP
+The bulk of the Xaw documentation is located in the API specification
+which may be installed in __docdir__, or found on the X.Org website.
.SH ACTIONS
All of the \fIXaw\fR widgets now have the additional translations
.B call-proc, declare, get-values
commit 35197044c7632b37322d15454589416fcdb7dc86
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Oct 24 22:28:42 2010 -0700
specs/Makefile.am: remove whitespace after line continuation chars
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/Makefile.am b/specs/Makefile.am
index 3b552c1..bb34170 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -27,7 +27,7 @@ dist_doc_DATA = $(doc_sources) \
AsciiSink.xml \
AsciiSource.xml \
AsciiText.xml \
- Box.xml \
+ Box.xml \
CH1.xml \
CH2.xml \
CH3.xml \
@@ -46,7 +46,7 @@ dist_doc_DATA = $(doc_sources) \
Panner.xml \
Porthole.xml \
Repeater.xml \
- Scrollbar.xml \
+ Scrollbar.xml \
SimpleMenu.xml \
Simple.xml \
SmeBSB.xml \
commit e20dbae7ab37431928e8f0f6d18644d0a7bdcdb7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Oct 24 22:27:34 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 72a49cc..8058d52 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright © 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
commit 47cab7a9160e4326107feac80ef4cc47289404ef
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Oct 17 20:29:02 2010 -0400
make: use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Makefile.am b/man/Makefile.am
index 9b08fef..72a49cc 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,14 +31,9 @@ EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit 82f22390f2d1d78c9bc4f4900e3d088fd704eeb0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Oct 17 20:26:32 2010 -0400
make: use the appropriate platform version of sed
As provided by AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Makefile.am b/man/Makefile.am
index ea9fbcb..9b08fef 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,8 +31,6 @@ EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
-SED = sed
-
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
commit a2fa2705252db693d2b0f9da8f28fbfe3f88f083
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Oct 17 20:24:43 2010 -0400
config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
It depends on util-macros 1.8 or later
The existing statement can now be removed from the configuration file.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 47f2215..399b154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,6 @@ XORG_MACROS_VERSION(1.10)
AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_AWK
-AC_PROG_SED
AM_PROG_CC_C_O
# Need to call this explicitly since the first call to PKG_CHECK_MODULES
commit b4d3a7153d9f39f9f385a750d39e30385caddd7e
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:02 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/Xaw/AllWidgets.h b/include/X11/Xaw/AllWidgets.h
index 0200ac4..5c125d5 100644
--- a/include/X11/Xaw/AllWidgets.h
+++ b/include/X11/Xaw/AllWidgets.h
@@ -1,5 +1,4 @@
/*
- * $Xorg: AllWidgets.h,v 1.5 2001/02/09 02:03:42 xorgcvs Exp $
*
Copyright 1990, 1998 The Open Group
diff --git a/include/X11/Xaw/AsciiSink.h b/include/X11/Xaw/AsciiSink.h
index 2349274..be13433 100644
--- a/include/X11/Xaw/AsciiSink.h
+++ b/include/X11/Xaw/AsciiSink.h
@@ -1,7 +1,3 @@
-/*
- * $Xorg: AsciiSink.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
- */
-
/***********************************************************
Copyright 1987, 1988, 1994, 1998 The Open Group
@@ -48,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.5 2001/01/17 19:42:25 dawes Exp $ */
#ifndef _XawAsciiSink_h
#define _XawAsciiSink_h
diff --git a/include/X11/Xaw/AsciiSinkP.h b/include/X11/Xaw/AsciiSinkP.h
index b160092..ec6c212 100644
--- a/include/X11/Xaw/AsciiSinkP.h
+++ b/include/X11/Xaw/AsciiSinkP.h
@@ -1,8 +1,3 @@
-/*
-* $Xorg: AsciiSinkP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
-*/
-
-
/***********************************************************
Copyright 1987, 1988, 1994, 1998 The Open Group
@@ -49,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.9 2001/01/17 19:42:25 dawes Exp $ */
#ifndef _XawAsciiSinkP_h
#define _XawAsciiSinkP_h
diff --git a/include/X11/Xaw/AsciiSrc.h b/include/X11/Xaw/AsciiSrc.h
index 8728dd9..0bd14b4 100644
--- a/include/X11/Xaw/AsciiSrc.h
+++ b/include/X11/Xaw/AsciiSrc.h
@@ -1,5 +1,3 @@
-/* $Xorg: AsciiSrc.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
-
/*
Copyright 1989, 1994, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */
/*
diff --git a/include/X11/Xaw/AsciiSrcP.h b/include/X11/Xaw/AsciiSrcP.h
index 22d3008..2668f06 100644
--- a/include/X11/Xaw/AsciiSrcP.h
+++ b/include/X11/Xaw/AsciiSrcP.h
@@ -1,8 +1,3 @@
-/*
-* $Xorg: AsciiSrcP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
-*/
-
-
/***********************************************************
Copyright 1987, 1988, 1994, 1998 The Open Group
@@ -49,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.8 2001/01/17 19:42:25 dawes Exp $ */
/*
* AsciiSrcP.h - Private Header for Ascii Text Source.
diff --git a/include/X11/Xaw/AsciiText.h b/include/X11/Xaw/AsciiText.h
index e6b4bc8..0c38f9c 100644
--- a/include/X11/Xaw/AsciiText.h
+++ b/include/X11/Xaw/AsciiText.h
@@ -1,7 +1,3 @@
-/*
- * $Xorg: AsciiText.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
- */
-
/***********************************************************
Copyright 1987, 1988, 1994, 1998 The Open Group
@@ -48,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.5 2001/01/17 19:42:25 dawes Exp $ */
/*
* AsciiText.h - Public header file for AsciiText Widget
diff --git a/include/X11/Xaw/AsciiTextP.h b/include/X11/Xaw/AsciiTextP.h
index 25e3eee..52863e5 100644
--- a/include/X11/Xaw/AsciiTextP.h
+++ b/include/X11/Xaw/AsciiTextP.h
@@ -1,7 +1,3 @@
-/*
- * $Xorg: AsciiTextP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $
- */
-
/***********************************************************
Copyright 1987, 1988, 1994, 1998 The Open Group
@@ -48,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.8 2001/01/17 19:42:25 dawes Exp $ */
/*
* AsciiText.c - Private header file for AsciiText Widget.
diff --git a/include/X11/Xaw/Box.h b/include/X11/Xaw/Box.h
index 17db281..19e9a65 100644
--- a/include/X11/Xaw/Box.h
+++ b/include/X11/Xaw/Box.h
@@ -1,8 +1,3 @@
-/*
-* $Xorg: Box.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $
-*/
-
-
/***********************************************************
Copyright 1987, 1988, 1998 The Open Group
@@ -49,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xaw/Box.h,v 1.7 2001/01/17 19:42:25 dawes Exp $ */
#ifndef _XawBox_h
#define _XawBox_h
diff --git a/include/X11/Xaw/BoxP.h b/include/X11/Xaw/BoxP.h
index a64142e..87f2ac4 100644
--- a/include/X11/Xaw/BoxP.h
+++ b/include/X11/Xaw/BoxP.h
@@ -1,8 +1,3 @@
-/*
-* $Xorg: BoxP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $
-*/
-
-
/***********************************************************
Copyright 1987, 1988, 1994, 1998 The Open Group
@@ -49,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
Reply to: