Skip to Content.
Sympa Menu

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

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 (2fa23024cd759673ac574f23d29d07968b0c169a)
  • Date: Mon, 11 Jun 2012 03:30:13 -0500

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

crypto/openssl/HISTORY | 3
crypto/openssl/UP_TRIGGERS | 4
database/ibpp/DETAILS | 2
database/ibpp/HISTORY | 3
database/mariadb/DEPENDS | 7
database/mariadb/DETAILS | 5
database/mariadb/HISTORY | 4
dev/null |binary
devel/meld/DETAILS | 4
devel/meld/HISTORY | 3
disk/lvm/DETAILS | 2
disk/lvm/HISTORY | 3
editors/emacs/DETAILS | 2
editors/emacs/HISTORY | 5
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 5
http/seamonkey/PRE_BUILD | 4
http/seamonkey/seamonkey-2.9_gcc-4.7-1.patch | 320
----------
kernels/linux/HISTORY | 7
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.34 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.2 | 5
kernels/linux/latest.defaults | 2
libs/libevent/HISTORY | 3
libs/libevent/UP_TRIGGERS | 4
science/gdal/DETAILS | 4
science/gdal/HISTORY | 3
science/maxima/DEPENDS | 3
science/maxima/DETAILS | 4
science/maxima/HISTORY | 4
science/qlandkarte-gt/DETAILS | 4
science/qlandkarte-gt/HISTORY | 3
science/wxmaxima/DETAILS | 4
science/wxmaxima/HISTORY | 3
video-libs/xine-lib/DETAILS | 6
video-libs/xine-lib/HISTORY | 3
video/ffmpeg/DETAILS | 2
video/ffmpeg/HISTORY | 3
video/mplayer/DEPENDS | 2
video/mplayer/DETAILS | 6
video/mplayer/HISTORY | 7
video/mplayer/MPlayer-1.0rc4.tar.bz2.sig | 0
video/mplayer/mplayer.gpg |binary
video/xine-ui/DETAILS | 4
video/xine-ui/HISTORY | 4
video/xine-ui/PRE_BUILD | 3
video/xine-ui/curl.patch | 10
video/xine-ui/xine-ui-0.99.6.tar.bz2.sig | 0
video/xine-ui/xine-ui-0.99.7.tar.xz.sig |binary
xfce/libxfce4util/HISTORY | 3
xfce/libxfce4util/UP_TRIGGERS | 7
50 files changed, 126 insertions(+), 374 deletions(-)

New commits:
commit 5fe2fa6091e9af9b40a7fee55a69a3ac73a29dda
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

seamonkey: => 2.10 (+security)

commit 0272b5f0fb60cf6f30217d7a42c776c7e6146f7b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

editors/emacs: version 24.1

commit 782d679ffec0cec66582ecbcc060236e628a08a5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ffmpeg: => 0.7.13 (legacy)

commit 893ec9bea5b0608aa7c6940154c74247f076bc00
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/mplayer: remove obsolete switch --disable-faad-internal from DEPENDS

commit f8d283d472cf1d99c237b32ca9e4a3eab40cba80
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

mplayer 1.1

why to use gpg checking if almost every new version is signed by new gpg
key, not only mplayer

commit 2236bf8eb4e3eac31d44f50f48dd339c2c9267c1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

lvm 2.02.96

commit 53dd4bac83c5137142812bfab0475f4d926a0547
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/meld: version 1.6.0

commit 3c86ac1feb2b94a7191c4a96243e984bb0d38c59
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xine-ui: => 0.99.7

commit eaa0dc934aedd59ee5dad40aaf2b61019f8adc12
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xine-lib: => 1.2.2

commit 27862ec8f74f50683ec5c0cbb1203a2c5412230b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 3.4.2

commit c08b3ab4dc925acffcce0a67a106f478a0f6523d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.0.34 (lts)

commit 891e79b3150af0492552b226aee1f7da74e8df59
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mariadb: => 5.2.12 (security)

commit 7ffb2c104239e17b39a7950032e3cd227d20db61
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

ibpp: use the right char for (r)

commit d195591efed54749d52a2bd30697faa822fc3ce1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/qlandkarte-gt: version 1.4.2

commit b423d0726396f65242ee2c2a197a85b60c2e5a11
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/gdal: version 1.9.1

commit 4c0aa23778f5308a77f9dd60abc3b03453f09c4f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

openssl: fixed UP_TRIGGERS

commit 050389e4f6d83d8cf3f776e2c4b3496819a4c567
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libevent: corrected UP_TRIGGERS

commit 387eb588640f3592c68c37b32cd635f14fd0dfb3
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libxfce4util: UP_TRIGGERS fixed

if libxfce4util is installed for the first time:

libxfce4util checking for reverse triggers...

Removing dependees of libxfce4util

No spells to cast!
Cannot cast these spells:
---------------------------
libxfce4util (up_triggers)

