qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xcalc 1.0.4.

Browse Source
This commit is contained in:
matthieu 2010-11-25 21:58:01 +00:00
parent 51e80e68c8
commit 79dc50bfcd
12 changed files with 1268 additions and 1468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
app/xcalc/ChangeLog
View File

@ -1,3 +1,108 @@
commit 8245b9f8451b92a1aaa7a3520114a4afdd37c2e8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 24 15:58:04 2010 -0800
xcalc 1.0.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 4ac002703c8bda62f768f581e1ec81bbf7446365
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 11:12:55 2010 -0800
create_keypad: declare list of button name strings as const
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 0d7aa29c6209391cf8307c19b5cf84528f8c2184
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 10:55:58 2010 -0800
Purge RCS/CVS version tags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9ede32efd5f840b7728e28e24efe2759e2c3917b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 10:41:45 2010 -0800
config: Explicitly check for xt & x11 pkgs, since xcalc calls those directly
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 4be6d1bd7b6293ff4af1042098a6164aa9639595
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 10:37:40 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.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 30e01e9b012c7191c28946a73c2ff5b969d9eec7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 10:35:57 2010 -0800
config: Remove unnecessary calls from configure.ac
AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5505a663714c71aa3545889633f36079522edcb5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 10:34:33 2010 -0800
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
Enables use of platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6919c12a985abd335b4890005d572107f833c3ec
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Nov 20 10:31:43 2010 -0800
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8180d8ea42cfdda9ed3828fb28d1a6cd24d951db
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Feb 11 10:08:06 2010 -0500
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 04d8b9bfcd40eee452ba080b654dac9281251115
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 19 20:48:47 2009 -0500
configure.ac: use backticks rather than $() for cmd subs
Use "$PKG_CONFIG" rather than hard coded "pkg-config"
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 6c21e467c805d62593d34da9e83a2fa2f01798a6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 19:51:44 2009 -0800

22
app/xcalc/Makefile.am
View File

@ -21,7 +21,7 @@
bin_PROGRAMS = xcalc
AM_CFLAGS = $(XCALC_CFLAGS)
AM_CFLAGS = $(XCALC_CFLAGS) $(CWARNFLAGS)
xcalc_LDADD = $(XCALC_LIBS) -lm
xcalc_SOURCES = \
@ -63,26 +63,8 @@ EXTRA_DIST = $(appman_PRE) autogen.sh
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__apploaddir__|$(appdefaultdir)|' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

28
app/xcalc/Makefile.in
View File

@ -112,12 +112,14 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPDEFS_CFLAGS = @APPDEFS_CFLAGS@
APPDEFS_LIBS = @APPDEFS_LIBS@
APP_MAN_DIR = @APP_MAN_DIR@
@ -146,6 +148,7 @@ EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -160,6 +163,7 @@ MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
OBJEXT = @OBJEXT@
@ -171,12 +175,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XCALC_CFLAGS = @XCALC_CFLAGS@
XCALC_LIBS = @XCALC_LIBS@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
ac_ct_CC = @ac_ct_CC@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@ -194,7 +200,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -222,7 +227,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CFLAGS = $(XCALC_CFLAGS)
AM_CFLAGS = $(XCALC_CFLAGS) $(CWARNFLAGS)
xcalc_LDADD = $(XCALC_LIBS) -lm
xcalc_SOURCES = \
actions.c \
@ -245,24 +250,6 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE) autogen.sh
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__apploaddir__|$(appdefaultdir)|' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@ -696,6 +683,7 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.

816
app/xcalc/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

1
app/xcalc/actions.c
View File

@ -1,4 +1,3 @@
/* $XConsortium: actions.c,v 1.9 94/04/17 20:43:30 converse Exp $ */
/*
Copyright (c) 1989 X Consortium

2
app/xcalc/app-defaults/XCalc
View File

@ -1,5 +1,3 @@
! $XConsortium: XCalc.ad,v 1.13 94/03/03 19:19:32 converse Exp $
! $XFree86$
! XCalc application class resource file
XCalc.Title: Calculator

1716
app/xcalc/configure vendored
View File

File diff suppressed because it is too large Load Diff

31
app/xcalc/configure.ac
View File

@ -21,31 +21,28 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xcalc, [1.0.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcalc)
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xcalc], [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xcalc])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
PKG_CHECK_MODULES(XCALC, xaw7)
XCALC_CFLAGS="$CWARNFLAGS $XCALC_CFLAGS"
AC_SUBST(XCALC_CFLAGS)
AC_SUBST(XCALC_LIBS)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XCALC, xaw7 xt x11)
PKG_CHECK_MODULES(APPDEFS, xt)
xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
AC_ARG_WITH(appdefaultdir,
AC_HELP_STRING([--with-appdefaultdir=<pathname>],
[specify directory for app-defaults files (default is autodetected)]),

6
app/xcalc/math.c
View File

@ -1,8 +1,4 @@
/* $XConsortium: math.c,v 1.17 91/07/25 17:51:34 rws Exp $
* $MIT: contrib/programs/xcalc/math.c,v 3.2 1999/12/14 18:53:00 gjcoram Exp$
* $XFree86: xc/programs/xcalc/math.c,v 1.5tsi Exp $
* $XdotOrg: xc/programs/xcalc/math.c,v 1.3 2004/05/23 20:03:49 alanc Exp $
*
/*
* math.c - mathematics functions for a hand calculator under X
*
* Author: John H. Bradley, University of Pennsylvania

4
app/xcalc/xcalc.c
View File

@ -1,4 +1,3 @@
/* $XConsortium: xcalc.c,v 1.16 94/04/17 20:43:31 converse Exp $ */
/*
Copyright (c) 1989 X Consortium
@ -28,7 +27,6 @@ other dealings in this Software without prior written authorization
from the X Consortium.
*/
/* $XFree86$ */
/*
* xcalc.c - a hand calculator for the X Window system
@ -234,7 +232,7 @@ static void create_display(Widget parent)
static void create_keypad(Widget parent)
{
static char *Keyboard[] = {
static const char *Keyboard[] = {
"button1", "button2", "button3", "button4", "button5",
"button6", "button7", "button8", "button9", "button10",
"button11","button12","button13","button14","button15",

2
app/xcalc/xcalc.h
View File

@ -1,4 +1,3 @@
/* $XConsortium: xcalc.h,v 1.4 94/04/17 20:43:32 converse Exp $ */
/*
Copyright (c) 1989 X Consortium
@ -28,7 +27,6 @@ other dealings in this Software without prior written authorization
from the X Consortium.
*/
/* $XFree86$ */
/*
* xcalc.h - symbolic constants for xcalc

3
app/xcalc/xcalc.man
View File

@ -1,5 +1,3 @@
.\" $XConsortium: xcalc.man,v 1.10 94/04/17 20:43:32 matt Exp $
.\" $XdotOrg: $
.\" Copyright (c) 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
@ -26,7 +24,6 @@
.\" other dealings in this Software without prior written authorization
.\" from the X Consortium.
.\"
.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.4 2002/10/12 16:06:46 herrb Exp $
.\"
.de EX \"Begin example
.ne 5