Skip to Content.
Sympa Menu

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

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 (2a57dab89aa345a64e4d289afc0358b8af9ef72e)
  • Date: Sat, 1 Dec 2007 22:53:04 -0600

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

http/firefox/DEPENDS | 16 +++++++++-------
http/firefox/HISTORY | 6 ++++++
http/firefox/PRE_BUILD | 7 +++++--
http/firefox/mozconfig3 | 5 ++---
4 files changed, 22 insertions(+), 12 deletions(-)

New commits:
commit 2a57dab89aa345a64e4d289afc0358b8af9ef72e
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

firefox: Tweaks to make 3.0 beta 1 work better. Updated DEPENDS
and removed patches from 3.0 beta 1. Without patches canvas builds.

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index a82138e..3cace4a 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -3,12 +3,19 @@ depends g++ &&
depends glib2 &&
depends jpeg '--with-system-jpeg' &&
depends libpng &&
-depends nspr &&
depends pango &&
depends perl &&
depends zip &&
depends zlib '--with-system-zlib' &&
-depends nss &&
+
+if [ "$FIREFOX_CVS" == "n" ]; then
+ depends nspr &&
+ depends nss &&
+ optional_depends cairo "--enable-system-cairo --enable-svg
--enable-svg-renderer=cairo" "" "for native SVG rendering"
+else
+ depends cairo &&
+ depends python
+fi

# These were the GTK+2 option in the GTK version conditional, perhaps
# the flags need a closer look.
@@ -17,8 +24,3 @@ depends libidl &&

suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar' &&
-
-
-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/HISTORY b/http/firefox/HISTORY
index c292fe0..d9501b8 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2007-12-02 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: Cleaned up. 3.0 beta cannot use system npsr, nss.
+ depends python
+ * PRE_BUILD: 3.0 doesn't need cairo-fixes or x-lib patches.
+ * mozconfig3: Cannot use system npsr/nss. Canvas works.
+
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.
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 724ebde..cfb4fa9 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -1,7 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
+
+if [ "$FIREFOX_CVS" == "n" ]; then
+patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
+fi &&

if [ "$FIREFOX_CVS" == "y" ]; then
cp $SCRIPT_DIRECTORY/mozconfig3 $SOURCE_DIRECTORY/.mozconfig
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
index db02239..51ceb76 100644
--- a/http/firefox/mozconfig3
+++ b/http/firefox/mozconfig3
@@ -7,14 +7,13 @@ 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 --without-system-nspr
+ac_add_options --without-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



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

Archive powered by MHonArc 2.6.24.

Top of Page