commit 0394062a54b2624cf9ee0eddda91e2017c1e0ee7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/wxmaxima: version 12.04.0

commit 8162685f495d186715deb243b1fd3ff5dad6cefc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/maxima: version 5.27.0

commit 7e55b63d533eb57c6e780ac72285323834eb623d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/maxima: add dependency on perl

diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 85a9b0d..7fcc22c 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: don't go below spell_ok if it fails check
+
2012-05-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8x, 1.0.0j, SECURITY_PATCH=19
http://www.openssl.org/news/secadv_20120510.txt
diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS
index d9b53dc..3edee70 100755
--- a/crypto/openssl/UP_TRIGGERS
+++ b/crypto/openssl/UP_TRIGGERS
@@ -1,7 +1,7 @@
# this makes ABI changes automatically cast those that depend on openssl via
an up_trigger

-local OLD_SPELL_VERSION=""
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0
+
if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
diff --git a/database/ibpp/DETAILS b/database/ibpp/DETAILS
index e146917..0a27ced 100755
--- a/database/ibpp/DETAILS
+++ b/database/ibpp/DETAILS
@@ -13,7 +13,7 @@ SHORT="C++ classes to access and administer a Firebird
database"
cat << EOF
IBPP, where 'PP' stands for '++', is a C++ client interface for
Firebird Server versions 1.0, 1.5 and further. It also works with
-InterBase� 6.0, though it is expected it might only support Firebird
+InterBase® 6.0, though it is expected it might only support Firebird
in the future. It is a class library, free of any specific
development tool dependancies. It is not tied to any 'visual' or
'RAD' tool. It was indeed developed to add Firebird access in any
diff --git a/database/ibpp/HISTORY b/database/ibpp/HISTORY
index d6d2aad..ca53f7c 100644
--- a/database/ibpp/HISTORY
+++ b/database/ibpp/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: use properly encoded char for (r)
+
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/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index 073b1ad..ed9f6ec 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -7,9 +7,10 @@ optional_depends zlib \
"--with-zlib-dir=bundled" \
"to use system zlib instead of bundled" &&

-optional_depends readline \
- "--without-readline" "" \
- "to use system readline instead of bundled" &&
+# temporarily broken cause of mismatching API
+#optional_depends readline \
+# "--without-readline" "" \
+# "to use system readline instead of bundled" &&

optional_depends libedit \
"--without-libedit" "" \
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index e25ce01..9261999 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -1,8 +1,9 @@
SPELL=mariadb
- VERSION=5.2.10
+ VERSION=5.2.12
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_HASH=sha512:192f050a349ed01cea9d4830c1528584c37ef6d7a1df207ecadfe617ad6a48f85fcbd075792bd929a37310a8d6086f78bd9db716e11d9a98d57e4451096eadd6
+
SOURCE_HASH=sha512:d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333

SOURCE_URL[0]=http://mirrors.fe.up.pt/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[1]=http://ftp-stud.hs-esslingen.de/pub/Mirrors/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE

SOURCE_URL[2]=http://ftp.osuosl.org/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 267d9e9..63d39d3 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2.12; SECURITY_PATCH=1 (CVE-2012-2122)
+ * DEPENDS: disabled system readline support
+
2012-03-02 Arjan Bouter <abouter AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: added NDB for ndbcluster

diff --git a/devel/meld/DETAILS b/devel/meld/DETAILS
index ef204b8..4eec28e 100755
--- a/devel/meld/DETAILS
+++ b/devel/meld/DETAILS
@@ -1,10 +1,10 @@
SPELL=meld
- VERSION=1.5.4
+ VERSION=1.6.0
BRANCH=$(echo $VERSION|cut -d. -f1,2)
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:57f48b94fd57fa9d1e26cd5d3629e0e47bd7f9955104dddfb0cfc0b7f87baf0c6e773c1f1a6bb63fab4fb370f989722fb25cd8e609a6f20e9d327e370b188465
+
SOURCE_HASH=sha512:049af934e140dc53f4d56602ab3be8456307948f0d11b816430788db888820c38744bceb4567724748b727fbd5f5d5ae9f15c5b881b4c941689c038d99acc39d
LICENSE[0]=GPL
KEYWORDS="gnome devel"
WEB_SITE=http://meld.sourceforge.net/
diff --git a/devel/meld/HISTORY b/devel/meld/HISTORY
index d6d94f1..7c3e735 100644
--- a/devel/meld/HISTORY
+++ b/devel/meld/HISTORY
@@ -1,3 +1,6 @@
+2012-06-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.0
+
2012-04-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.4

diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index 6e2262d..ed9cf44 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=lvm
- VERSION=2.02.92
+ VERSION=2.02.96
SOURCE=LVM2.$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index fcd0376..535e89d 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.02.96
+
2012-02-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.92

