Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6843757c710426fd13c9d461de049d0032005387)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6843757c710426fd13c9d461de049d0032005387)
  • Date: Tue, 17 Jun 2008 07:05:03 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/firefox/DEPENDS | 11 ++---------
http/firefox/DETAILS | 4 ++--
http/firefox/HISTORY | 7 +++++++
http/firefox/INSTALL | 28 +++++-----------------------
http/firefox/PRE_BUILD | 15 +++------------
http/firefox/cairo-fixes.patch | 15 ---------------
http/firefox/desktop/firefox.desktop | 2 +-
http/firefox/mozconfig | 24 ------------------------
http/firefox/mozconfig3 | 3 +--
http/firefox/x-lib.patch | 11 -----------
10 files changed, 21 insertions(+), 99 deletions(-)

New commits:
commit 6843757c710426fd13c9d461de049d0032005387
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox: => 3.0, updated 2.0 branch, added some fixes, cleaned up

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index c6ebd79..ef5e99d 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -7,15 +7,8 @@ depends pango &&
depends perl &&
depends zip &&
depends zlib '--with-system-zlib' &&
-
-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
+depends cairo &&
+depends python &&

# These were the GTK+2 option in the GTK version conditional, perhaps
# the flags need a closer look.
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index c4a9834..c90409e 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.0rc3
+ VERSION=3.0
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.14
+ VERSION=3.0
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 86b76c0..71b3479 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2008-06-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: Firefox 3.0, updated 2.0 branch too
+ * INSTALL: added bashism, removed useless brackets and spaces
+ * PRE_BUILD: removed useless patches cause we don't have 2.0 anymore,
+ SPELL > SCRIPT, `sed -i' > `sedit', cleaned up
+ * DEPENDS: no 2.0 branch => no stupid depends
+
2008-06-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated FIREFOX_CVS=y to 3.0rc3

diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 7116f8f..0c77434 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -16,24 +16,17 @@ 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
-fi &&
-
#
# Script to set MOZILLA_FIVE_HOME
#
-cp ${SCRIPT_DIRECTORY}/${SPELL}.sh $INSTALL_ROOT/etc/profile.d &&
+cp -v $SPELL_DIRECTORY/$SPELL.sh $INSTALL_ROOT/etc/profile.d &&

#
# Create symlink to mozilla for hardwired applications
# Only create if /usr/bin/mozilla does not exist or is
# already a symlink
#
-if [ "$FIREFOX_MOZLINK" = "y" ]; then
+if [[ $FIREFOX_MOZLINK == y ]]; then
if ! test -f $INSTALL_ROOT/usr/bin/mozilla ||
test -h $INSTALL_ROOT/usr/bin/mozilla ; then
ln -sf $TRACK_ROOT/usr/bin/firefox /usr/bin/mozilla
@@ -52,30 +45,19 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
if ! test -f $FIREFOX_HOME/libnssckbi.so ||
test -h $FIREFOX_HOME/libnssckbi.so; then
ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $FIREFOX_HOME/libnssckbi.so
- fi
+ fi
fi &&
-if [[ "$FIREFOX_NULLPLUGIN" == "n" ]]
-then
+if [[ $FIREFOX_NULLPLUGIN == n ]]; then
rm $FIREFOX_HOME/plugins/libnullplugin.so
fi &&

-
#
# install firefox script so it loads properly even if MOZILLA_FIVE_HOME is
# not set or set to a different mozilla/firefox directory
#
-install -m 755 -o root -g root $SCRIPT_DIRECTORY/firefox \
+install -m 755 -o root -g root $SPELL_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
-fi &&
-
-
# fix up permissions, firefox 2.0.0.8 installs stuff non-readable for
# anyone but root
chmod -R go+r /usr/lib/firefox &&
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 5bf88d7..60c1760 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,17 +3,8 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla &&

-if [ "$FIREFOX_CVS" == "n" ]; then
- patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
- patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch
-fi &&
+cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&

-if [ "$FIREFOX_CVS" == "y" ]; then
- cp $SCRIPT_DIRECTORY/mozconfig3 .mozconfig
-else
- cp $SCRIPT_DIRECTORY/mozconfig .mozconfig
-fi &&
-
-if [ "$FIREFOX_OFFICIAL" == "y" ]; then
- sedit '24iac_add_options --enable-official-branding' .mozconfig
+if [[ $FIREFOX_OFFICIAL == y ]]; then
+ sed -i '24iac_add_options --enable-official-branding' .mozconfig
fi
diff --git a/http/firefox/cairo-fixes.patch b/http/firefox/cairo-fixes.patch
deleted file mode 100644
index f11250e..0000000
--- a/http/firefox/cairo-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:55.602763128 +0000
-+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp 2007-09-16
02:28:27.527046255 +0000
-@@ -98,6 +98,12 @@
- #include "nsTArray.h"
-
- #include "cairo.h"
-+typedef enum _cairo_font_type {
-+ CAIRO_FONT_TYPE_TOY,
-+ CAIRO_FONT_TYPE_FT,
-+ CAIRO_FONT_TYPE_WIN32,
-+ CAIRO_FONT_TYPE_ATSUI
-+} cairo_font_type_t;
- #include "imgIEncoder.h"
- #ifdef MOZILLA_1_8_BRANCH
- #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
diff --git a/http/firefox/desktop/firefox.desktop
b/http/firefox/desktop/firefox.desktop
index 6701acd..5c9bd1c 100644
--- a/http/firefox/desktop/firefox.desktop
+++ b/http/firefox/desktop/firefox.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Firefox
Exec=firefox
-Icon=/usr/lib/firefox/icons/mozicon16.xpm
+Icon=/usr/lib/firefox/icons/mozicon128.png
Terminal=false
Type=Application
Categories=Application;Network;Browsers
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
deleted file mode 100644
index 6f72db0..0000000
--- a/http/firefox/mozconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# 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 --enable-default-toolkit=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
-
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
index 51ceb76..076bf67 100644
--- a/http/firefox/mozconfig3
+++ b/http/firefox/mozconfig3
@@ -9,7 +9,7 @@ mk_add_options MOZ_CO_PROJECT=browser
ac_add_options --with-pthreads
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-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
@@ -22,4 +22,3 @@ 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
-
diff --git a/http/firefox/x-lib.patch b/http/firefox/x-lib.patch
deleted file mode 100644
index 059eb7e..0000000
--- a/http/firefox/x-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- layout/build/Makefile.in.orig 2007-01-20 00:02:50.000000000 +0400
-+++ layout/build/Makefile.in 2007-01-20 00:04:17.000000000 +0400
-@@ -225,7 +225,7 @@
- endif
-
- ifdef MOZ_ENABLE_GTK2
--EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
-+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) -L/usr/X11R6/lib -lXrender -lX11 \
- $(NULL)
- endif
-




Archive powered by MHonArc 2.6.24.

Top of Page