[Pkg-wmaker-commits] [wmcube] 01/07: Imported Upstream version 1.0.2
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Sat Mar 19 19:38:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmcube.
commit 4f2e242975ec2b1ea460dfc20e7e57e1c58de1b7
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Wed Mar 16 00:23:10 2016 -0400
Imported Upstream version 1.0.2
---
3D-objects/CONTRIBUTE | 2 +-
CHANGES | 5 +++++
INSTALL | 4 ++--
README | 6 +++---
THANKS | 6 +++++-
wmcube/Makefile | 2 +-
wmcube/Makefile.FREEBSD | 2 +-
wmcube/Makefile.LINUX | 2 +-
wmcube/Makefile.NETBSD | 2 +-
wmcube/Makefile.OPENBSD | 2 +-
wmcube/Makefile.SOLARIS | 2 +-
wmcube/wmcube.1 | 16 ++++++++--------
wmcube/wmcube.c | 15 ++++++++-------
wmgeneral/list.c | 21 +++++++++++----------
wmgeneral/list.h | 24 ++++++++++--------------
15 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/3D-objects/CONTRIBUTE b/3D-objects/CONTRIBUTE
index 9945ee8..1436758 100644
--- a/3D-objects/CONTRIBUTE
+++ b/3D-objects/CONTRIBUTE
@@ -58,7 +58,7 @@ Cezary M. Kruk <c.kruk at bigfoot.com>
- slackware2.wmc
- slackware3.wmc
-Three objects recommended by Doug Torrance <dtorrance at monmouthcollege.edu>
+Three objects recommended by Doug Torrance <dtorrance at piedmont.edu>
- X-lines.wmc
- X-planes.wmc
diff --git a/CHANGES b/CHANGES
index 855a4db..1b8f1b2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+wmcube 1.0.2 (February 28, 2016):
+ * Two following patches by Douglas Torrance: avoiding
+ hyphen-used-as-minus-sign Lintian warning as well as removing
+ inline keywords and allowing builds using gcc5.
+
wmcube 1.0.1 (February 19, 2015):
* Applied a few patches written by Doug Torrance (see: THANKS
file).
diff --git a/INSTALL b/INSTALL
index f5750ea..3185803 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,9 +21,9 @@ them to your needs is up to you.
Installation
--------------------------------------------------------------
-1) $ tar -zxf wmcube-1.0.1.tar.gz
+1) $ tar -zxf wmcube-1.0.2.tar.gz
-2) $ cd wmcube-1.0.1/wmcube
+2) $ cd wmcube-1.0.2/wmcube
3) $ make # if you run Linux
or:
diff --git a/README b/README
index 5757609..0c5b9d1 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-wmcube 1.0.1
+wmcube 1.0.2
---------------------------------------------------------------
Author: Cezary M. Kruk
c.kruk at bigfoot.com
http://linux-bsd-unix.strefa.pl
Contributors:
- Doug Torrance <dtorrance at monmouthcollege.edu>
+ Doug Torrance <dtorrance at piedmont.edu>
wmCube 0.98
---------------------------------------------------------------
@@ -83,6 +83,6 @@ detailed as you can.
Copyright
---------------------------------------------------------------
-wmcube (C) 2014-2015 by Cezary M. Kruk, Wrocław, Poland
+wmcube (C) 2014-2016 by Cezary M. Kruk, Wrocław, Poland
wmCube (C) 2000-2001 by Robert Kling, Lulea, Sweden
diff --git a/THANKS b/THANKS
index d96d208..142c992 100644
--- a/THANKS
+++ b/THANKS
@@ -1,9 +1,13 @@
-I would like to thank to Doug Torrance for his contribution to
+I would like to thank to Douglas Torrance for his contribution to
wmcube including:
* a set of patches:
+ - remove_inline_keywords.patch -- removes inline keywords; allows
+ builds using gcc5.
+ - manpage_escape_hyphens.patch -- avoids hyphen-used-as-minus-sign
+ Lintian warning.
- 30_bts-386850_fix_smp.patch -- fixes smp support, reading
all the fields in /proc/stat;
- 40_bts-357072_long_uptime_fix.patch -- fixes execution on
diff --git a/wmcube/Makefile b/wmcube/Makefile
index 2a66a33..9109993 100644
--- a/wmcube/Makefile
+++ b/wmcube/Makefile
@@ -1,7 +1,7 @@
CC = gcc
OS = -DLINUX
-VERSION = 1.0.1
+VERSION = 1.0.2
LIBDIR = -L/usr/X11R6/lib
LIBDIR = -L/usr/X11R6/lib
diff --git a/wmcube/Makefile.FREEBSD b/wmcube/Makefile.FREEBSD
index 98c589b..63401e3 100644
--- a/wmcube/Makefile.FREEBSD
+++ b/wmcube/Makefile.FREEBSD
@@ -1,7 +1,7 @@
CC = gcc
OS = -DFREEBSD
-VERSION = 1.0.1
+VERSION = 1.0.2
LIBDIR = -L/usr/X11R6/lib
LIBDIR = -L/usr/X11R6/lib
diff --git a/wmcube/Makefile.LINUX b/wmcube/Makefile.LINUX
index 2a66a33..9109993 100644
--- a/wmcube/Makefile.LINUX
+++ b/wmcube/Makefile.LINUX
@@ -1,7 +1,7 @@
CC = gcc
OS = -DLINUX
-VERSION = 1.0.1
+VERSION = 1.0.2
LIBDIR = -L/usr/X11R6/lib
LIBDIR = -L/usr/X11R6/lib
diff --git a/wmcube/Makefile.NETBSD b/wmcube/Makefile.NETBSD
index aa3a5aa..8a4bcd9 100644
--- a/wmcube/Makefile.NETBSD
+++ b/wmcube/Makefile.NETBSD
@@ -1,7 +1,7 @@
CC = gcc
OS = -DNETBSD
-VERSION = 1.0.1
+VERSION = 1.0.2
LIBDIR = -L/usr/X11R6/lib -L./libdocapp/
diff --git a/wmcube/Makefile.OPENBSD b/wmcube/Makefile.OPENBSD
index adfd8a0..675214b 100644
--- a/wmcube/Makefile.OPENBSD
+++ b/wmcube/Makefile.OPENBSD
@@ -1,7 +1,7 @@
CC = gcc
OS = -DOPENBSD
-VERSION = 1.0.1
+VERSION = 1.0.2
LIBDIR = -L/usr/X11R6/lib -L./libdocapp/
diff --git a/wmcube/Makefile.SOLARIS b/wmcube/Makefile.SOLARIS
index eed97b4..79b99dd 100644
--- a/wmcube/Makefile.SOLARIS
+++ b/wmcube/Makefile.SOLARIS
@@ -1,7 +1,7 @@
CC = gcc
OS = -DSOLARIS
-VERSION = 1.0.1
+VERSION = 1.0.2
LIBDIR = -L/usr/X11R6/lib
LIBDIR = -L/usr/openwin/lib -L/opt/sfw/lib -L/usr/local/lib -R/usr/openwin/lib -R/opt/sfw/lib -R/usr/local/lib
diff --git a/wmcube/wmcube.1 b/wmcube/wmcube.1
index f69d93e..a2a3218 100644
--- a/wmcube/wmcube.1
+++ b/wmcube/wmcube.1
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH WMCUBE 1 "February 19, 2015" "Version 1.0.1" "3D object CPU Load display applet"
+.TH WMCUBE 1 "February 28, 2016" "Version 1.0.2" "3D object CPU Load display applet"
.SH NAME
wmcube \-\- spinning 3D object that shows the current CPU load
@@ -55,16 +55,16 @@ use blue image.
display this help.
.SH TIPS & TRICKS
-By combining together -RG, -RB, or -GB switches you get yellow, magenta, or cyan
-images. Combining -RGB switches produces the gray image \-\- the same as without
+By combining together \-RG, \-RB, or \-GB switches you get yellow, magenta, or cyan
+images. Combining \-RGB switches produces the gray image \-\- the same as without
any swiches.
.SH PROGRAM AUTHORS
-wmcube 1.0.1:
+wmcube 1.0.2:
.IP
-(C) 2014-2015 Cezary M. Kruk <\fIc.kruk at bigfoot.com\fP>
+(C) 2014-2016 Cezary M. Kruk <\fIc.kruk at bigfoot.com\fP>
.IP
-(C) 2015 Doug Torrance
+(C) 2015-2016 Doug Torrance <\fIdtorrance at piedmont.edu\fP>
.LP
wmCube 0.98:
.IP
@@ -77,9 +77,9 @@ Filip Van Raemdonck <mechanix at digibel.org> \-\- manpage for version 0.98 of wmcu
.LP
Sandro Tosi <matrixhasu at gmail.com> \-\- manpage for version 0.99-pre1 of wmcube.
.LP
-Doug Torrance <dtorrance at monmouthcollege.edu> \-\- manpage for version 1.0.0.
+Doug Torrance <dtorrance at piedmont.edu> \-\- manpage for version 1.0.0.
.LP
-Cezary M. Kruk <c.kruk at bigfoot.com> \-\- manpage for version 1.0.1.
+Cezary M. Kruk <c.kruk at bigfoot.com> \-\- manpage for version 1.0.2.
.SH SEE ALSO
.BR fvwm (1), wmaker (1)
diff --git a/wmcube/wmcube.c b/wmcube/wmcube.c
index 516e971..37eca87 100644
--- a/wmcube/wmcube.c
+++ b/wmcube/wmcube.c
@@ -2,13 +2,14 @@
wmcube.c
- Version 1.0.1 (2015-02-19)
+ Version 1.0.2 (2016-02-28)
Cezary M. Kruk <c.kruk at bigfoot.com>
http://linux-bsd-unix.strefa.pl
Contributions:
A few patches, three new objects, and other updates by Doug Torrance
- <dtorrance at monmouthcollege.edu> (2015-02-19)
+ A small improvement of the manpage by Doug Torrance
+ <dtorrance at piedmont.edu> (2016-02-28)
Versions 0.98 (2000-10-23)
Robert Kling <robkli-8 at student.luth.se>
@@ -31,10 +32,10 @@
*/
-#define CK_WMCUBE_VERSION "1.0.1"
-#define CK_REV_YEAR "2014-2015"
-#define CK_REV_DATE "2015-02-19"
-#define DT_REV_YEAR "2015"
+#define CK_WMCUBE_VERSION "1.0.2"
+#define CK_REV_YEAR "2014-2016"
+#define CK_REV_DATE "2016-02-28"
+#define DT_REV_YEAR "2015-2016"
#define RK_WMCUBE_VERSION "0.98"
#define RK_REV_YEAR "2000"
#define RK_REV_DATE "2000-10-23"
@@ -908,7 +909,7 @@ void setupobj(char *filename)
void print_help() {
printf("\nwmcube %s (C) %s Cezary M. Kruk (%s)\n", CK_WMCUBE_VERSION, CK_REV_YEAR, CK_REV_DATE);
- printf(" (C) %s Doug Torrance\n", DT_REV_YEAR);
+ printf(" (C) %s Doug Torrance\n", DT_REV_YEAR);
printf("wmCube %s (C) %s Robert Kling (%s)\n\n", RK_WMCUBE_VERSION, RK_REV_YEAR, RK_REV_DATE);
printf(" Usage: wmcube [-o <filename>] [-drcfnbipRGBh]\n\n");
diff --git a/wmgeneral/list.c b/wmgeneral/list.c
index f804b2c..1e3764b 100644
--- a/wmgeneral/list.c
+++ b/wmgeneral/list.c
@@ -5,7 +5,8 @@
Author: Kresten Krab Thorup
Many modifications by Alfredo K. Kojima
-
+
+Modified by Douglas Torrance
This file is part of GNU CC.
@@ -38,7 +39,7 @@ Boston, MA 02111-1307, USA. */
/* Return a cons cell produced from (head . tail) */
-INLINE LinkedList*
+LinkedList*
list_cons(void* head, LinkedList* tail)
{
LinkedList* cell;
@@ -51,7 +52,7 @@ list_cons(void* head, LinkedList* tail)
/* Return the length of a list, list_length(NULL) returns zero */
-INLINE int
+int
list_length(LinkedList* list)
{
int i = 0;
@@ -66,7 +67,7 @@ list_length(LinkedList* list)
/* Return the Nth element of LIST, where N count from zero. If N
larger than the list length, NULL is returned */
-INLINE void*
+void*
list_nth(int index, LinkedList* list)
{
while(index-- != 0)
@@ -81,7 +82,7 @@ list_nth(int index, LinkedList* list)
/* Remove the element at the head by replacing it by its successor */
-INLINE void
+void
list_remove_head(LinkedList** list)
{
if (!*list) return;
@@ -101,7 +102,7 @@ list_remove_head(LinkedList** list)
/* Remove the element with `car' set to ELEMENT */
/*
-INLINE void
+void
list_remove_elem(LinkedList** list, void* elem)
{
while (*list)
@@ -112,7 +113,7 @@ list_remove_elem(LinkedList** list, void* elem)
}
}*/
-INLINE LinkedList *
+LinkedList *
list_remove_elem(LinkedList* list, void* elem)
{
LinkedList *tmp;
@@ -132,7 +133,7 @@ list_remove_elem(LinkedList* list, void* elem)
/* Return element that has ELEM as car */
-INLINE LinkedList*
+LinkedList*
list_find(LinkedList* list, void* elem)
{
while(list)
@@ -146,7 +147,7 @@ list_find(LinkedList* list, void* elem)
/* Free list (backwards recursive) */
-INLINE void
+void
list_free(LinkedList* list)
{
if(list)
@@ -158,7 +159,7 @@ list_free(LinkedList* list)
/* Map FUNCTION over all elements in LIST */
-INLINE void
+void
list_mapcar(LinkedList* list, void(*function)(void*))
{
while(list)
diff --git a/wmgeneral/list.h b/wmgeneral/list.h
index af0f22c..7491b6b 100644
--- a/wmgeneral/list.h
+++ b/wmgeneral/list.h
@@ -3,6 +3,8 @@
Author: Kresten Krab Thorup
+Modified by Douglas Torrance
+
This file is part of GNU CC.
GNU CC is free software; you can redistribute it and/or modify
@@ -29,31 +31,25 @@ Boston, MA 02111-1307, USA. */
#ifndef __LIST_H_
#define __LIST_H_
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-# define INLINE inline
-#else
-# define INLINE
-#endif
-
typedef struct LinkedList {
void *head;
struct LinkedList *tail;
} LinkedList;
-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
+LinkedList* list_cons(void* head, LinkedList* tail);
-INLINE int list_length(LinkedList* list);
+int list_length(LinkedList* list);
-INLINE void* list_nth(int index, LinkedList* list);
+void* list_nth(int index, LinkedList* list);
-INLINE void list_remove_head(LinkedList** list);
+void list_remove_head(LinkedList** list);
-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
+LinkedList *list_remove_elem(LinkedList* list, void* elem);
-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
+void list_mapcar(LinkedList* list, void(*function)(void*));
-INLINE LinkedList*list_find(LinkedList* list, void* elem);
+LinkedList*list_find(LinkedList* list, void* elem);
-INLINE void list_free(LinkedList* list);
+void list_free(LinkedList* list);
#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcube.git
More information about the Pkg-wmaker-commits
mailing list