diff --git a/editors/emacs/DETAILS b/editors/emacs/DETAILS
index 4d878c5..4df5384 100755
--- a/editors/emacs/DETAILS
+++ b/editors/emacs/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-trunk
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=23.4
+ VERSION=24.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:4}
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index 1c9c643..8d7d45d 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,5 +1,8 @@
+2012-06-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 24.1
+
2012-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 23.4
+ * DETAILS: version 23.4

2011-09-28 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: scm branch requires to run autogen.sh
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 3c9c4e5..3fd454e 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
SPELL=seamonkey
- VERSION=2.9.1
+ VERSION=2.10
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:d1aea9283e3f49af6faf51e8629bb16eb9859ec961b674df1f7b9acd34cfa6deb2c0ef4e4391abb5e7b41d4f4f8c0e122ca9e226c42dae8de256159a2bd269c6
+
SOURCE_HASH=sha512:58ee8230174ac34183d68ed29baf3e601898fd5ba692de5856181fc48d0f96a022e17012d569960c75e640c00272e41aaa89ee3b0f34a561211fd22015a697d0
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
SOURCE_URL[1]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
WEB_SITE=http://www.seamonkey-project.org/
- SECURITY_PATCH=42
+ SECURITY_PATCH=43
TMPFS=off
ENTERED=20010922
LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 757d9a4..ed60146 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,8 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.10; SECURITY_PATCH++
+ * PRE_BUILD: fixed packaging for usage with system libs
+ * seamonkey-2.9_gcc-4.7-1.patch: dropped, fixed by upstream
+
2012-05-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.9.1
* PRE_BUILD, seamonkey-2.9_gcc-4.7-1.patch: patch from LFS added
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 28b9254..98d515b 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -5,8 +5,8 @@ cd comm-release &&

sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#'
mozilla/configure &&

-# This patch fixes various files to ensure that Seamonkey compiles with GCC
4.7
-patch -p1 < "$SPELL_DIRECTORY/seamonkey-2.9_gcc-4.7-1.patch" &&
+# ignore packaging errors for the libs we have in a system
+sedit "/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@" suite/installer/Makefile.in &&

