[Lunar-commits] <moonbase-other> thunderbird: Version bump to 17.0.8 and a number of adjustments to BUILD,

stumbles stumbles at lunar-linux.org
Mon Aug 19 00:23:34 CEST 2013


commit 01b1780ed454f87df09cc675e4b78df4cadebc66
Author: stumbles <stumbles at lunar-linux.org>
Date: Sun, 18 Aug 2013 15:23:00 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/01b1780ed454f87df09cc675e4b78df4cadebc66

thunderbird: Version bump to 17.0.8 and a number of adjustments to BUILD,

PRE_BUILD, etc.
---
  mail/thunderbird/BUILD     | +3/-47    
  mail/thunderbird/DEPENDS   | +15/-21   
  mail/thunderbird/DETAILS   | +3/-3     
  mail/thunderbird/PRE_BUILD | +22/-6    
  mail/thunderbird/mozconfig | +1/-1     
  5 files changed, 44 insertions(+), 78 deletions(-)

--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,17 +1,3 @@
-(
-
-  sedit 's/@PRE_RELEASE_SUFFIX@//g' mozilla/browser/base/content/browser.xul &&
-
-  # Workaround Segmentation fault at install part on precompile_cache.js
-  sedit '/^GENERATE_CACHE=1$/d' mail/installer/Makefile.in &&
-
-  if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
-        set_module_config OLD_VER "`installed_version $MODULE`"
-  fi  &&
-
-  # Adds support for libvpx 1.0. Later firefox will have this fix so remove this then.
-  sedit 's/VPX_CODEC_USE_INPUT_PARTITION/VPX_CODEC_USE_INPUT_FRAGMENTS/' mozilla/configure  &&
-  sedit 's/v0\.9\.7/v1.0.0/' mozilla/configure  &&
 
   export MOZ_CO_PROJECT=mail  &&
   export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
@@ -26,42 +12,14 @@
   export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
   mkdir -p ${MOZ_OBJDIR}  &&
 
-  #Add DEPENDS options
-
-  if in_depends $MODULE gnome-vfs ; then
-    echo "ac_add_options --enable-gnomevfs" >> mozconfig
-  else
-    echo "ac_add_options --disable-gnomevfs" >> mozconfig
-  fi  &&
-
-  if in_depends $MODULE libevent ; then
-    echo "ac_add_options --with-system-libevent" >> mozconfig
-  else
-    echo "ac_add_options --without-system-libevent" >> mozconfig
-  fi  &&
-
-  if in_depends $MODULE dbus-glib ; then
-    echo "ac_add_options --enable-dbus" >> mozconfig
-  else
-    echo "ac_add_options --disable-dbus" >> mozconfig
-  fi  &&
-
-  if in_depends $MODULE libffi ; then
-    echo "ac_add_options --enable-system-ffi" >> mozconfig
-  else
-    echo "ac_add_options --disable-system-ffi" >> mozconfig
-  fi  &&
+  for flag in $OPTS; do
+  echo "ac_add_options $flag" >> mozconfig
+  done &&
 
   if in_depends $MODULE sun-jdk ; then
     echo "ac_add_options --with-java-bin-path=/usr/java/default/bin" >> mozconfig
   fi  &&
 
-  if in_depends $MODULE openldap ; then
-    echo "ac_add_options --enable-ldap" >> mozconfig
-  else
-    echo "ac_add_options --disable-ldap" >> mozconfig
-  fi  &&
-
   setterm -bfreq -blength &&
 
   #Finally, the build!
@@ -77,5 +35,3 @@
   for s in 16 22 24 32 48 256 ; do
     install -Dm 644 mozilla/dist/thunderbird/chrome/icons/default/default${s}.png /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
   done
-
-) > $C_FIFO 2>&1
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -3,29 +3,23 @@ depends zip
 depends unzip
 depends gtk+-2
 
-optional_depends "Python"           ""  ""  "Needed to do a Profile Guided Optimization build"
-optional_depends "gnome-vfs"        ""  ""  "For Gnome VFS support"
-optional_depends "hunspell"         "--enable-system-hunspell"  "--disable-system-hunspell"  "For spelling support"
+optional_depends "Python"     ""  ""  "Needed to do a Profile Guided Optimization build"
+optional_depends "gnome-vfs"  "--enable-gnomevfs"         "--disable-gnomevfs"        "For Gnome VFS support"
+optional_depends "hunspell"   "--enable-system-hunspell"  "--disable-system-hunspell" "For spelling support"
 
 # $OPTS is ignored in this BUILD
