Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (386a69fe0d904a7a2466f15dbc51508bc327e990)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (386a69fe0d904a7a2466f15dbc51508bc327e990)
  • Date: Sat, 1 Dec 2007 11:33:21 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

http/firefox/DEPENDS | 12 ++++++------
http/firefox/DETAILS | 10 ++++++----
http/firefox/HISTORY | 8 ++++++++
http/firefox/INSTALL | 14 ++++++++++----
http/firefox/PREPARE | 16 +---------------
http/firefox/PRE_BUILD | 37 +++++++------------------------------
http/firefox/mozconfig3 | 26 ++++++++++++++++++++++++++
7 files changed, 64 insertions(+), 59 deletions(-)

New commits:
commit 386a69fe0d904a7a2466f15dbc51508bc327e990
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

firefox: Removed CVS version since it didn't work and no one was
maintaining it. Added devel version of 3.0 beta 1.
Fixes Bug #13517 concering downloading in PRE_BUILD.

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index d044bf9..a82138e 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -2,8 +2,8 @@ depends atk &&
depends g++ &&
depends glib2 &&
depends jpeg '--with-system-jpeg' &&
-depends libpng '--with-system-png' &&
-depends nspr '--with-system-nspr' &&
+depends libpng &&
+depends nspr &&
depends pango &&
depends perl &&
depends zip &&
@@ -12,13 +12,13 @@ depends nss &&

# These were the GTK+2 option in the GTK version conditional, perhaps
# the flags need a closer look.
-depends gtk+2 '--enable-default-toolkit=gtk2 --enable-xft
--disable-freetype2' &&
+depends gtk+2 '--enable-xft --disable-freetype2' &&
depends libidl &&

suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar' &&

-if [ "$FIREFOX_CVS" == "y" ]; then
- depends CVS
-fi &&
+
+if [ "$FIREFOX_CVS" == "n" ]; then
optional_depends cairo "--enable-system-cairo --enable-svg
--enable-svg-renderer=cairo" "" "for native SVG rendering"
+fi
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 8688555..bf6d3a7 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,9 +1,11 @@
SPELL=firefox
if [ "$FIREFOX_CVS" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- SOURCE=${SPELL}-1.0+.tar.bz2
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
- SOURCE_IGNORE=volatile
+ VERSION=3.0b1
+ SOURCE=$SPELL-$VERSION-source.tar.bz2
+ SOURCE2=${SOURCE}.asc
+ SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
+
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SPELL/releases/$VERSION/source/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL}.asc
else
VERSION=2.0.0.11
SOURCE=$SPELL-$VERSION-source.tar.bz2
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 08c5d51..c292fe0 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,11 @@
+2007-12-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to add devel version 3.0 beta 1
+ * DEPENDS: Removed hardcoded options for depends.
+ * PRE_BUILD: Removed cvs download code. Bug #13517
+ * INSTALL: Need separte patches for firefox-config
+ * PEPARE: Changed working for devel version
+ * mozconfig3: Added since we need separate config options for 3.0
+
2007-12-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
updated spell to 2.0.0.11
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index ec36913..724c990 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -4,7 +4,9 @@ if spell_ok Firebird; then
dispel Firebird
fi &&
#fix firefox-config file to match installed configuration
-patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch &&
+if [ "$FIREFOX_CVS" == "n" ]; then
+patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch
+fi &&