patch -p0 < "$SPELL_DIRECTORY/ldap.patch" &&
patch -p0 < "$SPELL_DIRECTORY/mailnews.patch"
diff --git a/http/seamonkey/seamonkey-2.9_gcc-4.7-1.patch
b/http/seamonkey/seamonkey-2.9_gcc-4.7-1.patch
deleted file mode 100644
index e602338..0000000
--- a/http/seamonkey/seamonkey-2.9_gcc-4.7-1.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-Submitted By: Andrew Benton <andy AT benton.eu.com>
-Date: 2012-04-23
-Initial Package Version: 12.0
-Upstream Status: Submitted to Mozilla Bugzilla bug #733867 (not by me)
-Origin: partly from http://gcc.gnu.org/gcc-4.7/porting_to.html and partly
from
-Mozilla Bugzilla bug #733867
-Description: Fixes compiling thunderbird-12.0 with gcc-4.7
-The same effect can be achieved with these seds:
-
-sed -i '/fcntl.h/a#include <unistd.h>' \
-mozilla/ipc/chromium/src/base/file_util_linux.cc
-sed -i '/fcntl.h/a#include <unistd.h>' \
-mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-sed -i '/sys\/time\.h/a#include <unistd.h>' \
-mozilla/ipc/chromium/src/base/time_posix.cc
-sed -i 's#"MSG_LINEBREAK#" MSG_LINEBREAK#g;s#"CRLF#" CRLF#g' \
-mailnews/mime/src/mimemult.cpp \
-mailnews/mime/src/mimedrft.cpp \
-mailnews/local/src/nsPop3Protocol.cpp \
-mailnews/imap/src/nsImapServerResponseParser.cpp \
-mailnews/imap/src/nsImapProtocol.cpp \
-mailnews/imap/src/nsImapMailFolder.cpp \
-mailnews/compose/src/nsSmtpProtocol.cpp \
-mailnews/base/src/nsMsgFolderCompactor.cpp \
-mailnews/base/search/src/nsMsgSearchAdapter.cpp
-
-
-diff -Naur comm-release-orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp
comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release-orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp
2012-04-20 23:32:15.000000000 +0100
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
2012-04-23 11:04:20.605341981 +0100
-@@ -688,7 +688,7 @@
- PL_strcat(encoding, "{");
- lengthStr.AppendInt((PRInt32) strlen(value));
- PL_strcat(encoding, lengthStr.get());
-- PL_strcat(encoding, "}"CRLF);
-+ PL_strcat(encoding, "}" CRLF);
- PL_strcat(encoding, value);
- return NS_OK;
- }
-diff -Naur comm-release-orig/mailnews/base/src/nsMsgFolderCompactor.cpp
comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release-orig/mailnews/base/src/nsMsgFolderCompactor.cpp
2012-04-20 23:32:15.000000000 +0100
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp 2012-04-23
11:04:20.588675565 +0100
-@@ -758,7 +758,7 @@
- }
- }
- }
--#define EXTRA_KEYWORD_HDR "
"MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR "
" MSG_LINEBREAK
-
- // if status offset isn't in the first block, this code won't work.
There's no good reason
- // for the status offset not to be at the beginning of the message
anyway.
-@@ -1216,7 +1216,7 @@
- // check if there's an envelope header; if not, write one.
- if (strncmp(m_dataBuffer, "From ", 5))
- {
-- m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+ m_fileStream->Write("From " CRLF, 7, &bytesWritten);
- m_offlineMsgSize += bytesWritten;
- }
- }
-diff -Naur comm-release-orig/mailnews/compose/src/nsSmtpProtocol.cpp
comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release-orig/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-20
23:32:15.000000000 +0100
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp 2012-04-23
11:04:20.548676167 +0100
-@@ -1722,7 +1722,7 @@
- {
- m_sendDone = true;
- nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-- SendData(url, "QUIT"CRLF); // send a quit command to close the connection
with the server.
-+ SendData(url, "QUIT" CRLF); // send a quit command to close the
connection with the server.
- m_nextState = SMTP_RESPONSE;
- m_nextStateAfterResponse = SMTP_DONE;
- return(0);
-@@ -1969,7 +1969,7 @@
- {
- nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
- // send a quit command to close the connection with the server.
-- if (SendData(url, "QUIT"CRLF) == NS_OK)
-+ if (SendData(url, "QUIT" CRLF) == NS_OK)
- {
- m_nextState = SMTP_RESPONSE;
- m_nextStateAfterResponse = SMTP_ERROR_DONE;
-diff -Naur comm-release-orig/mailnews/imap/src/nsImapMailFolder.cpp
comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release-orig/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-20
23:32:15.000000000 +0100
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp 2012-04-23
11:04:20.535343034 +0100
-@@ -8309,7 +8309,7 @@
- bool needMoreData = false;
- char * newLine = nsnull;
- PRUint32 numBytesInLine = 0;
-- const char *envelope = "From "CRLF;
-+ const char *envelope = "From " CRLF;
- offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
- fileSize += bytesWritten;
- do
-diff -Naur comm-release-orig/mailnews/imap/src/nsImapProtocol.cpp
comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release-orig/mailnews/imap/src/nsImapProtocol.cpp 2012-04-20
23:32:15.000000000 +0100
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp 2012-04-23
11:04:20.505343485 +0100
-@@ -1409,7 +1409,7 @@
- {
- // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
- nsCAutoString commandBuffer(GetServerCommandTag());
-- commandBuffer.Append(" IDLE"CRLF);
-+ commandBuffer.Append(" IDLE" CRLF);
-
- do
- {
-@@ -3287,7 +3287,7 @@
- commandString.Append(messageIds);
- commandString.Append(" (");
- commandString.Append(attribute);
-- commandString.Append(")"CRLF);
-+ commandString.Append(")" CRLF);
- nsresult rv = SendData(commandString.get());
-
- if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
-
- IncrementCommandTagNumber();
- nsCAutoString command(GetServerCommandTag());
-- command.Append(" expunge"CRLF);
-+ command.Append(" expunge" CRLF);
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
- command.Append(gAppName);
- command.Append("\" \"version\" \"");
- command.Append(gAppVersion);
-- command.Append("\")"CRLF);
-+ command.Append("\")" CRLF);
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
- nsCAutoString correctedPassword;
- EscapeUserNamePasswordString(password.get(), &correctedPassword);
- command.Append(correctedPassword);
-- command.Append("\""CRLF);
-+ command.Append("\"" CRLF);
- rv = SendData(command.get(), true /* suppress logging */);
- NS_ENSURE_SUCCESS(rv, rv);
- ParseIMAPandCheckForNewMail();
-@@ -7447,7 +7447,7 @@
- nsCString command(GetServerCommandTag());
- command += " create \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if(NS_SUCCEEDED(rv))
-@@ -7550,7 +7550,7 @@
- nsCString command (GetServerCommandTag());
- command += " lsub \"\" \"";
- command += escapedPattern;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- PR_Free(boxnameWithOnlineDirectory);
-
-@@ -7579,7 +7579,7 @@
- command += useXLIST ?
- " xlist \"\" \"" : " list \"\" \"";
- command += escapedPattern;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- PR_Free(boxnameWithOnlineDirectory);
-
-@@ -7600,7 +7600,7 @@
- nsCString command (GetServerCommandTag());
- command += " subscribe \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -7618,7 +7618,7 @@
- nsCString command (GetServerCommandTag());
- command += " unsubscribe \"";
- command += escapedName;
-- command += "\""CRLF;
-+ command += "\"" CRLF;
-
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
-@@ -7632,7 +7632,7 @@
- if (m_urlInProgress)
- return;
- nsCAutoString command (GetServerCommandTag());
-- command += " IDLE"CRLF;
-+ command += " IDLE" CRLF;
- nsresult rv = SendData(command.get());
- if (NS_SUCCEEDED(rv))
- {
-@@ -7659,7 +7659,7 @@
- nsCOMPtr <nsIAsyncInputStream> asyncInputStream =
do_QueryInterface(m_inputStream);
- if (asyncInputStream)
- asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
-- nsresult rv = SendData("DONE"CRLF);
-+ nsresult rv = SendData("DONE" CRLF);
- // set a short timeout if we don't want to wait for a response
- if (m_transport && !waitForResponse)
- m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7728,8 +7728,8 @@
- PRUint32 msgsHandled = 0;
- const char *formatString;
- formatString = (idsAreUid)
-- ? "%s uid store %s %s"CRLF
-- : "%s store %s %s"CRLF;
-+ ? "%s uid store %s %s" CRLF
-+ : "%s store %s %s" CRLF;
-
- do
- {
-diff -Naur
comm-release-orig/mailnews/imap/src/nsImapServerResponseParser.cpp
comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release-orig/mailnews/imap/src/nsImapServerResponseParser.cpp
2012-04-20 23:32:15.000000000 +0100
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
2012-04-23 11:04:20.452010953 +0100
-@@ -185,7 +185,7 @@
-
- NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' &&
- *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command
string");
-- bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+ bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
- if (sendingIdleDone)
- fWaitingForMoreClientInput = false;
-
-diff -Naur comm-release-orig/mailnews/local/src/nsPop3Protocol.cpp
comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release-orig/mailnews/local/src/nsPop3Protocol.cpp 2012-04-20
23:32:16.000000000 +0100
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp 2012-04-23
11:04:20.432011254 +0100
-@@ -2483,7 +2483,7 @@
- return(MK_OUT_OF_MEMORY);
- m_pop3ConData->next_state_after_response = POP3_GET_LIST;
- m_listpos = 0;
-- return SendData(m_url, "LIST"CRLF);
-+ return SendData(m_url, "LIST" CRLF);
- }
-
-
-diff -Naur comm-release-orig/mailnews/mime/src/mimedrft.cpp
comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release-orig/mailnews/mime/src/mimedrft.cpp 2012-04-20
23:32:16.000000000 +0100
-+++ comm-release/mailnews/mime/src/mimedrft.cpp 2012-04-23
11:04:20.408678271 +0100
-@@ -1473,7 +1473,7 @@
- *newbody = 0;
- PL_strcatn(newbody, newbodylen, "<PRE>");
- PL_strcatn(newbody, newbodylen, body);
-- PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+ PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
- PR_Free(body);
- body = newbody;
- }
-diff -Naur comm-release-orig/mailnews/mime/src/mimemult.cpp
comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release-orig/mailnews/mime/src/mimemult.cpp 2012-04-20
23:32:16.000000000 +0100
-+++ comm-release/mailnews/mime/src/mimemult.cpp 2012-04-23
11:04:20.402011705 +0100
-@@ -280,7 +280,7 @@
- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition:
attachment; filename=\""));
- MimeWriteAString(obj, fileName);
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
- MimeWriteAString(obj,
NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
- MimeWriteAString(obj, obj->options->state->detachedFilePath);
- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
- status = MimeWriteAString(obj, header);
- if (status < 0)
- return status;
-- status = MimeWriteAString(obj,
NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding:
8bit"MSG_LINEBREAK));
-+ status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""
MSG_LINEBREAK"Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
- MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition:
inline; filename=\"Deleted: "));
- MimeWriteAString(obj, fileName);
-- MimeWriteAString(obj,
NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted;
date=\""));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\""
MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
- }
- nsCString result;
- char timeBuffer[128];
-@@ -306,8 +306,8 @@
- "%a %b %d %H:%M:%S %Y",
- &now);
- MimeWriteAString(obj, nsDependentCString(timeBuffer));
-- MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-- MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You
deleted an attachment from this message. The original MIME headers for the
attachment were:"MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+ MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You
deleted an attachment from this message. The original MIME headers for the
attachment were:" MSG_LINEBREAK));
- MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
- }
- PRInt32 old_nchildren = container->nchildren;
-diff -Naur
comm-release-orig/mozilla/ipc/chromium/src/base/file_util_linux.cc
comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release-orig/mozilla/ipc/chromium/src/base/file_util_linux.cc
2012-04-20 23:39:41.000000000 +0100
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
2012-04-23 11:03:54.892395244 +0100
-@@ -5,6 +5,7 @@
- #include "base/file_util.h"
-
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include <string>
- #include <vector>
-diff -Naur
comm-release-orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release-orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
2012-04-20 23:39:41.000000000 +0100
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
2012-04-23 11:04:00.442311789 +0100
-@@ -6,6 +6,7 @@
-
- #include <errno.h>
- #include <fcntl.h>
-+#include <unistd.h>
-
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Naur comm-release-orig/mozilla/ipc/chromium/src/base/time_posix.cc
comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release-orig/mozilla/ipc/chromium/src/base/time_posix.cc
2012-04-20 23:39:42.000000000 +0100
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc 2012-04-23
11:04:06.865548542 +0100
-@@ -8,6 +8,7 @@
- #include <mach/mach_time.h>
- #endif
- #include <sys/time.h>
-+#include <unistd.h>
- #ifdef ANDROID
- #include <time64.h>
- #else
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 8a11bb8..a2f3a8d 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,10 @@
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.2
+ * info/patches/maintenance_patches_3/patch-3.4.2: added
+
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.34: added
+
2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.33: added
* info/patches/maintenance_patches_3/patch-3.0.{21-31}: dropped
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.34
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.34
new file mode 100755
index 0000000..7214ffb
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.34
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.34"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="cf1814bacf8eed57e0b4383ac19a9de9df797b2c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.2
new file mode 100755
index 0000000..679d277
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.2
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3b38df9159c44cab8c34675950d9c2594ee4dcc2"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 5eb52c7..75e2fbc 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.4
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.4.1
+LATEST_maintenance_patches_3=patch-3.4.2
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/libs/libevent/HISTORY b/libs/libevent/HISTORY
index bceaf8e..38426e6 100644
--- a/libs/libevent/HISTORY
+++ b/libs/libevent/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: don't compare when spell isn't installed
+
2012-06-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.19

