Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (dd4c2a818d5ee80da489fdcd760a066f6cc4fa51)

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 devel-xorg-modular grimoire by Vlad Glagolev (dd4c2a818d5ee80da489fdcd760a066f6cc4fa51)
  • Date: Sun, 7 Aug 2011 13:20:32 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

VERSION | 2
chat-im/gajim/DEPENDS | 1
chat-im/gajim/HISTORY | 3
graphics/imagemagick/DETAILS | 4
graphics/imagemagick/HISTORY | 3
http/firefox/BUILD | 19 --
http/firefox/CONFIGURE | 10 -
http/firefox/DEPENDS | 18 --
http/firefox/DETAILS | 5
http/firefox/HISTORY | 22 ++
http/firefox/INSTALL | 8
http/firefox/PRE_BUILD | 41 ++++
http/firefox/curl.patch | 84
++++++++++
http/firefox/firefox-xulrunner.patch | 14 -
http/firefox/glyph.patch | 15 +
http/firefox/mozconfig3 | 28 ---
http/firefox/mozconfig4 | 28 ---
http/firefox/mozconfig5 | 28 +++
kernels/linux/HISTORY | 11 +
kernels/linux/PREPARE | 6
kernels/linux/info/patches/maintenance_patches/patch-2.6.39.4 | 6
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.1 | 6
kernels/linux/latest.defaults | 4
kernels/linux/volatiles | 1
mail/thunderbird/BUILD | 3
mail/thunderbird/DETAILS | 2
mail/thunderbird/HISTORY | 6
mail/thunderbird/INSTALL | 3
mail/thunderbird/PRE_BUILD | 2
python-pypi/werkzeug/DETAILS | 4
python-pypi/werkzeug/HISTORY | 3
utils/pcmciautils/DETAILS | 2
utils/pcmciautils/HISTORY | 3
utils/quvi/DETAILS | 4
utils/quvi/HISTORY | 3
video-libs/libass/DETAILS | 4
video-libs/libass/HISTORY | 3
video/minitube/DETAILS | 4
video/minitube/HISTORY | 3
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
xfce/thunar/DETAILS | 4
xfce/thunar/HISTORY | 3
43 files changed, 281 insertions(+), 147 deletions(-)

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>

linux 3.0.1

diff --git a/VERSION b/VERSION
index c19ae48..1d8f979 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.59-test
+0.60-test
diff --git a/chat-im/gajim/DEPENDS b/chat-im/gajim/DEPENDS
index b02cb7c..e5df6c4 100755
--- a/chat-im/gajim/DEPENDS
+++ b/chat-im/gajim/DEPENDS
@@ -9,4 +9,5 @@ suggest_depends farsight2 "" "" "for ability to start audio
and video chat" &&
suggest_depends pyopenssl "" "" "for secure connections support" &&
suggest_depends dbus-python "" "" "to control Gajim via commandline" &&
suggest_depends pycrypto "" "" "for encrypting chat messages" &&
+suggest_depends libxscrnsaver "" "" "for automatic status support" &&
suggest_depends gtkspell "" "" "for spell checking support"
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 95936fc..090dac1 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added libxscrnsaver suggest dep
+
2011-07-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.14.4

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* &&

-patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch &&
+#Fix compilation with curl-7.21.7
+# https://bug673072.bugzilla.mozilla.org/attachment.cgi?id=547353
+patch -p0 < $SPELL_DIRECTORY/curl.patch &&

-if [[ "$FIREFOX_CVS" == "n" ]]; then
- cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig
+#Fedora patch to remove glyph in title bar
+# http://osdir.com/ml/scm-fedora-commits/2011-06/msg10320.html
+patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
+
+cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
+
+if [[ "$FIREFOX_SAFE" == "y" ]]; then
+ sed -i '27iac_add_options --enable-safe-browsing' .mozconfig
else
- cp -v $SPELL_DIRECTORY/mozconfig4 .mozconfig
-fi
+ sed -i '27iac_add_options --disable-safe-browsing' .mozconfig
+fi &&
+
+if is_depends_enabled $SPELL wireless_tools; then
+ sed -i '27iac_add_options --enable-necko-wifi' .mozconfig
+else
+ sed -i '27iac_add_options --disable-necko-wifi' .mozconfig
+fi &&
+
+if is_depends_enabled $SPELL yasm; then
+ sed -i '27iac_add_options --enable-webm' .mozconfig
+else
+ sed -i '27iac_add_options --disable-webm' .mozconfig
+fi &&
+
+if ! is_depends_enabled $SPELL alsa-lib; then
+ sed -i '27iac_add_options --disable-ogg' .mozconfig &&
+ sed -i '27iac_add_options --disable-wave' .mozconfig
+fi &&
+
+if [[ "$FIREFOX_STRIP" == "y" ]]; then
+ sed -i '27iac_add_options --enable-strip' .mozconfig
+fi &&


