Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.30 grimoire by Arwed von Merkatz (e9ee05ec690769c975b8f3785df3ebf7c7a57a1d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.30 grimoire by Arwed von Merkatz (e9ee05ec690769c975b8f3785df3ebf7c7a57a1d)
  • Date: Fri, 6 Mar 2009 11:28:15 -0600

GIT changes to stable-0.30 grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

VERSION | 2 -
audio-players/moc/HISTORY | 4 ++
audio-players/moc/PRE_BUILD | 2 -
audio-players/moc/ffmpeg.patch | 23 --------------
http/xulrunner/DETAILS | 66
++++++++++++++++++++---------------------
http/xulrunner/HISTORY | 3 +
6 files changed, 41 insertions(+), 59 deletions(-)

New commits:
commit e9ee05ec690769c975b8f3785df3ebf7c7a57a1d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

VERSION: 0.30-2

commit 6b3815480511936f6370922f42e45b094b6746e5
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

moc: Removed patch incorporated upstream. Appears they changed the
source and didn't version bump. No integrity failure since we are using
their key and sig. Bug 15087.
(cherry picked from commit 4a5ee4638e3e4b5dc8a32edacdc617b8a574d0d1)

commit d75d7ba5754045187ba36bb36768ae61d881b756
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xulrunner: Release version of xulrunner 1.9.0.6
is finally released. PATCHLEVEL++
(cherry picked from commit 508c890230d21519b89d77bb1109e85b914703da)

diff --git a/VERSION b/VERSION
index 49575fb..49d38a3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.30-1
+0.30-2
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index 6158385..6a1139d 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,7 @@
+2009-02-24 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_BUILD: Removed. Bug #15087
+ * ffmpeg.patch: Removed. Fixed upstream without version bump.
+
2009-01-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* ffmpeg.patch: fix the include path #14349 (by Javier)
* DEPENDS: changed ffmpeg-svn to LIBAVCODEC
diff --git a/audio-players/moc/PRE_BUILD b/audio-players/moc/PRE_BUILD
deleted file mode 100755
index ed8a1e0..0000000
--- a/audio-players/moc/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/ffmpeg.patch
diff --git a/audio-players/moc/ffmpeg.patch b/audio-players/moc/ffmpeg.patch
deleted file mode 100644
index 1226e4b..0000000
--- a/audio-players/moc/ffmpeg.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur moc-2.4.3.orig/configure moc-2.4.3/configure
---- moc-2.4.3.orig/configure 2008-03-12 20:01:40.000000000 -0600
-+++ moc-2.4.3/configure 2008-03-12 20:42:11.000000000 -0600
-@@ -29013,6 +29013,7 @@
- fi
-
-
-+ libavformat_CFLAGS='-I/usr/include/ffmpeg'
- if test "x$FFMPEG_CONFIG" = "xyes"
- then
- libavformat_CFLAGAS=`ffmpeg-config --cflags`
-diff -Naur moc-2.4.3.orig/decoder_plugins/ffmpeg/ffmpeg.c
moc-2.4.3/decoder_plugins/ffmpeg/ffmpeg.c
---- moc-2.4.3.orig/decoder_plugins/ffmpeg/ffmpeg.c 2008-03-12
20:01:40.000000000 -0600
-+++ moc-2.4.3/decoder_plugins/ffmpeg/ffmpeg.c 2008-03-12 20:10:43.000000000
-0600
-@@ -22,7 +22,7 @@
- #ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
-
- /* FFmpeg also likes common names, without that, our common.h and log.h
would
- * not be included. */
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index d0902cc..7785992 100644
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,42 +1,42 @@
SPELL=xulrunner
VERSION=1.9.0.6
- SOURCE=$SPELL-$VERSION.tar.bz2
-# SOURCE2=$SOURCE.asc
-# SOURCE2_IGNORE=signature
-# SOURCE_GPG=firefox.gpg:$SOURCE2:WORKS_FOR_ME
-
SOURCE_HASH=sha512:552915eec0bd5408856e88463ce889ed85e5af8ead250f4d691807025e8e050d50e21baac999fa33eea10b471923715e068292a76391d91b34ead405738ece5a
+ SOURCE=$SPELL-$VERSION-source.tar.bz2
+ SOURCE2=$SOURCE.asc
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG=firefox.gpg:$SOURCE2:WORKS_FOR_ME
+#
SOURCE_HASH=sha512:552915eec0bd5408856e88463ce889ed85e5af8ead250f4d691807025e8e050d50e21baac999fa33eea10b471923715e068292a76391d91b34ead405738ece5a
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URI=$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URI=$SPELL/releases/$VERSION/source/$SOURCE2
- SOURCE_URL[0]=http://dbg.download.sourcemage.org/distro/$SOURCE
-#SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
-# SOURCE_URL[1]=ftp://archive.progeny.com/$SOURCE_URI
-# SOURCE_URL[2]=http://ftp.oleane.net/pub/$SOURCE_URI
-# SOURCE_URL[3]=ftp://ftp.chg.ru/pub/WWW/mozilla/$SOURCE_URI
-#
SOURCE_URL[4]=ftp://ftp.sunsite.kth.se/mirrors/ftp.mozilla.org/$SOURCE_URI
-# SOURCE_URL[5]=http://ftp.cvut.cz/$SOURCE_URI
-#
SOURCE_URL[6]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/$SOURCE_URI
-# SOURCE_URL[7]=http://mirrors.xmission.com/$SOURCE_URI
-# SOURCE_URL[8]=ftp://gd.tuwien.ac.at/infosys/browsers/$SOURCE_URI
-# SOURCE_URL[9]=ftp://ftp.planetmirror.com.au/pub/$SOURCE_URI
-# SOURCE_URL[10]=http://ftp.uni-erlangen.de/pub/mirrors/$SOURCE_URI
-# SOURCE_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE_URI
-# SOURCE_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE_URI
-# SOURCE2_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE2_URI
-# SOURCE2_URL[1]=ftp://archive.progeny.com/$SOURCE2_URI
-# SOURCE2_URL[2]=http://ftp.oleane.net/pub/$SOURCE2_URI
-# SOURCE2_URL[3]=ftp://ftp.chg.ru/pub/WWW/mozilla/$SOURCE2_URI
-#
SOURCE2_URL[4]=ftp://ftp.sunsite.kth.se/mirrors/ftp.mozilla.org/$SOURCE2_URI
-# SOURCE2_URL[5]=http://ftp.cvut.cz/$SOURCE2_URI
-#
SOURCE2_URL[6]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/$SOURCE2_URI
-# SOURCE2_URL[7]=http://mirrors.xmission.com/$SOURCE2_URI
-# SOURCE2_URL[8]=ftp://gd.tuwien.ac.at/infosys/browsers/$SOURCE2_URI
-# SOURCE2_URL[9]=ftp://ftp.planetmirror.com.au/pub/$SOURCE2_URI
-# SOURCE2_URL[10]=http://ftp.uni-erlangen.de/pub/mirrors/$SOURCE2_URI
-# SOURCE2_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE2_URI
-# SOURCE2_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE2_URI
+# SOURCE_URL[0]=http://dbg.download.sourcemage.org/distro/$SOURCE
+SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
+ SOURCE_URL[1]=ftp://archive.progeny.com/$SOURCE_URI
+ SOURCE_URL[2]=http://ftp.oleane.net/pub/$SOURCE_URI
+ SOURCE_URL[3]=ftp://ftp.chg.ru/pub/WWW/mozilla/$SOURCE_URI
+ SOURCE_URL[4]=ftp://ftp.sunsite.kth.se/mirrors/ftp.mozilla.org/$SOURCE_URI
+ SOURCE_URL[5]=http://ftp.cvut.cz/$SOURCE_URI
+ SOURCE_URL[6]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/$SOURCE_URI
+ SOURCE_URL[7]=http://mirrors.xmission.com/$SOURCE_URI
+ SOURCE_URL[8]=ftp://gd.tuwien.ac.at/infosys/browsers/$SOURCE_URI
+ SOURCE_URL[9]=ftp://ftp.planetmirror.com.au/pub/$SOURCE_URI
+ SOURCE_URL[10]=http://ftp.uni-erlangen.de/pub/mirrors/$SOURCE_URI
+ SOURCE_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE_URI
+ SOURCE_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE_URI
+ SOURCE2_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE2_URI
+ SOURCE2_URL[1]=ftp://archive.progeny.com/$SOURCE2_URI
+ SOURCE2_URL[2]=http://ftp.oleane.net/pub/$SOURCE2_URI
+ SOURCE2_URL[3]=ftp://ftp.chg.ru/pub/WWW/mozilla/$SOURCE2_URI
+
SOURCE2_URL[4]=ftp://ftp.sunsite.kth.se/mirrors/ftp.mozilla.org/$SOURCE2_URI
+ SOURCE2_URL[5]=http://ftp.cvut.cz/$SOURCE2_URI
+
SOURCE2_URL[6]=ftp://ftp.mirror.ac.uk/sites/ftp.mozilla.org/pub/$SOURCE2_URI
+ SOURCE2_URL[7]=http://mirrors.xmission.com/$SOURCE2_URI
+ SOURCE2_URL[8]=ftp://gd.tuwien.ac.at/infosys/browsers/$SOURCE2_URI
+ SOURCE2_URL[9]=ftp://ftp.planetmirror.com.au/pub/$SOURCE2_URI
+ SOURCE2_URL[10]=http://ftp.uni-erlangen.de/pub/mirrors/$SOURCE2_URI
+ SOURCE2_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE2_URI
+ SOURCE2_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE2_URI
WEB_SITE=http://www.mozilla.org/
- PATCHLEVEL=4
+ PATCHLEVEL=5
SECURITY_PATCH=3
ENTERED=20060829
LICENSE[0]=MPL
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 2fe0e9d..6334642 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2009-02-16 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to released version. PATCHLEVEL++
+
2009-02-04 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.9.0.6. Updated SOURCE for scm version.
SECURITY_PATCH++



  • [SM-Commit] GIT changes to stable-0.30 grimoire by Arwed von Merkatz (e9ee05ec690769c975b8f3785df3ebf7c7a57a1d), Arwed von Merkatz, 03/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page