diff --git a/libs/libevent/UP_TRIGGERS b/libs/libevent/UP_TRIGGERS
index b8aa116..4ef15ef 100755
--- a/libs/libevent/UP_TRIGGERS
+++ b/libs/libevent/UP_TRIGGERS
@@ -1,8 +1,8 @@
# up_trigger everything on major version updates

-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)"
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0

-if spell_ok $SPELL && [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]];
then
+if [[ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]]; then
message "This is a possibly incompatible update of $SPELL..." &&
message "Figuring out what spells need to be recast, this may take a
while." &&

diff --git a/science/gdal/DETAILS b/science/gdal/DETAILS
index 5abd5b2..9d83e9b 100755
--- a/science/gdal/DETAILS
+++ b/science/gdal/DETAILS
@@ -1,8 +1,8 @@
SPELL=gdal
- VERSION=1.9.0
+ VERSION=1.9.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://download.osgeo.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:5d51ade953ea5171c7be1b6f12b705e97aaaba8e6e641a87d6a02d1cf52f573f6cf2505397db4f2d176095a7e6dbd01c5c24c313e7abd48a4594919cf9ac8890
+
SOURCE_HASH=sha512:b3a2752a8bc3b0766b258438373a26e95d763e2fc18617ff88763e07e3f90ccabbc183507b23c24974fc818a16546f10439d83ef80ac7bddc22f6edee1c779a7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.gdal.org/";
LICENSE[0]="MIT/X"
diff --git a/science/gdal/HISTORY b/science/gdal/HISTORY
index 883ced8..23564d1 100644
--- a/science/gdal/HISTORY
+++ b/science/gdal/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.9.1
+
2012-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: jpeg -> JPEG
* DETAILS: version 1.9.0
diff --git a/science/maxima/DEPENDS b/science/maxima/DEPENDS
index 5c0ba69..0742306 100755
--- a/science/maxima/DEPENDS
+++ b/science/maxima/DEPENDS
@@ -1,3 +1,4 @@
depends LISP &&
depends tk &&
-depends rlwrap
+depends rlwrap &&
+depends perl
diff --git a/science/maxima/DETAILS b/science/maxima/DETAILS
index 1c0d8df..f083179 100755
--- a/science/maxima/DETAILS
+++ b/science/maxima/DETAILS
@@ -1,9 +1,9 @@
SPELL=maxima
- VERSION=5.24.0
+ VERSION=5.27.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:ace5ca96d5a1b6934cd611729fd746e265f88ffdc502c518f2501db60c433ba62f2e9da76b9b0713624c39667716682d7771cabdab2df7d9ec491da6d50c42a5
+
SOURCE_HASH=sha512:74dcf03c5c603caa54545c05a6f1426ec8207448400289322d193c677fa96eda8098f1296fea582e15342a64a2e048155ef6135a1b0e061f82a842bf0a140959
LICENSE[0]=GPL
WEB_SITE=http://maxima.sourceforge.net/
KEYWORDS="algebra lisp science"
diff --git a/science/maxima/HISTORY b/science/maxima/HISTORY
index 5f4ba94..32a8ea4 100644
--- a/science/maxima/HISTORY
+++ b/science/maxima/HISTORY
@@ -1,3 +1,7 @@
+2012-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.27.0
+ * DEPENDS: added dependency on perl
+
2011-06-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added dependency on rlwrap

