New commits:
commit 3f2e1effa392a0e8555b2090d0b8dc0a48fc520f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
quvi 0.2.19
commit 8725d6e281778c35a5969679e35566554384a796
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: removed extra volatiles
commit 65693fff93be819017baf255a88880b40aaf7741
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
linux: version sort OK
commit 55f17eaa2fd336ffe659f085899f96e17022b067
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
thunderbird: Updated to version 5.0. Various fixes need for
this specific build.
commit 32ff325a027fc61be30246e91d2ffac6ed8b2d4c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pcmciautils 018
commit 71d05e431f627f19da9d013f51fff1d6c46d732e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libass 0.9.13
commit 13edb0fc587e7d1612e8ba1c0865bdbf71c83bb8
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
firefox: Added a few missing options
commit 9f460facd08187dedae73c252bdce10ae31e4d8d
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
VERSION: 0.60-test
commit 29686f5b29130c72e1da2dd906890048ca62eb3d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gajim: added libxscrnsaver suggest dep
commit b32d01b8c6f2584172b7c22b15b777dc3c814716
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
imagemagick: Updated to version 6.7.1-2
commit ed57c693081322dee2ec336832d5602d72b2a974
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
werkzeug: => 0.7.1
commit fb27ad65f897de427df142b81581c7a021f1f13e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
thunar: => 1.2.2
commit 1df0a2bf3765ad50f957ec761302ca6e546b6b93
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
firefox: Few cleanups including patch to remove extra glyph in
title bar.
commit 6f78ff9700b7d386035fccc8ada9e45350d5f833
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
firefox: Major spell update to get 5.0.1 to build. Works for me. :)
commit 094844f7fdcdf9c1d2c8d85ffd4c578ee185f7a4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
video/minitube: version 1.5
commit ea84046f2bf97e2ea2eb995895621275087a4516
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
wine: Updated devel to 1.3.26
commit 006aca46d535aba60f38093b602cb792bc25e038
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>
linux 2.6.39.4
commit 62f884ee77fbd98239b8448d0392e42a3eb822fc
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 9bd85de..0d2d299 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.7.1-0
+ VERSION=6.7.1-2
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-
SOURCE_HASH=sha512:ae5c8340e77c6310ca472c941cb2277c80b28a1ec2c566de3bcb8fd53e62cff4ef74d86efbe6aaff161b6be4c43075a5e59fef1bb143a54e49275d0469f4c589
+
SOURCE_HASH=sha512:2278bc5d442d4dedb2fde3d474eccb793bbb7e6601ef9987a42173c42da860b65ec48a8b992a76fdb43ec26800643c4902bd6de52175194a27ff32cfab9c8612
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 9310b88..4c37979 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.7.1-2
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed optional dependency on g++ to gcc with
sub-depends on CXX
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 498a968..e7cd074 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -4,13 +4,6 @@ FIREFOX_HOME="$INSTALL_ROOT/usr/lib/firefox" &&
export MOZ_PHOENIX=1 &&
#
-# Only strip if the user wants us to
-#
-if echo $LDFLAGS | grep -q -- '-s'; then
- OPTS="$OPTS --enable-strip"
-fi &&
-
-#
# No fast optimization for Mozilla, bit us so many times...
#
CFLAGS="${CFLAGS//-Os/-O2}" &&
@@ -23,19 +16,7 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
#
CFLAGS="${CFLAGS//-ffast-math/}" &&
CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
-
-if [[ "$FIREFOX_CVS" == "y" ]]; then
- autoconf-2.13 &&
-# workaround for configure not handling --disable-webm correctly
- if [[ $OPTS =~ --disable-webm ]]; then
- echo ac_add_options --disable-webm >> .mozconfig
- fi
-fi &&
-
-# necko-wifi is part of xulrunner if enabled, but firefox
-# compile fails without wireless_tools without this option
-echo ac_add_options --disable-necko-wifi >> .mozconfig &&
echo ac_add_options --enable-optimize=-O2 >> .mozconfig &&
make_single &&
diff --git a/http/firefox/CONFIGURE b/http/firefox/CONFIGURE
index b3dce72..704b84d 100755
--- a/http/firefox/CONFIGURE
+++ b/http/firefox/CONFIGURE
@@ -1,4 +1,10 @@
-config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n
+config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n &&
config_query FIREFOX_OFFICIAL "Enable official branding? If enabled, you may
\
-be restricted in distributing these binaries IAW mozilla policies" n
+be restricted in distributing these binaries IAW mozilla policies" n &&
+
+config_query FIREFOX_SAFE "Enable safe browsing (anti-phishing)
implementation?" n &&
+
+config_query FIREFOX_STRIP \
+ 'Remove debugging symbols?' \
+ n
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index b38a77f..e860798 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,6 +1,6 @@
depends atk &&
depends curl &&
-depends -sub CXX gcc &&
+depends -sub CXX gcc &&
depends glib2 &&
depends JPEG &&
depends pango &&
@@ -10,22 +10,16 @@ depends zlib &&
depends cairo &&
depends python &&
depends libnotify &&
-if [[ "$FIREFOX_CVS" = "n" ]]; then
depends nspr &&
depends -sub "3.12.x" nss &&
-depends -sub APNG libpng &&
-depends xulrunner
-else
depends autoconf-2.13 &&
-depends libnotify &&
-optional_depends yasm \
- "--enable-webm" \
- "--disable-webm" \
- "enables the WebM video format"
-fi &&
-
depends gtk+2 &&
depends libidl &&
+optional_depends yasm "" "" "Support for WebM media (VP8 video and Vorbis
Audio)" &&
+optional_depends wireless_tools "" "" "for geolocation via WiFi access
points" &&
+optional_depends alsa-lib "" "" "for audio support" &&
+
+
suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index bfb88a3..c933eea 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,14 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=4.0.1
+ VERSION=5.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
-#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6.15
+ VERSION=5.0.1
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 861acfc..53c87c2 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,25 @@
+2011-08-06 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Added option for safe browsing
+ * DEPENDS: Added optional depends yasm removed depends yasm
+ * PRE_BUILD: Enable options for safe browsing and optioanl yasm
+
+2011-08-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel and stable to version 5.0.1
+ * CONFIGURE: Added option to strip debugging symbols
+ * DEPENDS: Added depends yasm for web video
+ Removed depends libpng, needs newer version
+ Removed depends xulrunner, won't build against
+ Added optional for wireless tools and alsa-lib
+ * INSTALL: Removed ln -s for xulrunnerplugins
+ * PRE_BUILD: Added curl patch and options to setup .mozconfig file
+ Added glyph.patch
+ * curl.patch: Added patch for curl-7.21.7
+ * mozconfig3: Removed old file
+ * mozconfig4: Removed old file
+ * mozconfig5: Updated and added new .mozconfig file
+ * firefox-xulrunner.patch: Removed un-needed patch
+ * glyph.patch: Fedora patch to removed char in title bar
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 5364ea7..17466d9 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -42,10 +42,4 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
test -h $FIREFOX_HOME/libnssckbi.so; then
ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $FIREFOX_HOME/libnssckbi.so
fi
-fi &&
-
-
-ln -vs "$INSTALL_ROOT/usr/lib/xulrunner/plugins" \
- "$INSTALL_ROOT/usr/lib/$SPELL-$VERSION/plugins"
-
-
+fi
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index f2f9e2b..635e323 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,15 +3,44 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla* &&