ChangeLog | 124 ++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 56 ++++++++------------ debian/changelog | 21 +++++++ debian/control | 27 +++++++--- include/X11/Xaw/XawInit.h | 1 specs/.gitignore | 2 specs/CH6.xml | 2 specs/Makefile.am | 7 -- src/Makefile.am | 10 +++ src/OS.c | 11 ---- src/XawI18n.h | 6 +- xaw6.pc.in | 2 12 files changed, 204 insertions(+), 65 deletions(-)
New commits: commit 87db4b7d9e375e710696149de083eb15989ab670 Author: Julien Cristau <[email protected]> Date: Sun Feb 6 21:56:56 2011 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index bd1f555..5700edf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxaw (2:1.0.9-2) UNRELEASED; urgency=low +libxaw (2:1.0.9-2) unstable; urgency=low * Bump Standards-Version to 3.9.1. * Drop Pre-Depends on x11-common, only needed for upgrades from sarge. @@ -8,7 +8,7 @@ libxaw (2:1.0.9-2) UNRELEASED; urgency=low work! * Wrap debian/control Depends fields. - -- Julien Cristau <[email protected]> Sun, 06 Feb 2011 21:39:27 +0100 + -- Julien Cristau <[email protected]> Sun, 06 Feb 2011 21:56:43 +0100 libxaw (2:1.0.9-1) experimental; urgency=low commit 14dbe44acae7582a0559d22289f526a5d37bd082 Author: Julien Cristau <[email protected]> Date: Sun Feb 6 21:56:25 2011 +0100 Wrap debian/control Depends fields. diff --git a/debian/changelog b/debian/changelog index c9c42d6..bd1f555 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libxaw (2:1.0.9-2) UNRELEASED; urgency=low shipped in etch. * Remove David Nusinow and Brice Goglin from Uploaders. Thanks for your work! + * Wrap debian/control Depends fields. -- Julien Cristau <[email protected]> Sun, 06 Feb 2011 21:39:27 +0100 diff --git a/debian/control b/debian/control index 6322a71..e294909 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxaw.git Package: libxaw7 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, Description: X11 Athena Widget library libXaw7 provides the second version of Xaw, the Athena Widgets tookit, which is largely used by legacy X applications. This version is the @@ -47,7 +49,10 @@ Package: libxaw7-dbg Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libxaw7 (= ${binary:Version}) +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libxaw7 (= ${binary:Version}), Description: X11 Athena Widget library (debug package) libXaw7 provides the second version of Xaw, the Athena Widgets tookit, which is largely used by legacy X applications. This version is the @@ -67,7 +72,14 @@ Description: X11 Athena Widget library (debug package) Package: libxaw7-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libxaw7 (= ${binary:Version}), libx11-dev, libxmu-dev, libxpm-dev, x11proto-core-dev +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libxaw7 (= ${binary:Version}), + libx11-dev, + libxmu-dev, + libxpm-dev, + x11proto-core-dev, Description: X11 Athena Widget library (development headers) libXaw7 provides the second version of Xaw, the Athena Widgets tookit, which is largely used by legacy X applications. This version is the commit f61766bf6d490f919ab09880a2a670756509d023 Author: Julien Cristau <[email protected]> Date: Sun Feb 6 21:53:43 2011 +0100 Remove David Nusinow and Brice Goglin from Uploaders. Thanks for your work! diff --git a/debian/changelog b/debian/changelog index 9fb07c9..c9c42d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ libxaw (2:1.0.9-2) UNRELEASED; urgency=low * Drop Pre-Depends on x11-common, only needed for upgrades from sarge. * Drop Conflicts/Replaces on libxaw6-dev, libxaw8-dev, libxaw-headers, last shipped in etch. + * Remove David Nusinow and Brice Goglin from Uploaders. Thanks for your + work! -- Julien Cristau <[email protected]> Sun, 06 Feb 2011 21:39:27 +0100 diff --git a/debian/control b/debian/control index 62b24e4..6322a71 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,9 @@ Source: libxaw Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected]>, Brice Goglin <[email protected]>, Cyril Brulebois <[email protected]> +Uploaders: + Drew Parsons <[email protected]>, + Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5), libx11-dev (>= 1:0.99.2), commit 21946bc646eec1f44029192d08c7ac36094264f0 Author: Julien Cristau <[email protected]> Date: Sun Feb 6 21:48:13 2011 +0100 Drop Conflicts/Replaces on libxaw6-dev, libxaw8-dev, libxaw-headers Last shipped in etch. diff --git a/debian/changelog b/debian/changelog index 3e3ef5b..9fb07c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libxaw (2:1.0.9-2) UNRELEASED; urgency=low * Bump Standards-Version to 3.9.1. * Drop Pre-Depends on x11-common, only needed for upgrades from sarge. + * Drop Conflicts/Replaces on libxaw6-dev, libxaw8-dev, libxaw-headers, last + shipped in etch. -- Julien Cristau <[email protected]> Sun, 06 Feb 2011 21:39:27 +0100 diff --git a/debian/control b/debian/control index 6ff9c16..62b24e4 100644 --- a/debian/control +++ b/debian/control @@ -66,8 +66,6 @@ Package: libxaw7-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libxaw7 (= ${binary:Version}), libx11-dev, libxmu-dev, libxpm-dev, x11proto-core-dev -Conflicts: libxaw6-dev, libxaw8-dev, libxaw-headers (<< 2:1.0.4-2) -Replaces: libxaw6-dev, libxaw8-dev, libxaw-headers (<< 2:1.0.4-2) Description: X11 Athena Widget library (development headers) libXaw7 provides the second version of Xaw, the Athena Widgets tookit, which is largely used by legacy X applications. This version is the commit 19090053ae97d03f86b20add84da6815f43bbc93 Author: Julien Cristau <[email protected]> Date: Sun Feb 6 21:45:56 2011 +0100 Drop Pre-Depends on x11-common, only needed for upgrades from sarge. diff --git a/debian/changelog b/debian/changelog index fb30a38..3e3ef5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxaw (2:1.0.9-2) UNRELEASED; urgency=low * Bump Standards-Version to 3.9.1. + * Drop Pre-Depends on x11-common, only needed for upgrades from sarge. -- Julien Cristau <[email protected]> Sun, 06 Feb 2011 21:39:27 +0100 diff --git a/debian/control b/debian/control index a443198..6ff9c16 100644 --- a/debian/control +++ b/debian/control @@ -66,7 +66,6 @@ Package: libxaw7-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libxaw7 (= ${binary:Version}), libx11-dev, libxmu-dev, libxpm-dev, x11proto-core-dev -Pre-Depends: x11-common (>= 1:7.0.0) Conflicts: libxaw6-dev, libxaw8-dev, libxaw-headers (<< 2:1.0.4-2) Replaces: libxaw6-dev, libxaw8-dev, libxaw-headers (<< 2:1.0.4-2) Description: X11 Athena Widget library (development headers) commit 1e77ba6fc5f7e6127c09dcc9c7ed094f61818a1a Author: Julien Cristau <[email protected]> Date: Sun Feb 6 21:44:33 2011 +0100 Bump Standards-Version to 3.9.1. diff --git a/debian/changelog b/debian/changelog index 0308e6a..fb30a38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxaw (2:1.0.9-2) UNRELEASED; urgency=low + + * Bump Standards-Version to 3.9.1. + + -- Julien Cristau <[email protected]> Sun, 06 Feb 2011 21:39:27 +0100 + libxaw (2:1.0.9-1) experimental; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 42091dd..a443198 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: xutils-dev (>= 1:7.5+4), # specs: xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxaw Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxaw.git commit 8f0be7a277206bfc7ad483470833bcd7f5b3ee22 Author: Cyril Brulebois <[email protected]> Date: Wed Jan 12 04:15:46 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 642dfc2..0308e6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libxaw (2:1.0.9-1) UNRELEASED; urgency=low +libxaw (2:1.0.9-1) experimental; urgency=low * New upstream release. * Noticeable change: xaw6.pc now only has xmu in Requires.private, no longer in Requires. Since it might trigger some FTBFS, target experimental. Better be safe than sorry. - -- Cyril Brulebois <[email protected]> Wed, 12 Jan 2011 04:13:10 +0100 + -- Cyril Brulebois <[email protected]> Wed, 12 Jan 2011 04:15:35 +0100 libxaw (2:1.0.8-2) unstable; urgency=low commit 0a29e30a252ddcec0c6382d6d452439ff333f7c3 Author: Cyril Brulebois <[email protected]> Date: Wed Jan 12 04:15:28 2011 +0100 Warn about xaw6.pc change WRT xmu. diff --git a/debian/changelog b/debian/changelog index 33d0cb0..642dfc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ libxaw (2:1.0.9-1) UNRELEASED; urgency=low * New upstream release. + * Noticeable change: xaw6.pc now only has xmu in Requires.private, no + longer in Requires. Since it might trigger some FTBFS, target + experimental. Better be safe than sorry. -- Cyril Brulebois <[email protected]> Wed, 12 Jan 2011 04:13:10 +0100 commit c030e6d55c688cbb5d098eab1f936297c7f2b825 Author: Cyril Brulebois <[email protected]> Date: Wed Jan 12 04:13:19 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 9e4a671..faa2ba5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,127 @@ +commit 8ac146ce96cfa133b788b1ffdd13fe0b648ee4fc +Author: Alan Coopersmith <[email protected]> +Date: Tue Jan 11 17:07:08 2011 -0800 + + libXaw 1.0.9 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e7a9b0302f7cb84015e8f612e5b65694d785b2d8 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + Tested-by: Alan Coopersmith <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 55fc7aa22197350d9cd1039e0398132a63d3589f +Author: Alan Coopersmith <[email protected]> +Date: Sat Nov 20 20:10:12 2010 -0800 + + Check for getpagesize() with autoconf instead of #ifdef osname + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + Reviewed-by: Gaetan Nadon <[email protected]> + Tested-by: Gaetan Nadon <[email protected]> + +commit b2e86875d03e349a4c85135e4cf41b26b99b083e +Author: Alan Coopersmith <[email protected]> +Date: Sat Nov 20 20:06:04 2010 -0800 + + convert header checks/ifdefs to autoconf standard AC_CHECK_HEADERS + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + Reviewed-by: Gaetan Nadon <[email protected]> + Tested-by: Gaetan Nadon <[email protected]> + +commit 41bf7992c45c6766c5982b3500b03d9c1b1fab87 +Author: Alan Coopersmith <[email protected]> +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 <[email protected]> + +commit f85d4342cbfbb58764e24e202f3a7c95eaba3d77 +Author: Alan Coopersmith <[email protected]> +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 <[email protected]> + +commit 394a0c49c849e497cbcb987154ff796eb34f4820 +Author: Alan Coopersmith <[email protected]> +Date: Thu Nov 11 23:30:22 2010 -0800 + + specs/CH6.xml: Remove stray quote in chapter title + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e9da4e6268b2cfbda793435caedc6403b2a918f0 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit fd5ef2fb841903c0a7d59e56f8fe69d0974f964c +Author: Jeremy Huddleston <[email protected]> +Date: Tue Nov 2 09:52:34 2010 -0700 + + xaw6.pc: Only list xmu in Requires.private, not Requires + + Signed-off-by: Jeremy Huddleston <[email protected]> + + Based on earlier similar change to xaw7.pc which was: + Signed-off-by: Alan Coopersmith <[email protected]> + Tested-by: Gaetan Nadon <[email protected]> + +commit 5136e2aabb73fec3c1670616bf0ebf828a1a1ca9 +Author: Cyril Brulebois <[email protected]> +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 <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 7b8196c9f7723b77b5d18fc1cc2070e557a7f767 +Author: Jeremy Huddleston <[email protected]> +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 <[email protected]> + commit 46ca2da2e8d29d7f1347c9f4e9fb3794dd99cb7a Author: Alan Coopersmith <[email protected]> Date: Mon Oct 25 10:47:03 2010 -0700 diff --git a/debian/changelog b/debian/changelog index 8905958..33d0cb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxaw (2:1.0.9-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <[email protected]> Wed, 12 Jan 2011 04:13:10 +0100 + libxaw (2:1.0.8-2) unstable; urgency=low [ Julien Cristau ] commit 8ac146ce96cfa133b788b1ffdd13fe0b648ee4fc Author: Alan Coopersmith <[email protected]> Date: Tue Jan 11 17:07:08 2011 -0800 libXaw 1.0.9 Signed-off-by: Alan Coopersmith <[email protected]> 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 <[email protected]> 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 <[email protected]> Tested-by: Alan Coopersmith <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> 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 <[email protected]> Date: Sat Nov 20 20:10:12 2010 -0800 Check for getpagesize() with autoconf instead of #ifdef osname Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Julien Cristau <[email protected]> Reviewed-by: Gaetan Nadon <[email protected]> Tested-by: Gaetan Nadon <[email protected]> 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 <[email protected]> Date: Sat Nov 20 20:06:04 2010 -0800 convert header checks/ifdefs to autoconf standard AC_CHECK_HEADERS Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Julien Cristau <[email protected]> Reviewed-by: Gaetan Nadon <[email protected]> Tested-by: Gaetan Nadon <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Thu Nov 11 23:30:22 2010 -0800 specs/CH6.xml: Remove stray quote in chapter title Signed-off-by: Alan Coopersmith <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Tue Nov 2 09:52:34 2010 -0700 xaw6.pc: Only list xmu in Requires.private, not Requires Signed-off-by: Jeremy Huddleston <[email protected]> Based on earlier similar change to xaw7.pc which was: Signed-off-by: Alan Coopersmith <[email protected]> Tested-by: Gaetan Nadon <[email protected]> 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 <[email protected]> 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 <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