diff --git a/science/qlandkarte-gt/DETAILS b/science/qlandkarte-gt/DETAILS
index bf1ed45..b499f3c 100755
--- a/science/qlandkarte-gt/DETAILS
+++ b/science/qlandkarte-gt/DETAILS
@@ -1,8 +1,8 @@
SPELL=qlandkarte-gt
- VERSION=1.4.0
+ VERSION=1.4.2
SOURCE="qlandkartegt-${VERSION}.tar.gz"

SOURCE_URL[0]=http://garr.dl.sourceforge.net/project/qlandkartegt/qlandkartegt/QLandkarteGT%20${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:ed2b76d6c9a76b26c45d9f6d920796e0d2151c64b462217582e37feefb60c5c2116b3c1c36b25c9efd40dae7214cb4d2b412ac98c52b1aa7b65077702350ce86
+
SOURCE_HASH=sha512:86756f1bf81a65da0c74c5dfb60c20abdd6e905b2b75c725c1e8aa63d2d9de9aad73a90b2ffcde473685a4b4b44de92f9cd6e8d4be854ff3aa55687abcde7626
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/qlandkartegt-${VERSION}"
WEB_SITE="http://www.qlandkarte.org/";
LICENSE[0]=GPL
diff --git a/science/qlandkarte-gt/HISTORY b/science/qlandkarte-gt/HISTORY
index 8390f9e..6bc3fa2 100644
--- a/science/qlandkarte-gt/HISTORY
+++ b/science/qlandkarte-gt/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.4.2
+
2012-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added suggested dependency on gpsbabel

