Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 libs/nspr/CONFIGURE    |    1 +
 libs/nspr/HISTORY      |    7 +++++++
 libs/nspr/PRE_BUILD    |    5 +++++
 libs/nspr/assert.patch |   18 ++++++++++++++++++
 4 files changed, 31 insertions(+)

New commits:
commit d5c136e4177a5022ed8ff368c48dd2a07e86c869
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    nspr: Added optional patch for static_assert.  Needed at least for
    firefox 3.

diff --git a/libs/nspr/CONFIGURE b/libs/nspr/CONFIGURE
new file mode 100755
index 0000000..fad1043
--- /dev/null
+++ b/libs/nspr/CONFIGURE
@@ -0,0 +1 @@
+config_query $STATIC_ASSERT  "Add patch for STATIC_ASSERT?" n
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index 3c619a7..e25c4e1 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,10 @@
+2007-12-01 George Sherwood <george AT beernabeer.com>
+       * CONFIGURE: Added to query for optional STATIC_ASSERT
+       * PRE_BUILD: Added to apply STATIC_ASSERT patch
+       * assert.patch: Added patch from 
+         http://paketler.pardus.org.tr/2007/source/nspr.html
+         Needed to use system npsr in firefox 3
+
 2007-07-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.6.7
 
diff --git a/libs/nspr/PRE_BUILD b/libs/nspr/PRE_BUILD
new file mode 100755
index 0000000..cd761e4
--- /dev/null
+++ b/libs/nspr/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+if [ "$STATIC_ASSERT" == "y" ]; then
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/assert.patch
+fi
diff --git a/libs/nspr/assert.patch b/libs/nspr/assert.patch
new file mode 100644
index 0000000..3c7ea40
--- /dev/null
+++ b/libs/nspr/assert.patch
@@ -0,0 +1,18 @@
+--- 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___ */
+