pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/Xaw-Xpm Fixed the build errors with gcc4.
details: https://anonhg.NetBSD.org/pkgsrc/rev/7c69ef3f7fd9
branches: trunk
changeset: 533950:7c69ef3f7fd9
user: rillig <rillig%pkgsrc.org@localhost>
date: Tue Oct 09 11:09:21 2007 +0000
description:
Fixed the build errors with gcc4.
diffstat:
x11/Xaw-Xpm/distinfo | 10 +++-
x11/Xaw-Xpm/patches/patch-aa | 86 +++++++++++++++++++++++++++++++++++++++++--
x11/Xaw-Xpm/patches/patch-ag | 22 +++++++++--
x11/Xaw-Xpm/patches/patch-ah | 40 ++++++++++++++++++++
x11/Xaw-Xpm/patches/patch-ai | 13 ++++++
x11/Xaw-Xpm/patches/patch-aj | 13 ++++++
x11/Xaw-Xpm/patches/patch-ak | 24 ++++++++++++
7 files changed, 197 insertions(+), 11 deletions(-)
diffs (262 lines):
diff -r 0c09b5403dc4 -r 7c69ef3f7fd9 x11/Xaw-Xpm/distinfo
--- a/x11/Xaw-Xpm/distinfo Tue Oct 09 10:04:00 2007 +0000
+++ b/x11/Xaw-Xpm/distinfo Tue Oct 09 11:09:21 2007 +0000
@@ -1,12 +1,16 @@
-$NetBSD: distinfo,v 1.5 2007/01/29 18:36:29 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/10/09 11:09:21 rillig Exp $
SHA1 (Xaw-XPM-1.1.tar.gz) = 8d85d0a96c86f46da9dcf21eef8daf3a7dd64c7f
RMD160 (Xaw-XPM-1.1.tar.gz) = a97a08af7459ada39c7b97a69cf1b05d3e570343
Size (Xaw-XPM-1.1.tar.gz) = 1188556 bytes
-SHA1 (patch-aa) = b220f322f3a8a82400144defecb65bb2121ba997
+SHA1 (patch-aa) = 29e549f234464cf8795d422f772bb92d9ace21a2
SHA1 (patch-ab) = a2e4249ab6d9dce2b98452cf60c0d49e281cde7b
SHA1 (patch-ac) = 4bf9c4870a2b1fcc32a5a2809763da8c14a55d19
SHA1 (patch-ad) = b1de4e1008c0b5791df3c32e5520b7823d203237
SHA1 (patch-ae) = 9e163e8daa63099f732292a00449202dd54b7ddd
SHA1 (patch-af) = 993be70d46216dff66b6710f001351e2e0ccf929
-SHA1 (patch-ag) = da8c9e1348ae7b1bf97cf47cca6fb9e1a8c8cf6d
+SHA1 (patch-ag) = 51538b3ef4b78338f99a2e2d8daff325cb5dceba
+SHA1 (patch-ah) = e9e0925c196014b871c1075da9721910c7d257ec
+SHA1 (patch-ai) = 00efa6c86de5990b72ef44dc934d82644e299445
+SHA1 (patch-aj) = f38f22e45d7adde59898c70be901e328e398369f
+SHA1 (patch-ak) = 280afd17cba2fc0594f89a24dadf112aebf744a3
diff -r 0c09b5403dc4 -r 7c69ef3f7fd9 x11/Xaw-Xpm/patches/patch-aa
--- a/x11/Xaw-Xpm/patches/patch-aa Tue Oct 09 10:04:00 2007 +0000
+++ b/x11/Xaw-Xpm/patches/patch-aa Tue Oct 09 11:09:21 2007 +0000
@@ -1,10 +1,88 @@
-$NetBSD: patch-aa,v 1.3 1999/06/28 09:11:13 agc Exp $
+$NetBSD: patch-aa,v 1.4 2007/10/09 11:09:22 rillig Exp $
Handle wide signal masks.
---- Xpm.c.orig Tue Nov 26 13:40:26 1996
-+++ Xpm.c Mon Jun 28 10:04:57 1999
-@@ -206,9 +206,8 @@
+For the removal of the type casts, see patch-ak.
+
+--- Xpm.c.orig 1996-11-26 14:40:26.000000000 +0100
++++ Xpm.c 2007-10-09 12:54:37.000000000 +0200
+@@ -46,7 +46,7 @@ char directory[MAXPATHLEN];
+ }
+ chdir(directory);
+ }
+- (PixmapNode *)PixList.first = (PixmapNode *)pixnode;
++ PixList.first = pixnode;
+ pixnode->next = NULL;
+ PixList.n_entries = 1;
+ pixnode->filename = filename;
+@@ -55,18 +55,18 @@ char directory[MAXPATHLEN];
+
+ /* Is the pixmap already in the list? */
+
+- (PixmapNode *)pixnode = (PixmapNode *)PixList.first;
++ pixnode = PixList.first;
+ for(;;)
+ {
+ if(strncmp(filename,pixnode->filename, MAXPATHLEN) == 0)
+ return((Pixmap *)&pixnode->pixmap);
+ if(pixnode->next == NULL) break;
+- (PixmapNode *)pixnode = (PixmapNode *)pixnode->next;
++ pixnode = pixnode->next;
+ }
+
+ /* Didnt find the pixmap...make a new one */
+
+- (PixmapNode *)pixnew = (void *)malloc(sizeof(PixmapNode));
++ pixnew = (void *)malloc(sizeof(PixmapNode));
+
+ XGetWindowAttributes(XtDisplay(w) ,DefaultRootWindow(XtDisplay(w)),&root_att);
+ orig_att.closeness=65536;
+@@ -86,7 +86,7 @@ char directory[MAXPATHLEN];
+ }
+ chdir(directory);
+ }
+- (PixmapNode *)pixnode->next = (PixmapNode *)pixnew;
++ pixnode->next = pixnew;
+ pixnew->filename = filename;
+ pixnew->next = NULL;
+ return((Pixmap *)&pixnew->pixmap);
+@@ -105,7 +105,7 @@ XpmAttributes orig_att;
+ char error_buf[BUFSIZ];
+ char directory[MAXPATHLEN];
+
+- (PixmapNode *)pixnode = (PixmapNode *)PixList.first;
++ pixnode = PixList.first;
+ for(;;)
+ {
+ if(strncmp(filename,pixnode->filename, MAXPATHLEN) == 0)
+@@ -114,7 +114,7 @@ char directory[MAXPATHLEN];
+ break;
+ }
+ if(pixnode->next == NULL) break;
+- (PixmapNode *)pixnode = (PixmapNode *)pixnode->next;
++ pixnode = pixnode->next;
+ }
+ if(found)
+ {
+@@ -140,7 +140,7 @@ char directory[MAXPATHLEN];
+ }
+ else
+ {
+- (PixmapNode *)pixnew = (void *)malloc(sizeof(PixmapNode));
++ pixnew = (void *)malloc(sizeof(PixmapNode));
+ XGetWindowAttributes(XtDisplay(w) ,DefaultRootWindow(XtDisplay(w)),&root_att);
+ orig_att.closeness=65536;
+ orig_att.colormap=root_att.colormap;
+@@ -159,7 +159,7 @@ char directory[MAXPATHLEN];
+ }
+ chdir(directory);
+ }
+- (PixmapNode *)pixnode->next = (PixmapNode *)pixnew;
++ pixnode->next = pixnew;
+ pixnew->filename = filename;
+ pixnew->next = NULL;
+ return((Pixmap *)&pixnew->mask);
+@@ -206,9 +206,8 @@ char *soundfile;
sigchld.
*/
new.sa_handler=SigHandle;
diff -r 0c09b5403dc4 -r 7c69ef3f7fd9 x11/Xaw-Xpm/patches/patch-ag
--- a/x11/Xaw-Xpm/patches/patch-ag Tue Oct 09 10:04:00 2007 +0000
+++ b/x11/Xaw-Xpm/patches/patch-ag Tue Oct 09 11:09:21 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2007/01/29 18:36:29 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2007/10/09 11:09:22 rillig Exp $
---- laylex.c.orig 1995-03-30 22:14:39.000000000 +0000
-+++ laylex.c
+--- laylex.c.orig 1995-03-31 00:14:39.000000000 +0200
++++ laylex.c 2007-10-09 13:05:03.000000000 +0200
@@ -42,7 +42,7 @@ int LayYYleng; extern char LayYYtext[];
int LayYYmorfg;
extern char *LayYYsptr, LayYYsbuf[];
@@ -11,7 +11,21 @@
extern int LayYYlineno;
struct LayYYsvf {
struct LayYYwork *LayYYstoff;
-@@ -68,6 +68,16 @@ static char *LayYYsourcebase, *LayYYsour
+@@ -57,17 +57,30 @@ extern struct LayYYsvf LayYYsvec[], *Lay
+ #include <X11/Xresource.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
++#include <stdlib.h>
+
+ #include "LayoutP.h"
+ #include "laygram.h"
+ static char *LayYYsourcebase, *LayYYsource;
+
++static int count (char *s, char c);
++
+ #define input() (*LayYYsource++)
+ #define unput(c) (--LayYYsource)
+
# define YYNEWLINE 10
LayYYlex(){
int nstr; extern int LayYYprevious;
diff -r 0c09b5403dc4 -r 7c69ef3f7fd9 x11/Xaw-Xpm/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xaw-Xpm/patches/patch-ah Tue Oct 09 11:09:21 2007 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ah,v 1.1 2007/10/09 11:09:22 rillig Exp $
+
+--- Command.c.orig 1996-11-11 10:38:27.000000000 +0100
++++ Command.c 2007-10-09 12:47:58.000000000 +0200
+@@ -651,7 +651,7 @@ Cardinal *num_args;
+ if(oldcbw->command.setpixmap != cbw->command.setpixmap &&
+ cbw->command.setpixmap != None)
+ {
+- (CommandWidget)cbw->command.setpix =
++ cbw->command.setpix =
+ InsertPixmap(cbw, ((CommandWidget)cbw)->command.setpixmap,
+ ((CommandWidget)cbw)->simple.pixdir);
+ if ((Pixmap)*cbw->command.setpix == (Pixmap)NULL)
+@@ -661,7 +661,7 @@ Cardinal *num_args;
+ if(oldcbw->command.hlpixmap != cbw->command.hlpixmap &&
+ cbw->command.hlpixmap != None)
+ {
+- (CommandWidget)cbw->command.hlpix =
++ cbw->command.hlpix =
+ InsertPixmap(cbw, ((CommandWidget)cbw)->command.hlpixmap,
+ ((CommandWidget)cbw)->simple.pixdir);
+ if ((Pixmap)*cbw->command.hlpix == (Pixmap)NULL)
+@@ -715,7 +715,7 @@ static void Realize(w, valueMask, attrib
+
+ if(cbw->command.setpixmap != None)
+ {
+- (Pixmap *)cbw->command.setpix =
++ cbw->command.setpix =
+ (Pixmap *)InsertPixmap(w, cbw->command.setpixmap,
+ cbw->simple.pixdir);
+ if( (Pixmap) *cbw->command.setpix == (Pixmap)NULL)
+@@ -723,7 +723,7 @@ static void Realize(w, valueMask, attrib
+ }
+ if(cbw->command.hlpixmap != None)
+ {
+- (Pixmap *)cbw->command.hlpix =
++ cbw->command.hlpix =
+ (Pixmap *)InsertPixmap(w, cbw->command.hlpixmap,
+ cbw->simple.pixdir);
+ if( (Pixmap) *cbw->command.hlpix == (Pixmap)NULL)
diff -r 0c09b5403dc4 -r 7c69ef3f7fd9 x11/Xaw-Xpm/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xaw-Xpm/patches/patch-ai Tue Oct 09 11:09:21 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2007/10/09 11:09:23 rillig Exp $
+
+--- Panner.c.orig 1996-10-26 09:59:58.000000000 +0200
++++ Panner.c 2007-10-09 12:48:44.000000000 +0200
+@@ -556,7 +556,7 @@ static void Realize (gw, valuemaskp, att
+ (gw, valuemaskp, attr);
+ if(pw->panner.sliderpixmap != None)
+ {
+- (Pixmap *)((PannerWidget)pw)->panner.spix =
++ ((PannerWidget)pw)->panner.spix =
+ (Pixmap *)InsertPixmap(pw, ((PannerWidget)pw)->panner.sliderpixmap,
+ ((PannerWidget)pw)->simple.pixdir);
+ if((Pixmap)*((PannerWidget)pw)->panner.spix == (Pixmap)NULL)
diff -r 0c09b5403dc4 -r 7c69ef3f7fd9 x11/Xaw-Xpm/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xaw-Xpm/patches/patch-aj Tue Oct 09 11:09:21 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2007/10/09 11:09:23 rillig Exp $
+
+--- Scrollbar.c.orig 1996-11-26 10:07:53.000000000 +0100
++++ Scrollbar.c 2007-10-09 12:49:11.000000000 +0200
+@@ -1086,7 +1086,7 @@ static void Realize (w, valueMask, attri
+ }
+ if(((ScrollbarWidget)sbw)->scrollbar.thumbpixmap != None)
+ {
+- (Pixmap *)((ScrollbarWidget)sbw)->scrollbar.thumbpix =
++ ((ScrollbarWidget)sbw)->scrollbar.thumbpix =
+ InsertPixmap(sbw, ((ScrollbarWidget)sbw)->scrollbar.thumbpixmap,
+ ((ScrollbarWidget)sbw)->simple.pixdir);
+ if((Pixmap)*sbw->scrollbar.thumbpix == (Pixmap)NULL)
diff -r 0c09b5403dc4 -r 7c69ef3f7fd9 x11/Xaw-Xpm/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xaw-Xpm/patches/patch-ak Tue Oct 09 11:09:21 2007 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ak,v 1.1 2007/10/09 11:09:23 rillig Exp $
+
+Warning: typos can greatly reduce the readability of your code (see
+patch-aa).
+
+--- Xpm.h.orig 1996-11-17 08:13:02.000000000 +0100
++++ Xpm.h 2007-10-09 12:52:11.000000000 +0200
+@@ -8,13 +8,13 @@ typedef struct _PixmapNode {
+ Pixmap pixmap;
+ Pixmap mask;
+ int usage;
+- struct PixmapNode *next;
++ struct _PixmapNode *next;
+ } PixmapNode;
+
+ typedef struct _pixmaplist{
+ int n_entries;
+- struct PixmapNode *first;
+- struct PixmapNode *last;
++ struct _PixmapNode *first;
++ struct _PixmapNode *last;
+ } pixmaplist;
+
+ pixmaplist PixList;
Home |
Main Index |
Thread Index |
Old Index