From b7a1c28108f79e7c2d05db54c9c4663a20712950 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Wed, 15 Mar 2006 12:55:21 +0000 Subject: Remove upstreamed patches Submitted by: "Jack L." --- .../openoffice.org-2.0-devel/files/patch-backtrace | 95 ---------------- editors/openoffice.org-2.0-devel/files/patch-epm | 124 --------------------- .../files/patch-rsc+source+rscpp+makefile.mk | 21 ---- 3 files changed, 240 deletions(-) delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-backtrace delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-epm delete mode 100644 editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+makefile.mk (limited to 'editors/openoffice.org-2.0-devel/files') diff --git a/editors/openoffice.org-2.0-devel/files/patch-backtrace b/editors/openoffice.org-2.0-devel/files/patch-backtrace deleted file mode 100644 index 523bba02d5e4..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-backtrace +++ /dev/null @@ -1,95 +0,0 @@ -Issuetracker : #i56946# -CWS : N/A -Author : (JCA) -Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx -To pass the compilation, we had been preparing dummy function at sal. -We implemented this. - ---- sal/osl/unx/backtrace.c Thu Sep 8 23:52:44 2005 -+++ sal/osl/unx/backtrace.c Sun Oct 23 09:19:04 2005 -@@ -129,6 +129,7 @@ - #include - #include - #include -+#include - #include "backtrace.h" - - #define FRAME_PTR_OFFSET 1 -@@ -136,11 +137,55 @@ - - int backtrace( void **buffer, int max_frames ) - { -- return 1; -+ struct frame *fp; -+ jmp_buf ctx; -+ int i; -+ /* get stack- and framepointer */ -+ setjmp(ctx); -+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]); -+ for ( i=0; (ifr_savfp; -+ /* iterate through backtrace */ -+ for (i=0; fp && fp->fr_savpc && ifr_savpc; -+ /* next frame */ -+ fp=fp->fr_savfp; -+ } -+ return i; - } - - void backtrace_symbols_fd( void **buffer, int size, int fd ) - { -+ FILE *fp = fdopen( fd, "w" ); -+ -+ if ( fp ) -+ { -+ void **pFramePtr; -+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- ) -+ { -+ Dl_info dli; -+ ptrdiff_t offset; -+ -+ if ( 0 != dladdr( *pFramePtr, &dli ) ) -+ { -+ if ( dli.dli_fname && dli.dli_fbase ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; -+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); -+ } -+ if ( dli.dli_sname && dli.dli_saddr ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; -+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); -+ } -+ } -+ fprintf( fp, "[0x%x]\n", *pFramePtr ); -+ } -+ fflush( fp ); -+ fclose( fp ); -+ } - - } - #endif /* defined FREEBSD */ - ---- sal/osl/unx/backtrace.h Thu Sep 8 23:52:59 2005 -+++ sal/osl/unx/backtrace.h Sun Oct 23 09:19:40 2005 -@@ -46,6 +46,16 @@ - - void backtrace_symbols_fd( void **buffer, int size, int fd ); - -+/* no frame.h on FreeBSD */ -+#if defined FREEBSD -+struct frame { -+ long arg0[8]; -+ long arg1[6]; -+ struct frame *fr_savfp; -+ long fr_savpc; -+}; -+#endif -+ - #ifdef __cplusplus - } /* extern "C" */ - #endif - diff --git a/editors/openoffice.org-2.0-devel/files/patch-epm b/editors/openoffice.org-2.0-devel/files/patch-epm deleted file mode 100644 index 8808325b529d..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-epm +++ /dev/null @@ -1,124 +0,0 @@ -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.8 -diff -u -r1.8 epm-3.7.patch ---- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 -+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 -@@ -546,3 +546,116 @@ - } - - --- 457,462 ---- -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 -+*************** -+*** 26,31 **** -+--- 26,38 ---- -+ -+ #include "epm.h" -+ -++ void cr2semicolon(char *command) -++ { -++ int len, i; -++ len=strlen(command); -++ for (i=0;inum_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+ else -+ #ifdef __FreeBSD__ -+ /* -+--- 156,172 ---- -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! #ifdef __FreeBSD__ -+! if (d->type == DEPEND_REQUIRES) { -+! if (dist->relnumber) -+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); -+! else -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); -+! } -+! #else -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+! #endif -+ else -+ #ifdef __FreeBSD__ -+ /* -+*************** -+*** 179,187 **** -+--- 196,206 ---- -+ " by the BSD packager.\n", stderr); -+ break; -+ case COMMAND_POST_INSTALL : -++ cr2semicolon(c->command); -+ fprintf(fp, "@exec %s\n", c->command); -+ break; -+ case COMMAND_PRE_REMOVE : -++ cr2semicolon(c->command); -+ fprintf(fp, "@unexec %s\n", c->command); -+ break; -+ case COMMAND_POST_REMOVE : -+*************** -+*** 199,205 **** -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+--- 218,224 ---- -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 -+--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 -+*************** -+*** 181,192 **** -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! -+ putc(*s, fp); -+ } -+ -+--- 181,199 ---- -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -++ #if defined(__FreeBSD__) -++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) -++ { -++ putc('\\', fp); -++ bytes ++; -++ } -++ #else -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! #endif -+ putc(*s, fp); -+ } -+ diff --git a/editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+makefile.mk deleted file mode 100644 index 2959319805b5..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-rsc+source+rscpp+makefile.mk +++ /dev/null @@ -1,21 +0,0 @@ -Issuetracker : #i54178# -CWS : hr17 -Author: : -Description : - -Index: rsc/source/rscpp/makefile.mk -=================================================================== -RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- rsc/source/rscpp/makefile.mk 8 Sep 2005 14:00:27 -0000 1.5 -+++ rsc/source/rscpp/makefile.mk 21 Sep 2005 10:18:09 -0000 -@@ -36,6 +36,8 @@ - - TARGETTYPE=CUI - TARGETTHREAD=ST -+# we don't need STL in this project -+NO_DEFAULT_STL=TRUE - - PRJNAME=rsc - TARGET=rscpp -- cgit v1.2.3