Browse files

firefox: version bumped to 22.0

also re-enable system sqlite - though marked as 'discouraged'
  • Loading branch information...
1 parent 1f4c1c0 commit 713a1390a8a646ab76afb3f007a4d3f95a0015b5 @v4hn v4hn committed Jun 26, 2013
Showing with 47 additions and 56 deletions.
  1. +40 −45 web/firefox/BUILD
  2. +4 −7 web/firefox/DEPENDS
  3. +3 −3 web/firefox/DETAILS
  4. +0 −1 web/firefox/mozconfig
View
85 web/firefox/BUILD
@@ -1,59 +1,54 @@
-(
-
# To skirt around this make failure; ftbzip2.c:183: undefined reference to `BZ2_bzDecompressInit'
- CFLAGS+=" -lbz2" &&
-
- # Workaround Segmentation fault at install part on precompile_cache.js
- sedit '/^GENERATE_CACHE = 1$/d' browser/installer/Makefile.in &&
+CFLAGS+=" -lbz2" &&
- sedit 's/@PRE_RELEASE_SUFFIX@//g' browser/base/content/browser.xul &&
+# Workaround Segmentation fault at install part on precompile_cache.js
+sedit '/^GENERATE_CACHE = 1$/d' browser/installer/Makefile.in &&
- export MOZ_CO_PROJECT=browser &&
- export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
- export MOZILLA_OFFICIAL=1 &&
- export BUILD_OFFICIAL=1 &&
- export MOZ_MAKE_FILES=$MAKES &&
- export MOZ_OPTIMIZE_FLAGS="$CFLAGS" &&
- export MOZ_DEBUG_FLAGS="$CFLAGS" &&
+sedit 's/@PRE_RELEASE_SUFFIX@//g' browser/base/content/browser.xul &&
- cp $SCRIPT_DIRECTORY/mozconfig . &&
- export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla" &&
- mkdir -p ${MOZ_OBJDIR} &&
+export MOZ_CO_PROJECT=browser &&
+export MOZILLA_HOME=/usr/lib/$MODULE-$VERSION &&
+export MOZILLA_OFFICIAL=1 &&
+export BUILD_OFFICIAL=1 &&
+export MOZ_MAKE_FILES=$MAKES &&
+export MOZ_OPTIMIZE_FLAGS="$CFLAGS" &&
+export MOZ_DEBUG_FLAGS="$CFLAGS" &&
- for flag in $OPTS; do
- echo "ac_add_options $flag" >> mozconfig
- done &&
+cp $SCRIPT_DIRECTORY/mozconfig . &&
+export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla" &&
+mkdir -p ${MOZ_OBJDIR} &&
- # turn off this #$ bell during build
- setterm -bfreq -blength &&
+for flag in $OPTS; do
+ echo "ac_add_options $flag" >> mozconfig
+done &&
- if [ -n "${MAKES}" ]; then
- echo "mk_add_options MOZ_MAKE_FLAGS='-j${MAKES}'" >> mozconfig
- fi &&
+# turn off this #$ bell during build
+setterm -bfreq -blength &&
- #Finally, the build!
- if [ "$PGO" == "y" ] ; then
- #CCache breaks the pgo build
- export CCACHE_DISABLE=1 &&
- echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig &&
+if [ -n "${MAKES}" ]; then
+ echo "mk_add_options MOZ_MAKE_FLAGS='-j${MAKES}'" >> mozconfig
+fi &&
- make -f client.mk profiledbuild
- else
- make -f client.mk build
- fi &&
+#Finally, the build!
+if [ "$PGO" == "y" ] ; then
+ #CCache breaks the pgo build
+ export CCACHE_DISABLE=1 &&
+ echo "mk_add_options PROFILE_GEN_SCRIPT='python $MOZ_OBJDIR/_profile/pgo/profileserver.py'" >> mozconfig &&
- cd ${MOZ_OBJDIR} &&
- prepare_install &&
- make install &&
+ make -f client.mk profiledbuild
+else
+ make -f client.mk build
+fi &&
- # Now the .desktop file and icons
- install -Dm 644 {"$SCRIPT_DIRECTORY",/usr/share/applications}/firefox.desktop &&
+cd ${MOZ_OBJDIR} &&
+prepare_install &&
+make install &&
- for s in 16 22 24 32 48 256 ; do
- install -Dm 644 $SOURCE_DIRECTORY/browser/branding/official/default${s}.png /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
- done &&
+install -Dm 644 {"$SCRIPT_DIRECTORY",/usr/share/applications}/firefox.desktop &&
- # symlink plugins folder
- ln -sfn /usr/lib/lunar/plugins "/usr/lib/firefox-$VERSION/browser/plugins"
+for s in 16 22 24 32 48 256 ; do
+ install -Dm 644 $SOURCE_DIRECTORY/browser/branding/official/default${s}.png /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
+done &&
-) > $C_FIFO 2>&1
+# symlink plugins folder
+ln -sfn /usr/lib/lunar/plugins "/usr/lib/firefox-$VERSION/browser/plugins"
View
11 web/firefox/DEPENDS
@@ -8,13 +8,6 @@ depends libnotify4
depends alsa-lib
depends libvpx
-# Firefox crashes with sqlite 3.6.18 when adding new bookmarks:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=512940
-# Comment 9: "System SQLite isn't supported by Mozilla (in fact we discourage its use)"
-# So, disable the option to use system sqlite - instead, use Mozilla's version
-#optional_depends "sqlite" "" "" \
-# "Use system sqlite"
-
optional_depends "freetype2" "--enable-tree-freetype" "--disable-tree-freetype" "for freetype font support"
optional_depends "Python" "" "" "Needed to do a Profile Guided Optimization build"
optional_depends "flash-plugin-11" "" "" "To enable Flash plugin"
@@ -30,3 +23,7 @@ optional_depends "sun-jdk" "--with-java-bin-path=/usr/java/default/bin"
# firefox requires jpeg-turbo extensions, so NO, libjpeg is not enough
optional_depends "libjpeg-turbo" "--with-system-jpeg" "--without-system-jpeg" "system jpeg requires libjpeg-turbo"
+
+# https://bugzilla.mozilla.org/show_bug.cgi?id=512940
+# Comment 9: "System SQLite isn't supported by Mozilla (in fact we discourage its use)"
+optional_depends "sqlite" "--enable-system-sqlite" "--disable-system-sqlite" "Use system sqlite (discouraged)"
View
6 web/firefox/DETAILS
@@ -1,14 +1,14 @@
MODULE=firefox
- VERSION=21.0
+ VERSION=22.0
SOURCE=$MODULE-$VERSION.source.tar.bz2
SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/firefox/releases/$VERSION/source
SOURCE_URL[1]=ftp://mozilla.isc.org/pub/mozilla.org/firefox/releases/$VERSION/source
SOURCE_URL[2]=ftp://ftp.mozilla.org/pub/firefox/releases/$VERSION/source
- SOURCE_VFY=sha1:e63b5488eaec1956947f59609d5839332ba7ffe1
+ SOURCE_VFY=sha1:db2d5b028b6ea95b5f006b46e153f50f7a52bf80
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla-release
WEB_SITE=http://www.mozilla.org/projects/firefox
ENTERED=20110814
- UPDATED=20130515
+ UPDATED=20130626
SHORT="A speedy, full-featured web browser"
cat << EOF
View
1 web/firefox/mozconfig
@@ -29,7 +29,6 @@ ac_add_options --enable-shared-js
ac_add_options --enable-system-pixman
ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
-ac_add_options --disable-system-sqlite
#firefox 14 will not build with system cairo
#because it uses some mozilla made extensions/private functions

0 comments on commit 713a139

Please sign in to comment.