-optional_depends "libevent"         ""  ""  "For event detection"
-optional_depends "dbus-glib"        ""  ""  "For dbus support"
-optional_depends "libffi" "" "" "Use system libffi instead of compiling the one in firefox"
-
-optional_depends "startup-notification"  "--enable-startup-notification"  ""  \
-                 "To enable startup notification"
-
-optional_depends "libnotify4"  "--enable-libnotify"  "--disable-libnotify"  \
-                 "To enable libnotify support"
-
-optional_depends "openldap"  "--enable-ldap"  "--disable-ldap"  \
-                 "To enable ldap support"
-
-optional_depends "%GECKO_RENDERER"  "--with-system-libxul --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL"  ""  \
+optional_depends "libevent"   "--with-system-libevent"    "--without-system-libevent" "For event detection"
+optional_depends "dbus-glib"  "--enable-dbus"             "--disable-dbus"            "For dbus support"
+optional_depends "libffi"     "--enable-system-ffi"       "--disable-system-ffi"      "Use system libffi instead of compiling the one in firefox"
+optional_depends "libnotify4" "--enable-libnotify"        "--disable-libnotify"       "To enable libnotify support"
+optional_depends "openldap"   "--enable-ldap"             "--disable-ldap"            "To enable ldap support"
+optional_depends "nspr"       "--with-system-nspr"        "--without-system-nspr"     "To use system nspr"
+optional_depends "nss"        "--with-system-nss"         "--without-system-nss"      "To use system nss"
+
+optional_depends "%GECKO_RENDERER"  "--with-system-libxul --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL"  "--without-system-libxul"  \
                  "To use system xulrunner"
 
-optional_depends "nspr"  "--with-system-nspr"  ""  \
-                "To use system nspr"
+optional_depends "startup-notification"  "--enable-startup-notification"  "--disable-startup-notification"  \
+                 "To enable startup notification"
 
-optional_depends "nss"  "--with-system-nss"  ""  \
-                 "To use system nss"
+optional_depends "%JAVA_SDK" "--with-java-bin-path=/usr/java/default/bin" "" "For java support"
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,15 +1,15 @@
           MODULE=thunderbird
-         VERSION=17.0.4
+         VERSION=17.0.8
           SOURCE=thunderbird-$VERSION.source.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/comm-esr17
    SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/thunderbird/releases/$VERSION/source
    SOURCE_URL[1]=ftp://mozilla.isc.org/pub/mozilla.org/thunderbird/releases/$VERSION/source
    SOURCE_URL[2]=http://mozilla.ftp.halifax.rwth-aachen.de/mozilla/thunderbird/releases/$VERSION/source
    SOURCE_URL[3]=ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source
-      SOURCE_VFY=sha1:eb9ba2d0ee15a40f9668a48c24a61bf32d9d0ff5
+      SOURCE_VFY=sha1:4bcbb33f0b3ea050e805723680b5669d80438812
         WEB_SITE=http://www.mozilla.org/projects/thunderbird
          ENTERED=20031021
-         UPDATED=20130313
+         UPDATED=20130818
            SHORT="A full-featured mail client"
 
 cat << EOF
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,7 +1,23 @@
-if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
-  message "${PROBLEM_COLOR}Run:  ${MODULE_COLOR}lin -c cairo"
-  message "${MESSAGE_COLOR}To recompile cairo with tee support, which is required by Thunderbird.${DEFAULT_COLOR}"
-  exit 1
-fi
+  default_pre_build &&
 
-default_pre_build
+  if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
+    message "${PROBLEM_COLOR}Run:  ${MODULE_COLOR}lin -c cairo"
+    message "${MESSAGE_COLOR}To recompile cairo with tee support, which is required by Thunderbird.${DEFAULT_COLOR}"
+     exit 1
+  fi &&
+
+# Adds support for libvpx 1.0. Later firefox will have this fix so remove this then.
+  sedit 's/VPX_CODEC_USE_INPUT_PARTITION/VPX_CODEC_USE_INPUT_FRAGMENTS/' mozilla/configure  &&
+  sedit 's/v0\.9\.7/v1.0.0/' mozilla/configure  &&
+
+  sedit 's/@PRE_RELEASE_SUFFIX@//g' mozilla/browser/base/content/browser.xul &&
+
+# Workaround Segmentation fault at install part on precompile_cache.js
+  sedit '/^GENERATE_CACHE=1$/d' mail/installer/Makefile.in &&
+
+  if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
+        set_module_config OLD_VER "`installed_version $MODULE`"
+  fi &&
+
+ # To skirt around this make failure in ftbzip2.c:183: undefined reference to `BZ2_bzDecompressInit'
+  CFLAGS+=" -lbz2"
--- a/mail/thunderbird/mozconfig
+++ b/mail/thunderbird/mozconfig
@@ -34,7 +34,7 @@ ac_add_options --enable-shared-js
 ac_add_options --enable-system-pixman
 ac_add_options --enable-calendar
 #thunderbird 12 will not build with tree freetype
-#ac_add_options --enable-tree-freetype
+ac_add_options --enable-tree-freetype
 ac_add_options --enable-static-mail
 ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi




More information about the Lunar-commits mailing list