Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (bef9eedcceda65f18ab9babd77ddb6d85ee76da3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (bef9eedcceda65f18ab9babd77ddb6d85ee76da3)
  • Date: Wed, 6 Jun 2012 11:31:16 -0500

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

ChangeLog | 8 +
audio-players/deadbeef/CONFIGURE | 2
audio-players/deadbeef/DETAILS | 4
audio-players/deadbeef/HISTORY | 4
crypto/cryptsetup-luks/DETAILS | 4
crypto/cryptsetup-luks/HISTORY | 3
crypto/gnutls/DETAILS | 2
crypto/gnutls/HISTORY | 3
crypto/nss/DETAILS | 4
crypto/nss/HISTORY | 3
database/postgresql/DETAILS | 6
database/postgresql/HISTORY | 3
dev/null |binary
devel/bison/DETAILS | 4
devel/bison/HISTORY | 5
devel/bison/bison.gpg |binary
disk/udisks/DEPENDS | 1
disk/udisks/HISTORY | 3
editors/sandy/BUILD | 1
editors/sandy/CONFIGURE | 3
editors/sandy/DEPENDS | 3
editors/sandy/DETAILS | 22 +++
editors/sandy/HISTORY | 4
editors/sandy/INSTALL | 5
editors/sandy/PRE_BUILD | 14 ++
editors/sandy/PROVIDES | 1
gnome2-libs/glib2/HISTORY | 5
gnome2-libs/glib2/PRE_BUILD | 8 -
gnome2-libs/glib2/PRE_SUB_DEPENDS | 3
gnome2-libs/glib2/SUB_DEPENDS | 1
gnome2-libs/pango/DETAILS | 2
gnome2-libs/pango/HISTORY | 3
gnome2-libs/pango/pango-1.30.0.tar.xz.sig | 0
gnome2-libs/pango/pango-1.30.1.tar.xz.sig |binary
gnome3-libs/gcr/DEPENDS | 10 +
gnome3-libs/gcr/HISTORY | 4
http/firefox/DETAILS | 6
http/firefox/HISTORY | 5
http/firefox/PRE_BUILD | 2
http/firefox/mozconfig | 31 ++++
http/firefox/mozconfig5 | 30 ----
http/surf/HISTORY | 4
http/surf/PRE_BUILD | 8 -
kde4-apps/digikam4/DETAILS | 4
kde4-apps/digikam4/HISTORY | 4
kde4-apps/digikam4/PRE_BUILD | 3
kde4-apps/digikam4/boost148.patch | 65
----------
kde4-apps/digikam4/libkipi140.patch | 63
---------
kernels/linux/HISTORY | 14 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.21 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.22 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.23 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.25 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.26 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.27 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.28 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.29 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.30 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.31 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.33 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.1 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.10 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.3 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.4 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.5 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.6 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.1.7 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.10 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.11 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.19 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.4 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.5 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.6 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.7 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.8 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.9 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.1 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.2 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.3 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.4 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.5 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.6 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.3.8 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.1 | 5
kernels/linux/latest.defaults | 2
libs/nspr/DETAILS | 4
libs/nspr/HISTORY | 3
net/libpcap/BUILD | 3
net/libpcap/DEPENDS | 11 +
net/libpcap/HISTORY | 6
net/libpcap/PRE_BUILD | 6
net/libpcap/libnl-3.patch | 21 +++
python-pypi/gdata/DETAILS | 4
python-pypi/gdata/HISTORY | 3
python-pypi/sqlalchemy/DEPENDS | 16 +-
python-pypi/sqlalchemy/DETAILS | 4
python-pypi/sqlalchemy/HISTORY | 4
shell-term-fm/ffmpegthumbnailer/DEPENDS | 5
shell-term-fm/ffmpegthumbnailer/DETAILS | 21 +++
shell-term-fm/ffmpegthumbnailer/HISTORY | 4
shell-term-fm/ffmpegthumbnailer/PRE_BUILD | 4
shell-term-fm/ffmpegthumbnailer/desktop/ffmpegthumbnailer.desktop | 4
shell-term-fm/ffmpegthumbnailer/ffmpegapi_fix_r241.patch | 56
++++++++
smgl/init.d/DEPENDS | 3
smgl/init.d/HISTORY | 3
spelling/hspell/BUILD | 2
spelling/hspell/DETAILS | 2
spelling/hspell/HISTORY | 4
utils/teapot/BUILD | 2
utils/teapot/CONFIGURE | 6
utils/teapot/DEPENDS | 19 ++
utils/teapot/DETAILS | 26 ++++
utils/teapot/HISTORY | 3
video/ffmpeg-svn/DEPENDS | 4
video/ffmpeg-svn/HISTORY | 4
video/ffmpeg/DEPENDS | 19 ++
video/ffmpeg/DETAILS | 2
video/ffmpeg/HISTORY | 6
video/miro/DETAILS | 6
video/miro/HISTORY | 3
windowmanagers/dwm/DETAILS | 21 +--
windowmanagers/dwm/HISTORY | 6
windowmanagers/dwm/PRE_BUILD | 8 -
127 files changed, 508 insertions(+), 404 deletions(-)

New commits:
commit 9d39e46c471ebf042de04f26f4923b62c563ae77
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libpcap: fixed libnl support

commit 1031a35bb6edec9cef25deba59afa0a3e66e6930
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

gcr: added dependency info

commit 188266a6715331891d8426a07fd4531fedfd609e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

glib2: added sub dependency info for python and fixed patching

commit 303e7741088e3d5eefb2d3880e6a49a9bf474e37
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

init.d: fixed udev check for linux 3.x

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

cryptsetup-luks 1.4.3

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

gnutls 3.0.20

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

firefox 13.0, SECURITY_PATCH=49

commit 7a6c79f7f83203a14d9d882f484664faa7ee2abd
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

surf: ensure EDITOR has a value by sourcing /etc/profile.d/editor.sh or
defaulting to nano

commit d7d6d741fc3d04181295d430b70ca87e1fb3d319
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

ffmpegthumbnailer: new spell, Thumbnailer to create thumbnails for video
files.

commit 5e4e25d9f049cd5aa16caf33399102aa137e307a
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

sandy: new spell, A tiny ncurses text editor (Closes #368)

commit f97272664526ee43577eab2441596756dbfe2cc2
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

dwm: => 6.0
fixed formatting for Long description
PRE_BUILD: ensure EDITOR has a value by sourcing /etc/profile.d/editor.sh
or defaulting to nano

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

bison: => 2.5.1

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

linux: => 3.1.10 (eol)

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

linux: => 3.3.8 (lts)

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

linux: => 3.2.19 (lts)

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

linux: => 3.0.33 (lts)

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

nss 3.13.5

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

nspr 4.9.1

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

pango 1.30.1

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

miro 5.0.1

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

digikam4 2.6.0

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

postgresql: => 9.1.4 (security)

commit ccaf700fad2629fffb0008091e4d3e5c932535eb
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

hspell: => 1.2
BUILD: added, build with enable-shared

commit a4296380292d6bf6b3ce337d0f9a67c5b249cd22
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

utils/teapot: new spell, advanced spreadsheet

Teapot is an advanced console spreadsheet. It is novel among
spreadsheets in that it gives spreadsheets 3 dimensions instead of the
standard 2, and it is more programmatically logical, referring to cells
as @(x,y,z) instead of A1B2 or $A3$B4 and similar kludges. There is also
a GUI using FLTK.

This spell is currently incomplete but functional. The console client
builds and works fine. The GUI does not currently build, because it
fails to find FLTK since it can't locate the FLTK cmake recipe. I have
FLTK and cmake both installed, but neither seem to install this file,
and I don't know where it comes from.

I also haven't tested building the user manual since it requires lyx and
latex2html. I did at least test that the dependencies are picked up when
selecting the option, however.

Anyone who is more familiar with CMake and can fix the GUI build is
welcome to do so.

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

sqlalchemy: => 0.7.7, fixed dep flags

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

gdata 2.0.17

commit 3d556e26947bb57a2b68088d2c042a0c6ae6cfbb
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

deadbeef: => 0.5.5
gtk+3 support no longer experimental

commit 450f0531df44b6673da03a082d2b60a4ba566b7d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

udisks: added depends udev with GUDEV subdepends

commit 6f837eed7405e8947aece21dd419e16321930248
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

ffmpeg-svn: remove optional_depends dirac replaced by schroedinger

commit 3360249b418f926ee4cda58058db80832c60ce19
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

ffmpeg: stable => 0.11
DEPENDS: dirac replaced by schroedinger in stable
yasm -> X86-assembler (--disable-yasm is still valid)
optional_depends libvpx added for stable

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

linux 3.4.1

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

libpcap: fixed libnl support

diff --git a/ChangeLog b/ChangeLog
index f2c3569..2693466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-05 Sukneet Basuta <sukneet AT sourcemage.org>
+ * editors/sandy: new spell, A tiny ncurses text editor
+ * shell-term-fm/ffmpegthumbnailer: new spell, Thumbnailer to create
+ thumbnails for video files
+
+2012-06-04 Justin Boffemmyer <flux AT sourcemage.org>
+ * utils/teapot: new spell, a curses-based advanced spreadsheet
+
2012-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* python-pypi/python-sphinx: new spell, a documentation generator for
python

diff --git a/audio-players/deadbeef/CONFIGURE
b/audio-players/deadbeef/CONFIGURE
index 6c9f390..5f1e622 100755
--- a/audio-players/deadbeef/CONFIGURE
+++ b/audio-players/deadbeef/CONFIGURE
@@ -1 +1 @@
-config_query GTK3 "Build with experimental GTK+3 support?" n
+config_query GTK3 "Build with GTK+3 support?" n
diff --git a/audio-players/deadbeef/DETAILS b/audio-players/deadbeef/DETAILS
index f4b7829..de2dac6 100755
--- a/audio-players/deadbeef/DETAILS
+++ b/audio-players/deadbeef/DETAILS
@@ -1,8 +1,8 @@
SPELL=deadbeef
- VERSION=0.5.4
+ VERSION=0.5.5
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:cd73948ec644c23a2f2c927561a81124445f3dfd34b166052403361192d2591f9c037bb7dc3cd889de3aadf6d032fced674ebc12dff4ae9b125a2fca0ac8109a
+
SOURCE_HASH=sha512:18ff9d10f3e31bfde5ae193c8d738d973299b5f96ac4137cd805b6aca843fc60ee81c7371faaad0e5dde6a1a8683231afa85dbd1fa9cd4798d261ba5ae7fcc76
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://deadbeef.sourceforge.net/";
LICENSE[0]="GPLv2"
diff --git a/audio-players/deadbeef/HISTORY b/audio-players/deadbeef/HISTORY
index 597739b..7403200 100644
--- a/audio-players/deadbeef/HISTORY
+++ b/audio-players/deadbeef/HISTORY
@@ -1,3 +1,7 @@
+2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.5.5
+ * CONFIGURE: gtk+3 support no longer experimental
+
2012-05-11 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.5.4
* libzip.patch: updated line location
diff --git a/crypto/cryptsetup-luks/DETAILS b/crypto/cryptsetup-luks/DETAILS
index e933868..edd3d44 100755
--- a/crypto/cryptsetup-luks/DETAILS
+++ b/crypto/cryptsetup-luks/DETAILS
@@ -1,9 +1,9 @@
SPELL=cryptsetup-luks
- VERSION=1.4.2
+ VERSION=1.4.3
SOURCE=cryptsetup-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cryptsetup-$VERSION
SOURCE_URL[0]=http://cryptsetup.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:00927efa1cddfd43113c3fab3b21a9877810328fe162c55e8a5f946268a039ed2b556d9932d4afb2b4a62d4268fed7726b3e21ab2583320a259b21351b1cd961
+
SOURCE_HASH=sha512:e91ad9cda9549802e9ea5cec02273ee4bc1a040883650e903e91a07c8cce8131b0bda068fa3433d2b5b3b7470cf9481d73670267cd419ce2d7b0f673b3601ba3
WEB_SITE=http://code.google.com/p/cryptsetup/
ENTERED=20060117
LICENSE[0]=GPL
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index a8d9128..cc28acf 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,6 @@
+2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.4.3
+
2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.4.2

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 46806d8..bc67f67 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -47,7 +47,7 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.bz2
;;
3.0)
- VERSION=3.0.19
+ VERSION=3.0.20
SOURCE=$SPELL-$VERSION.tar.xz
;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 095aec8..1a7d182 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.20
+
2012-04-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.19

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 91a75c4..1faeaae 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -29,10 +29,10 @@ case $NSS_BRANCH in
# SOURCE2_URL[0]=$SOURCE_URL.asc
;;
3.13)
- VERSION=3.13.4
+ VERSION=3.13.5
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:d39117239030b93e4e644ffaec6788f6b2d4ef604cb6232ca0146882e6d9315834e73804c1b67bf90e79c533104c856cc141a4153f7d946beb122ced0ce49173
+
SOURCE_HASH=sha512:8096390bbb8544ef1c3d5b8e3245b5bb618b4fa718e2fb8ab4c134f3e8b386c07146bbd60a16edd261b4c5014d29b6cf85118ad0e7e43b53ba3fd7c25a7c79b5
;;
esac

diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 18281c4..dbd334f 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.13.5
+
2012-04-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.13.4

diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index cc98de6..4da9d13 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,6 +1,6 @@
SPELL=postgresql
- VERSION=9.1.3
-
SOURCE_HASH=sha512:411b9ed2d5cb4c38388710bc6186c8ccc3bddb9a607a933539bfc8b77df81d45c6f0b8ad9117960b0c5756bab51958f47c1e95943a488713841bd400da27a2e9
+ VERSION=9.1.4
+
SOURCE_HASH=sha512:c49937ada0b011d08b8cfd9b7ac5d593dc5c3e36e97c19b2c6e08bb4f14332854b2c64eb1b77a78d6da9612f3cee2a857644b7bd6aedb7a4cd507c5bc64c4a62
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE
@@ -16,7 +16,7 @@ fi

WEB_SITE=http://www.postgresql.org/
GATHER_DOCS=off
- SECURITY_PATCH=10
+ SECURITY_PATCH=11
ENTERED=20011113
LICENSE[0]=BSD
KEYWORDS="database"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 77f6e0a..bfe6775 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.1.4; SECURITY_PATCH++
+
2012-04-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 9.1.3
SECURITY_PATCH=10
diff --git a/devel/bison/DETAILS b/devel/bison/DETAILS
index 2a4781e..e944892 100755
--- a/devel/bison/DETAILS
+++ b/devel/bison/DETAILS
@@ -1,6 +1,6 @@
SPELL=bison
- VERSION=2.5
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=2.5.1
+ SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/devel/bison/HISTORY b/devel/bison/HISTORY
index 567afc9..81d02b3 100644
--- a/devel/bison/HISTORY
+++ b/devel/bison/HISTORY
@@ -1,3 +1,8 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.5.1; switched to tar.gz extension
+ * bison.gpg: added 78D5264E public key (Akim Demaille
+ <akim.demaille AT gmail.com>)
+
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/devel/bison/bison.gpg b/devel/bison/bison.gpg
index 65903c3..82fe18e 100644
Binary files a/devel/bison/bison.gpg and b/devel/bison/bison.gpg differ
diff --git a/disk/udisks/DEPENDS b/disk/udisks/DEPENDS
index e2ad577..5d33ff9 100755
--- a/disk/udisks/DEPENDS
+++ b/disk/udisks/DEPENDS
@@ -3,6 +3,7 @@ depends parted &&
depends lvm &&
depends libatasmart &&
depends docbook-xsl &&
+depends -sub GUDEV udev &&

optional_depends man \
"--enable-man-pages" \
diff --git a/disk/udisks/HISTORY b/disk/udisks/HISTORY
index 3785790..99cf124 100644
--- a/disk/udisks/HISTORY
+++ b/disk/udisks/HISTORY
@@ -1,3 +1,6 @@
+2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: added depends udev with GUDEV subdepends
+
2011-08-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.4

