Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=voroskoi.git;a=commitdiff;h=8f1c255e01c62a499059a60cf849e6c4ace70a6c
commit 8f1c255e01c62a499059a60cf849e6c4ace70a6c Author: voroskoi <[EMAIL PROTECTED]> Date: Tue Nov 27 14:21:16 2007 +0100 nspr-4.6.7-2-i686 add PR_STATIC_ASSERT as ff3 needs it diff --git a/source/lib/nspr/FrugalBuild b/source/lib/nspr/FrugalBuild index 2b9d0e6..4301663 100644 --- a/source/lib/nspr/FrugalBuild +++ b/source/lib/nspr/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nspr pkgver=4.6.7 -pkgrel=1 +pkgrel=2 pkgdesc="NSPR library from mozilla.org" url="http://www.mozilla.org/projects/nspr/"; pkgurl="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/"; @@ -13,7 +13,7 @@ license="MPL GPL" depends=('glibc') up2date="lynx -dump '$pkgurl'|sort -n -r|head -n 2|sort -n|head -n 1|sed -e 's/.*v//' -e 's|/||g'" source=($pkgurl/v${pkgver}/src/$pkgname-$pkgver.tar.gz \ - nspr-config-pc.patch0 nspr.pc.in nspr-config-vars.in) + nspr-config-pc.patch0 nspr.pc.in nspr-config-vars.in nspr-static-assert.patch) # Taken from Fedora :) Thx for it. @@ -22,6 +22,7 @@ build() { Fcd cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-pc.in || Fdie Fpatch nspr-config-pc.patch0 + Fpatchall cp $Fsrcdir/nspr-config-vars.in ./mozilla/nsprpub/config/ || Fdie ./mozilla/nsprpub/configure --prefix=/usr \ --libdir=/usr/lib \ @@ -58,5 +59,6 @@ build() { sha1sums=('cf45319d02285ec5479445a1e9adfb9e94f55a6a' \ '86f7724760f3d4c0295829b4a8b7e8685bccd588' \ '6d3a40116e513721b782ad25d21447e3d3a91d6d' \ - 'ca1ec22ec23134e8aab2589db33057439a75c2bd') + 'ca1ec22ec23134e8aab2589db33057439a75c2bd' \ + 'c69959bd67fb90f06133144092c787d1d7d28e67') # optimization OK diff --git a/source/lib/nspr/nspr-static-assert.patch b/source/lib/nspr/nspr-static-assert.patch new file mode 100644 index 0000000..07e5be9 --- /dev/null +++ b/source/lib/nspr/nspr-static-assert.patch @@ -0,0 +1,19 @@ +Index: mozilla/nsprpub/pr/include/prlog.h +diff -u mozilla/nsprpub/pr/include/prlog.h:3.14 mozilla/nsprpub/pr/include/prlog.h:3.15 +--- mozilla/nsprpub/pr/include/prlog.h:3.14 Sun Apr 25 15:00:47 2004 ++++ mozilla/nsprpub/pr/include/prlog.h Mon May 28 14:48:26 2007 +@@ -251,6 +251,14 @@ + + #endif /* defined(DEBUG) || defined(FORCE_PR_ASSERT) */ + ++/* ++** Compile-time assert. "condition" must be a constant expression. ++** The macro can be used only in places where an "extern" declaration is ++** allowed. ++*/ ++#define PR_STATIC_ASSERT(condition) \ ++ extern void pr_static_assert(int arg[(condition) ? 1 : -1]) ++ + PR_END_EXTERN_C + + #endif /* prlog_h___ */ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
