[Lunar-commits] <moonbase> xulrunner: fix xulrunner to NOT build against nspr

[Samuel Verstraete]

commit 6159fef9e8320f493c99cd225742db401fecdd38
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Mon Oct 13 06:26:05 2008 +0200

    xulrunner: fix xulrunner to NOT build against nspr
    
    Building against the system nspr won't allow firefox to compile, nor epiphany.
    
    Also remove ld_add/ld_remove as elangelo already addressed it
    
    Conflicts:
    
    	web/xulrunner/POST_REMOVE
---
 web/xulrunner/BUILD       |    3 +--
 web/xulrunner/DETAILS     |    2 +-
 web/xulrunner/POST_REMOVE |    3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/web/xulrunner/BUILD b/web/xulrunner/BUILD
index d3565d6..58ea640 100644
--- a/web/xulrunner/BUILD
+++ b/web/xulrunner/BUILD
@@ -4,14 +4,13 @@
 
   patch_it patch/mozilla-ps-pdf-simplify-operators.patch 1 &&
   patch_it patch/100-system-hunspell-corrections.patch 0 &&
-  patch_it patch/bzXXX_pc_honour_system_nspr_nss.patch 1 &&
+#  patch_it patch/bzXXX_pc_honour_system_nspr_nss.patch 1 &&
   patch_it patch/mozilla-pkgconfig.patch 1 &&
   patch_it patch/fix-mozilla-launcher.patch 0 &&
 
   OPTS+=" --enable-application=xulrunner \
           --prefix=/usr \
           --libdir=/usr/lib \
-          --with-system-nspr \
           --with-system-jpeg \
           --with-system-zlib \
           --with-system-bz2 \
diff --git a/web/xulrunner/DETAILS b/web/xulrunner/DETAILS
index 1385d11..7eec0bb 100644
--- a/web/xulrunner/DETAILS
+++ b/web/xulrunner/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
      SOURCE2_VFY=sha1:6167afdbf3de17fa002dc965fdd9a8d46329122d
         WEB_SITE=http://www.mozilla.org
          ENTERED=20080624
-         UPDATED=20081005
+         UPDATED=20081013
            SHORT="a XUL runtime that requires no browser"
 
 cat << EOF
diff --git a/web/xulrunner/POST_REMOVE b/web/xulrunner/POST_REMOVE
index 90f0d62..5b625da 100644
--- a/web/xulrunner/POST_REMOVE
+++ b/web/xulrunner/POST_REMOVE
@@ -1,2 +1 @@
-rm -rf /usr/include/xulrunner-*
-rm -rf /usr/lib/xulrunner-*
+#ld_remove /usr/lib/xulrnner