# Not recommended by http://www.mozilla.org/build to use
# make install. Manually install the files.
@@ -17,11 +19,12 @@ cp -LfRv dist/include/*
$INSTALL_ROOT/usr/include/firefox/ &&
mkdir -p $INSTALL_ROOT/usr/share/idl/firefox/ &&
cp -LfRv dist/idl/* $INSTALL_ROOT/usr/share/idl/firefox/ &&

+if [ "$FIREFOX_CVS" == "n" ]; then
#fix install directories in *.pc files.
sed -i s#usr/local#usr# build/unix/firefox-* &&
sed -i s#-${VERSION}## build/unix/firefox-* &&
-cp build/unix/firefox*.pc $INSTALL_ROOT/usr/lib/pkgconfig &&
-
+cp build/unix/firefox*.pc $INSTALL_ROOT/usr/lib/pkgconfig
+fi &&

#
# Script to set MOZILLA_FIVE_HOME
@@ -67,11 +70,14 @@ fi &&
install -m 755 -o root -g root $SCRIPT_DIRECTORY/firefox \
$INSTALL_ROOT/usr/bin &&

+if [ "$FIREFOX_CVS" == "n" ]; then
# make the pkgconfig files reference the nspr from the standalone nspr spell
sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc
&&
sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc &&
-sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc &&
+sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc
+fi &&
+

# fix up permissions, firefox 2.0.0.8 installs stuff non-readable for
# anyone but root
diff --git a/http/firefox/PREPARE b/http/firefox/PREPARE
index 50df2b8..b4b132a 100755
--- a/http/firefox/PREPARE
+++ b/http/firefox/PREPARE
@@ -10,18 +10,4 @@ if grep -q -- "PR"
$INSTALL_ROOT/etc/sorcery/local/depends/firefox; then
rm -f $INSTALL_ROOT/etc/sorcery/local/depends/firefox
fi &&

-config_query FIREFOX_CVS \
- "Checkout the CVS version?" n &&
-
-# touch the SOURCE tarball if you update via cvs and already have a cvs
tarball
-# otherwise you have to download 40 MB of crap
-if [ "$FIREFOX_CVS" = "y" ] &&
- [ -f $SOURCE_CACHE/Firebird_cvs.tar.bz2 ]; then
- mv -v $SOURCE_CACHE/Firebird_cvs.tar.bz2 \
- $SOURCE_CACHE/firefox_cvs.tar.bz2
-fi &&
-
-if [ "$FIREFOX_CVS" = "y" ] &&
- [ -f $SOURCE_CACHE/firefox_cvs.tar.bz2 ]; then
- touch $SOURCE_CACHE/$SOURCE
-fi
+config_query FIREFOX_CVS "Build the devel version?" n
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index d523658..724ebde 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,37 +1,14 @@
-if [ "$FIREFOX_CVS" = "y" ] &&
- [ -f $SOURCE_CACHE/$FIREFOX_TARBALL ]; then
-if [ ! -f /root/.cvspass ]; then
- touch /root/.cvspass
-fi
&&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch

-mk_source_dir $SOURCE_DIRECTORY
&&
-
-FIREFOX_TARBALL=firefox-1.0+.tar.bz2 &&
-
- message "${MESSAGE_COLOR}Unpacking source file $FIREFOX_TARBALL" \
- "$for ${SPELL_COLOR}$SPELL${DEFAULT_COLOR}"
&&
- tar jxf $SOURCE_CACHE/$FIREFOX_TARBALL
&&
- message "${MESSAGE_COLOR}\tIt can take some considerable time to" \
- "\tregenerate the cvs tags you will not see much progress or a" \
- "\ttime but do not despair, GOOD THINGS are happening in the" \
- "\tbackground.${DEFAULT_COLOR}"
&&
- cvs -z9 -q -d:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot \
- checkout -PA -d mozilla mozilla/client.mk
&&
- cd $SOURCE_DIRECTORY
&&
- make -j1 -f client.mk checkout MOZ_CO_FLAGS=-PA
MOZ_CO_PROJECT=browser
- cd $BUILD_DIRECTORY
&&
- message "${MESSAGE_COLOR}Generating tarball for reuse"
&&
- tar jcf $FIREFOX_TARBALL mozilla/
&&
- message "Moving $FIREFOX_TARBALL to/var/spool/sorcery${DEFAULT_COLOR}"
&&
- mv -v $FIREFOX_TARBALL $SOURCE_CACHE/
+if [ "$FIREFOX_CVS" == "y" ]; then
+ cp $SCRIPT_DIRECTORY/mozconfig3 $SOURCE_DIRECTORY/.mozconfig
else
- default_pre_build &&
- cd $SOURCE_DIRECTORY &&
- patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch &&
- patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
+ cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig
fi &&

-cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig &&
if [ "$FIREFOX_OFFICIAL" == "y" ]; then
sedit '24iac_add_options --enable-official-branding'
$SOURCE_DIRECTORY/.mozconfig
fi
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
new file mode 100644
index 0000000..db02239
--- /dev/null
+++ b/http/firefox/mozconfig3
@@ -0,0 +1,26 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=browser
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --with-pthreads
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg=/usr/lib/
+ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --with-system-png=/usr/lib
+ac_add_options --enable-application=browser
+ac_add_options --disable-system-cairo
+ac_add_options --disable-canvas
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-freetype2
+ac_add_options --enable-pango
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
+



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (386a69fe0d904a7a2466f15dbc51508bc327e990), George Sherwood, 12/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page