Source Mage code commit list

[Julien ROZO <scm AT sourcemage.org>]

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

 http/kompozer/DEPENDS        |   10 +++++-----
 http/kompozer/DETAILS        |    2 +-
 http/kompozer/HISTORY        |    6 ++++++
 http/kompozer/PRE_BUILD      |    5 +++++
 http/kompozer/nss-3.12.patch |   35 +++++++++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 6 deletions(-)

New commits:
commit b467902c72dbbbc02675d72989c2f76f39d94972
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    kompozer: fix compilation issue with nss 3.12

diff --git a/http/kompozer/DEPENDS b/http/kompozer/DEPENDS
index 4a82ef9..851f1b9 100755
--- a/http/kompozer/DEPENDS
+++ b/http/kompozer/DEPENDS
@@ -10,11 +10,11 @@ depends  nspr    '--with-system-nspr'                     
               &&
 depends  perl                                                            &&
 depends  zip                                                             &&
 depends  zlib    '--with-system-zlib'                                    &&
-# seems to be broken atm
-#optional_depends  nss                                                     \
-#                  '--enable-crypto'                                       \
-#                  '--disable-crypto'                                      \
-#                  'for encrypted communications support (e.g. https://)'  &&
+
+optional_depends  nss                                                     \
+                  '--enable-crypto'                                       \
+                  '--disable-crypto'                                      \
+                  'for encrypted communications support (e.g. https://)'  &&
 
 optional_depends  libmng                            \
                   '--with-system-mng'               \
diff --git a/http/kompozer/DETAILS b/http/kompozer/DETAILS
index 3a1dfdf..3cec665 100755
--- a/http/kompozer/DETAILS
+++ b/http/kompozer/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.kompozer.net/
         KEYWORDS="web http editors"
          ENTERED=20080228
-      PATCHLEVEL=1
+      PATCHLEVEL=2
            SHORT='GECKO-based web editing environment'
 cat << EOF
 KompoZer is a complete Web Authoring System that combines web file management
diff --git a/http/kompozer/HISTORY b/http/kompozer/HISTORY
index 080cdf8..dda07c2 100644
--- a/http/kompozer/HISTORY
+++ b/http/kompozer/HISTORY
@@ -1,3 +1,9 @@
+2009-03-27 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * DEPENDS: readded nss as optional
+       * PRE_BUILD: added patch to fix compilation issue with nss 3.12
+       * nss-3.12.patch: added
+       * DETAILS: patchlevel=2
+
 2009-01-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DEPENDS: nss doesn't seem to work atm
        * DETAILS: patchlevel++
diff --git a/http/kompozer/PRE_BUILD b/http/kompozer/PRE_BUILD
index 893d797..89d4431 100755
--- a/http/kompozer/PRE_BUILD
+++ b/http/kompozer/PRE_BUILD
@@ -6,6 +6,11 @@ cp  composer/config/mozconfig.linux  .mozconfig  &&
 patch -p1 < $SCRIPT_DIRECTORY/gfxshared_s.patch  &&
 patch -p1 < $SCRIPT_DIRECTORY/xprintutil.patch   &&
 
+# Patch to fix compilation issue with nss 3.12
+if is_depends_enabled $SPELL nss && [[ $(installed_version nss) == 3.12 ]]; 
then
+    patch -p1 < $SCRIPT_DIRECTORY/nss-3.12.patch 
+fi &&
+
 #
 # Add user optimizations
 #
diff --git a/http/kompozer/nss-3.12.patch b/http/kompozer/nss-3.12.patch
new file mode 100644
index 0000000..3f50b92
--- /dev/null
+++ b/http/kompozer/nss-3.12.patch
@@ -0,0 +1,35 @@
+--- mozilla.orig/security/manager/ssl/src/nsKeygenHandler.cpp  2007-07-31 
21:20:55.000000000 +0200
++++ mozilla/security/manager/ssl/src/nsKeygenHandler.cpp       2009-03-27 
10:12:48.000000000 +0100
+@@ -59,6 +59,15 @@
+     { nsnull, 0 }, 
+ };
+ 
++DERTemplate SECAlgorithmIDTemplate[] = {
++    { DER_SEQUENCE,
++        0, NULL, sizeof(SECAlgorithmID) },
++    { DER_OBJECT_ID,
++        offsetof(SECAlgorithmID,algorithm), },
++    { DER_OPTIONAL | DER_ANY,
++        offsetof(SECAlgorithmID,parameters), },
++    { 0, }
++};
+ 
+ DERTemplate CERTSubjectPublicKeyInfoTemplate[] = {
+     { DER_SEQUENCE,
+@@ -79,16 +88,6 @@
+     { 0, }
+ };
+ 
+-DERTemplate SECAlgorithmIDTemplate[] = {
+-    { DER_SEQUENCE,
+-        0, NULL, sizeof(SECAlgorithmID) },
+-    { DER_OBJECT_ID,
+-        offsetof(SECAlgorithmID,algorithm), },
+-    { DER_OPTIONAL | DER_ANY,
+-        offsetof(SECAlgorithmID,parameters), },
+-    { 0, }
+-};
+-
+ const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
+     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) },
+     { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) },