[Lunar-commits] <moonbase-other> xulrunner: Bump to 31.0.

[Dennis Veatch]

commit 4c3f571af3a1f56fe70005c066d8028acf6b1348
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Wed, 13 Aug 2014 08:50:48 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/4c3f571af3a1f56fe70005c066d8028acf6b1348

xulrunner: Bump to 31.0.
---
  web/xulrunner/BUILD   | +9/-24    
  web/xulrunner/DEPENDS | +4/-1     
  web/xulrunner/DETAILS | +4/-8     
  3 files changed, 17 insertions(+), 33 deletions(-)

--- a/web/xulrunner/BUILD
+++ b/web/xulrunner/BUILD
@@ -1,11 +1,6 @@
 
-  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
-  KERN_VER=`uname -r | cut -d. -f 1-2` &&
-  cp security/coreconf/Linux2.6.mk security/coreconf/Linux$KERN_VER.mk &&
+  export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
+  mkdir -p ${MOZ_OBJDIR}  &&
 
   OPTS+=" --enable-application=xulrunner \
           --prefix=/usr \
@@ -13,42 +8,32 @@
           --with-system-jpeg \
           --with-system-zlib \
           --with-system-bz2 \
-          --enable-system-lcms \
           --enable-system-sqlite \
           --enable-system-cairo \
+          --enable-pango \
+          --enable-system-pixman \
           --with-pthreads \
           --enable-strip \
           --disable-tests \
           --disable-mochitest \
           --disable-installer \
           --disable-debug \
-          --enable-optimize \
           --enable-default-toolkit=cairo-gtk2 \
-          --enable-pango \
           --enable-svg \
           --enable-canvas \
           --disable-javaxpcom \
           --disable-crashreporter \
           --enable-safe-browsing \
+          --enable-optimize \
           --disable-necko-wifi \
+          --enable-tree-freetype \
           --enable-startup-notification" &&
 
-# wifi breaks build due to incompatibile header files
-  #OPTS+=" --enable-application=xulrunner \
-  #        --disable-test \
-  #        --enable-system-sqlite \
-  #        --enable-image-encoder=all \
-  #        --enable-js-binary \
-  #        --enable-storage --enable-places --enable-places_bookmarks \
-  #        --enable-jsd \
-  #        --enable-xpctools \
-  #        --enable-gnomeui \
-  #        --disable-libxul \
-  #        --disable-javaxpcom"
-
   export MOZ_CO_PROJECT=xulrunner &&
   export MOZILLA_OFFICIAL=1 &&
   export BUILD_OFFICIAL=1 &&
   export FREEBL_NO_DEPEND=0 &&
 
-  default_build 
+  cd ${MOZ_OBJDIR}  &&
+  ../configure $OPTS &&
+  default_make
--- a/web/xulrunner/DEPENDS
+++ b/web/xulrunner/DEPENDS
@@ -1,8 +1,11 @@
+depends freetype2
+depends %JPEG
+depends pixman
+depends cairo
 depends ORBit2
 depends zip
 depends unzip
 depends expat
 depends startup-notification
-depends lcms
 depends sqlite
 depends libnotify4
--- a/web/xulrunner/DETAILS
+++ b/web/xulrunner/DETAILS
@@ -1,18 +1,14 @@
           MODULE=xulrunner
-         VERSION=1.9.2.19
+         VERSION=31.0
           SOURCE=$MODULE-$VERSION.source.tar.bz2
-         SOURCE2=xulrunner-1.9.2-gcc-4.7.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla-1.9.2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla-release
    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
+      SOURCE_VFY=sha1:92290d90446800ddb1c08211102533cc7794c8b4
         WEB_SITE=http://www.mozilla.org
          ENTERED=20080624
-         UPDATED=20110701
+         UPDATED=20140811
            SHORT="a XUL runtime that requires no browser"
-PSAFE=no
 cat << EOF
 XULRunner is a Mozilla runtime package that can be used to bootstrap XUL+XPCOM
 applications that are as rich as Firefox and Thunderbird. It will provide