Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.42 grimoire by Arwed von Merkatz (53d612fc10012230cb6ad33f72d68acbc05c989a)

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.42 grimoire by Arwed von Merkatz (53d612fc10012230cb6ad33f72d68acbc05c989a)
  • Date: Wed, 7 Apr 2010 11:12:18 -0500

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

VERSION | 2 +-
http/firefox/DETAILS | 6 +++---
http/firefox/HISTORY | 3 +++
http/xulrunner/DETAILS | 6 +++---
http/xulrunner/HISTORY | 3 +++
kde4-support/shared-desktop-ontologies/DETAILS | 2 +-
kde4-support/shared-desktop-ontologies/HISTORY | 3 +++
mail/alpine/DETAILS | 2 +-
mail/alpine/HISTORY | 4 ++++
mail/alpine/PRE_BUILD | 4 +++-
10 files changed, 25 insertions(+), 10 deletions(-)

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

VERSION: 0.42-2

commit 8c107ea82cba682f10ab27b80f6885967d47555d
Author: George Sherwood <george AT beernabeer.com>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

firefox: Updated to version 3.6.3. SECURITY_PATCH++

commit 42d0b37bf47b6dd76eee1d59a7dbc49345c77efc
Author: George Sherwood <george AT beernabeer.com>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

xulrunner: Updated to version 1.9.2.3 SECURITY_PATCH++

commit 6e4c5cb8474a116b24490da00257e4b08220bd6f
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

shared-desktop-ontologies: fixed SOURCE_URL, bug 15639

commit aab907ead74233ee449e5066a3dacf6ab2e7efaa
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

alpine: update topal to 72, fixes bug 15633
(cherry picked from commit 5e3e39fcf909329650c04d21b5cea89641b54fc2)

diff --git a/VERSION b/VERSION
index 0fc2eb9..00c2187 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.42-1
+0.42-2
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index d200999..b6b693a 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.6
+ VERSION=3.6.3
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6
+ VERSION=3.6.3
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -17,7 +17,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=29
+ SECURITY_PATCH=31
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 82373ba..db8f9da 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2010-04-03 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.6.3. SECURITY_PATCH++
+
2010-01-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: add --disable-necko-wifi to .mozconfig, so configure works
without wireless_tools installed. necko-wifi is part of xulrunner
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index eb300fa..226a17f 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
SPELL=xulrunner
- VERSION=1.9.2
- FFVERSION=3.6
+ VERSION=1.9.2.3
+ FFVERSION=3.6.3
SOURCE=firefox-$FFVERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE2_IGNORE=signature
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
WEB_SITE=http://www.mozilla.org/
- SECURITY_PATCH=11
+ SECURITY_PATCH=13
ENTERED=20060829
LICENSE[0]=MPL
DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index a162132..2ac25d8 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.9.2.3. SECURITY_PATCH++
+
2010-01-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: added workaround for broken configure so disabling
wireless_tools works
diff --git a/kde4-support/shared-desktop-ontologies/DETAILS
b/kde4-support/shared-desktop-ontologies/DETAILS
index 2520823..02dd9b3 100755
--- a/kde4-support/shared-desktop-ontologies/DETAILS
+++ b/kde4-support/shared-desktop-ontologies/DETAILS
@@ -3,7 +3,7 @@

SOURCE_HASH=sha512:1b56305fcb33de9f92a2726d9ada067805892c3b1241af0b523b75d92cfbb56bb782bfbf23348bfecb4576dc19adc0e866cafa3c2bce87edd984b61118d7acc9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/oscaf/files/$SPELL/$VERSION/$SOURCE
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/oscaf/$SPELL/$VERSION/$SOURCE
WEB_SITE=http://sourceforge.net/projects/oscaf
LICENSE[0]=BSD
LICENSE[1]=BY-CC
diff --git a/kde4-support/shared-desktop-ontologies/HISTORY
b/kde4-support/shared-desktop-ontologies/HISTORY
index 1e6f73d..773e881 100644
--- a/kde4-support/shared-desktop-ontologies/HISTORY
+++ b/kde4-support/shared-desktop-ontologies/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: fixed SOURCE_URL, bug #15639
+
2009-11-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2

diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
index 576ff34..3e896b5 100755
--- a/mail/alpine/DETAILS
+++ b/mail/alpine/DETAILS
@@ -68,7 +68,7 @@ if [[ $ALPINE_CHAPPA == y ]]; then

SOURCE21_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/maildir.patch.gz
fi
if [[ $ALPINE_TOPAL == y ]]; then
- VERSION3=70
+ VERSION3=72
SOURCE22=topal-package-$VERSION3.tgz
SOURCE23=topal-package-$VERSION3.tgz.asc

SOURCE22_URL[0]=http://homepage.ntlworld.com/phil.brooke/topal/rel-$VERSION3/$SOURCE22
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index f94193f..a11c4bc 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,7 @@
+2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: topal update to 72, fixes bug 15633
+ * PRE_BUILD: fix to build a native mime-tool
+
2009-11-27 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: version update to re-alpine
* PREPARE: updated for patches
diff --git a/mail/alpine/PRE_BUILD b/mail/alpine/PRE_BUILD
index e2f2a2f..f32158c 100755
--- a/mail/alpine/PRE_BUILD
+++ b/mail/alpine/PRE_BUILD
@@ -23,6 +23,8 @@ fi &&
if [[ $ALPINE_TOPAL == y ]]; then
unpack_file 22 &&
patch -p1 < topal-$VERSION3/$SPELL-2.00.patch-1 &&
-patch -p1 < topal-$VERSION3/$SPELL-2.00.patch-2
+patch -p1 < topal-$VERSION3/$SPELL-2.00.patch-2 &&
+rm -f topal-$VERSION3/MIME-tool/mime-tool &&
+sed -i "s:\-Wall \-O2:\-Wall $CFLAGS:" topal-$VERSION3/Makefile
fi




  • [SM-Commit] GIT changes to stable-0.42 grimoire by Arwed von Merkatz (53d612fc10012230cb6ad33f72d68acbc05c989a), Arwed von Merkatz, 04/07/2010

Archive powered by MHonArc 2.6.24.

Top of Page