diff --git a/science/wxmaxima/DETAILS b/science/wxmaxima/DETAILS
index 73248ca..7c60c44 100755
--- a/science/wxmaxima/DETAILS
+++ b/science/wxmaxima/DETAILS
@@ -1,8 +1,8 @@
SPELL=wxmaxima
- VERSION=11.08.0
+ VERSION=12.04.0
SOURCE="wxMaxima-${VERSION}.tar.gz"

SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/wxMaxima/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:920cae40b1fa8b0f5884b6c629d2d18c6c7b149f443da895abc18b42204551a1dd0cf24bd25604da74c24df481a0f16183957fc2c9df73c72756889b0fb000b2
+
SOURCE_HASH=sha512:3a6a275960948df8356bbebc8dcb16979abaf59bd039a0cfe52bf307250feb628df21a5b3bc0756cc5b1537d7fbd40e753398f5f8229f8670f26ce783416e290
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/wxMaxima-${VERSION}"
WEB_SITE="http://andrejv.github.com/wxmaxima";
LICENSE[0]=GPL
diff --git a/science/wxmaxima/HISTORY b/science/wxmaxima/HISTORY
index 8852357..ca03dd0 100644
--- a/science/wxmaxima/HISTORY
+++ b/science/wxmaxima/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 12.04.0
+
2011-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 11.08.0

diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index c51c6c3..4defb1f 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -1,7 +1,7 @@
SPELL=xine-lib
- VERSION=1.2.1
-
SOURCE_HASH=sha512:7d68bc1ef6a3c15c95218b746437fe7c3ad6fffecab11b39b7580cf1ca0b7e5dda4754f38d459a99d71e82a3b11ac451fefc68fd2f5f3e418fd5136c949c73e4
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.2.2
+
SOURCE_HASH=sha512:338916386adafda85bafef0dae862c49470d7b6ccf2d8c83ada7ac2f50d12746daa0ebd3ec3fd68e063e20a1f86b0508665b3a49ba493e7fa9abf22f17bd8b81
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
WEB_SITE=http://www.xine-project.org/
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 442ea8a..fe6c26b 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,6 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.2; switched source to .xz
+
2012-04-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.1
* DEPENDS: corrected dependencies and flags
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index c421765..2b62472 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -3,7 +3,7 @@ if [[ $FFMPEG_RELEASE == stable ]]; then
VERSION=0.11
SECURITY_PATCH=12
else
- VERSION=0.7.12
+ VERSION=0.7.13
SECURITY_PATCH=11
fi
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index ed0c299..a8baba2 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.13 (legacy)
+
2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated stable to 0.11
* DEPENDS: dirac replaced by schroedinger in stable
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index c345fa7..cfdf360 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -22,7 +22,7 @@ fi &&

optional_depends libvorbis "--disable-tremor-internal
--extra-libs=-lvorbisenc" "" "to use external libvorbis to play ogg/vorbis
audio" &&

-optional_depends faad2 "--enable-faad --disable-faad-internal" "" "to use
shared faad for AAC decoding" &&
+optional_depends faad2 "--enable-faad" "" "to use shared faad for AAC
decoding" &&

