Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (d38e043537ecedfdf1f0ab417b33815075d5817f)
  • Date: Tue, 20 Mar 2007 13:39:58 -0500

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

http/firefox/BUILD | 2 +-
http/firefox/DETAILS | 2 +-
http/firefox/HISTORY | 6 ++++++
http/firefox/INSTALL | 2 +-
http/firefox/firefox-config.patch | 10 +++++-----
5 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit d38e043537ecedfdf1f0ab417b33815075d5817f
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

firefox: Updated to version 2.0.0.3

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 8b9270f..f53fc45 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -1,4 +1,4 @@
-FIREFOX_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&
+FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firefox &&
export MOZ_PHOENIX=1 &&

#
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 5255a1c..52e36c9 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -5,7 +5,7 @@ if [ "$FIREFOX_CVS" == "y" ]; then

SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs-mirror.mozilla.org:/cvsroot:mozilla/client.mk
SOURCE_IGNORE=volatile
else
- VERSION=2.0.0.2
+ VERSION=2.0.0.3
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 638662b..bdbe20a 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2007-03-20 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 2.0.0.3
+ * BUILD: Small cleanup of FIREFOX_HOME variable.
+ * INSTALL: Updated sed to using $VERSION vice hardcoded version
+ * firefox-config.patch: Updated for version 2.0.0.3.
+
2007-03-03 George Sherwood <george AT beernabeer.com>
* INSTALL: Added sedit to fix firefox-plugin.pc for nspr. Bug #13581

diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index eb9e432..895d4b3 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -19,7 +19,7 @@ cp -LfRv dist/idl/* $INSTALL_ROOT/usr/sh

#fix install directories in *.pc files.
sed -i s#usr/local#usr# build/unix/firefox-* &&
-sed -i s#-2.0.0.2## build/unix/firefox-* &&
+sed -i s#-${VERSION}## build/unix/firefox-* &&
cp build/unix/firefox*.pc $INSTALL_ROOT/usr/lib/pkgconfig &&


diff --git a/http/firefox/firefox-config.patch
b/http/firefox/firefox-config.patch
index 3ef7fc8..56a84de 100644
--- a/http/firefox/firefox-config.patch
+++ b/http/firefox/firefox-config.patch
@@ -14,8 +14,8 @@
exit 0
;;
--cflags)
-- if test "/usr/local/include/firefox-2.0.0.2" != /usr/include ; then
-- includes="-I/usr/local/include/firefox-2.0.0.2"
+- if test "/usr/local/include/firefox-2.0.0.3" != /usr/include ; then
+- includes="-I/usr/local/include/firefox-2.0.0.3"
+ if test "/usr/include/firefox" != /usr/include ; then
+ includes="-I/usr/include/firefox"
fi
@@ -25,14 +25,14 @@
if test "$echo_cflags" = "yes"; then
nspr_cflags="-I/usr/include/nspr"
for n in $echo_components; do
-- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.2/$n"
+- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.3/$n"
+ component_includes="$component_includes -I/usr/include/firefox/$n"
done
echo $component_includes $includes $nspr_cflags
fi

if test "$echo_idlflags" = "yes"; then
-- echo "-I/usr/local/share/idl/firefox-2.0.0.2"
+- echo "-I/usr/local/share/idl/firefox-2.0.0.3"
+ echo "-I/usr/share/idl/firefox"
fi

@@ -41,6 +41,6 @@
;;
esac
done
-- echo -L/usr/local/lib/firefox-2.0.0.2 $libs
+- echo -L/usr/local/lib/firefox-2.0.0.3 $libs
+ echo -L/usr/lib $libs
fi



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (d38e043537ecedfdf1f0ab417b33815075d5817f), George Sherwood, 03/20/2007

Archive powered by MHonArc 2.6.24.

Top of Page