New commits:
commit a1d77d7914b942fa91e49e22294a22f47f59f110
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
openal: Fix Bug #14126 (gcc42.patch fails for snapshot)
commit a97dd18a3e4e7c4b6eaec5b27d200661c3f8d23d
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
firefox: Updated to version 2.0.0.10. SECURITY_PATCH++ Removed
patch incorporated upstream.
diff --git a/audio-libs/openal/HISTORY b/audio-libs/openal/HISTORY
index 8591900..669a529 100644
--- a/audio-libs/openal/HISTORY
+++ b/audio-libs/openal/HISTORY
@@ -1,3 +1,7 @@
+2007-11-28 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Only apply gcc42.patch for $OPENAL_VERSION=release
+ See Bug #14126
+
2007-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD, gcc42.patch: fix gcc 4.2 problem
* BUILD, PRE_BUILD: cd to the correct dir
diff --git a/audio-libs/openal/PRE_BUILD b/audio-libs/openal/PRE_BUILD
index 2534b6b..1d69f5c 100755
--- a/audio-libs/openal/PRE_BUILD
+++ b/audio-libs/openal/PRE_BUILD
@@ -9,6 +9,6 @@ elif [[ $OPENAL_VERSION == scm ]]; then
cd OpenAL-Sample &&
NOCONFIGURE=Y ./autogen.sh
fi &&
-if [[ $OPENAL_VERSION != scm ]]; then
- patch -p1 < $SPELL_DIRECTORY/gcc42.patch
+if [[ $OPENAL_VERSION == release ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/gcc42.patch
fi
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[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 2c88001..1b101bc 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-02 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.0.0.9.
* firefox-config.patch: Updated to 2.0.0.9
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