# audio codecs
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 7e3e8be..01dd1b7 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -11,8 +11,8 @@ if [[ $MPLAYER_BRANCH == scm ]]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.0rc4
- SOURCE=MPlayer-$VERSION.tar.bz2
+ VERSION=1.1
+ SOURCE=MPlayer-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/releases/$SOURCE
SOURCE_URL[1]=ftp://ftp2.mplayerhq.hu/MPlayer/releases/$SOURCE
@@ -24,7 +24,7 @@ else
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
SECURITY_PATCH=3
fi
- PATCHLEVEL=2
+ PATCHLEVEL=0
WEB_SITE=http://www.mplayerhq.hu
LICENSE[0]=GPL
ENTERED=20010922
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 56caba3..c8abd0c 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,10 @@
+2012-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: removed obsolete switch --disable-faad-internal
+
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1, bz2 -> xz
+ * mplayer.gpg: 06D4D9C7 (Reimar D�ffinger) added
+
2012-01-01 Robin Cook <rcook AT wyrms.net>
* CONFLICTS: added to conflict with mplayer2
* PROVIDES: added to provide MPLAYER
diff --git a/video/mplayer/MPlayer-1.0rc4.tar.bz2.sig
b/video/mplayer/MPlayer-1.0rc4.tar.bz2.sig
deleted file mode 100644
index 4caeb67..0000000
Binary files a/video/mplayer/MPlayer-1.0rc4.tar.bz2.sig and /dev/null differ
diff --git a/video/mplayer/mplayer.gpg b/video/mplayer/mplayer.gpg
index b5efdf0..ca0b92a 100644
Binary files a/video/mplayer/mplayer.gpg and b/video/mplayer/mplayer.gpg
differ
diff --git a/video/xine-ui/DETAILS b/video/xine-ui/DETAILS
index 2772c6f..de334d5 100755
--- a/video/xine-ui/DETAILS
+++ b/video/xine-ui/DETAILS
@@ -1,6 +1,6 @@
SPELL=xine-ui
- VERSION=0.99.6
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.99.7
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
diff --git a/video/xine-ui/HISTORY b/video/xine-ui/HISTORY
index f9ce18d..b0793e7 100644
--- a/video/xine-ui/HISTORY
+++ b/video/xine-ui/HISTORY
@@ -1,3 +1,7 @@
+2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.99.7; switched to .xz source
+ * curl.patch: dropped
+
2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply the patch
* curl.patch: added, to fix compilation with curl >=7.21.7
diff --git a/video/xine-ui/PRE_BUILD b/video/xine-ui/PRE_BUILD
index 4d61fa0..9f1183b 100755
--- a/video/xine-ui/PRE_BUILD
+++ b/video/xine-ui/PRE_BUILD
@@ -1,6 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/curl.patch" &&
-
+# don't force mime db update
sed -i "s: install-data-hook::" misc/Makefile.in
diff --git a/video/xine-ui/curl.patch b/video/xine-ui/curl.patch
deleted file mode 100644
index 57a7f57..0000000
--- a/video/xine-ui/curl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/xitk/download.c.orig 2009-12-19 03:34:22.000000000 +0300
-+++ src/xitk/download.c 2011-09-14 23:13:28.299536494 +0400
-@@ -28,7 +28,6 @@
-
- #ifdef HAVE_CURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
-
diff --git a/video/xine-ui/xine-ui-0.99.6.tar.bz2.sig
b/video/xine-ui/xine-ui-0.99.6.tar.bz2.sig
deleted file mode 100644
index 63f2449..0000000
Binary files a/video/xine-ui/xine-ui-0.99.6.tar.bz2.sig and /dev/null differ
diff --git a/video/xine-ui/xine-ui-0.99.7.tar.xz.sig
b/video/xine-ui/xine-ui-0.99.7.tar.xz.sig
new file mode 100644
index 0000000..4b46c6f
Binary files /dev/null and b/video/xine-ui/xine-ui-0.99.7.tar.xz.sig differ
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index a45cca7..52ff928 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,6 @@
+2012-06-09 Ladislav Hagara <hgr AT vabo.cz>
+ * UP_TRIGGERS: fixed
+
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
* UP_TRIGGER: added, for proper upgrade

diff --git a/xfce/libxfce4util/UP_TRIGGERS b/xfce/libxfce4util/UP_TRIGGERS
index 2b8c75e..ff7732c 100755
--- a/xfce/libxfce4util/UP_TRIGGERS
+++ b/xfce/libxfce4util/UP_TRIGGERS
@@ -1,7 +1,9 @@
# recast everything on minor version update
-spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&

-if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
+if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
message "This is a possibly incompatible update of $SPELL..." &&
message "Figuring out what spells need to be recast, this may take a
while." &&

@@ -11,4 +13,5 @@ if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
up_trigger $each cast_self
fi
done
+ fi
fi



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (2fa23024cd759673ac574f23d29d07968b0c169a), Vlad Glagolev, 06/11/2012

Archive powered by MHonArc 2.6.24.

Top of Page