FreeBSD Bugzilla – Attachment 82860 Details for
Bug 118474
[patch] x11-fm/ezfm unbreak fix build with GCC 4.2 + adopt maintainship
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
_ezfm.diff
_ezfm.diff (text/plain), 6.25 KB, created by
Pietro Cerutti
on 2007-12-07 00:20:01 UTC
(
hide
)
Description:
_ezfm.diff
Filename:
MIME Type:
Creator:
Pietro Cerutti
Created:
2007-12-07 00:20:01 UTC
Size:
6.25 KB
patch
obsolete
>--- Makefile.orig 2007-12-06 23:55:05.000000000 +0100 >+++ Makefile 2007-12-07 00:19:58.000000000 +0100 >@@ -13,24 +13,17 @@ > DISTNAME= EZFM-0.4-src > EXTRACT_SUFX= .tgz > >-MAINTAINER= ports@FreeBSD.org >+MAINTAINER= gahr@gahr.ch > COMMENT= EZWGL-based file manager for X Window System > > LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ > EZ.1:${PORTSDIR}/graphics/EZWGL > > WRKSRC= ${WRKDIR}/EZFM-${PORTVERSION} >-USE_X_PREFIX= yes > USE_GMAKE= yes > > MAN1= ezfm.1 > >-.include <bsd.port.pre.mk> >- >-.if ${OSVERSION} >= 700042 >-BROKEN= Broken with gcc 4.2 >-.endif >- > do-install: > @ ${INSTALL_PROGRAM} ${WRKSRC}/ezfm ${PREFIX}/bin > @ ${MKDIR} ${PREFIX}/share/ezfm >@@ -47,4 +40,4 @@ > @${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR} > .endif > >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >--- files/patch-ab.orig 2002-10-31 18:10:41.000000000 +0100 >+++ files/patch-ab 2007-12-07 00:02:49.000000000 +0100 >@@ -1,8 +1,5 @@ >- >-$FreeBSD: ports/x11-fm/ezfm/files/patch-ab,v 1.3 2002/10/31 17:10:41 naddy Exp $ >- >---- ezfm.h.orig Wed Oct 6 00:01:29 1999 >-+++ ezfm.h Thu Oct 31 18:05:27 2002 >+--- ezfm.h.orig 1999-10-06 00:01:29.000000000 +0200 >++++ ezfm.h 2007-12-07 00:02:05.000000000 +0100 > @@ -52,8 +52,11 @@ > #define REMOVABLE_DRIVES > #endif >@@ -16,3 +13,11 @@ > #define syserr(en) (((en) >= 0 && (en) < sys_nerr) ? sys_errlist[(en)] : "Unknown error") > #define SECONDS_IN_YEAR 31536000 > #define SelectionBackground "yellow" >+@@ -253,7 +256,6 @@ >+ EXTERN char ezfmFolderBgPixmap[]; >+ EXTERN EZ_Widget *ezfmDragIcon; >+ EXTERN Cursor ezfmDragCursor; >+-EXTERN Pixmap rootBgPixmap; >+ EXTERN EZ_LabelPixmap *bigPixmap; >+ EXTERN int transparent; >+ EXTERN Display *theDisplay; >--- files/patch-ac.orig 1998-08-10 02:28:06.000000000 +0200 >+++ files/patch-ac 2007-12-07 00:09:45.000000000 +0100 >@@ -1,6 +1,33 @@ >---- infoBtn.c Thu Jun 25 16:09:58 1998 >-+++ /home/andy/tmp/wrk/infoBtn.c Thu Jul 30 11:27:26 1998 >-@@ -292,7 +292,7 @@ >+--- infoBtn.c.orig 1998-11-16 06:02:59.000000000 +0100 >++++ infoBtn.c 2007-12-07 00:09:30.000000000 +0100 >+@@ -214,7 +214,7 @@ >+ if(chmod(ptr->pathname, ptr->mode) != 0) >+ { >+ char *err= (errno >= 0 && errno <sys_nerr)? >+- sys_errlist[errno] : "Unknown error"; >++ (char *)sys_errlist[errno] : "Unknown error"; >+ ezfmWarning("chmod() failed due to the following error", err); >+ haserr++; >+ } >+@@ -245,7 +245,7 @@ >+ if(chown(ptr->pathname, pswd->pw_uid, grp->gr_gid) != 0) >+ { >+ char *err= (errno >= 0 && errno <sys_nerr)? >+- sys_errlist[errno] : "Unknown error"; >++ (char *)sys_errlist[errno] : "Unknown error"; >+ ezfmWarning("chown() failed due to the following error", err); >+ haserr++; >+ } >+@@ -260,7 +260,7 @@ >+ if(rename(ptr->pathname, nname) < 0) >+ { >+ char *err= (errno >= 0 && errno <sys_nerr)? >+- sys_errlist[errno] : "Unknown error"; >++ (char *)sys_errlist[errno] : "Unknown error"; >+ ezfmWarning("rename() failed due to the following error", err); >+ haserr++; >+ } >+@@ -290,7 +290,7 @@ > } > } > /**************************************************************************/ >@@ -9,7 +36,7 @@ > { > char str[12]; > infoControl *ptr = (infoControl *)data; >-@@ -349,7 +349,7 @@ >+@@ -347,7 +347,7 @@ > EZ_GRID_CELL_GEOMETRY, 2, idx , 1, 1, > EZ_CLIENT_INT_DATA, rr, > EZ_CLIENT_PTR_DATA, clabel, >@@ -18,7 +45,7 @@ > NULL); > label = EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe, > EZ_LABEL_STRING, "write", >-@@ -360,7 +360,7 @@ >+@@ -358,7 +358,7 @@ > EZ_CLIENT_INT_DATA, ww, > EZ_CLIENT_PTR_DATA, clabel, > EZ_GRID_CELL_GEOMETRY, 3, idx , 1, 1, >@@ -27,7 +54,7 @@ > NULL); > label = EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe, > EZ_LABEL_STRING, "execute", >-@@ -371,7 +371,7 @@ >+@@ -369,7 +369,7 @@ > EZ_CLIENT_PTR_DATA, clabel, > EZ_CHECK_BUTTON_ON_OFF, xx&mode, > EZ_GRID_CELL_GEOMETRY, 4, idx , 1, 1, >--- /dev/null 2007-12-07 00:22:00.000000000 +0100 >+++ files/patch-folder.c 2007-12-07 00:07:02.000000000 +0100 >@@ -0,0 +1,11 @@ >+--- folder.c.orig 2007-12-07 00:06:06.000000000 +0100 >++++ folder.c 2007-12-07 00:06:26.000000000 +0100 >+@@ -2118,7 +2118,7 @@ >+ else >+ { >+ char *err = (errno >= 0 && errno <sys_nerr)? >+- sys_errlist[errno] : "Unknown error"; >++ (char *)sys_errlist[errno] : "Unknown error"; >+ ezfmWarning("Rename File Failed", err); >+ } >+ } >--- /dev/null 2007-12-07 00:22:00.000000000 +0100 >+++ files/patch-signal.c 2007-12-07 00:17:40.000000000 +0100 >@@ -0,0 +1,19 @@ >+--- signal.c.orig 1999-10-07 22:08:11.000000000 +0200 >++++ signal.c 2007-12-07 00:17:33.000000000 +0100 >+@@ -88,7 +88,7 @@ >+ { >+ int i; >+ char command[256]; >+- fprintf(stderr, "existing, please wait ... "); >++ fprintf(stderr, "exiting, please wait ... "); >+ sleep(3); >+ for(i = 0; i < 8; i++) >+ { >+@@ -100,6 +100,7 @@ >+ } >+ } >+ fprintf(stderr, "Done\n"); >++ _exit(EXIT_SUCCESS); >+ } >+ /**************************************************************/ >+ >--- /dev/null 2007-12-07 00:22:00.000000000 +0100 >+++ files/patch-trashBtn.c 2007-12-07 00:11:32.000000000 +0100 >@@ -0,0 +1,11 @@ >+--- trashBtn.c.orig 2007-12-07 00:11:13.000000000 +0100 >++++ trashBtn.c 2007-12-07 00:11:21.000000000 +0100 >+@@ -173,7 +173,7 @@ >+ else >+ { >+ char *err = (errno >= 0 && errno <sys_nerr)? >+- sys_errlist[errno] : "Unknown error"; >++ (char *)sys_errlist[errno] : "Unknown error"; >+ ezfmWarning("Error Deleting File", err); >+ } >+ } >--- /dev/null 2007-12-07 00:24:48.000000000 +0100 >+++ files/patch-action.c 2007-12-07 00:24:18.000000000 +0100 >@@ -0,0 +1,11 @@ >+--- action.c.orig 2007-12-07 00:24:02.000000000 +0100 >++++ action.c 2007-12-07 00:24:09.000000000 +0100 >+@@ -417,7 +417,7 @@ >+ execl("/bin/sh", "sh", "-c", cmdline, NULL); >+ /* if we ever get to here, some thing went wrong */ >+ err= (errno >= 0 && errno <sys_nerr)? >+- sys_errlist[errno] : "Unknown error"; >++ (char *)sys_errlist[errno] : "Unknown error"; >+ write(STDERR_FILENO, err, strlen(err)); >+ _exit(127); >+ }
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=82860">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 118474
: 82860