diff --git a/editors/sandy/BUILD b/editors/sandy/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/editors/sandy/BUILD
@@ -0,0 +1 @@
+make
diff --git a/editors/sandy/CONFIGURE b/editors/sandy/CONFIGURE
new file mode 100755
index 0000000..0f28589
--- /dev/null
+++ b/editors/sandy/CONFIGURE
@@ -0,0 +1,3 @@
+message "sandy does not use a config file, you might want to customize it
now" &&
+message "Your custom config will be saved to
${INSTALL_ROOT}/usr/share/doc/sandy/" &&
+config_query SANDY_CONFIG 'Do you wish to use a custom config.def.h?' n
diff --git a/editors/sandy/DEPENDS b/editors/sandy/DEPENDS
new file mode 100755
index 0000000..0a9fea1
--- /dev/null
+++ b/editors/sandy/DEPENDS
@@ -0,0 +1,3 @@
+depends ncurses &&
+suggest_depends dmenu &&
+suggest_depends xsel
diff --git a/editors/sandy/DETAILS b/editors/sandy/DETAILS
new file mode 100755
index 0000000..d8e2088
--- /dev/null
+++ b/editors/sandy/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=sandy
+if [[ ${SANDY_AUTOUPDATE} == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=scm
+fi
+ SOURCE=${SPELL}-scm.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
+ SOURCE_URL[0]=hg_http://hg.suckless.org/sandy:${SPELL}-scm
+ SOURCE_IGNORE=volatile
+ WEB_SITE=http://tools.suckless.org/sandy/
+ ENTERED=20120229
+ LICENSE[0]=MIT
+ KEYWORDS="editors"
+ SHORT="A tiny ncurses text editor"
+cat << EOF
+Sandy is an ncurses text editor with an easy-to-read, hackable C
+source. Sandy tries to maximize screen estate, minimize the SLOC
+used and not get in your way too much. It can somehow be controlled
+using a named pipe that lives in /tmp and all preferences and
+keybindings are to be chosen at compile time.
+EOF
diff --git a/editors/sandy/HISTORY b/editors/sandy/HISTORY
new file mode 100644
index 0000000..958f8a0
--- /dev/null
+++ b/editors/sandy/HISTORY
@@ -0,0 +1,4 @@
+2012-06-05 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PROVIDES: modified Neko Nyancat's
+ spell files from Feature #368
+ * CONFIGURE, PRE_BUILD, INSTALL: created
diff --git a/editors/sandy/INSTALL b/editors/sandy/INSTALL
new file mode 100755
index 0000000..e112ee4
--- /dev/null
+++ b/editors/sandy/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+if [[ "$SANDY_CONFIG" == 'y' ]]; then
+ mkdir -p ${INSTALL_ROOT}/usr/share/doc/sandy &&
+ cp config.def.h ${INSTALL_ROOT}/usr/share/doc/sandy/
+fi
diff --git a/editors/sandy/PRE_BUILD b/editors/sandy/PRE_BUILD
new file mode 100755
index 0000000..ea284b0
--- /dev/null
+++ b/editors/sandy/PRE_BUILD
@@ -0,0 +1,14 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$SANDY_CONFIG" == 'y' ]]; then
+ if [[ -e ${INSTALL_ROOT}/usr/share/doc/sandy/config.def.h ]]; then
+ cp ${INSTALL_ROOT}/usr/share/doc/sandy/config.def.h ./
+ fi &&
+ if query 'Do you want to edit your config now?' n; then
+ if [ -z"$EDITOR" ]; then
+ . /etc/profile.d/editor.sh
+ fi
+ ${EDITOR:-nano} config.def.h
+ fi
+fi
diff --git a/editors/sandy/PROVIDES b/editors/sandy/PROVIDES
new file mode 100755
index 0000000..8182706
--- /dev/null
+++ b/editors/sandy/PROVIDES
@@ -0,0 +1 @@
+TEXT-EDITOR
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 6dc953d..f3a4b12 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,8 @@
+2012-06-06 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: fixed patching, is_depends_enabled doesn't like
+ providers.
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: added python
+
2012-05-27 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS, PRE_BUILD: Make python optional

diff --git a/gnome2-libs/glib2/PRE_BUILD b/gnome2-libs/glib2/PRE_BUILD
index e033b33..3106958 100755
--- a/gnome2-libs/glib2/PRE_BUILD
+++ b/gnome2-libs/glib2/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-xzcat $SPELL_DIRECTORY/py3.patch.xz |patch -p1 &&
-if ! is_depends_enabled $SPELL PYTHON; then
+if is_depends_enabled $SPELL python3; then
+ message "patching for python3" &&
+ xzcat $SPELL_DIRECTORY/py3.patch.xz |patch -p1
+elif is_depends_enabled $SPELL python; then
+ message "not patching for python3"
+else
find . -name 'Makefile*' -exec sed -i -e '/^SUBDIRS =/,/[^\]$/ {;s,
tests,,g;s, gdbus-2.0/codegen,,g;}' {} +
fi
diff --git a/gnome2-libs/glib2/PRE_SUB_DEPENDS
b/gnome2-libs/glib2/PRE_SUB_DEPENDS
index 541ab10..c555d64 100755
--- a/gnome2-libs/glib2/PRE_SUB_DEPENDS
+++ b/gnome2-libs/glib2/PRE_SUB_DEPENDS
@@ -1,4 +1,7 @@
case $THIS_SUB_DEPENDS in
GLIB_DEVEL) if [[ "$GLIB_VER" == "devel" ]]; then return 0; fi;;
+ PYTHON) if is_depends_enabled $SPELL python; then return 0;
+ elif is_depends_enabled $SPELL python3; then return 0;
+ fi ;;
esac
return 1
diff --git a/gnome2-libs/glib2/SUB_DEPENDS b/gnome2-libs/glib2/SUB_DEPENDS
index 0ac9ba2..0ae7f3d 100755
--- a/gnome2-libs/glib2/SUB_DEPENDS
+++ b/gnome2-libs/glib2/SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
GLIB_DEVEL) echo "Devel release needed, forcing it." &&
GLIB_VER="devel" ;;
+ PYTHON) depends PYTHON ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index 49e3888..efc5e56 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,5 +1,5 @@
SPELL=pango
- VERSION=1.30.0
+ VERSION=1.30.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 376be36..ccc7721 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.30.1
+
2012-03-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.30.0
* PRE_BUILD: autoreconf removed
diff --git a/gnome2-libs/pango/pango-1.30.0.tar.xz.sig
b/gnome2-libs/pango/pango-1.30.0.tar.xz.sig
deleted file mode 100644
index 94e4cc2..0000000
Binary files a/gnome2-libs/pango/pango-1.30.0.tar.xz.sig and /dev/null differ
diff --git a/gnome2-libs/pango/pango-1.30.1.tar.xz.sig
b/gnome2-libs/pango/pango-1.30.1.tar.xz.sig
new file mode 100644
index 0000000..b41ccec
Binary files /dev/null and b/gnome2-libs/pango/pango-1.30.1.tar.xz.sig differ
diff --git a/gnome3-libs/gcr/DEPENDS b/gnome3-libs/gcr/DEPENDS
new file mode 100755
index 0000000..ff7fcb8
--- /dev/null
+++ b/gnome3-libs/gcr/DEPENDS
@@ -0,0 +1,10 @@
+depends -sub PYTHON glib2 &&
+depends libgcrypt &&
+optional_depends p11-kit '' '' 'for P11 support' &&
+optional_depends gobject-introspection \
+ '--enable-introspection=yes' \
+ '--enable-introspection=no' \
+ 'for introspection support'
+optional_depends gtk-doc '--enable-gtk-doc' \
+ '--disable-gtk-doc' \
+ 'to build the documentation'
diff --git a/gnome3-libs/gcr/HISTORY b/gnome3-libs/gcr/HISTORY
index 82bffa7..abf761c 100644
--- a/gnome3-libs/gcr/HISTORY
+++ b/gnome3-libs/gcr/HISTORY
@@ -1,3 +1,7 @@
+2012-06-06 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added the most obvious dependencies,
+ depends on glib2 with PYTHON enabed
+
2012-04-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.4.1

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index b75ffc9..22d6e7d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=12.0
+ VERSION=13.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=12.0
+ VERSION=13.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=48
+ SECURITY_PATCH=49
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f9caefc..a673d2c 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 13.0, SECURITY_PATCH=49
+ * PRE_BUILD, mozconfig5: mozconfig5 -> mozconfig
+ * mozconfig: --disable-crashreporter added
+
2012-04-25 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: 12.0, SECURITY_PATCH=48

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index f62a6d3..8b10399 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -11,7 +11,7 @@ patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
#
http://projects.archlinux.org/svntogit/packages.git/plain/trunk/firefox-install-dir.patch?h=packages/firefox
patch -p1 < $SPELL_DIRECTORY/install_dir.patch &&

-cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
+cp -v $SPELL_DIRECTORY/mozconfig .mozconfig &&

if [[ "$FIREFOX_SAFE" == "y" ]]; then
sed -i '27iac_add_options --enable-safe-browsing' .mozconfig
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
new file mode 100644
index 0000000..609fcbb
--- /dev/null
+++ b/http/firefox/mozconfig
@@ -0,0 +1,31 @@
+#
+# 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 --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --disable-dbus
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
+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/http/firefox/mozconfig5 b/http/firefox/mozconfig5
deleted file mode 100644
index 9e9d2f0..0000000
--- a/http/firefox/mozconfig5
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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 --with-system-nspr
-ac_add_options --with-system-nss
-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/http/surf/HISTORY b/http/surf/HISTORY
index fce6752..da2a64d 100644
--- a/http/surf/HISTORY
+++ b/http/surf/HISTORY
@@ -1,3 +1,7 @@
+2012-06-05 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: ensure EDITOR has a value by sourcing
+ /etc/profile.d/editor.sh or defaulting to nano
+
2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, DOWNLOAD, PREPARE: Use prepare_select_branch

diff --git a/http/surf/PRE_BUILD b/http/surf/PRE_BUILD
index 13e5708..3c877dc 100755
--- a/http/surf/PRE_BUILD
+++ b/http/surf/PRE_BUILD
@@ -6,8 +6,10 @@ if [[ "$SURF_CONFIG" == 'y' ]]; then
if [[ -e ${INSTALL_ROOT}/usr/share/doc/surf/config.def.h ]]; then
cp ${INSTALL_ROOT}/usr/share/doc/surf/config.def.h ./
fi &&
- if query 'Do you want to edit your config now?' n
- then
- ${EDITOR} config.def.h
+ if query 'Do you want to edit your config now?' n; then
+ if [ -z"$EDITOR" ]; then
+ . /etc/profile.d/editor.sh
+ fi
+ ${EDITOR:-nano} config.def.h
fi
fi
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index e4e5d51..44bade3 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -1,7 +1,7 @@
SPELL=digikam4
SPELLX=${SPELL//4}
- VERSION=2.5.0
-
SOURCE_HASH=sha512:e3d500e7719c059a425d77a09005906361fee8ea584002b172393e6156e0d79d5c59a2498e84329b5e42e92dda2850a76c636524392a113a489207b57d0b7ee7
+ VERSION=2.6.0
+
SOURCE_HASH=sha512:7984e8b463a5393a4606a4f6d752c7d006cc62ada6947467c034ec5e7fdd5de12826e0f33bfb07b80bb7c83d03a29273eec618a0e7c0f5588416b94fe1d2768a
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.sourceforge.net/digikam/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index d06a26b..2bc6a0b 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,7 @@
+2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.6.0
+ * PRE_BUILD, libkipi140.patch, boost148.patch: removed
+
2012-02-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.5.0 (Fixed SOURCE_URL[0])
* PRE_BUILD, libkipi140.patch, boost148.patch: added patch to fix
compile
diff --git a/kde4-apps/digikam4/PRE_BUILD b/kde4-apps/digikam4/PRE_BUILD
deleted file mode 100755
index 48600f3..0000000
--- a/kde4-apps/digikam4/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/boost148.patch &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/libkipi140.patch
diff --git a/kde4-apps/digikam4/boost148.patch
b/kde4-apps/digikam4/boost148.patch
deleted file mode 100644
index 6779d1a..0000000
--- a/kde4-apps/digikam4/boost148.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/core/libs/database/imagehistory/imagehistorygraph_boost.h
2012-01-05 08:32:19.837388059 -0500
-+++ b/core/libs/database/imagehistory/imagehistorygraph_boost.h
2012-01-05 09:17:27.798341897 -0500
-@@ -1198,7 +1198,7 @@
- {
- boost::dag_shortest_paths(graph, v,
- // we provide a constant weight
of 1
--
weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+
weight_map(boost::ref_property_map<typename
boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
- // Store distance and
predecessors in QMaps, wrapped to serve as property maps
-
distance_map(VertexIntMapAdaptor(distances)).
-
predecessor_map(VertexVertexMapAdaptor(predecessors))
-@@ -1218,7 +1218,7 @@
- {
- boost::dag_shortest_paths(graph, v,
- // we provide a constant weight
of 1
--
weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+
weight_map(boost::ref_property_map<typename
boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
- // Invert the default compare
method: With greater, we get the longest path
-
distance_compare(std::greater<int>()).
- // will be returned if a node is
unreachable
-@@ -1384,14 +1384,15 @@
- template <class GraphType, typename VertexLessThan>
- class lessThanMapEdgeToTarget
- {
-+ typedef typename
boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
- public:
- lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan
vertexLessThan)
- : g(g), vertexLessThan(vertexLessThan) {}
- const GraphType& g;
- VertexLessThan vertexLessThan;
-- bool operator()(const Edge& a, const Edge& b)
-+ bool operator()(const edge_descriptor& a, const
edge_descriptor& b)
- {
-- return vertexLessThan(boost::target(a.toEdge(), g),
boost::target(b.toEdge(), g));
-+ return vertexLessThan(boost::target(a, g), boost::target(b,
g));
- }
- };
-
-@@ -1402,20 +1403,21 @@
- {
- typedef std::pair<Vertex, QList<Edge> > VertexInfo;
-
-- QList<Edge> outEdges;
-+ typedef typename
boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
-+ QList<edge_descriptor> outEdges;
- std::vector<VertexInfo> stack;
-
- boost::put(color, u, boost::gray_color);
- vis.discover_vertex(u, g);
-
-- outEdges = toEdgeList(boost::out_edges(u, g));
-+ outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
- // Sort edges. The lessThan we have takes vertices, so we use a
lessThan which
- // maps the given edges to their targets, and calls our vertex
lessThan.
- qSort(outEdges.begin(), outEdges.end(),
lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
-
-- foreach(const Edge& e, outEdges)
-+ foreach(const edge_descriptor& e, outEdges)
- {
-- Vertex v = boost::target(e.toEdge(), g);
-+ Vertex v = boost::target(e, g);
- vis.examine_edge(e, g);
- boost::default_color_type v_color = boost::get(color, v);
- if (v_color == boost::white_color)
-
diff --git a/kde4-apps/digikam4/libkipi140.patch
b/kde4-apps/digikam4/libkipi140.patch
deleted file mode 100644
index c22d8f8..0000000
--- a/kde4-apps/digikam4/libkipi140.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/core/utilities/setup/setupplugins.cpp
b/core/utilities/setup/setupplugins.cpp
-index 0f4030a..b8efb35 100644
---- a/core/utilities/setup/setupplugins.cpp
-+++ b/core/utilities/setup/setupplugins.cpp
-@@ -6,8 +6,8 @@
- * Date : 2004-01-02
- * Description : setup Kipi plugins tab.
- *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot
com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail
dot com>
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
-
- panel->setLayout(mainLayout);
-
-+#if KIPI_VERSION < 0x010400
-+ d->checkAllBtn->setVisible(false);
-+ d->clearBtn->setVisible(false);
-+#endif
-+
- initPlugins();
-
- // --------------------------------------------------------
-@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
- void SetupPlugins::slotCheckAll()
- {
- QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
- d->kipiConfig->slotCheckAll();
-+#endif
- QApplication::restoreOverrideCursor();
- }
-
- void SetupPlugins::slotClear()
- {
- QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
- d->kipiConfig->slotClear();
-+#endif
- QApplication::restoreOverrideCursor();
- }
-
-diff --git a/core/utilities/setup/setupplugins.h
b/core/utilities/setup/setupplugins.h
-index 271a569..114e0fa 100644
---- a/core/utilities/setup/setupplugins.h
-+++ b/core/utilities/setup/setupplugins.h
-@@ -6,8 +6,8 @@
- * Date : 2004-01-02
- * Description : setup Kipi plugins tab.
- *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail
dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot
com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail
dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail
dot com>
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-
-
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index a7a8103..8a11bb8 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,17 @@
+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
+ * info/patches/maintenance_patches_3/patch-3.2.19: added
+ * info/patches/maintenance_patches_3/patch-3.2.{1-11}: dropped
+ * info/patches/maintenance_patches_3/patch-3.3.8: added
+ * info/patches/maintenance_patches_3/patch-3.3.{1-6}: dropped
+ * info/patches/maintenance_patches_3/patch-3.1.10: added
+ * info/patches/maintenance_patches_3/patch-3.1.{1-7}: dropped
+
+2012-06-04 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.4.1
+ * info/patches/maintenance_patches_3/patch-3.4.1: added
+
2012-05-21 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=3.4, LATEST_3=3.4
* info/kernels/3.4: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.21
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.21
deleted file mode 100755
index 72112aa..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.21
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.21"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="9a571b350d0e1f7623ea895d5a5601377b112156"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.22
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.22
deleted file mode 100755
index 8ce45b8..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.22
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.22"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="c44a8c69d5911ba342f7037a5307e234b9ecfcb6"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.23
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.23
deleted file mode 100755
index 999c7af..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.23
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.23"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="14569e179edf5dd676d9edd2126e35c5847bd106"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24
deleted file mode 100755
index f9f9cc1..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.24"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="7b59963afe3f978fe71a7cb7c31e6a9087a51ea2"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.25
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.25
deleted file mode 100755
index 311cdc3..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.25
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.25"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="1c59db4bdcf2c11e10ccaf6482a1667a24faea4c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.26
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.26
deleted file mode 100755
index 1ab4fd9..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.26
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.26"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="eb3c114353fc9df31b98c55214fd746cfdb0ca69"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.27
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.27
deleted file mode 100755
index 1365bee..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.27
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.27"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="bc79cd3320529eeb8a5659682afff30875b8b9fb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.28
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.28
deleted file mode 100755
index 52cfeaf..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.28
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.28"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="cc86692a30633e42fa78967057ac3e2839d258f1"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.29
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.29
deleted file mode 100755
index 6830ad1..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.29
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.29"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="ef7f2b601a498d3217740603a7251f33f07e3ec0"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.30
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.30
deleted file mode 100755
index 7cfcf77..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.30
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.30"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="ac1e25b38f443a2c6b7b06e3651434471d5eb346"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.31
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.31
deleted file mode 100755
index b3f1118..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.31
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.0"
-patchversion="${appliedkernels}.31"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
-sha1sum="6cb49bd2e933bb3c40aaa2c88444513047fabcee"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.33
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.33
new file mode 100755
index 0000000..16624fc
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.33
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.33"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="d2a7ff310446873f624d2bc08013849dea0c551c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.1
deleted file mode 100755
index 5c807af..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.1
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.1"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="95a55c8147ea7f893e091e8c0c3bd44821dff4c3"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.10
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.10
new file mode 100755
index 0000000..45c3dd8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.10
@@ -0,0 +1,5 @@
+appliedkernels="3.1"
+patchversion="${appliedkernels}.10"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f15223f34c6fb1a78db55a993591cad7b4dd7d63"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
deleted file mode 100755
index e38e8ce..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.2
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.2"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="9d9348cb4e1fed7fcf8accdbb921d09b92da136a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.3
deleted file mode 100755
index 6f34e53..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.3
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.3"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="1337ab3adbf36035918628ea0f0ce07bbf3273bb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.4
deleted file mode 100755
index 7556543..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.4
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.4"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="5fdc91a2c1a6204f6e0366e637d23faccdf84e01"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.5
deleted file mode 100755
index d1bee35..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.5
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.5"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="ae0b91c518a30633b55f104a4d3920f7ecf108e0"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.6
deleted file mode 100755
index a674314..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.6
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.6"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="c906930339d73538031cc7ffa9f7aa40232c7997"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.7
deleted file mode 100755
index d0b2092..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.1.7
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.1"
-patchversion="${appliedkernels}.7"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="b77f1a4b1ca2d278c82bc551b094befce3388cd4"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1
deleted file mode 100755
index b63160a..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.1"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="3e6dbebd459f21d03e542f933f2d391281871fd6"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.10
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.10
deleted file mode 100755
index 908a56a..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.10
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.10"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="a0f28e0fdcdc2782610513bb4128ae183f609a3f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.11
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.11
deleted file mode 100755
index 4f56004..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.11
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.11"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="4b6b027080b114f5f2ba7aa07d4fac95088d6c44"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.19
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.19
new file mode 100755
index 0000000..9356d47
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.19
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.19"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="95f9349f434dd73bd7d36fc5d538aff1ec6b37c3"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
deleted file mode 100755
index f1e0c50..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.2"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="9e503b4f6d00fa65a3da472373f5c0f2072b6a64"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.4
deleted file mode 100755
index 8547fd2..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.4
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.4"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="c21baa3d83d59fa2e87dea5834e6034bd3245d00"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.5
deleted file mode 100755
index 3e4265a..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.5
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.5"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="402563b8d7d7efd9b4da3f1da5f1a2a922ef8d71"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.6
deleted file mode 100755
index 4f892c1..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.6
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.6"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="5ed014b62c0ebd8d9c3d20953ea5da2b88aeea4a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.7
deleted file mode 100755
index d74c4a1..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.7
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.7"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="59d629be5c7acf2de644fe6a89468d6d67203420"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.8
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.8
deleted file mode 100755
index 7b02174..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.8
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.8"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="83dbb2a93e827614008ff0074c95e1d5cdcdaa6b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.9
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.9
deleted file mode 100755
index 05ac05d..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.9
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.2"
-patchversion="${appliedkernels}.9"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="f279f2c393942f3b59f655e83f4b91951ddf60da"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.1
deleted file mode 100755
index 803ecdf..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.1
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.1"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="19f7d30b990132d1c125b6676de6011983be80d0"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.2
deleted file mode 100755
index adbe193..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.2
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.2"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="5e9b2ba27aa612715575d037b07580e8310f1d9b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.3
deleted file mode 100755
index c76209b..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.3
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.3"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="67c8b4529c8b956349e2bfe5b86f30b24e208479"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.4
deleted file mode 100755
index bcb7558..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.4
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.4"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="e7ce334db46ec222e7a4c976c5307f43f5761e35"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.5
deleted file mode 100755
index f90bf55..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.5
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.5"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="933a0eec5feae941d8740666e32b40ba44ff0bf7"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.6
deleted file mode 100755
index d382d1e..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.6
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.3"
-patchversion="${appliedkernels}.6"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="33df42e70ac0ce872182cbc02ecb0218ba67f846"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.8
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.8
new file mode 100755
index 0000000..ca22c34
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.3.8
@@ -0,0 +1,5 @@
+appliedkernels="3.3"
+patchversion="${appliedkernels}.8"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="9470171a7dcd2da10efa174b23c568a061901a3a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.1
new file mode 100755
index 0000000..bab6b4a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.1
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="d4f39b4f204fa1b4da98dd8fe8a798fd2507693e"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index b79d113..5eb52c7 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
+LATEST_maintenance_patches_3=patch-3.4.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/libs/nspr/DETAILS b/libs/nspr/DETAILS
index 076f53d..d0f2f76 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,11 +1,11 @@
SPELL=nspr
- VERSION=4.9
+ VERSION=4.9.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/nspr/
ENTERED=20050512
-
SOURCE_HASH=sha512:c0c18d06919a20f779b683d3ec24a82bcd48693e00f6aff4f66038c55e16305d050b83e1e6b7a4b3d0da5d1f1db699eb11ae111280989c60f5ea5c42420884d9
+
SOURCE_HASH=sha512:b7613eb5f97d9d8d0254d454fb516a672664fbf46b34eb03cc51a9b3af11d8cbdc117691c068f8e64a8255aadfd28b2814eda53edcd97a643b26b94b5adec341
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=MPL
GATHER_DOCS=no
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index 3ed77c8..17308ed 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.9.1
+
2012-02-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.9

diff --git a/net/libpcap/BUILD b/net/libpcap/BUILD
new file mode 100755
index 0000000..6f9ce09
--- /dev/null
+++ b/net/libpcap/BUILD
@@ -0,0 +1,3 @@
+CFLAGS="-I$INSTALL_ROOT/usr/include/libnl3 $CFLAGS" &&
+
+default_build
diff --git a/net/libpcap/DEPENDS b/net/libpcap/DEPENDS
index 46f3a98..1d85d08 100755
--- a/net/libpcap/DEPENDS
+++ b/net/libpcap/DEPENDS
@@ -1,3 +1,12 @@
depends flex &&
depends bison &&
-optional_depends libnl '' '--without-libnl' 'nettlink support'
+
+optional_depends BLUEZ \
+ "--enable-bluetooth" \
+ "--disable-bluetooth" \
+ "for Bluetooth support" &&
+
+optional_depends libnl \
+ "--with-libnl" \
+ "--without-libnl" \
+ "for netlink support"
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 7b5d9cb..2b3a32b 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,9 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: added, for missing flags
+ * DEPENDS: added optional depends on BLUEZ; corrected flags
+ * PRE_BUILD: added, to apply the patch
+ * libnl-3.patch: added, to make libnl dependency actually work
+
2012-01-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.1

diff --git a/net/libpcap/PRE_BUILD b/net/libpcap/PRE_BUILD
new file mode 100755
index 0000000..8a3b86d
--- /dev/null
+++ b/net/libpcap/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/libnl-3.patch" &&
+
+autoconf
diff --git a/net/libpcap/libnl-3.patch b/net/libpcap/libnl-3.patch
new file mode 100644
index 0000000..2ce5936
--- /dev/null
+++ b/net/libpcap/libnl-3.patch
@@ -0,0 +1,21 @@
+--- configure.in.orig 2012-01-02 04:47:37.000000000 +0400
++++ configure.in 2012-06-04 23:41:10.871001151 +0400
+@@ -431,14 +431,14 @@
+
+ if test x$with_libnl != xno ; then
+ #
+- # Try libnl 2.x first.
++ # Try libnl 3.x first.
+ #
+- AC_CHECK_LIB(nl, nl_socket_alloc,
++ AC_CHECK_LIB(nl-3, nl_socket_alloc,
+ [
+ #
+- # Yes, we have libnl 2.x.
++ # Yes, we have libnl 3.x.
+ #
+- LIBS="-lnl-genl -lnl $LIBS"
++ LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
+ AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is
version 2.x])
+ ],
diff --git a/python-pypi/gdata/DETAILS b/python-pypi/gdata/DETAILS
index f30ad70..6a83d75 100755
--- a/python-pypi/gdata/DETAILS
+++ b/python-pypi/gdata/DETAILS
@@ -1,7 +1,7 @@
SPELL=gdata
SPELLX=gdata-python-client
- VERSION=2.0.16
-
SOURCE_HASH=sha512:563480d9c37f6c822764931c1049929dd20a2b548b9fb1276b7e683c13faa1f14a453209fe85d2b3a42dbc7f786684b99527919ff7b4bd4ffff3f38bc9f2e967
+ VERSION=2.0.17
+
SOURCE_HASH=sha512:814755099ecd4691f13786600975b28be662312c10b22af22e2e4acf31832e8d8dd14da75940afc596fff0cfa26c7def984abc8b7a9175facf1bd662d652ceaf
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://code.google.com/p/$SPELLX
diff --git a/python-pypi/gdata/HISTORY b/python-pypi/gdata/HISTORY
index c55d356..c42f5ea 100644
--- a/python-pypi/gdata/HISTORY
+++ b/python-pypi/gdata/HISTORY
@@ -1,3 +1,6 @@
+2012-06-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.17
+
2012-01-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.16

diff --git a/python-pypi/sqlalchemy/DEPENDS b/python-pypi/sqlalchemy/DEPENDS
index bad51c7..1c508f9 100755
--- a/python-pypi/sqlalchemy/DEPENDS
+++ b/python-pypi/sqlalchemy/DEPENDS
@@ -1,9 +1,7 @@
-depends python &&
-#depends formencode &&
-suggest_depends kinterbasdb "firebird support" &&
-suggest_depends mysql-python "MySQL support" &&
-suggest_depends pygresql "Postgresql support" &&
-suggest_depends pysqlite "sqlite support"
-#if is_depends_enabled $SPELL kinterbasdb;then
-# depends egenix-mx-base
-#fi
+depends python &&
+
+suggest_depends kinterbasdb "" "" "for Firebird support via Kinterbasedb" &&
+suggest_depends mysql-python "" "" "for MySQL support via MySQL-Python" &&
+suggest_depends psycopg2 "" "" "for PostgreSQL support via psycopg2" &&
+suggest_depends pysqlite "" "" "for SQLite support via pysqlite" &&
+suggest_depends -sub SQLITE python "" "" "for SQLite support via native
Python module"
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index 63bb09c..f0f1970 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=0.7.6
-
SOURCE_HASH=sha512:1e5b2274a87542160c65cd6a09272e6dd45aef8f9499c29e5b0eef5cde961fcabbffb1ebe801d2815f480866816e71a3b0dabda8b77e74a778fac0541a379d47
+ VERSION=0.7.7
+
SOURCE_HASH=sha512:02ee0d77a54d1fd12993d29264f3f03f29a0fc18a10ea19e03ac7860f853954ca9ba45a6550591d76b729cc635cd562c02e8fcca23ec356c3af829b547a8bb62
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"

SOURCE_URL[0]=http://pypi.python.org/packages/source/S/$CHEESESHOP_PKG/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index 8090bad..aee5132 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,7 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.7
+ * DEPENDS: updated dependencies; fixed flags
+
2012-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.6

diff --git a/shell-term-fm/ffmpegthumbnailer/DEPENDS
b/shell-term-fm/ffmpegthumbnailer/DEPENDS
new file mode 100755
index 0000000..d6483e9
--- /dev/null
+++ b/shell-term-fm/ffmpegthumbnailer/DEPENDS
@@ -0,0 +1,5 @@
+depends LIBAVCODEC &&
+depends libpng &&
+depends JPEG &&
+
+optional_depends gvfs "--enable-gio" "" "support for gio uris"
diff --git a/shell-term-fm/ffmpegthumbnailer/DETAILS
b/shell-term-fm/ffmpegthumbnailer/DETAILS
new file mode 100755
index 0000000..e55bea0
--- /dev/null
+++ b/shell-term-fm/ffmpegthumbnailer/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=ffmpegthumbnailer
+ VERSION=2.0.7
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+
SOURCE_HASH=sha512:f8bdcdb9227baf849a8db94e83c325666bf05e13f30d2c78b0f8e3536cd3e4463c9d83da68d1398f446682afd81a306332b90e246b17047f910ab509d30ebdc8
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://code.google.com/p/ffmpegthumbnailer/";
+ LICENSE[0]="GPLv2"
+ ENTERED=20120601
+ KEYWORDS=""
+ SHORT="Thumbnailer to create thumbnails for video files."
+cat << EOF
+This thumbnailer uses ffmpeg to decode frames from the video files, so
+supported videoformats depend on the configuration flags of ffmpeg.
+
+This thumbnailer was designed to be as fast and lightweight as possible. The
+only dependencies are ffmpeg, libpng and libjpeg.
+
+The project also includes a C/C++ library that can be used by developers to
+generate thumbnails in their projects
+EOF
diff --git a/shell-term-fm/ffmpegthumbnailer/HISTORY
b/shell-term-fm/ffmpegthumbnailer/HISTORY
new file mode 100644
index 0000000..24dfabe
--- /dev/null
+++ b/shell-term-fm/ffmpegthumbnailer/HISTORY
@@ -0,0 +1,4 @@
+2012-06-05 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS, DETAILS, PRE_BUILD: spell created
+ * ffmpegapi_fix_r241.patch: removed depreciated ffmpeg api
+ * desktop/ffmpegthumbnailer.desktop: taken from archlinux
diff --git a/shell-term-fm/ffmpegthumbnailer/PRE_BUILD
b/shell-term-fm/ffmpegthumbnailer/PRE_BUILD
new file mode 100755
index 0000000..d7b6fd3
--- /dev/null
+++ b/shell-term-fm/ffmpegthumbnailer/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p0 < $SPELL_DIRECTORY/ffmpegapi_fix_r241.patch
diff --git
a/shell-term-fm/ffmpegthumbnailer/desktop/ffmpegthumbnailer.desktop
b/shell-term-fm/ffmpegthumbnailer/desktop/ffmpegthumbnailer.desktop
new file mode 100644
index 0000000..79203e5
--- /dev/null
+++ b/shell-term-fm/ffmpegthumbnailer/desktop/ffmpegthumbnailer.desktop
@@ -0,0 +1,4 @@
+[Thumbnailer Entry]
+TryExec=ffmpegthumbnailer
+Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10
+MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v;
diff --git a/shell-term-fm/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
b/shell-term-fm/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
new file mode 100644
index 0000000..fd4bc8b
--- /dev/null
+++ b/shell-term-fm/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
@@ -0,0 +1,56 @@
+--- libffmpegthumbnailer/moviedecoder.cpp.old 2012-05-20 11:57:04.503450287
+0200
++++ libffmpegthumbnailer/moviedecoder.cpp 2012-05-20 11:57:14.633450566
+0200
+@@ -58,19 +58,26 @@
+ void MovieDecoder::initialize(const string& filename)
+ {
+ av_register_all();
+- avcodec_init();
+ avcodec_register_all();
+
+ string inputFile = filename == "-" ? "pipe:" : filename;
+ m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
+-
++
++#if LIBAVCODEC_VERSION_MAJOR < 53
+ if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext,
inputFile.c_str(), NULL, 0, NULL) != 0)
++#else
++ if ((!m_FormatContextWasGiven) &&
avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
++#endif
+ {
+ destroy();
+ throw logic_error(string("Could not open input file: ") + filename);
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR < 53
+ if (av_find_stream_info(m_pFormatContext) < 0)
++#else
++ if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
++#endif
+ {
+ destroy();
+ throw logic_error(string("Could not find stream information"));
+@@ -90,8 +97,12 @@
+
+ if ((!m_FormatContextWasGiven) && m_pFormatContext)
+ {
++#if LIBAVCODEC_VERSION_MAJOR < 53
+ av_close_input_file(m_pFormatContext);
+ m_pFormatContext = NULL;
++#else
++ avformat_close_input(&m_pFormatContext);
++#endif
+ }
+
+ if (m_pPacket)
+@@ -159,7 +170,11 @@
+
+ m_pVideoCodecContext->workaround_bugs = 1;
+
++#if LIBAVCODEC_VERSION_MAJOR < 53
+ if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
++#else
++ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
++#endif
+ {
+ throw logic_error("Could not open video codec");
+ }
diff --git a/smgl/init.d/DEPENDS b/smgl/init.d/DEPENDS
index b4da7f1..34d7ecc 100755
--- a/smgl/init.d/DEPENDS
+++ b/smgl/init.d/DEPENDS
@@ -14,7 +14,8 @@ then
local VER3=$(echo $KVER | cut -d. -f3) &&
VER3=${VER3%%[^0-9]*} &&

- if (( VER2 > 6 )) ||
+ if [[ $KVER/.* >=3 ]] ||
+ (( VER2 > 6 )) ||
(( VER2 == 6 && VER3 > 14 )) ||
spell_ok udev
then
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index d47336f..f9b7b1c 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,6 @@
+2012-06-06 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: fixed udev check for linux 3.x
+
2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.13
* init.d/devices: updated to work with linux 3
diff --git a/spelling/hspell/BUILD b/spelling/hspell/BUILD
new file mode 100755
index 0000000..37517ed
--- /dev/null
+++ b/spelling/hspell/BUILD
@@ -0,0 +1,2 @@
+OPTS="--enable-shared $OPTS" &&
+default_build
diff --git a/spelling/hspell/DETAILS b/spelling/hspell/DETAILS
index d52909b..9750b9c 100755
--- a/spelling/hspell/DETAILS
+++ b/spelling/hspell/DETAILS
@@ -1,5 +1,5 @@
SPELL=hspell
- VERSION=1.0
+ VERSION=1.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://ivrix.org.il/projects/spell-checker/${SOURCE}
diff --git a/spelling/hspell/HISTORY b/spelling/hspell/HISTORY
index 329fb27..08cc2a3 100644
--- a/spelling/hspell/HISTORY
+++ b/spelling/hspell/HISTORY
@@ -1,3 +1,7 @@
+2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 1.2
+ * BUILD: added, build with enable-shared
+
2007-05-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: converted to upstream signature checking
* hspell.gpg: added gpg keyring
diff --git a/utils/teapot/BUILD b/utils/teapot/BUILD
new file mode 100755
index 0000000..2848925
--- /dev/null
+++ b/utils/teapot/BUILD
@@ -0,0 +1,2 @@
+OPTS="$TEAPOT_BUILD $OPTS" &&
+cmake_build
diff --git a/utils/teapot/CONFIGURE b/utils/teapot/CONFIGURE
new file mode 100755
index 0000000..34d0197
--- /dev/null
+++ b/utils/teapot/CONFIGURE
@@ -0,0 +1,6 @@
+config_query TEAPOT_MANUAL "build teapot user manual (pdf and html)" y &&
+
+if [[ "$TEAPOT_MANUAL" == "n" ]]
+then
+ TEAPOT_BUILD="$TEAPOT_BUILD -DENABLE_HELP=off"
+fi
diff --git a/utils/teapot/DEPENDS b/utils/teapot/DEPENDS
new file mode 100755
index 0000000..a20349b
--- /dev/null
+++ b/utils/teapot/DEPENDS
@@ -0,0 +1,19 @@
+depends ncurses &&
+depends cmake &&
+
+if [[ "$TEAPOT_MANUAL" = "y" ]]
+then
+ depends lyx &&
+ depends latex2html
+fi &&
+
+optional_depends fltk \
+ "" \
+ "" \
+ "graphical interface" &&
+
+if is_depends_enabled $SPELL fltk
+then
+ depends -sub CXX gcc
+fi
+
diff --git a/utils/teapot/DETAILS b/utils/teapot/DETAILS
new file mode 100755
index 0000000..2e39f7c
--- /dev/null
+++ b/utils/teapot/DETAILS
@@ -0,0 +1,26 @@
+ SPELL=teapot
+ VERSION=2.3.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]="http://www.syntax-k.de/projekte/$SPELL/$SOURCE";
+
SOURCE_HASH=sha512:cb85aa59e0e4e25f5067bbf2099caa7414bc6f923808d140f12844d6f19ca32f6ed649fae99dc8c93d51e789a8c6d1d92f38fe5d57f41e968f6c3b8b59cec9ca
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
+ WEB_SITE="http://www.syntax-k.de/projekte/$SPELL/";
+ LICENSE[0]="GPLv3"
+ ENTERED=20120604
+ KEYWORDS=""
+ SHORT="curses-based spreadsheet"
+cat << EOF
+These days, it may seem pointless having yet another spreadsheet program (and
+one that doesn't even know how to load Microsoft Excel files). Its compact
size
+(130k for the ncurses executable, 140k for the GUI executable, 300k for the
+self-contained Windows EXE) and the fact that it can run across serial lines
+and SSH sessions make it an interesting choice for embedded applications and
as
+system administration utility, even more so since it has a batch processing
+mode and comes with example code for creating graphs from data sets.
+
+Another interesting feature is its modern approach to spread sheet theory: It
+sports true three-dimensional tables and iterative expressions. And since it
+breaks compatibility with the usual notions of big spreadsheet packages, it
can
+also throw old syntactic cruft over board which many spreadsheets still
inherit
+from the days of VisiCalc on ancient CP/M systems.
+EOF
diff --git a/utils/teapot/HISTORY b/utils/teapot/HISTORY
new file mode 100644
index 0000000..3cc2f5c
--- /dev/null
+++ b/utils/teapot/HISTORY
@@ -0,0 +1,3 @@
+2012-06-04 Justin Boffemmyer <flux AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: spell created
+
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index d666429..474dcc8 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -44,10 +44,6 @@ optional_depends x264 \
"--enable-libx264" \
"" \
"h.264" &&
-optional_depends dirac \
- '--enable-libdirac' \
- '--disable-decoder=libdirac' \
- 'dirac encoder' &&
optional_depends schroedinger \
'--enable-libschroedinger' \
'--disable-encoder=libschroedinger' \
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 3dc6d1c..3ae94fd 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,7 @@
+2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: remove optional_depends dirac
+ replaced by schroedinger
+
2012-05-12 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Added optional dependency on libvpx

diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS
index 3af1f02..d7b1adf 100755
--- a/video/ffmpeg/DEPENDS
+++ b/video/ffmpeg/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends yasm \
+optional_depends "X86-ASSEMBLER" \
"" \
"--disable-yasm" \
"for some assembler optimizations" &&
@@ -7,10 +7,6 @@ optional_depends celt \
"--enable-libcelt" \
"" \
"for celt codec support via libcelt" &&
-optional_depends dirac \
- "--enable-libdirac" \
- "" \
- "for dirac encoder support via libdirac" &&
optional_depends frei0r-plugins \
"--enable-frei0r" \
"" \
@@ -29,7 +25,18 @@ optional_depends libass \
optional_depends libmodplug \
"--enable-libmodplug" \
"" \
- "enable libmodplug support for playing mod files"
+ "enable libmodplug support for playing mod files" &&
+optional_depends libvpx \
+ "--enable-libvpx" \
+ "" \
+ "VP8 support"
+
+else
+
+optional_depends dirac \
+ "--enable-libdirac" \
+ "" \
+ "for dirac encoder support via libdirac"

fi &&

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 3fdd3f8..c421765 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg
if [[ $FFMPEG_RELEASE == stable ]]; then
- VERSION=0.10.3
+ VERSION=0.11
SECURITY_PATCH=12
else
VERSION=0.7.12
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index b761d61..ed0c299 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,9 @@
+2012-06-04 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated stable to 0.11
+ * DEPENDS: dirac replaced by schroedinger in stable
+ yasm -> X86-assembler (--disable-yasm is still valid)
+ optional_depends libvpx added for stable
+
2012-05-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.10.3

diff --git a/video/miro/DETAILS b/video/miro/DETAILS
index c423386..a98dc86 100755
--- a/video/miro/DETAILS
+++ b/video/miro/DETAILS
@@ -1,9 +1,9 @@
SPELL=miro
- VERSION=5.0
+ VERSION=5.0.1
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-2012-04-30-Miro-5.0"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ftp.osuosl.org/pub/pculture.org/miro/src/$SOURCE
-
SOURCE_HASH=sha512:b0d95efd28bd1c393fbb8236f7cbcac19ee7f258c5a5e073f7f633cb34b1b6573d44e048eec07cc9fa241a1cbfe7835224053f5572d116955676befbb2256683
+
SOURCE_HASH=sha512:fbfa5588470cddd3caaa8553ec1fbf5f09d063ed2d16ec40a183a822c34aa680a79879d7b9c252a0d5663b78ad0d74d851b71381985f42cb0359938c7d6a6902
WEB_SITE=http://www.getmiro.com/
ENTERED=20090804
LICENSE[0]=GPL
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index 6ec3f81..613c489 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,6 @@
+2012-06-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.0.1, SOURCE_DIRECTORY updated
+
2012-05-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.0, SOURCE_DIRECTORY updated

diff --git a/windowmanagers/dwm/DETAILS b/windowmanagers/dwm/DETAILS
index 0c7b1b2..23d6e6d 100755
--- a/windowmanagers/dwm/DETAILS
+++ b/windowmanagers/dwm/DETAILS
@@ -1,8 +1,8 @@
SPELL=dwm
- VERSION=5.8.2
+ VERSION=6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://dl.suckless.org/dwm/${SOURCE}
-
SOURCE_HASH=sha512:22adfa862074b5211bcfb65a5a6357a72a7a81d7b070ef455a8714adaf5d61b2b46bedc9cb9a7e1325221772e49137aa90e6ac976a81484c34919c293a62a9d5
+
SOURCE_HASH=sha512:895d1d363b3756c9ba19dbf06af34be753c1ae5971d540113d7f8901ad174c2e5944ef769b43e65f7b700f34832bb24082bc91d999b287610c9925182ce70c00
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://dwm.suckless.org/
ENTERED=20060923
@@ -11,14 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SHORT="dwm is a dynamic window manager for X."
cat << EOF
dwm is a dynamic window manager for X. It manages windows in tiled and
-floating layouts.
-Either layout can be applied dynamically, optimizing the environment for
-the application
-in use and the task performed. It is the little brother of wmii.
-Dwm is only a single binary, it's source code is intended to never exceed
-2000 SLOC.
-Because dwm is customized through editing its source code, it's pointless
-to make binary
-packages of it. This keeps its userbase small and elitist.
-No novices asking stupid questions.
+floating layouts. Either layout can be applied dynamically, optimizing
+the environment for the application in use and the task performed.
+It is the little brother of wmii. Dwm is only a single binary, it's
+source code is intended to never exceed 2000 SLOC. Because dwm is
+customized through editing its source code, it's pointless to make
+binary packages of it. This keeps its userbase small and elitist. No
+novices asking stupid questions.
EOF
diff --git a/windowmanagers/dwm/HISTORY b/windowmanagers/dwm/HISTORY
index e1665e7..299f645 100644
--- a/windowmanagers/dwm/HISTORY
+++ b/windowmanagers/dwm/HISTORY
@@ -1,3 +1,9 @@
+2012-06-05 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 6.0
+ fixed formatting for Long description
+ * PRE_BUILD: ensure EDITOR has a value by sourcing
+ /etc/profile.d/editor.sh or defaulting to nano
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/windowmanagers/dwm/PRE_BUILD b/windowmanagers/dwm/PRE_BUILD
index 0d8f0f3..3a32eff 100755
--- a/windowmanagers/dwm/PRE_BUILD
+++ b/windowmanagers/dwm/PRE_BUILD
@@ -15,8 +15,10 @@ if [[ "$DWM_CONFIG" == 'y' ]]; then
if [[ -e ${INSTALL_ROOT}/usr/share/doc/dwm/config.def.h ]]; then
cp ${INSTALL_ROOT}/usr/share/doc/dwm/config.def.h ./
fi &&
- if query 'Do you want to edit your config now?' n
- then
- ${EDITOR} config.def.h
+ if query 'Do you want to edit your config now?' n; then
+ if [ -z"$EDITOR" ]; then
+ . /etc/profile.d/editor.sh
+ fi
+ ${EDITOR:-nano} config.def.h
fi
fi



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (bef9eedcceda65f18ab9babd77ddb6d85ee76da3), Eric Sandall, 06/06/2012

Archive powered by MHonArc 2.6.24.

Top of Page