if [[ $FIREFOX_OFFICIAL == y ]]; then
- sed -i '24iac_add_options --enable-official-branding' .mozconfig || return
1
+ sed -i '27iac_add_options --enable-official-branding' .mozconfig || return
1
fi
diff --git a/http/firefox/curl.patch b/http/firefox/curl.patch
new file mode 100644
index 0000000..66b90cc
--- /dev/null
+++ b/http/firefox/curl.patch
@@ -0,0 +1,84 @@
+diff -r 15b32ce27a28 config/system-headers
+--- config/system-headers Thu Jul 21 20:50:16 2011 +1200
++++ config/system-headers Thu Jul 21 21:28:49 2011 +1200
+@@ -199,17 +199,16 @@ crypt.h
+ cstddef
+ cstdio
+ cstdlib
+ cstring
+ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+ dbus/dbus.h
+ dbus/dbus-glib.h
+ dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+diff -r 15b32ce27a28 js/src/config/system-headers
+--- js/src/config/system-headers Thu Jul 21 20:50:16 2011 +1200
++++ js/src/config/system-headers Thu Jul 21 21:28:49 2011 +1200
+@@ -199,17 +199,16 @@ crypt.h
+ cstddef
+ cstdio
+ cstdlib
+ cstring
+ ctime
+ ctype.h
+ curl/curl.h
+ curl/easy.h
+-curl/types.h
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
+ dbus/dbus.h
+ dbus/dbus-glib.h
+ dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+diff -r 15b32ce27a28
toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+--- toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
Thu Jul 21 20:50:16 2011 +1200
++++ toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
Thu Jul 21 21:28:49 2011 +1200
+@@ -28,17 +28,16 @@
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ #include "common/linux/http_upload.h"
+
+ #include <assert.h>
+ #include <dlfcn.h>
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+
+ namespace {
+
+ // Callback to get the response data from server.
+ static size_t WriteCallback(void *ptr, size_t size,
+ size_t nmemb, void *userp) {
+ if (!userp)
+ return 0;
+diff -r 15b32ce27a28
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+---
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
Thu Jul 21 20:50:16 2011 +1200
++++
toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
Thu Jul 21 21:28:49 2011 +1200
+@@ -24,17 +24,16 @@
+ // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ #include <curl/curl.h>
+ #include <curl/easy.h>
+-#include <curl/types.h>
+ #include <dlfcn.h>
+
+ #include <iostream>
+ #include <string>
+
+ #include "common/linux/libcurl_wrapper.h"
+
+ using std::string;
diff --git a/http/firefox/firefox-xulrunner.patch
b/http/firefox/firefox-xulrunner.patch
deleted file mode 100644
index e9cabf9..0000000
--- a/http/firefox/firefox-xulrunner.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/rules.mk.orig 2009-06-30 09:00:33.000000000 -0500
-+++ config/rules.mk 2009-06-30 09:00:57.000000000 -0500
-@@ -67,6 +67,11 @@
- SKIP_COPY_XULRUNNER=1
- endif
-
-+# Don't copy xulrunner files at install time, when using system xulrunner
-+ifdef LIBXUL_SDK
-+ SKIP_COPY_XULRUNNER=1
-+endif
-+
- # ELOG prints out failed command when building silently (gmake -s).
- ifneq (,$(findstring -s,$(MAKEFLAGS)))
- ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
diff --git a/http/firefox/glyph.patch b/http/firefox/glyph.patch
new file mode 100644
index 0000000..420205c
--- /dev/null
+++ b/http/firefox/glyph.patch
@@ -0,0 +1,15 @@
+diff -up browser/base/Makefile.in.fu browser/base/Makefile.in
+--- browser/base/Makefile.in.fu 2011-07-01 22:40:52.048773336 -0300
++++ browser/base/Makefile.in 2011-07-01 22:42:30.866213879 -0300
+@@ -62,10 +62,9 @@ EXTRA_JS_MODULES = \
+
+ include $(topsrcdir)/config/rules.mk
+
+-PRE_RELEASE_SUFFIX := ""
++PRE_RELEASE_SUFFIX :=
+
+ DEFINES += \
+- -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+ -DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
+ -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" \
+ $(NULL)
diff --git a/http/firefox/mozconfig3 b/http/firefox/mozconfig3
deleted file mode 100644
index fa47e6e..0000000
--- a/http/firefox/mozconfig3
+++ /dev/null
@@ -1,28 +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-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-ac_add_options --with-system-png=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --enable-application=browser
-ac_add_options --disable-system-cairo
-ac_add_options --enable-default-toolkit=cairo-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-system-libxul
-ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
diff --git a/http/firefox/mozconfig4 b/http/firefox/mozconfig4
deleted file mode 100644
index 5fd53fb..0000000
--- a/http/firefox/mozconfig4
+++ /dev/null
@@ -1,28 +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-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
-#ac_add_options --with-system-png=/usr/lib
-#ac_add_options --with-system-nspr
-#ac_add_options --with-system-nss
-ac_add_options --enable-application=browser
-ac_add_options --disable-system-cairo
-ac_add_options --enable-default-toolkit=cairo-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-system-libxul
-#ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-1.9
-ac_add_options --prefix=$INSTALL_ROOT/usr
-ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig5
new file mode 100644
index 0000000..25aef0c
--- /dev/null
+++ b/http/firefox/mozconfig5
@@ -0,0 +1,28 @@
+#
+# See http://www.mozilla.org/build/ for build instructions.
+#
+
+# Options for client.mk.
+mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
+mk_add_options AUTOCONF=autoconf2.13
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg=/usr/lib
+ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --disable-system-png
+ac_add_options --enable-application=browser
+ac_add_options --disable-system-cairo
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --disable-freetype2
+ac_add_options --enable-pango
+ac_add_options --enable-svg
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --prefix=$INSTALL_ROOT/usr
+ac_add_options --mandir=$INSTALL_ROOT/usr
+ac_add_options --enable-optimize="$CFLAGS"
+ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 4968dbe..7308545 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,14 @@
+2011-08-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * PREPARE: apply natural version sorting
+ * volatiles: the whole ^/lib/modules is located in global volatiles in
+ /var/lib/sorcery/volatiles
+
+2011-08-05 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.0.1
+ * info/patches/maintenance_patches_3/patch-3.0.1: added
+ * latest.defaults: updated latest to patch-2.6.39.4
+ * info/patches/maintenance_patches/patch-2.6.39.4: added
+
2011-08-02 Ladislav Hagara <hgr AT vabo.cz>
* info/patches/maintenance_patches/patch-2.6.35.14: added

diff --git a/kernels/linux/PREPARE b/kernels/linux/PREPARE
index 4b3cc17..26552bc 100755
--- a/kernels/linux/PREPARE
+++ b/kernels/linux/PREPARE
@@ -294,7 +294,7 @@ function custom_kernel()
function new_tree_menu()
{
menu=""
- versions="`ls -r1 $KERNELS_DIRECTORY`"
+ versions="`ls -1vr $KERNELS_DIRECTORY/`"
for version in $versions
do
menu="${menu}${version} Linux_Kernel Select_one "
@@ -333,7 +333,7 @@ function patch_list()
patches="`ls -1 $KPATCHES_DIRECTORY/`"
for patch in $patches
do
- patchvers="`ls -1r $KPATCHES_DIRECTORY/${patch}`"
+ patchvers="`ls -1vr $KPATCHES_DIRECTORY/${patch}`"
found="false"
for patchver in $patchvers
do
@@ -371,7 +371,7 @@ function list_specific_patch_dir()
fi
echo $2
fi
- patchvers="`ls -1r $KPATCHES_DIRECTORY/$2`"
+ patchvers="`ls -1vr $KPATCHES_DIRECTORY/$2`"
for patchver in $patchvers
do
source_patch $patchver
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.39.4
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.39.4
new file mode 100755
index 0000000..7a19f67
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.39.4
@@ -0,0 +1,6 @@
+appliedkernels="2.6.39"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.1
new file mode 100755
index 0000000..47f5fb5
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.1
@@ -0,0 +1,6 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 1120540..40a591b 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
LATEST_3=3.0
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
-LATEST_maintenance_patches=patch-2.6.39.3
-LATEST_maintenance_patches_3=patch-3.0
+LATEST_maintenance_patches=patch-2.6.39.4
+LATEST_maintenance_patches_3=patch-3.0.1
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/kernels/linux/volatiles b/kernels/linux/volatiles
index 5fc9c0f..ddfc271 100755
--- a/kernels/linux/volatiles
+++ b/kernels/linux/volatiles
@@ -1,2 +1 @@
-^/lib/modules/*/modules.*
^/boot/config-*
diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index ffe9a9b..e1dc3e4 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,4 +1,4 @@
-cd $SOURCE_DIRECTORY/comm-1.9.2 &&
+cd $SOURCE_DIRECTORY/comm-* &&

THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
export MOZ_THUNDERBIRD="1" &&
@@ -34,7 +34,6 @@ fi
./configure --prefix=${INSTALL_ROOT}/usr \
--with-user-appdir=.thunderbird \
--enable-application=mail \
- --enable-static \
--disable-crashreporter \
$OPTS &&

diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 98f1b40..1759406 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=3.1.10
+ VERSION=5.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index c77aa53..2aab2c8 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,9 @@
+2011-08-07 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 5.0
+ * PRE_BUILD: Updated directory name
+ * BUILD: Updated directory name. Removed invalid option "enable
static"
+ * INSTALL: regxpcon doesn't exist now. Removed it and touch command
+
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/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
index d5a11ca..03e7069 100755
--- a/mail/thunderbird/INSTALL
+++ b/mail/thunderbird/INSTALL
@@ -8,9 +8,6 @@ make install &&
cd ${INSTALL_ROOT}/usr/lib/thunderbird &&
export LD_LIBRARY_PATH="$THUNDERBIRD_HOME" &&
export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" &&
-$SOURCE_DIRECTORY/comm-1.9.2/mozilla/dist/bin/regxpcom &&
-touch `find . -name *.rdf` &&
-

#
# Create symlink from NSS Root CA store, if it exists. NSS requires this
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index dc78bba..4a4232a 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,4 +1,4 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
unpack_file '' &&
-cd comm-1.9.2
+cd comm-*
diff --git a/python-pypi/werkzeug/DETAILS b/python-pypi/werkzeug/DETAILS
index 78cf2b9..5f52bd3 100755
--- a/python-pypi/werkzeug/DETAILS
+++ b/python-pypi/werkzeug/DETAILS
@@ -1,8 +1,8 @@
SPELL=werkzeug
- VERSION=0.7
+ VERSION=0.7.1
SOURCE=Werkzeug-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/W/Werkzeug/${SOURCE}
-
SOURCE_HASH=sha512:0692aef85abd8e794665158321379e33f28f726d0258f086b983f611959abf1c89e2213f0dcdda6bc567ab056def2ca08648bdbe6cd544e483daec31692fefd3
+
SOURCE_HASH=sha512:fb831ae7d1fc8a750534bd596975eb08bfdd3ae6310660cb1976e82cd107e29c3a05fbcb6e5df1bf9c741d4c9af8c522bab1efb916cfa6bd7dcdfa77b13a1aeb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Werkzeug-${VERSION}"
WEB_SITE=http://werkzeug.pocoo.org/
LICENSE[0]=BSD
diff --git a/python-pypi/werkzeug/HISTORY b/python-pypi/werkzeug/HISTORY
index 955f486..5b25245 100644
--- a/python-pypi/werkzeug/HISTORY
+++ b/python-pypi/werkzeug/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.1
+
2011-07-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7

diff --git a/utils/pcmciautils/DETAILS b/utils/pcmciautils/DETAILS
index ffe2c5c..61f0e43 100755
--- a/utils/pcmciautils/DETAILS
+++ b/utils/pcmciautils/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcmciautils
- VERSION=017
+ VERSION=018
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=${SOURCE}.sign
SOURCE_URL=$KERNEL_URL/pub/linux/utils/kernel/pcmcia/$SOURCE
diff --git a/utils/pcmciautils/HISTORY b/utils/pcmciautils/HISTORY
index 6996868..b0d4acb 100644
--- a/utils/pcmciautils/HISTORY
+++ b/utils/pcmciautils/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 018
+
2010-05-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 017

diff --git a/utils/quvi/DETAILS b/utils/quvi/DETAILS
index 88d02ba..c617715 100755
--- a/utils/quvi/DETAILS
+++ b/utils/quvi/DETAILS
@@ -1,9 +1,9 @@
SPELL=quvi
- VERSION=0.2.17
+ VERSION=0.2.19
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:7d39011c4fcf18175a1a6c8031236a4279075c97664de3b040a6dba1762005338238bb4693f15acb76678bd27c0da1b5195991d9312087be7f79ef8db5752f2a
+
SOURCE_HASH=sha512:156eabd9674ec120279950295914b96c907cee7bd7d3bf09270734ca2af06736d842a7f21b4b400df461bb9c87986789ecb6104621e3f6a22a7a2631998e2b6e
WEB_SITE=http://quvi.sourceforge.net/
ENTERED=20110131
LICENSE[0]=GPL
diff --git a/utils/quvi/HISTORY b/utils/quvi/HISTORY
index 223651c..f4587dc 100644
--- a/utils/quvi/HISTORY
+++ b/utils/quvi/HISTORY
@@ -1,3 +1,6 @@
+2011-08-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.2.19
+
2011-06-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.17

diff --git a/video-libs/libass/DETAILS b/video-libs/libass/DETAILS
index a2caa60..50ac84a 100755
--- a/video-libs/libass/DETAILS
+++ b/video-libs/libass/DETAILS
@@ -1,8 +1,8 @@
SPELL=libass
- VERSION=0.9.12
+ VERSION=0.9.13
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:345b5138875a31bce4f08bd378ab064d01b26cb51df2010056970158e8f845519f4aedebb0e0609200781e9e28e000ceba17b30e81ba5925f97499b09347e461
+
SOURCE_HASH=sha512:d093a3cd4ff832b82b2648bdc22d0fa4f786e90fb10ca19c35327e79ac5117177fc882615816b4d0bba61cf89b5c49af30bab8cef2367ee3d318d1e76437e9de
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://code.google.com/p/libass";
LICENSE[0]=ISC
diff --git a/video-libs/libass/HISTORY b/video-libs/libass/HISTORY
index d05944d..5dabd45 100644
--- a/video-libs/libass/HISTORY
+++ b/video-libs/libass/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.13
+
2011-07-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.12, GPL -> ISC

diff --git a/video/minitube/DETAILS b/video/minitube/DETAILS
index 1a446e5..f2d4c65 100755
--- a/video/minitube/DETAILS
+++ b/video/minitube/DETAILS
@@ -1,8 +1,8 @@
SPELL=minitube
- VERSION=1.4.3
+ VERSION=1.5
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://flavio.tordini.org/files/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:caa01c498097f76f64e011d91b0a65505a0a0f3cedd3472b9c823d9e7bd1b5504652383613781a5f5515cda6a43ec69d8ecae8e07a541e5a755fafd16a82a60f
+
SOURCE_HASH=sha512:6d673cdc28e22b988e27e9d5dab08e46c2d3c3adeebd90e1baeb21fd7d3d69f844b01e0ef03083c3cc06d41304fc63b6195d902b1e91fa040bd2d8b681ecb98f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://flavio.tordini.org/minitube";
LICENSE[0]=GPL
diff --git a/video/minitube/HISTORY b/video/minitube/HISTORY
index afed8fb..d956d23 100644
--- a/video/minitube/HISTORY
+++ b/video/minitube/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: 1.5
+
2011-05-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: 1.4.3

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 1486027..30aeed5 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.3.25
+ VERSION=1.3.26
else
VERSION=1.2.3
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index f259ddc..da08716 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2011-08-05 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated latest devel to 1.3.26
+
2011-07-27 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated latest devel to 1.3.25

diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index d25f2ae..fb42c07 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -1,11 +1,11 @@
SPELL=thunar
- VERSION=1.3.0
+ VERSION=1.2.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=Thunar-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Thunar-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://thunar.xfce.org/
-
SOURCE_HASH=sha512:c6254fcd64038a245f2ea16d753f18c672df0c164b33b63787800617a7666390f19814fa5e50bcda290326bff2e93a9141ba0b6576099498f0f3070df78020ce
+
SOURCE_HASH=sha512:6bb932ae6820ebab47e82b2fd43afec868db0ea5631b74543a7e42573a40aaac21bfc6322a9c903b95cffa119d0685e4e0c716522931562611e64d20246d4e55
LICENSE[0]=GPL
LICENSE[1]=LGPL
ENTERED=20030608
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index dc8be69..f00fdbb 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,6 @@
+2011-08-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.2 -- return back to stable branch
+
2011-07-13 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: switched from EXTRAS to GUDEV for udev




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (dd4c2a818d5ee80da489fdcd760a066f6cc4fa51), Vlad Glagolev, 08/07/2011

Archive powered by MHonArc 2.6.24.

Top of Page