[Lunar-commits] <moonbase-other> xulrunner: Adjusting the if/then in BUILD to just used the currently

[Dennis Veatch]

commit 4c04a97eb4cfa45c702d7729e052ee4f4ce665cc
Author: Dennis Veatch <stumbles at lunar-linux.org>
Date: Sun, 19 Aug 2012 06:49:03 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/4c04a97eb4cfa45c702d7729e052ee4f4ce665cc

xulrunner: Adjusting the if/then in BUILD to just used the currently

installed kernel version to skirt around their mk issues.

Also adding a gcc patch, see;
http://www.anticensure.com/?__new_url=aHR0cHM6Ly9idWdzLmdlbnRvby5vcmcvc2hvd19idWcuY2dpP2lkPTQwOTIyNSNjOQ==
---
  web/xulrunner/BUILD                                          +3/-3     
  web/xulrunner/DETAILS                                        +3/-0     
  2 files changed, 6 insertions (+), 3 deletions (-)

--- a/web/xulrunner/BUILD
+++ b/web/xulrunner/BUILD
@@ -1,12 +1,12 @@
 (
 
+  patch_it $SOURCE2 1 &&
 # Inserting a missing header
   sed -i "4i #include <cstddef>" gfx/ots/src/os2.cc &&
 
 # See https://lkml.org/lkml/2011/6/14/293 and https://bugzilla.mozilla.org/show_bug.cgi?id=661609
-  if [ `uname -r | cut -c1-3` == "3.4" ] ; then
-      cp security/coreconf/Linux2.6.mk security/coreconf/Linux3.4.mk
-  fi &&
+  KERN_VER=`uname -r | cut -c1-3` &&
+  cp security/coreconf/Linux2.6.mk security/coreconf/Linux$KERN_VER.mk &&
 
   OPTS+=" --enable-application=xulrunner \
           --prefix=/usr \
--- a/web/xulrunner/DETAILS
+++ b/web/xulrunner/DETAILS
@@ -1,10 +1,13 @@
           MODULE=xulrunner
          VERSION=1.9.2.19
           SOURCE=$MODULE-$VERSION.source.tar.bz2
+         SOURCE2=xulrunner-1.9.2-gcc-4.7.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla-1.9.2
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$VERSION/source/
    SOURCE_URL[1]=ftp://mozilla.isc.org/pub/mozilla.org/$MODULE/releases/$VERSION/source
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:efa646a0621ada808e8f3c5a5241733ac7ddf8b1
+     SOURCE2_VFY=sha1:f58e6234ba4f303f3ba2c8a381d24d211081f515
         WEB_SITE=http://www.mozilla.org
          ENTERED=20080624
          UPDATED=20110701