aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch')
-rw-r--r--editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch246
1 files changed, 0 insertions, 246 deletions
diff --git a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
deleted file mode 100644
index 5432812bb50c..000000000000
--- a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
+++ /dev/null
@@ -1,246 +0,0 @@
---- ../nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003
-+++ ../nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003
-@@ -1,5 +1,5 @@
--*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000
----- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003
-+*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000
-+--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001
- ***************
- *** 166,171 ****
- --- 166,177 ----
-@@ -15,8 +15,8 @@
- INCLUDESRC = $(TOP)/include
- INCDIR = $(INCROOT)/audio
- WIDGET_DIR = $(TOP)/clients/audio/widgets
--*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999
----- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003
-+*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999
-+--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001
- ***************
- *** 1336,1348 ****
- static char *_SysErrorMsg (n)
-@@ -40,8 +40,8 @@
- }
-
- #endif /* USL sharedlibs in don't define for AUD3.2 */
--*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999
----- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003
-+*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999
-+--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001
- ***************
- *** 51,59 ****
- #include <errno.h>
-@@ -120,59 +120,157 @@
- return(-1);
- }
-
--*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000
----- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003
--***************
--*** 25,30 ****
----- 25,32 ----
--
-- #include "../../config/NetAudio.tmpl"
--
--+ CCOPTIONS += $(EXTRA_CCOPTIONS)
--+
-- #if ProjectX < 5
-- /* Pre-X11R5 compatability */
-- #ifndef NormalLibX
--***************
--*** 119,124 ****
----- 121,127 ----
--
-- #endif
-- BuildIncludes($(HEADERS),audio,..)
--+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
-- InstallMultiple($(HEADERS),$(INCDIR))
-- #if ProjectX >= 5
-- InstallNonExecFile(AuErrorDB,$(LIBDIR))
--*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000
----- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003
--***************
--*** 119,132 ****
-- }
-- | MAXRATE number
-- { ddaSetConfig(MAXRATE, (void *)$2); }
--! | MINRATE number
--! { ddaSetConfig(MINRATE, (void *)$2); }
--
-- string : STRING { ptr = (char *)malloc(strlen($1)+1);
-- strcpy(ptr, $1);
-- RemoveDQuote(ptr);
-- $$ = ptr;
--! }
-- number : NUMBER { $$ = $1; }
-- ;
--
----- 119,132 ----
-- }
-- | MAXRATE number
-- { ddaSetConfig(MAXRATE, (void *)$2); }
--! | MINRATE number
--! { ddaSetConfig(MINRATE, (void *)$2); } ;
--
-- string : STRING { ptr = (char *)malloc(strlen($1)+1);
-- strcpy(ptr, $1);
-- RemoveDQuote(ptr);
-- $$ = ptr;
--! };
-- number : NUMBER { $$ = $1; }
-- ;
--
-+--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002
-++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002
-+@@ -42,6 +42,8 @@
-+ @echo ""
-+ Date
-+ @echo ""
-++ @find . | egrep "\.(cxx|h|c)$$" | xargs \
-++ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
-+ $(MAKE) $(MFLAGS) Makefiles
-+ $(MAKE) $(MFLAGS) clean
-+ $(MAKE) $(MFLAGS) includes
-+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997
-++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997
-+@@ -133,6 +133,7 @@
-+ signal(SIGALRM, SIG_DFL);
-+ }
-+
-++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
-+ static void
-+ usleep(usecs)
-+ unsigned int usecs;
-+@@ -149,7 +150,7 @@
-+ setitimer(ITIMER_REAL, &ntval, &otval);
-+ pause();
-+ }
-+-
-++#endif
-+ #endif /* SYSV else not */
-+ #endif /* VMS else not */
-+ #endif /* NEEDUSLEEP */
-+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
-++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -155,8 +155,10 @@
-+ #include <assert.h>
-+
-+ #ifdef __FreeBSD__
-+-# include <machine/soundcard.h>
-+-# include <machine/pcaudioio.h>
-++# include <sys/soundcard.h>
-++# ifdef __i386__
-++# include <machine/pcaudioio.h>
-++# endif
-+ #else
-+ # ifdef __NetBSD__
-+ # include <sys/ioctl.h>
-+@@ -610,7 +612,11 @@
-+
-+ if(sndStatOut.fd == -1)
-+ {
-++#ifdef __FreeBSD__
-++ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait)
-++#else
-+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait)
-++#endif
-+ {
-+ osLogMsg("openDevice: waiting on output device\n");
-+ sleep(1);
-+@@ -1230,6 +1236,11 @@
-+ /*
-+ * Setup soundcard at maximum audio quality.
-+ */
-++
-++#ifdef __FreeBSD__
-++#define NO_16_BIT_SAMPLING
-++#endif
-++
-+ static void setupSoundcard(sndStatPtr)
-+ SndStat* sndStatPtr;
-+ {
-+@@ -1380,7 +1391,11 @@
-+
-+ AL_initialized = AuTrue;
-+
-++#ifdef __FreeBSD__
-++ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) {
-++#else
-+ if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) {
-++#endif
-+ UNIDENTMSG;
-+ return AuFalse;
-+ }
-+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999
-++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000
-+@@ -28,7 +28,7 @@
-+ */
-+
-+ #ifndef WIN32
-+-# ifdef __NetBSD__
-++# if defined(__NetBSD__) || defined(__FreeBSD__)
-+ # include <limits.h>
-+ # define MAXSHORT SHRT_MAX
-+ # define MINSHORT SHRT_MIN
-+--- misc/nas-1.4.1/lib/audio/Imakefile.orig Sun May 19 14:52:20 2002
-++++ misc/build/nas-1.4.1/lib/audio/Imakefile Sun May 19 14:54:25 2002
-+@@ -25,6 +25,8 @@
-+
-+ #include "../../config/NetAudio.tmpl"
-+
-++CCOPTIONS += $(EXTRA_CCOPTIONS)
-++
-+ #if ProjectX < 5
-+ /* Pre-X11R5 compatability */
-+ #ifndef NormalLibX
-+@@ -64,10 +66,14 @@
-+ COMPAT_OBJS = AuGetBest.o
-+ #endif /* ProjectX < 5 */
-+
-++#if HasBSD44Sockets
-++ SOCK_DEFINES = -DBSD44SOCKETS
-++#endif
-++
-+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
-+
-+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
-+- CONN_DEFINES = ConnectionFlags
-++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
-+
-+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \
-+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
-+@@ -119,6 +125,7 @@
-+
-+ #endif
-+ BuildIncludes($(HEADERS),audio,..)
-++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.))
-+ InstallMultiple($(HEADERS),$(INCDIR))
-+ #if ProjectX >= 5
-+ InstallNonExecFile(AuErrorDB,$(LIBDIR))
-+--- misc/nas-1.4.1/config/NetAudio.def.orig Sun Feb 13 05:31:14 2000
-++++ misc/build/nas-1.4.1/config/NetAudio.def Fri Mar 24 04:55:49 2000
-+@@ -8,5 +8,5 @@
-+
-+ XCOMM Directory where NAS will look for it's config file(s)
-+ #ifndef NasConfigSearchPath
-+-#define NasConfigSearchPath /etc/nas/
-++#define NasConfigSearchPath $(PROJECTROOT)/etc/
-+ #endif
-+--- misc/nas-1.4.1/server/dia/gram.y.orig Thu Oct 31 10:13:28 2002
-++++ misc/build/nas-1.4.1/server/dia/gram.y Thu Oct 31 10:15:18 2002
-+@@ -120,13 +120,13 @@
-+ | MAXRATE number
-+ { ddaSetConfig(MAXRATE, (void *)$2); }
-+ | MINRATE number
-+- { ddaSetConfig(MINRATE, (void *)$2); }
-++ { ddaSetConfig(MINRATE, (void *)$2); };
-+
-+ string : STRING { ptr = (char *)malloc(strlen($1)+1);
-+ strcpy(ptr, $1);
-+ RemoveDQuote(ptr);
-+ $$ = ptr;
-+- }
-++ };
-+ number : NUMBER { $$ = $1; }
-+ ;
-+
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 09:17:32 +0000