[Lunar-commits] seamonkey-1.1.7 and firefox-2.0.0.11 updates.

Terry Chan tchan at lunar-linux.org
Sat Dec 1 02:50:17 CET 2007


commit d61a540e9396aea33c034c440107bd13cb1f06de
Author: Terry Chan <tchan at lunar-linux.org>
Date:   Fri Nov 30 19:50:17 2007 -0600

    seamonkey-1.1.7 and firefox-2.0.0.11 updates.
    Version bump to seamonkey-1.1.7 and firefox-2.0.0.11. Added the seamonkey patch
    to both firefox and thunderbird. Removed the unneeded sedits in firefox and
    thunderbird builds. Corrected the logic test at the beginnning of seamonkey
    BUILD to match firefox and thunderbird tests.
---
 mail/thunderbird/BUILD   |    4 +---
 mail/thunderbird/DETAILS |    5 ++++-
 web/firefox/BUILD        |    6 ++----
 web/firefox/DETAILS      |    9 ++++++---
 web/seamonkey/BUILD      |    7 ++-----
 web/seamonkey/DETAILS    |    6 +++---
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index 97c7a28..55658a6 100644
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,4 +1,5 @@
 ( 
+  patch_it $SOURCE_CACHE/$SOURCE3 1 &&
   if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
   fi &&
@@ -13,9 +14,6 @@
         MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-negotiateauth"
   fi &&
 
-  # This hack added to fix a gtk+-2/pango/atk update that broke firefox. This should be removed in the future.
-  sedit "s/(MOZ_GTK2_LIBS)/(MOZ_GTK2_LIBS) -lX11 -lXrender/" layout/build/Makefile.in &&
-
   export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
   export MOZ_THUNDERBIRD=1
   export MOZILLA_OFFICIAL=1
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 117d515..650f865 100644
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -2,12 +2,15 @@
          VERSION=2.0.0.9
           SOURCE=thunderbird-$VERSION-source.tar.bz2
          SOURCE2=thunderbird.desktop
+         SOURCE3=sm-xrender.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source/
    SOURCE_URL[1]=http://archive.progeny.com/mozilla.org/$MODULE/releases/$VERSION/source/
-     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:fede9db98f25adb978b84129a6d15a4dbe6bbb3e
+     SOURCE2_URL=$PATCH_URL
      SOURCE2_VFY=sha1:a76c4e25bf4e491014c5bafbb07de096248a9931
+     SOURCE3_URL=$PATCH_URL
+     SOURCE3_VFY=sha1:cab357aa5854456ffd24713126e64a18b391a4cb
         WEB_SITE=http://www.mozilla.org/projects/thunderbird
          ENTERED=20031021
          UPDATED=20071117
diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index c714535..d70f2ea 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -1,5 +1,6 @@
 ( 
-  if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ] ; then
+  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+  if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
         set_module_config OLD_VER "`installed_version $MODULE`"
   fi &&
   
@@ -16,9 +17,6 @@
         MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-auth"
   fi &&
 
-  # This hack added to fix a gtk+-2/pango/atk update that broke firefox. This should be removed in the future.
-  sedit "s/(MOZ_GTK2_LIBS)/(MOZ_GTK2_LIBS) -lX11 -lXrender/" layout/build/Makefile.in &&
-
   export MOZ_FREETYPE2="no"
   export MOZ_PANGO="yes"
   export MOZ_CO_PROJECT=browser
diff --git a/web/firefox/DETAILS b/web/firefox/DETAILS
index 3d2c8b3..24197e4 100644
--- a/web/firefox/DETAILS
+++ b/web/firefox/DETAILS
@@ -1,14 +1,17 @@
           MODULE=firefox
-         VERSION=2.0.0.10
+         VERSION=2.0.0.11
           SOURCE=${MODULE}-${VERSION}-source.tar.bz2
+         SOURCE2=sm-xrender.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/
    SOURCE_URL[1]=ftp://ftp.uni-erlangen.de/pub/mozilla.org/firefox/releases/$VERSION/source/
    SOURCE_URL[2]=ftp://mozilla.isc.org/pub/mozilla.org/firefox/releases/$VERSION/source/
-      SOURCE_VFY=sha1:7146f31fe9f4ce6dbea5ecd98f993a8b60154770
+      SOURCE_VFY=sha1:6d070bf04f1a037b621237d02ef9be7802a51bf1
+     SOURCE2_URL=$PATCH_URL
+     SOURCE2_VFY=sha1:cab357aa5854456ffd24713126e64a18b391a4cb
         WEB_SITE=http://www.mozilla.org/projects/firefox
          ENTERED=20030810
-         UPDATED=20071126
+         UPDATED=20071130
       MAINTAINER="tchan at lunar-linux.org"
            SHORT="a speedy, full-featured web browser."
 
diff --git a/web/seamonkey/BUILD b/web/seamonkey/BUILD
index d3416c3..7350673 100644
--- a/web/seamonkey/BUILD
+++ b/web/seamonkey/BUILD
@@ -1,14 +1,11 @@
 (
   patch_it $SOURCE_CACHE/$SOURCE2 1 &&
-  if module_is_expired $MODULE ; then
-          set_module_config OLD_VER "`installed_version $MODULE`"
+  if module_is_expired $MODULE && [ "$VERSION" != "`installed_version $MODULE`" ]; then
+        set_module_config OLD_VER "`installed_version $MODULE`"
   fi &&
 
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION
     
-  # This hack added to fix a gtk+-2/pango/atk update that broke firefox. This should be removed in the future.
-  sedit "s/(MOZ_GTK2_LIBS)/(MOZ_GTK2_LIBS) -lX11 -lXrender/" layout/build/Makefile.in &&
-
   export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
   export MOZ_NSS_AUTOCONF=1
   export NATIVE_THEME_SUPPORT=1
diff --git a/web/seamonkey/DETAILS b/web/seamonkey/DETAILS
index a9084a1..25fe379 100644
--- a/web/seamonkey/DETAILS
+++ b/web/seamonkey/DETAILS
@@ -1,18 +1,18 @@
           MODULE=seamonkey
-         VERSION=1.1.6
+         VERSION=1.1.7
           SOURCE=$MODULE-$VERSION.source.tar.bz2
          SOURCE2=sm-xrender.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/
    SOURCE_URL[1]=ftp://sunsite.icm.edu.pl/pub/mozilla/seamonkey/releases/$VERSION/
    SOURCE_URL[2]=ftp://ftp.task.gda.pl/pub/mozilla/seamonkey/releases/$VERSION/
-      SOURCE_VFY=sha1:e37972ab4a30c1f12f1673916b4ab7049bee5fff
+      SOURCE_VFY=sha1:2a38cb20c5e162cc79b5124a0fd0092d6e1d464d
      SOURCE2_URL=$PATCH_URL
      SOURCE2_VFY=sha1:cab357aa5854456ffd24713126e64a18b391a4cb
         WEB_SITE=http://www.seamonkey-project.org/
            PSAFE=no
          ENTERED=20051208
-         UPDATED=20071107
+         UPDATED=20071130
       MAINTAINER=zbiggy at o2.pl
            SHORT="Seamonkey is a next generation mozilla web browser."
 cat << EOF


More information about the Lunar-commits mailing list