Author: ranger
Date: Wed Nov 7 21:10:24 2007
New Revision: 1052
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1052&repname=user%3a+ranger
Log:
nspr & spidermonkey
Modified:
trunk/experimental/common/main/finkinfo/libs/nspr.info
trunk/experimental/common/main/finkinfo/libs/nspr.patch
trunk/experimental/common/main/finkinfo/libs/spidermonkey.info
trunk/experimental/common/main/finkinfo/libs/spidermonkey.patch
Modified: trunk/experimental/common/main/finkinfo/libs/nspr.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/nspr.info&rev=1052&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/nspr.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/nspr.info Wed Nov 7 21:10:24
2007
@@ -1,14 +1,10 @@
Package: nspr
-Version: 4.6.6
+Version: 4.6.7
Revision: 1
-CustomMirror: <<
- Primary: http://ftp.mozilla.org/pub/mozilla.org/js
- en-US: http://ftp.mozilla.org/pub/mozilla.org/js/older-packages
-<<
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Source: http://ftp.mozilla.org/pub/mozilla.org/%n/releases/v%v/src/%n-%v.tar.gz
-Source-MD5: ba49bc35e2068f54893d3ea7031ad59c
+Source-MD5: 75d5de21ebc1a21886a25673920490ff
SourceDirectory: %n-%v/mozilla/nsprpub
PatchScript: <<
patch -p3 < %a/%n.patch
Modified: trunk/experimental/common/main/finkinfo/libs/nspr.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/nspr.patch&rev=1052&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/nspr.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/nspr.patch Wed Nov 7 21:10:24
2007
@@ -1,6 +1,6 @@
-diff -uNr nspr-4.6.6/mozilla/nsprpub/configure
nspr-4.6.6-patched/mozilla/nsprpub/configure
---- nspr-4.6.6/mozilla/nsprpub/configure 2007-01-18 18:44:31.000000000
-0500
-+++ nspr-4.6.6-patched/mozilla/nsprpub/configure 2007-05-29
10:50:59.000000000 -0400
+diff -uNr nspr-4.6.7/mozilla/nsprpub/configure
nspr-4.6.7-new/mozilla/nsprpub/configure
+--- nspr-4.6.7/mozilla/nsprpub/configure 2007-04-27 16:01:01.000000000
-0400
++++ nspr-4.6.7-new/mozilla/nsprpub/configure 2007-11-07 14:56:50.000000000
-0500
@@ -100,6 +100,16 @@
infodir='${prefix}/info'
mandir='${prefix}/man'
@@ -35,6 +35,15 @@
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+@@ -3349,7 +3349,7 @@
+ elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
+ case "${target_cpu}" in
+ powerpc*)
+- export MACOSX_DEPLOYMENT_TARGET=10.1
++ export MACOSX_DEPLOYMENT_TARGET=10.2
+ ;;
+ i*86*)
+ export MACOSX_DEPLOYMENT_TARGET=10.4
@@ -3855,7 +3855,7 @@
PR_MD_CSRCS=linux.c
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
@@ -44,9 +53,26 @@
_OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and
that
# combo is not yet good at debugging
inlined
-diff -uNr nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prtime.c
nspr-4.6.6-patched/mozilla/nsprpub/pr/src/misc/prtime.c
---- nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prtime.c 2007-01-15
19:31:10.000000000 -0500
-+++ nspr-4.6.6-patched/mozilla/nsprpub/pr/src/misc/prtime.c 2007-05-29
10:51:10.000000000 -0400
+diff -uNr nspr-4.6.7/mozilla/nsprpub/pr/include/md/_pth.h
nspr-4.6.7-new/mozilla/nsprpub/pr/include/md/_pth.h
+--- nspr-4.6.7/mozilla/nsprpub/pr/include/md/_pth.h 2005-07-21
14:22:53.000000000 -0400
++++ nspr-4.6.7-new/mozilla/nsprpub/pr/include/md/_pth.h 2007-11-07
14:57:40.000000000 -0500
+@@ -202,13 +202,6 @@
+ #define PT_NO_SIGTIMEDWAIT
+ #endif
+
+-/*
+- * These platforms don't have pthread_kill()
+- */
+-#if defined(DARWIN)
+-#define pthread_kill(thread, sig) ENOSYS
+-#endif
+-
+ #if defined(OSF1) || defined(VMS)
+ #define PT_PRIO_MIN PRI_OTHER_MIN
+ #define PT_PRIO_MAX PRI_OTHER_MAX
+diff -uNr nspr-4.6.7/mozilla/nsprpub/pr/src/misc/prtime.c
nspr-4.6.7-new/mozilla/nsprpub/pr/src/misc/prtime.c
+--- nspr-4.6.7/mozilla/nsprpub/pr/src/misc/prtime.c 2007-01-15
19:31:10.000000000 -0500
++++ nspr-4.6.7-new/mozilla/nsprpub/pr/src/misc/prtime.c 2007-11-07
14:56:11.000000000 -0500
@@ -1553,7 +1553,7 @@
case TT_EET: zone_offset = 2 * 60; break;
case TT_JST: zone_offset = 9 * 60; break;
Modified: trunk/experimental/common/main/finkinfo/libs/spidermonkey.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/spidermonkey.info&rev=1052&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/spidermonkey.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/spidermonkey.info Wed Nov 7
21:10:24 2007
@@ -1,17 +1,18 @@
Package: spidermonkey
-Version: 1.60
-Revision: 2
+Version: 1.7.0
+Revision: 1
+Epoch: 1
CustomMirror: <<
Primary: http://ftp.mozilla.org/pub/mozilla.org/js
en-US: http://ftp.mozilla.org/pub/mozilla.org/js/older-packages
<<
-Depends: %N-shlibs (= %v-%r)
+Depends: %N-shlibs (= %e:%v-%r)
BuildDepends: <<
nspr,
readline5
<<
Source: mirror:custom:js-%v.tar.gz
-Source-MD5: bd8f021e43a8fbbec55ac2cd3d483243
+Source-MD5: 5571134c3863686b623ebe4e6b1f6fe6
PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p2
SourceDirectory: js/src
CompileScript: <<
@@ -37,6 +38,7 @@
SplitOff2: <<
BuildDependsOnly: true
Package: %N-dev
+ Depends: %N-shlibs (= %e:%v-%r)
Files: bin/jscpucfg include lib
<<
DocFiles: *.html
Modified: trunk/experimental/common/main/finkinfo/libs/spidermonkey.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/spidermonkey.patch&rev=1052&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/spidermonkey.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/spidermonkey.patch Wed Nov 7
21:10:24 2007
@@ -1,21 +1,21 @@
-diff -uNr js/src/Makefile.ref js-patched/src/Makefile.ref
---- js/src/Makefile.ref 2006-08-21 14:58:45.000000000 -0400
-+++ js-patched/src/Makefile.ref 2007-05-29 11:36:57.000000000 -0400
-@@ -61,11 +61,11 @@
+diff -uNr js/src/Makefile.ref js-new/src/Makefile.ref
+--- js/src/Makefile.ref 2006-07-26 15:16:47.000000000 -0400
++++ js-new/src/Makefile.ref 2007-11-07 15:04:54.000000000 -0500
+@@ -63,11 +63,11 @@
ifdef JS_THREADSAFE
DEFINES += -DJS_THREADSAFE
--INCLUDES += -I../../dist/$(OBJDIR)/include
+-INCLUDES += -I$(DIST)/include/nspr
+INCLUDES += [EMAIL PROTECTED]@/include/nspr
ifdef USE_MSVC
- OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
+ OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib
else
--OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr${NSPR_LIBSUFFIX}
-+OTHER_LIBS += [EMAIL PROTECTED]@$(LIBDIR) -lnspr${NSPR_LIBSUFFIX}
- endif
- endif
-
-@@ -132,7 +132,7 @@
+-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX)
++OTHER_LIBS += [EMAIL PROTECTED]@/lib -lnspr$(NSPR_LIBSUFFIX)
+ endif
+ endif
+
+@@ -134,7 +134,7 @@
ifdef JS_READLINE
# For those platforms with the readline library installed.
DEFINES += -DEDITLINE
@@ -24,7 +24,7 @@
else
ifdef JS_EDITLINE
# Use the editline library, built locally.
-@@ -185,6 +185,8 @@
+@@ -188,6 +188,8 @@
jsstr.h \
jsxdrapi.h \
jsxml.h \
@@ -33,7 +33,7 @@
$(NULL)
API_HFILES = \
-@@ -377,3 +379,16 @@
+@@ -373,3 +375,16 @@
SUFFIXES: .i
%.i: %.c
$(CC) -C -E $(CFLAGS) $< > $*.i
@@ -50,9 +50,9 @@
+ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(MY_LIBDIR)
+ $(INSTALL) -m 755 $(OBJDIR)/js $(OBJDIR)/jscpucfg $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 644 $(HFILES) $(DESTDIR)$(INCLUDEDIR)
-diff -uNr js/src/config/Darwin.mk js-patched/src/config/Darwin.mk
---- js/src/config/Darwin.mk 2005-02-12 15:10:33.000000000 -0500
-+++ js-patched/src/config/Darwin.mk 2007-05-29 11:42:07.000000000 -0400
+diff -uNr js/src/config/Darwin.mk js-new/src/config/Darwin.mk
+--- js/src/config/Darwin.mk 2007-02-05 11:24:49.000000000 -0500
++++ js-new/src/config/Darwin.mk 2007-11-07 15:06:22.000000000 -0500
@@ -43,13 +43,13 @@
# Just ripped from Linux config
#
@@ -62,16 +62,16 @@
CCC = g++
-CFLAGS += -Wall -Wno-format
-OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
-+CFLAGS += -Wall -Wno-format -no-cpp-precomp -fno-common -pipe
++CFLAGS += -Wall -Wno-format -fno-common -pipe
+OS_CFLAGS = -DJS_THREADSAFE -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE
-DPOSIX_SOURCE -DDARWIN
RANLIB = ranlib
--MKSHLIB = libtool $(XMKSHLIBOPTS) -framework System
+-MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System
+MKSHLIB = $(CC) -compatibility_version 1.0 -current_version 1.0 -framework
System -dynamiclib $(XMKSHLIBOPTS) -lm -lplds4 -lplc4 -lnspr4 $(LDFLAGS)
- #.c.o:
- # $(CC) -c -MD $*.d $(CFLAGS) $<
-@@ -57,7 +57,6 @@
+ SO_SUFFIX = dylib
+
+@@ -59,7 +59,6 @@
CPU_ARCH = $(shell uname -m)
ifeq (86,$(findstring 86,$(CPU_ARCH)))
CPU_ARCH = x86
@@ -79,7 +79,7 @@
endif
GFX_ARCH = x
-@@ -65,14 +64,6 @@
+@@ -67,14 +66,6 @@
ASFLAGS += -x assembler-with-cpp
@@ -94,9 +94,9 @@
# Use the editline library to provide line-editing support.
JS_EDITLINE = 1
-diff -uNr js/src/config/Linux_All.mk js-patched/src/config/Linux_All.mk
+diff -uNr js/src/config/Linux_All.mk js-new/src/config/Linux_All.mk
--- js/src/config/Linux_All.mk 2005-05-10 15:53:44.000000000 -0400
-+++ js-patched/src/config/Linux_All.mk 2007-05-29 10:39:35.000000000 -0400
++++ js-new/src/config/Linux_All.mk 2007-11-07 15:03:08.000000000 -0500
@@ -41,37 +41,15 @@
# Config for all versions of Linux
#
@@ -154,10 +154,10 @@
-# FIXME: better patch rules.mk & fdlibm/Makefile*
-OS_CFLAGS += -DPIC -fPIC
-endif
-diff -uNr js/src/config.mk js-patched/src/config.mk
---- js/src/config.mk 2003-11-14 19:10:55.000000000 -0500
-+++ js-patched/src/config.mk 2007-05-29 10:39:35.000000000 -0400
-@@ -112,6 +112,8 @@
+diff -uNr js/src/config.mk js-new/src/config.mk
+--- js/src/config.mk 2006-07-27 17:00:57.000000000 -0400
++++ js-new/src/config.mk 2007-11-07 15:03:08.000000000 -0500
+@@ -116,6 +116,8 @@
CP = cp
endif
@@ -165,10 +165,10 @@
+
ifdef BUILD_OPT
OPTIMIZER = -O
- DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
-diff -uNr js/src/fdlibm/Makefile.ref js-patched/src/fdlibm/Makefile.ref
+ DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(USER)
+diff -uNr js/src/fdlibm/Makefile.ref js-new/src/fdlibm/Makefile.ref
--- js/src/fdlibm/Makefile.ref 2003-11-14 19:11:04.000000000 -0500
-+++ js-patched/src/fdlibm/Makefile.ref 2007-05-29 10:39:35.000000000 -0400
++++ js-new/src/fdlibm/Makefile.ref 2007-11-07 15:03:08.000000000 -0500
@@ -151,7 +151,7 @@
$(OBJDIR)/%.o: %.c
@@ -178,9 +178,9 @@
$(OBJDIR)/%.o: %.s
@$(MAKE_OBJDIR)
-diff -uNr js/src/rules.mk js-patched/src/rules.mk
---- js/src/rules.mk 2003-11-14 19:11:04.000000000 -0500
-+++ js-patched/src/rules.mk 2007-05-29 10:39:35.000000000 -0400
+diff -uNr js/src/rules.mk js-new/src/rules.mk
+--- js/src/rules.mk 2006-07-06 22:12:02.000000000 -0400
++++ js-new/src/rules.mk 2007-11-07 15:03:08.000000000 -0500
@@ -82,6 +82,10 @@
@$(MAKE_OBJDIR)
$(CC) -o $@ -c $(CFLAGS) $*.c
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
