Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4218
Added Files:
nspr.0d.info nspr.0d.patch
Log Message:
new version. "thanks for the API stability, upstream!"
--- NEW FILE: nspr.0d.info ---
Package: nspr.0d
Version: 4.8
Revision: 1
BuildDepends: fink (>= 0.24.12)
Depends: %N-shlibs (= %v-%r)
Conflicts: nspr
Replaces: nspr
BuildDependsOnly: true
Source:
http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%v/src/nspr-%v.tar.gz
Source-MD5: e0916a72bcc6c427551ea262183fdb26
SourceDirectory: nspr-%v/mozilla/nsprpub
Source2: mirror:debian:pool/main/n/nspr/nspr_4.8-1.diff.gz
Source2-MD5: 6f464e55fc87fd6b4e9e5193ba509fa5
PatchFile: %n.patch
PatchFile-MD5: 11d0c4f8ac772380b06c0b05e18bebe8
PatchScript: <<
#!/bin/sh -ev
patch -p3 < %{PatchFile}
gzip -dc ../../../nspr_*.diff.gz | patch -p1
for file in \
30_pkgconfig.dpatch \
99_configure.dpatch \
; do
echo "applying $file"
patch -p3 < debian/patches/$file
done
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --disable-debug --disable-dependency-tracking
--enable-macos-target=10.4 --libdir=%p/lib/nspr
InstallScript: <<
#!/bin/sh -ev
make -j1 install DESTDIR=%d
# counteract side-effect of burying the libs
mv %i/lib/nspr/pkgconfig %i/lib
SO_VERSION=0d
for file in libnspr4 libplc4 libplds4; do
ln -sf "$file.${SO_VERSION}.dylib" "%i/lib/nspr/$file.dylib"
done
<<
SplitOff: <<
Package: %N-shlibs
Files: <<
lib/nspr/libnspr4.0d.dylib
lib/nspr/libplc4.0d.dylib
lib/nspr/libplds4.0d.dylib
<<
Shlibs: <<
%p/lib/nspr/libnspr4.0d.dylib 1.0.0 %n (>= 4.8-1)
%p/lib/nspr/libplc4.0d.dylib 1.0.0 %n (>= 4.8-1)
%p/lib/nspr/libplds4.0d.dylib 1.0.0 %n (>= 4.8-1)
<<
<<
Description: Netscape Portable Runtime
DescDetail: <<
Netscape Portable Runtime (NSPR) provides a platform-neutral
API for system level and libc like functions. The API is
used in the Mozilla client, many of Netscape/AOL/iPlanet's
and other software offerings.
<<
DescPackaging: <<
dmacks overhauled 4.6.7-1 -> 4.8-1 all the following:
Upstream does not update compatibility_version when added new
public symbols! Maybe that's why debian hacked soname in
recent versions? We'll do that too: rename %n nspr -> nspr.0d
Bury library files so don't accidentally find them (many pkgs
seem to need BuildConflicts:nspr)
macos-target for consistency among all fink-supported
platforms (cleaner to use %c than patch configure fallbacks).
do not use SDKs...don't need portability or fat.
#Grab debian's patch for soname handling. Seems like they have
#lots of platforms covered and portably handle linker symlinks.
^-- uses libFOO.so.X.Y.Z (postfix libversion naming) and doesn't
actually do anything when used under fink (dunno why) so just
use their "SO_VERSION=0d" and manually hack it instead of
fiddling with their patch
Steal debian's nspr.pc patch (other fink packages may look for
nspr via pkg-config)
autoreconf generates syntax-error'd configure, so make sure to
patch configure, not just configure.in
make sure we get build-dir lib instead of usin local -L path.
But no external deps, so scrap -I and -L for %p altogether
instead of tracing and fixing makefile-variable spaghetti.
<<
License: OSI-Approved
Maintainer: Benjamin Reed <n...@fink.racoonfink.com>
Homepage: http://www.mozilla.org/projects/nspr/
--- NEW FILE: nspr.0d.patch ---
diff -Nurd -x'*~' nspr-4.8.orig/mozilla/nsprpub/config/rules.mk
nspr-4.8/mozilla/nsprpub/config/rules.mk
--- nspr-4.8.orig/mozilla/nsprpub/config/rules.mk 2009-05-01
19:08:01.000000000 -0400
+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-07-13 15:22:08.000000000
-0400
@@ -131,7 +131,8 @@
SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr.a
else
ifdef MKSHLIB
-SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+SO_VERSION=0d
+SHARED_LIBRARY =
$(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(SO_VERSION).$(DLL_SUFFIX)
endif
endif
diff -Nurd -x'*~' nspr-4.8.orig/mozilla/nsprpub/configure
nspr-4.8/mozilla/nsprpub/configure
--- nspr-4.8.orig/mozilla/nsprpub/configure 2009-05-08 09:12:31.000000000
-0400
+++ nspr-4.8/mozilla/nsprpub/configure 2009-07-13 15:54:49.000000000 -0400
@@ -108,6 +108,16 @@
infodir='${prefix}/info'
mandir='${prefix}/man'
+# NLS nuisances.
+# Only set these to C if already set. These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
@@ -496,16 +506,6 @@
esac
done
-# NLS nuisances.
-# Only set these to C if already set. These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
-
# 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.
@@ -1218,8 +1218,6 @@
powerpc-apple-darwin8*:i?86-apple-darwin*)
_SAVE_CFLAGS=$CFLAGS
_SAVE_CXXFLAGS=$CXXLAGS
- CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
- CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
;;
esac
@@ -3360,7 +3358,7 @@
;;
esac
DSO_CFLAGS=-fPIC
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
_OPTIMIZE_FLAGS=-O2
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
STRIP="$STRIP -x -S"
@@ -3369,6 +3367,8 @@
MDCPUCFG_H=_darwin.cfg
PR_MD_CSRCS=darwin.c
PR_MD_ASFILES=os_Darwin.s
+ LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(SO_VERSION).dylib'
+ LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(SO_VERSION).dylib'
# Add Mac OS X support for loading CFM & CFBundle plugins
if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
diff -Nurd -x'*~' nspr-4.8.orig/mozilla/nsprpub/pr/src/misc/prtime.c
nspr-4.8/mozilla/nsprpub/pr/src/misc/prtime.c
--- nspr-4.8.orig/mozilla/nsprpub/pr/src/misc/prtime.c 2009-05-06
18:50:53.000000000 -0400
+++ nspr-4.8/mozilla/nsprpub/pr/src/misc/prtime.c 2009-07-13
12:32:25.000000000 -0400
@@ -1523,7 +1523,7 @@
case TT_EET: zone_offset = 2 * 60; break;
case TT_JST: zone_offset = 9 * 60; break;
default:
- PR_ASSERT (0);
+ return PR_FAILURE;
break;
}
}
@@ -1571,11 +1571,12 @@
struct tm localTime;
time_t secs;
- PR_ASSERT(result->tm_month > -1 &&
+ if(!(result->tm_month > -1 &&
result->tm_mday > 0 &&
result->tm_hour > -1 &&
result->tm_min > -1 &&
- result->tm_sec > -1);
+ result->tm_sec > -1))
+ return PR_FAILURE;
/*
* To obtain time_t from a tm structure representing the local
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
