Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (0f3883327f795ed174715edef58e9cdf044aa182)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <eric AT sandall.us>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by George Sherwood (0f3883327f795ed174715edef58e9cdf044aa182)
  • Date: Mon, 13 Sep 2010 21:27:34 -0700

With the latest updates over the last week, firefox crashes on startup and google-chrome-bin crashes constantly, though we can browse a page, usually on a page with flash is when it crashes. I will try to revert cairo and see if that fixes my woes. Only one box has these issues, other machines work fine, so thought it was just me having issues.

-sandalle

On Sep 12, 2010, at 7:59 AM, George Sherwood wrote:

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

http/seamonkey/CONFIGURE      |    6 ++++++
http/seamonkey/DEPENDS        |    4 +++-
http/seamonkey/HISTORY        |    6 ++++++
http/seamonkey/PRE_BUILD      |    6 ++++++
http/seamonkey/blfs-mozconfig |    2 +-
5 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 0f3883327f795ed174715edef58e9cdf044aa182
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

   seamonkey: default to not use system cairo.  Newer version of cairo
   are causing crashes.  Need to consider for all mozilla products.

diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index 8c23f7a..37e0587 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -36,9 +36,15 @@ if [[ "$SEAMONKEY_XINERAMA" == "--enable-xinerama" ||     \
else
   SEAMONKEY_XINERAMA=n
fi &&
+
+config_query  SEAMONKEY_CAIRO                             \
+                     "Use system installed cairo?"        \
+                      n                                   &&
+
config_query  SEAMONKEY_XINERAMA                          \
                     'Enable Xinerama support?'           \
                     n                                    &&
+
config_query  SEAMONKEY_PANGO                             \
                     'Enable Pango support for complex font rendering?' \
                     n                                    &&
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index eb01c9d..c267ad7 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -1,4 +1,6 @@
-depends cairo &&
+if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
+   depends cairo
+fi &&
depends  gtk+2  &&
depends  jpeg   &&
depends  libidl  &&
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 5687f44..54d5261 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,9 @@
+2010-09-12 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Added option to use system installed cairo
+ * PRE_BUILD: Set option to enable/disable system installed cairo
+ * blfs-mozconfig: Removed default use of system cairo
+ * DEPENDS: Make depends cairo conditional
+
2010-09-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.7, SECURITY_PATCH=26
* PRE_BUILD: added --disable-crashreporter, broken
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 5fee834..d3cf3c6 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -7,6 +7,12 @@ cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&

#cp -v $SPELL_DIRECTORY/blfs-mozconfig mozilla/.mozconfig &&

+if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
+   sed -i '85iac_add_options --enable-system-cairo' .mozconfig
+else
+   sed -i '85iac_add_options --disable-system-cairo' .mozconfig
+fi &&
+
if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
   sed -i '85iac_add_options --disable-mailnews' .mozconfig
fi &&
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
index cdc3eb4..8d9b6d3 100644
--- a/http/seamonkey/blfs-mozconfig
+++ b/http/seamonkey/blfs-mozconfig
@@ -32,7 +32,7 @@ ac_add_options --prefix=/usr
ac_add_options --with-system-zlib
ac_add_options --with-system-png
ac_add_options --with-system-jpeg
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo

# This option specifies to include support for rendering the HTML
# <canvas></canvas> tag in the SeaMonkey browser.
_______________________________________________
SM-Commit mailing list
SM-Commit AT lists.ibiblio.org
http://lists.ibiblio.org/mailman/listinfo/sm-commit


Eric Sandall                      Source Mage GNU/Linux Developer
http://eric.sandall.us/           http://counter.li.org/  #196285




Archive powered by MHonArc 2.6.24.

Top of Page