Skip to Content.
Sympa Menu

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

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 (cd2c7952a70a623f74262b54502f86a5eb3609a5)
  • Date: Tue, 27 Nov 2007 21:02:15 -0600

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

http/firefox/DETAILS | 4 ++--
http/firefox/HISTORY | 7 +++++++
http/firefox/PRE_BUILD | 3 +--
http/firefox/firefox-config.patch | 10 +++++-----
http/firefox/gdkpango.patch | 10 ----------
5 files changed, 15 insertions(+), 19 deletions(-)

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

firefox: Updated to version 2.0.0.10. SECURITY_PATCH++ Removed
patch incorporated upstream.

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 1201bb2..c3525aa 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.9
+ VERSION=2.0.0.10
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=${SOURCE}.asc
SOURCE_GPG="firefox.gpg:${SOURCE2}:UPSTREAM_KEY"
@@ -15,7 +15,7 @@ else

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL}.asc
- SECURITY_PATCH=12
+ SECURITY_PATCH=13
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 84ef4b1..b5e127b 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2007-11-27 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to versoin 2.0.0.10. SECURITY_PATCH++
+
http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.10
+ * firefox-config.patch: Updated to 2.0.0.10
+ * PRE_BUILD: Removed patch
+ * gdkpango.patch: Removed. Incorporated upstream.
+
2007-11-09 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: added new patch
* gdkpango.patch: added to fix bug #14088
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 3914db6..d523658 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -28,8 +28,7 @@ else
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/x-lib.patch &&
- patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch &&
- patch -p0 < $SCRIPT_DIRECTORY/gdkpango.patch
+ patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
fi &&

cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig &&
diff --git a/http/firefox/firefox-config.patch
b/http/firefox/firefox-config.patch
index b633d12..0fddb03 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.9" != /usr/include ; then
-- includes="-I/usr/local/include/firefox-2.0.0.9"
+- if test "/usr/local/include/firefox-2.0.0.10" != /usr/include ; then
+- includes="-I/usr/local/include/firefox-2.0.0.10"
+ 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.9/$n"
+- component_includes="$component_includes
-I/usr/local/include/firefox-2.0.0.10/$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.9"
+- echo "-I/usr/local/share/idl/firefox-2.0.0.10"
+ echo "-I/usr/share/idl/firefox"
fi

@@ -41,6 +41,6 @@
;;
esac
done
-- echo -L/usr/local/lib/firefox-2.0.0.9 $libs
+- echo -L/usr/local/lib/firefox-2.0.0.10 $libs
+ echo -L/usr/lib $libs
fi
diff --git a/http/firefox/gdkpango.patch b/http/firefox/gdkpango.patch
deleted file mode 100644
index cdad162..0000000
--- a/http/firefox/gdkpango.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/system-headers.orig 2007-10-19 21:38:00.000000000 +0200
-+++ config/system-headers 2007-10-19 21:38:41.000000000 +0200
-@@ -208,6 +208,7 @@
- gdk/gdkevents.h
- gdk/gdk.h
- gdk/gdkkeysyms.h
-+gdk/gdkpango.h
- gdk/gdkprivate.h
- gdk/gdkregion.h
- gdk/gdkwindow.h



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (cd2c7952a70a623f74262b54502f86a5eb3609a5), George Sherwood, 11/27/2007

Archive powered by MHonArc 2.6.24.

Top of Page