Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (28b6f3bef79f8a468d14fed657e3dbfc78007972)

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-gcc grimoire by Eric Sandall (28b6f3bef79f8a468d14fed657e3dbfc78007972)
  • Date: Sun, 18 Apr 2010 02:05:45 -0500

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

ChangeLog | 3
audio-creation/dino/DEPENDS | 4
audio-creation/dino/DETAILS | 19 +
audio-creation/dino/HISTORY | 3
audio-creation/muse/DEPENDS | 11
audio-creation/muse/DETAILS | 2
audio-creation/muse/HISTORY | 6
audio-creation/muse/PRE_BUILD | 8
audio-creation/muse/configure_fix.diff | 64 ----
audio-creation/muse/muse_debian_0.8.1a-2.diff | 62 ---
audio-players/timidity/BUILD | 11
audio-players/timidity/DEPENDS | 2
audio-players/timidity/HISTORY | 3
audio-soft/mediatomb/DEPENDS | 8
audio-soft/mediatomb/DETAILS | 4
audio-soft/mediatomb/HISTORY | 5
audio-soft/mediatomb/PRE_BUILD | 13
audio-soft/mediatomb/curl-7.18.patch | 13
audio-soft/mediatomb/glibc-2.10.patch | 24 -
audio-soft/mediatomb/newffmpeg.patch | 77 ----
audio-soft/mediatomb/ps3-pcm.patch | 139
--------
collab/subversion/DETAILS | 4
collab/subversion/HISTORY | 3
crypto/openssh/DETAILS | 2
crypto/openssh/HISTORY | 3
crypto/openssl/BUILD | 1
crypto/openssl/DETAILS | 2
crypto/openssl/HISTORY | 4
database/sqlite/HISTORY | 3
database/sqlite/PRE_SUB_DEPENDS | 1
database/sqlite/REPAIR^all^PRE_SUB_DEPENDS | 6
database/sqlite/SUB_DEPENDS | 2
dev/null |binary
devel/diffuse/DETAILS | 4
devel/diffuse/HISTORY | 3
devel/strace/DEPENDS | 1
devel/strace/DETAILS | 4
devel/strace/HISTORY | 4
devel/strace/PRE_BUILD | 4
devel/strace/headers-2.6.32.patch | 30 -
disk/di/BUILD | 3
disk/di/DETAILS | 4
disk/di/HISTORY | 5
disk/di/INSTALL | 1
disk/di/PRE_BUILD | 4
disk/lvm/DETAILS | 4
disk/lvm/HISTORY | 3
disk/sdparm/DETAILS | 4
disk/sdparm/HISTORY | 3
editors/nano/DETAILS | 3
editors/nano/HISTORY | 3
editors/nano/nano-2.2.3.tar.gz.sig | 0
editors/nano/nano-2.2.4.tar.gz.sig |binary
ftp-libs/rb-libtorrent/CONFLICTS | 1
ftp-libs/rb-libtorrent/HISTORY | 4
ftp/curl/DETAILS | 2
ftp/curl/HISTORY | 3
gnome2-apps/abiword/DETAILS | 4
gnome2-apps/abiword/HISTORY | 4
gnome2-apps/abiword/PRE_BUILD | 4
gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig | 0
gnome2-apps/abiword/abiword-2.8.4.tar.gz.sig |binary
gnome2-apps/abiword/delete.patch | 11
gnome2-apps/empathy/DETAILS | 2
gnome2-apps/empathy/HISTORY | 3
gnome2-apps/empathy/empathy-2.30.0.1.tar.bz2.sig |binary
gnome2-apps/empathy/empathy-2.30.0.tar.bz2.sig | 0
gnome2-apps/glade2/HISTORY | 4
gnome2-apps/glade2/PRE_BUILD | 3
gnome2-apps/glade2/glade-2.12.2_gtk.patch | 80 +++++
gnome2-apps/glademm/HISTORY | 3
gnome2-apps/glademm/PRE_BUILD | 3
gnome2-apps/glademm/gcc-4.4.patch | 136
++++++++
gnome2-apps/gnumeric/DETAILS | 4
gnome2-apps/gnumeric/HISTORY | 3
gnome2-apps/gnumeric/gnumeric-1.10.1.tar.bz2.sig | 0
gnome2-apps/gnumeric/gnumeric-1.10.2.tar.bz2.sig |binary
gnome2-libs/exempi/DETAILS | 7
gnome2-libs/exempi/HISTORY | 4
gnome2-libs/exempi/exempi-2.0.2.tar.gz.sig | 0
gnome2-libs/exempi/exempi-2.1.1.tar.gz.sig |binary
gnome2-libs/glibmm/DETAILS | 2
gnome2-libs/glibmm/HISTORY | 3
gnome2-libs/glibmm/glibmm-2.24.0.tar.bz2.sig | 0
gnome2-libs/glibmm/glibmm-2.24.1.tar.bz2.sig |binary
gnome2-libs/gnome-icon-theme/DETAILS | 2
gnome2-libs/gnome-icon-theme/HISTORY | 3
gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.29.0.tar.bz2.sig | 0
gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.30.0.tar.bz2.sig | 0
gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.30.1.tar.bz2.sig |binary
gnome2-libs/goffice/DETAILS | 2
gnome2-libs/goffice/HISTORY | 3
gnome2-libs/goffice/goffice-0.8.1.tar.bz2.sig | 0
gnome2-libs/goffice/goffice-0.8.2.tar.bz2.sig |binary
gnome2-libs/gtk-engines2/DETAILS | 2
gnome2-libs/gtk-engines2/HISTORY | 3
gnome2-libs/gtk-engines2/gtk-engines-2.20.0.tar.bz2.sig | 0
gnome2-libs/gtk-engines2/gtk-engines-2.20.1.tar.bz2.sig |binary
gnome2-libs/pangomm/DETAILS | 2
gnome2-libs/pangomm/HISTORY | 3
gnome2-libs/pangomm/pangomm-2.26.0.tar.bz2.sig | 0
gnome2-libs/pangomm/pangomm-2.26.1.tar.bz2.sig |binary
gnome2-libs/tracker/BUILD | 16 -
gnome2-libs/tracker/CONFIGURE | 27 +
gnome2-libs/tracker/DEPENDS | 160
+++++++---
gnome2-libs/tracker/DETAILS | 20 -
gnome2-libs/tracker/HISTORY | 14
gnome2-libs/tracker/PREPARE | 8
gnome2-libs/tracker/PRE_BUILD | 5
gnome2-libs/tracker/tracker-0.7.28.tar.bz2.sig | 0
gnome2-libs/tracker/tracker-0.8.2.tar.bz2.sig |binary
gnome2-libs/tracker/tracker-0.9.1.tar.bz2.sig |binary
gnome2-libs/zenity/DEPENDS | 2
gnome2-libs/zenity/HISTORY | 3
graphics/gimp/DEPENDS | 6
graphics/gimp/HISTORY | 3
graphics/imagemagick/DETAILS | 2
graphics/imagemagick/HISTORY | 3
graphics/imagemagick/ImageMagick-6.6.1-1.tar.bz2.sig | 0
graphics/imagemagick/ImageMagick-6.6.1-3.tar.bz2.sig |binary
graphics/rawstudio/HISTORY | 4
graphics/rawstudio/PRE_BUILD | 1
graphics/rawstudio/gcc-4.4.patch | 11
http/gnash/DEPENDS | 9
http/gnash/HISTORY | 3
http/webkitgtk/HISTORY | 3
http/webkitgtk/PRE_BUILD | 5
http/webkitgtk/webkit-icu44.patch | 136
++++++++
libs/libffi/DETAILS | 6
libs/libffi/HISTORY | 4
libs/libsigc++3/DETAILS | 2
libs/libsigc++3/HISTORY | 3
libs/libsigc++3/libsigc++-2.2.5.tar.gz.sig | 0
libs/libsigc++3/libsigc++-2.2.6.tar.gz.sig |binary
libs/libxml++/BUILD | 2
libs/libxml++/HISTORY | 4
mail/mailx/HISTORY | 4
mail/mailx/PRE_BUILD | 6
mail/mailx/openssl-1.patch | 69 ++++
net/nsd/DETAILS | 4
net/nsd/HISTORY | 3
printer/system-config-printer/DETAILS | 6
printer/system-config-printer/HISTORY | 3
security/base/HISTORY | 5
security/base/INSTALL | 6
shell-term-fm/c3270/DETAILS | 26 -
shell-term-fm/c3270/HISTORY | 3
utils/qutescoop/BUILD | 2
utils/qutescoop/DETAILS | 11
utils/qutescoop/HISTORY | 5
utils/qutescoop/PRE_BUILD | 6
utils/qutescoop/teamspeak.patch | 12
utils/sudo/DETAILS | 4
utils/sudo/HISTORY | 3
video-libs/live/DETAILS | 2
video-libs/live/HISTORY | 3
video-libs/live/live.2010.02.10.tar.gz.sig | 0
video-libs/live/live.2010.04.09.tar.gz.sig |binary
video/mjpegtools/HISTORY | 4
video/mjpegtools/PRE_BUILD | 3
video/mjpegtools/gcc-4.4.patch | 11
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
x11-toolkits/gtkmm2/DETAILS | 2
x11-toolkits/gtkmm2/HISTORY | 3
x11-toolkits/gtkmm2/gtkmm-2.20.1.tar.bz2.sig | 0
x11-toolkits/gtkmm2/gtkmm-2.20.2.tar.bz2.sig |binary
x11/xscreensaver/DETAILS | 4
x11/xscreensaver/HISTORY | 3
169 files changed, 961 insertions(+), 628 deletions(-)

New commits:
commit ffe6a8b2f1d8173053386a70dd606c2bce59be48
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

gnumeric: => 1.10.2

commit b1a7294d9c3449d49123858311814f7affb329f1
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

goffice: => 0.8.2

commit 8a91b20d46768fe3839d0d7a3ad6ddaf4bf01613
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Tommy Boatman <tboatman AT sourcemage.org>

c3270: update to 3.3.10ga4

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

libsigc++3 2.2.6

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

gtk-engines2 2.20.1

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

gnome-icon-theme 2.30.1

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

gtkmm2 2.20.2

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

pangomm 2.26.1

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

glibmm 2.24.1

commit c42cc4564818d8bfad71d5222925503b3c1a2f25
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

openssl: fixed HISTORY entry

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

webkitgtk: apply patch from upstream when icu 4.4 is installed

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

gnome2-apps/glademm: fixed build with gcc 4.4

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

Revert "gnome2-apps/glademm: fixed build with gcc 4.4"

This reverts commit bf3402ce6ad088ad964b4fdb8aced3f6aa3b4b7f.

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

audio-creation/dino: new spell, a midi sequencer

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

gnome2-apps/glademm: fixed build with gcc 4.4

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

gnome2-apps/glade2: fixed build with newer versions of gtk

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

libs/libxml++: disabled building of documentation

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

audio-players/timidity: activated alsa sequencer client and server mode

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

audio-creation/muse: version 1.0.1

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

subversion 1.6.11

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

openssl: actually PATCHLEVEL++ for 1.0

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

openssl: fixed lib installation on x86-64 systems

commit c19a0ee5a3c96d80e42c7204977d3a7a0cc8285e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated to 1.1.43

commit 0daa51032203e83a20b839f6c8b6c7bbd5b642a7
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

imagemagick: Updated to version 6.6.1-3

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

mailx: fixed compilation with the newest openssl

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

openssh: => 5.5p1

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

zenity: added missing dep on gnome-doc-utils

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

nano 2.2.4, SECURITY_PATCH=1, #15674

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

sudo 1.7.2p6, SECURITY_PATCH=3, #15674

commit 4157549a2d2e4eea81cf3f843aa37f8dab613522
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

base: create install dir before installing and don't put the default
config into place

commit f94b5e130d62bfbdbb141cf09228ccfd8d4cbef8
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

tracker: updated stable to 0.8.2, updated developement to 0.9.1

commit f95b1d80b6020d3bc16f80fa85721ff3d6674c9e
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

empathy: => 2.30.0.1

commit 9e9b85cd7fcb6caaaa505ce2903fb69519972e59
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

tracker: optionaly depends on exempi

commit fea665d650a553789d58c893cb28379e2876c3dd
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

exempi: => 2.1.1

commit c9984eaab87666dd9a540cefb6ae3d8695bab772
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

tracker: depends on thread-safe sqlite

commit 17250f1cd5013996e344c521ed329c049fd47232
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

sqlite: added subdependency handlers for documentation building

commit 27c623a4c347ce4d916f67bdb93d95753107fd43
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libffi: => 3.0.9

commit 980fd053c4192a9deaa79f094c2131cdd276683e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

system-config-printer: => 1.2.1

commit 34cb8ff119854c3b3ac2435fb02af180b40f1076
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

gimp: added configure options to disable poppler, lcms and libwmf

commit 030d646212ea087ed9d264414c273a9e2dce81a1
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

tracker: removed SCM version, added developement version,
updated developement to 0.9.0
updated stable to 0.8.1
removed TRACKER_MONITOR, TRACKER_GUI, added TRACKER_AC,
TRACKER_SEARCH_TOOL, TRACKER_PREFERENCES, TRACKER_STATUS,
TRACKER_EXPLORER, TRACKER_SEARCH_BAR,
removed dependency on libgee, bzip2, gmime,
removed optional dependency on gnome-vfs2, gnome-desktop,
optionaly depends on id3lib, libxml2, libnotify,
libgnome-keyring,
gtk-doc, graphviz, enca, libvorbis, flac, totem-pl-parser,
nautilus2, jpeg, tiff, libiptcdata, devicekit-power, hal, gtk+2,
libgee, gnome-panel,
removed PRE_BUILD

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

mediatomb: version 0.12.1, added missing optional deps on liblastfm and
libmp4v2, removed obsolete patches and PRE_BUILD

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

diffuse 0.4.3

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

sdparm 1.05

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

nsd: => 3.2.5

commit 9d895059f28320dfb6476d38ee341ed8c7d6cd9f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

live: updated to 2010.04.09

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

graphics/rawstudio: added patch so it compiles with gcc 4.4

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

video/mjpegtools: patched to make it build with gcc 4.4

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

utils/qutescoop: version 1.0.2

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

abiword: => 2.8.4

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

gnash: disabled xpcom support in NPAPI plugin temporarily #15660

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

curl 7.20.1

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

di 4.20

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

strace 4.5.20

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

lvm 2.02.63

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

xscreensaver 5.11

commit 5677bc6f8318192cf40efe95dc0584225c0c23c7
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

rb-libtorrent: added self conflict to fix linking of python bindings

diff --git a/ChangeLog b/ChangeLog
index 8fa2c61..dfd53f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * audio-creation/dino: new spell, a midi sequencer
+
2010-04-14 Ismael Luceno <ismael AT sourcemage.org>
* audio-soft/eyeD3: removed deprecated spell (since 2007-09-09)

diff --git a/audio-creation/dino/DEPENDS b/audio-creation/dino/DEPENDS
new file mode 100755
index 0000000..47e69ac
--- /dev/null
+++ b/audio-creation/dino/DEPENDS
@@ -0,0 +1,4 @@
+depends JACK-DRIVER &&
+depends glademm &&
+depends lash &&
+depends libxml++
diff --git a/audio-creation/dino/DETAILS b/audio-creation/dino/DETAILS
new file mode 100755
index 0000000..000aebc
--- /dev/null
+++ b/audio-creation/dino/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=dino
+ VERSION=0.2.4
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://download.savannah.nongnu.org/releases-noredirect/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:ab9ecb565df03af1be48120af0bc50a0de786c0454f2a57445a2fae720dec387428c1aa6725e6c67ed382616ee80f535333d096d7046a7f52f604df25f84ede4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://dino.nongnu.org";
+ LICENSE[0]=GPL
+ ENTERED=20100417
+ SHORT="a MIDI sequencer"
+cat << EOF
+Dino is a MIDI sequencer for GNU/Linux. It is free software released under
+the GNU General Public License.
+
+Dino is a pattern-based sequencer, which means that you write small patterns
+of MIDI events that you can repeat and arrange to create a whole song. Each
+track has its own patterns, so you can for example play the same drum pattern
+over and over again while you play different lead synth patterns and
basslines.
+EOF
diff --git a/audio-creation/dino/HISTORY b/audio-creation/dino/HISTORY
new file mode 100644
index 0000000..a513549
--- /dev/null
+++ b/audio-creation/dino/HISTORY
@@ -0,0 +1,3 @@
+2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/audio-creation/muse/DEPENDS b/audio-creation/muse/DEPENDS
index 02c0766..2b3038d 100755
--- a/audio-creation/muse/DEPENDS
+++ b/audio-creation/muse/DEPENDS
@@ -11,7 +11,16 @@ optional_depends fluidsynth \
optional_depends lash \
"--enable-lash" \
"--disable-lash" \
- "for Linux Audio Session Handler support"
+ "for Linux Audio Session Handler support" &&
+optional_depends python \
+ "--enable-python" \
+ "--disable-python" \
+ "build python bindings" &&
+
+optional_depends dssi \
+ "--enable-dssi" \
+ "--disable-dssi" \
+ "build DSSI + DSSI-Vst support"

# Notice: MusE can depend on FST for VST plugin hosting, but the
# supported FST version is an obsolete 1.6 which won't compile with
diff --git a/audio-creation/muse/DETAILS b/audio-creation/muse/DETAILS
index 15f9b3f..cda2587 100755
--- a/audio-creation/muse/DETAILS
+++ b/audio-creation/muse/DETAILS
@@ -1,5 +1,5 @@
SPELL=muse
- VERSION=0.8.1a
+ VERSION=1.0.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%a}
SOURCE_URL[0]=$SOURCEFORGE_URL/lmuse/$SOURCE
diff --git a/audio-creation/muse/HISTORY b/audio-creation/muse/HISTORY
index eabcc06..1603cde 100644
--- a/audio-creation/muse/HISTORY
+++ b/audio-creation/muse/HISTORY
@@ -1,3 +1,9 @@
+2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.1
+ * PRE_BUILD configure_fix.diff muse_debian_0.8.1a-2.diff: removed
+ * DEPENDS: added optional dependencies on
+ python and dssi
+
2006-08-31 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.8.1a, updated WEB_SITE & descriptions,
removed UPDATED & BUILD_API.
diff --git a/audio-creation/muse/PRE_BUILD b/audio-creation/muse/PRE_BUILD
deleted file mode 100755
index 39e0e3b..0000000
--- a/audio-creation/muse/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-# Apply patch to fix --disable-fluidsynth configure option
-patch -p0 < $SCRIPT_DIRECTORY/configure_fix.diff &&
-
-# Apply bugfixes from Debian package
-patch -p1 < $SCRIPT_DIRECTORY/muse_debian_0.8.1a-2.diff
diff --git a/audio-creation/muse/configure_fix.diff
b/audio-creation/muse/configure_fix.diff
deleted file mode 100644
index 9fba002..0000000
--- a/audio-creation/muse/configure_fix.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- configure~ 2006-08-31 01:19:49.000000000 +0300
-+++ configure 2006-08-31 01:20:03.000000000 +0300
-@@ -22373,14 +22373,12 @@
- muse_enable_fluidlib="yes"
- synth_fluidsynth="fluidsynth"
- synth_fluid="fluid"
--synth_fluidsynth_build="yes"
- # Check whether --enable-fluidsynth or --disable-fluidsynth was given.
- if test "${enable_fluidsynth+set}" = set; then
- enableval="$enable_fluidsynth"
-
- case "$enableval" in
- "yes")
-- synth_fluidsynth_build="yes"
- synth_fluidsynth="fluidsynth"
- synth_fluid="fluid"
- ;;
-@@ -22388,7 +22386,6 @@
- muse_enable_fluidlib="no"
- synth_fluidsynth=""
- synth_fluid=""
-- synth_fluidsynth_build="no"
-
- ;;
- *)
-@@ -22410,7 +22407,6 @@
- fi
-
-
--if test "$muse_enable_fluidlib" = "yes"; then
-
-
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-@@ -22575,8 +22571,11 @@
- _ACEOF
-
- fi
--fi
-
-+if test "$muse_enable_fluidlib" = "no"; then
-+ synth_fluidsynth=""
-+ synth_fluid=""
-+fi
-
-
-
-@@ -24985,7 +24984,7 @@
-
- Software synths
- ---------------
-- FluidSynth: $synth_fluidsynth_build
-+ FluidSynth: $muse_enable_fluidlib
-
- " >&5
- echo "$as_me:
-@@ -25014,7 +25013,7 @@
-
- Software synths
- ---------------
-- FluidSynth: $synth_fluidsynth_build
-+ FluidSynth: $muse_enable_fluidlib
-
- " >&6;}
-
diff --git a/audio-creation/muse/muse_debian_0.8.1a-2.diff
b/audio-creation/muse/muse_debian_0.8.1a-2.diff
deleted file mode 100644
index 99503ab..0000000
--- a/audio-creation/muse/muse_debian_0.8.1a-2.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/synti/simpledrums/ssplugin.h 2004-12-13 22:41:01.000000000 +0200
-+++ b/synti/simpledrums/ssplugin.h 2006-08-31 00:33:31.000000000 +0300
-@@ -15,6 +15,7 @@
-
- //#include <ladspa.h>
- #include "muse/ladspa.h"
-+#include "muse/fastlog.h"
- #include <math.h>
-
- //---------------------------------------------------------
-@@ -133,27 +134,6 @@
-
- };
-
--
--static inline float fast_log2 (float val)
-- {
-- /* don't use reinterpret_cast<> because that prevents this
-- from being used by pure C code (for example, GnomeCanvasItems)
-- */
-- int* const exp_ptr = (int *)(&val);
-- int x = *exp_ptr;
-- const int log_2 = ((x >> 23) & 255) - 128;
-- x &= ~(255 << 23);
-- x += 127 << 23;
-- *exp_ptr = x;
-- val = ((-1.0f/3) * val + 2) * val - 2.0f/3; // (1)
-- return (val + log_2);
-- }
--
--static inline float fast_log10 (const float val)
-- {
-- return fast_log2(val) / 3.312500f;
-- }
--
- //---------------------------------------------------------
- // PluginList
- //---------------------------------------------------------
---- a/synti/vam/vamgui.cpp 2006-01-01 23:11:05.000000000 +0200
-+++ b/synti/vam/vamgui.cpp 2006-08-31 00:33:39.000000000 +0300
-@@ -558,7 +558,7 @@
- "Select a preset");
- if (fn.isEmpty())
- return;
-- bool popenFlag;
-+ //bool popenFlag;
- FILE* f = fopen(fn.ascii(),"r");//fileOpen(this, fn, QString(".pre"),
"r", popenFlag, true);
- if (f == 0)
- return;
-@@ -605,9 +605,9 @@
- }
- }
- ende:
-- if (popenFlag)
-- pclose(f);
-- else
-+ //if (popenFlag)
-+ // pclose(f);
-+ //else
- fclose(f);
-
- if (presetFileName) delete presetFileName;
diff --git a/audio-players/timidity/BUILD b/audio-players/timidity/BUILD
index c7bdf10..dbf3c55 100755
--- a/audio-players/timidity/BUILD
+++ b/audio-players/timidity/BUILD
@@ -1,11 +1,12 @@
# always build with oss
-OPTS="$OPTS --audio-oss"
+OPTS="$OPTS --audio-oss" &&
# those lines remove the --audio-* switches and put them in the AUDIO array
# instead
# --audio-oss --audio-alsa will result in AUDIO=oss,alsa
-local AUDIO="$(echo "$OPTS" | tr ' ' '\n' | grep audio)"
-OPTS="$(echo "$OPTS" | tr ' ' '\n' | grep -v audio | tr '\n' ' ')"
-AUDIO="$(echo "$AUDIO" | sed -e 's/--audio-//' | tr '\n' ',' | sed -e
's/,$//')"
-OPTS="$OPTS --enable-audio=$AUDIO"
+local AUDIO="$(echo "$OPTS" | tr ' ' '\n' | grep audio)" &&
+OPTS="$(echo "$OPTS" | tr ' ' '\n' | grep -v audio | tr '\n' ' ')" &&
+AUDIO="$(echo "$AUDIO" | sed -e 's/--audio-//' | tr '\n' ',' | sed -e
's/,$//')" &&
+OPTS="$OPTS --enable-audio=$AUDIO" &&
+OPTS="$OPTS --enable-server" &&
patch -p1 < $SCRIPT_DIRECTORY/gcc4.x.patch &&
default_build
diff --git a/audio-players/timidity/DEPENDS b/audio-players/timidity/DEPENDS
index 6ab29dc..5248458 100755
--- a/audio-players/timidity/DEPENDS
+++ b/audio-players/timidity/DEPENDS
@@ -2,7 +2,7 @@ depends eawpats &&

# note: the --audio-* switches aren't real configure switches, they're
# parsed out into a different variable in BUILD
-optional_depends "alsa-lib" "--audio-alsa" "" "for alsa output" &&
+optional_depends "alsa-lib" "--audio-alsa --enable-alsaseq" "" "for alsa
output" &&
optional_depends "JACK-DRIVER" "--audio-jack" "" "for jack output" &&
optional_depends "nas" "--audio-nas" "" "for NAS output" &&
optional_depends "esound" "--audio-esd" "" "for ESD output" &&
diff --git a/audio-players/timidity/HISTORY b/audio-players/timidity/HISTORY
index a5ee54b..9484ac4 100644
--- a/audio-players/timidity/HISTORY
+++ b/audio-players/timidity/HISTORY
@@ -1,3 +1,6 @@
+2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, BUILD: activated alsa sequencer client and server mode
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/audio-soft/mediatomb/DEPENDS b/audio-soft/mediatomb/DEPENDS
index 3b538bc..6dbaedc 100755
--- a/audio-soft/mediatomb/DEPENDS
+++ b/audio-soft/mediatomb/DEPENDS
@@ -47,4 +47,10 @@ optional_depends libextractor \
optional_depends LIBAVCODEC \
"--enable-ffmpeg" \
"--disable-ffmpeg" \
- "to gather metadata from video files"
+ "to gather metadata from video files" &&
+optional_depends libmp4v2 \
+ "" "--disable-libmp4v2" \
+ "to enable MP4 support" &&
+optional_depends liblastfm \
+ "" "--disable-lastfmlib" \
+ "to enable last fm scrobbing"
diff --git a/audio-soft/mediatomb/DETAILS b/audio-soft/mediatomb/DETAILS
index 53d0378..0552531 100755
--- a/audio-soft/mediatomb/DETAILS
+++ b/audio-soft/mediatomb/DETAILS
@@ -1,8 +1,8 @@
SPELL=mediatomb
- VERSION=0.11.0
+ VERSION=0.12.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:52e6fccbbda16edc778044ac591c1f3b80941edafbd80170ef4d10297fca051421976003566609db7461faa4c0efd74337943e10b802e57072525a2e5e74036b
+
SOURCE_HASH=sha512:36e7269a532a79c91b4ea7be36f92cbefa913a1f856e422e46fe2b97ee7a569dd20c38b0cbe651a8e7faacde892ea18f3cac66c3c0737480c44f9b9bc3a45438
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://mediatomb.cc";
LICENSE[0]=GPL
diff --git a/audio-soft/mediatomb/HISTORY b/audio-soft/mediatomb/HISTORY
index 3e1cab8..14a53d4 100644
--- a/audio-soft/mediatomb/HISTORY
+++ b/audio-soft/mediatomb/HISTORY
@@ -1,3 +1,8 @@
+2010-04-15 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.12.1
+ * DEPENDS: added missing optional deps on libmp4v2 and liblastfm
+ * PRE_BUILD: no longer needed
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: updated mysql dependency to MYSQL provider

diff --git a/audio-soft/mediatomb/PRE_BUILD b/audio-soft/mediatomb/PRE_BUILD
deleted file mode 100755
index ad371f7..0000000
--- a/audio-soft/mediatomb/PRE_BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-default_pre_build &&
-create_account mediatomb &&
-cd $SOURCE_DIRECTORY &&
-sedit 's#FFMPEG_SEARCH_HEADERS/ffmpeg#FFMPEG_SEARCH_HEADERS#g' configure &&
-sedit 's#ffmpeg/avformat.h#libavformat/avformat.h#g' configure &&
-sedit 's#ffmpeg/avformat.h#libavformat/avformat.h#g'
src/metadata/ffmpeg_handler.cc &&
-##next line can prolly be removed for versions > 0.11.0, fixed in svn
-#sedit 's#CURLOPT_NOBODY)#CURLOPT_NOBODY, 1)#' src/url.cc
-
-patch -p1 < $SPELL_DIRECTORY/curl-7.18.patch &&
-patch -p0 < $SPELL_DIRECTORY/glibc-2.10.patch &&
-patch -p1 < $SPELL_DIRECTORY/newffmpeg.patch &&
-patch -p1 < $SPELL_DIRECTORY/ps3-pcm.patch
diff --git a/audio-soft/mediatomb/curl-7.18.patch
b/audio-soft/mediatomb/curl-7.18.patch
deleted file mode 100644
index 5d0d4b2..0000000
--- a/audio-soft/mediatomb/curl-7.18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mediatomb-0.11.0/src/url.cc
-===================================================================
---- mediatomb-0.11.0.orig/src/url.cc
-+++ mediatomb-0.11.0/src/url.cc
-@@ -75,7 +75,7 @@
-
- if (only_header)
- {
-- curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
-+ curl_easy_setopt(curl_handle, CURLOPT_NOBODY, TRUE);
- curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
- curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA,
- (void *)buffer.getPtr());
diff --git a/audio-soft/mediatomb/glibc-2.10.patch
b/audio-soft/mediatomb/glibc-2.10.patch
deleted file mode 100644
index ff207b7..0000000
--- a/audio-soft/mediatomb/glibc-2.10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/tools.cc
-===================================================================
---- src/tools.cc (revisione 2018)
-+++ src/tools.cc (copia locale)
-@@ -303,8 +303,8 @@
- Ref<StringBuffer> buf(new StringBuffer(len / 2));
- for (int i = 0; i < len; i += 2)
- {
-- char *chi = strchr(HEX_CHARS, ptr[i]);
-- char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-+ const char *chi = strchr(HEX_CHARS, ptr[i]);
-+ const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
- int hi, lo;
-
- if (chi)
-@@ -397,7 +397,7 @@
- char clo = data[i++];
- int hi, lo;
-
-- char *pos;
-+ const char *pos;
-
- pos = strchr(hex, chi);
- if (!pos)
diff --git a/audio-soft/mediatomb/newffmpeg.patch
b/audio-soft/mediatomb/newffmpeg.patch
deleted file mode 100644
index e18a161..0000000
--- a/audio-soft/mediatomb/newffmpeg.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: mediatomb-0.11.0/configure.ac
-===================================================================
---- mediatomb-0.11.0.orig/configure.ac
-+++ mediatomb-0.11.0/configure.ac
-@@ -2340,9 +2340,14 @@ if test "x$FFMPEG_OK" = xyes; then
- ]
- )
- else
-- AC_CHECK_HEADER(ffmpeg/avformat.h,
-- [],
-+ AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h],
-+ [ffmpeg_found=yes; break;], [],
- [
-+ #define __STDC_CONSTANT_MACROS
-+ #include <stdint.h>
-+ ]
-+ )
-+ if test "x$ffmpeg_found" != "xyes"; then
- CPPFLAGS="-I$SEARCH_DIR_HEADERS"
- unset ac_cv_header_ffmpeg_avformat_h
- AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
-@@ -2357,12 +2362,7 @@ if test "x$FFMPEG_OK" = xyes; then
- #include <stdint.h>
- ]
- )
-- ],
-- [
-- #define __STDC_CONSTANT_MACROS
-- #include <stdint.h>
-- ]
-- )
-+ fi
- fi
- fi
-
-@@ -2447,7 +2447,11 @@ if test "x$FFMPEG_OK" = xyes; then
- [
- #define __STDC_CONSTANT_MACROS
- #include <stdint.h>
-+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+ #include <libavformat/avformat.h>
-+ #else
- #include <ffmpeg/avformat.h>
-+ #endif
- ],
- [
- av_register_all();
-@@ -2462,7 +2466,11 @@ if test "x$FFMPEG_OK" = xyes; then
- #define __STDC_CONSTANT_MACROS
- #include <stdint.h>
- extern "C" {
-- #include <ffmpeg/avformat.h>
-+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+ #include <libavformat/avformat.h>
-+ #else
-+ #include <ffmpeg/avformat.h>
-+ #endif
- }
- ],
- [
-Index: mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
-===================================================================
---- mediatomb-0.11.0.orig/src/metadata/ffmpeg_handler.cc
-+++ mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
-@@ -56,7 +56,11 @@ extern "C"
- {
- #endif
-
--#include <ffmpeg/avformat.h>
-+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+# include <libavformat/avformat.h>
-+#else
-+# include <ffmpeg/avformat.h>
-+#endif
-
- #ifdef FFMPEG_NEEDS_EXTERN_C
- } // extern "C"
diff --git a/audio-soft/mediatomb/ps3-pcm.patch
b/audio-soft/mediatomb/ps3-pcm.patch
deleted file mode 100644
index 11657f0..0000000
--- a/audio-soft/mediatomb/ps3-pcm.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -urpN mediatomb-0.11.0.orig/src/cds_resource_manager.cc
mediatomb-0.11.0/src/cds_resource_manager.cc
---- mediatomb-0.11.0.orig/src/cds_resource_manager.cc 2008-05-26
23:14:56.000000000 +1000
-+++ mediatomb-0.11.0/src/cds_resource_manager.cc 2008-05-26
23:14:56.000000000 +1000
-@@ -184,6 +184,30 @@ void CdsResourceManager::addResources(Re
-
t_res->addAttribute(MetadataHandler::getResAttrName(R_DURATION),
- duration);
-
-+ int freq = tp->getSampleFreq();
-+ if (freq == SOURCE)
-+ {
-+ String frequency =
item->getResource(0)->getAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY));
-+ if (string_ok(frequency))
-+
t_res->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY),
frequency);
-+ }
-+ else if (freq != OFF)
-+ {
-+
t_res->addAttribute(MetadataHandler::getResAttrName(R_SAMPLEFREQUENCY),
String::from(freq));
-+ }
-+
-+ int chan = tp->getNumChannels();
-+ if (chan == SOURCE)
-+ {
-+ String nchannels =
item->getResource(0)->getAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS));
-+ if (string_ok(nchannels))
-+
t_res->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS),
nchannels);
-+ }
-+ else if (chan != OFF)
-+ {
-+
t_res->addAttribute(MetadataHandler::getResAttrName(R_NRAUDIOCHANNELS),
String::from(chan));
-+ }
-+
- if (tp->isThumbnail())
- t_res->addOption(_(RESOURCE_CONTENT_TYPE),
_(EXIF_THUMBNAIL));
-
-diff -urpN mediatomb-0.11.0.orig/src/config_manager.cc
mediatomb-0.11.0/src/config_manager.cc
---- mediatomb-0.11.0.orig/src/config_manager.cc 2008-05-26
23:14:56.000000000 +1000
-+++ mediatomb-0.11.0/src/config_manager.cc 2008-05-26 23:14:56.000000000
+1000
-@@ -2092,6 +2092,43 @@ Ref<TranscodingProfileList> ConfigManage
- prof->setAcceptURL(false);
- }
-
-+ if (child->getChildByName(_("sample-frequency")) != nil)
-+ {
-+ param = child->getChildText(_("sample-frequency"));
-+ if (param == "source")
-+ prof->setSampleFreq(SOURCE);
-+ else if (param == "off")
-+ prof->setSampleFreq(OFF);
-+ else
-+ {
-+ int freq = param.toInt();
-+ if (freq <= 0)
-+ throw _Exception(_("Error in config file: incorrect "
-+ "parameter for <sample-frequency> "
-+ "tag"));
-+
-+ prof->setSampleFreq(freq);
-+ }
-+ }
-+
-+ if (child->getChildByName(_("audio-channels")) != nil)
-+ {
-+ param = child->getChildText(_("audio-channels"));
-+ if (param == "source")
-+ prof->setNumChannels(SOURCE);
-+ else if (param == "off")
-+ prof->setNumChannels(OFF);
-+ else
-+ {
-+ int chan = param.toInt();
-+ if (chan <= 0)
-+ throw _Exception(_("Error in config file: incorrect "
-+ "parameter for <number-of-channels> "
-+ "tag"));
-+ prof->setNumChannels(chan);
-+ }
-+ }
-+
- if (child->getChildByName(_("hide-original-resource")) != nil)
- {
- param = child->getChildText(_("hide-original-resource"));
-diff -urpN mediatomb-0.11.0.orig/src/transcoding/transcoding.cc
mediatomb-0.11.0/src/transcoding/transcoding.cc
---- mediatomb-0.11.0.orig/src/transcoding/transcoding.cc 2008-05-26
23:14:56.000000000 +1000
-+++ mediatomb-0.11.0/src/transcoding/transcoding.cc 2008-05-26
23:14:56.000000000 +1000
-@@ -52,6 +52,8 @@ TranscodingProfile::TranscodingProfile()
- accept_url = true;
- hide_orig_res = false;
- thumbnail = false;
-+ sample_frequency = SOURCE; // keep original
-+ number_of_channels = SOURCE;
- attributes = Ref<Dictionary>(new Dictionary());
- fourcc_list = Ref<Array<StringBase> >(new Array<StringBase>());
- fourcc_mode = FCC_None;
-@@ -66,6 +68,8 @@ TranscodingProfile::TranscodingProfile(t
- accept_url = true;
- hide_orig_res = false;
- thumbnail = false;
-+ sample_frequency = SOURCE; // keep original
-+ number_of_channels = SOURCE;
- buffer_size = 0;
- chunk_size = 0;
- initial_fill_size = 0;
-diff -urpN mediatomb-0.11.0.orig/src/transcoding/transcoding.h
mediatomb-0.11.0/src/transcoding/transcoding.h
---- mediatomb-0.11.0.orig/src/transcoding/transcoding.h 2008-05-26
23:14:56.000000000 +1000
-+++ mediatomb-0.11.0/src/transcoding/transcoding.h 2008-05-26
23:14:56.000000000 +1000
-@@ -39,6 +39,9 @@
- #include "dictionary.h"
- #include "object_dictionary.h"
-
-+#define SOURCE (-1)
-+#define OFF 0
-+
- typedef enum transcoding_type_t
- {
- TR_None,
-@@ -164,6 +167,14 @@ public:
- /// \brief Provides information on the mode of the list
- avi_fourcc_listmode_t getAVIFourCCListMode() { return fourcc_mode; }
-
-+ /// \brief Sample frequency handling
-+ void setSampleFreq(int freq) { sample_frequency = freq; }
-+ int getSampleFreq() { return sample_frequency; }
-+
-+ /// \brief Number of channels
-+ void setNumChannels(int chans) { number_of_channels = chans; }
-+ int getNumChannels() { return number_of_channels; }
-+
- protected:
- zmm::String name;
- zmm::String tm;
-@@ -178,6 +189,8 @@ protected:
- size_t chunk_size;
- size_t initial_fill_size;
- transcoding_type_t tr_type;
-+ int number_of_channels;
-+ int sample_frequency;
- zmm::Ref<Dictionary> attributes;
- zmm::Ref<zmm::Array<zmm::StringBase> > fourcc_list;
- avi_fourcc_listmode_t fourcc_mode;
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index 1583ac5..5ac5c36 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
SPELL=subversion
- VERSION=1.6.9
+ VERSION=1.6.11
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
@@ -9,7 +9,7 @@ if [[ "$SVN_HEAD" == y ]]; then
else
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://subversion.tigris.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:006e773205a9c2051ab7247cd648c4805748433e37c7bce82b9d3a566f384b2ee8537dd091eda398c4764af255cee4fc1ae89d2a0393e8b0e6ab66464ad7e537
+
SOURCE_HASH=sha512:84729d308eeebdbb0ebf1d9d19b8ed915b31f36f27884ddedfbbb104b3f0b44021418679465c6b93d6e4d41539d7dd524a399238d69bab2f5c94b62da9fadffa
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://subversion.tigris.org/
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 90795eb..5307f96 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2010-04-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.11
+
2010-02-26 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS: updated to RUBY provider

diff --git a/crypto/openssh/DETAILS b/crypto/openssh/DETAILS
index 01d7e07..e28a486 100755
--- a/crypto/openssh/DETAILS
+++ b/crypto/openssh/DETAILS
@@ -1,5 +1,5 @@
SPELL=openssh
- VERSION=5.4p1
+ VERSION=5.5p1
SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index aa9fd8e..2379afa 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2010-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.5p1
+
2010-03-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated sftp filecontrol patch to 5.4p1, PATCHLEVEL+=1

diff --git a/crypto/openssl/BUILD b/crypto/openssl/BUILD
index 0569cf3..962c5a6 100755
--- a/crypto/openssl/BUILD
+++ b/crypto/openssl/BUILD
@@ -8,6 +8,7 @@ fi &&
OPTS="$OPENSSL_TLSEXT $OPTS" &&
OPTS="--prefix=${INSTALL_ROOT}/usr \
--openssldir=${INSTALL_ROOT}/etc/ssl \
+ --libdir=lib \
enable-md2 \
shared \
threads \
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 21a6282..ae4e484 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -10,7 +10,7 @@ case $OPENSSL_BRANCH in
;;
1.0)
VERSION=1.0.0
- PATCHLEVEL=1
+ PATCHLEVEL=2
;;
esac

diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 8aed2f8..f79b5b0 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2010-04-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=2 for 1.0
+ * BUILD: corrected lib path (fixes installation on x86-64 systems)
+
2010-04-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1 for 1.0 branch
* BUILD: enable md2 by default (still needed somewhere, e.g. nmap)
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 819487a..e912916 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: added TSAFE
+
2010-03-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.23.1

diff --git a/database/sqlite/PRE_SUB_DEPENDS b/database/sqlite/PRE_SUB_DEPENDS
index e3a282a..df05602 100755
--- a/database/sqlite/PRE_SUB_DEPENDS
+++ b/database/sqlite/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
TCL) is_depends_enabled $SPELL tcl ;;
+ TSAFE) if [[ $SQLITE_TSAFE == "--enable-threadsafe" ]]; then return 0;
fi ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..df05602
--- /dev/null
+++ b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ TCL) is_depends_enabled $SPELL tcl ;;
+ TSAFE) if [[ $SQLITE_TSAFE == "--enable-threadsafe" ]]; then return 0;
fi ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/database/sqlite/SUB_DEPENDS b/database/sqlite/SUB_DEPENDS
index 78e3c33..3877564 100755
--- a/database/sqlite/SUB_DEPENDS
+++ b/database/sqlite/SUB_DEPENDS
@@ -1,6 +1,8 @@
case $THIS_SUB_DEPENDS in
TCL) message "TCL support requested forcing TCL dependency" &&
depends tcl "--enable-tcl" ;;
+ TSAFE) message "Thread support requested, forcing it" &&
+ SQLITE_TSAFE="--enable-threadsafe" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/devel/diffuse/DETAILS b/devel/diffuse/DETAILS
index 96cc908..d9c0b3b 100755
--- a/devel/diffuse/DETAILS
+++ b/devel/diffuse/DETAILS
@@ -1,8 +1,8 @@
SPELL=diffuse
- VERSION=0.4.2
+ VERSION=0.4.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:ffbb6623fda6c77532dad28aa609b16cbf4777b47df271fcd5b4585595bd94ab1c0ada01c1acc0306deecf1b63798c0c6f2e36f677b5f05e342fc59365039543
+
SOURCE_HASH=sha512:e529d9b4babc538881e5eae374b6b0f9ea1752cc43a0a98d4d2fa3322373be52bbfaecca4c0a8a7d254e2958e72ad736f0ce59fe17c9c7bc6548e2788b9ed59f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://diffuse.sourceforge.net/
LICENSE[0]=GPL
diff --git a/devel/diffuse/HISTORY b/devel/diffuse/HISTORY
index fbd768a..f092835 100644
--- a/devel/diffuse/HISTORY
+++ b/devel/diffuse/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.4.3
+
2010-04-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.4.2

diff --git a/devel/strace/DEPENDS b/devel/strace/DEPENDS
deleted file mode 100755
index 5584a0a..0000000
--- a/devel/strace/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends autoconf
diff --git a/devel/strace/DETAILS b/devel/strace/DETAILS
index 836ae89..3b5fbad 100755
--- a/devel/strace/DETAILS
+++ b/devel/strace/DETAILS
@@ -1,9 +1,9 @@
SPELL=strace
- VERSION=4.5.19
+ VERSION=4.5.20
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/strace/$SOURCE
-
SOURCE_HASH=sha512:a7e500a7f47b5b22621efa723d5d522dd26bf2de908c7056531378661977c5671bff9892519db5870b8d448f943879b03beeb31a323a2f2305f2042d0f7c05c4
+
SOURCE_HASH=sha512:b5adcbd00960580adf9441068d252216a40fcc4dca7888447f2de941b33e28bdd75058f3a7126eb487bc93f100b1f660d0fc5998885ca76929e5a0ce2069f2db
WEB_SITE=http://sourceforge.net/projects/strace/
ENTERED=20010922
LICENSE[0]=BSD
diff --git a/devel/strace/HISTORY b/devel/strace/HISTORY
index 27b0d36..5649c9e 100644
--- a/devel/strace/HISTORY
+++ b/devel/strace/HISTORY
@@ -1,3 +1,7 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.5.20
+ * DEPENDS, PRE_BUILD, headers-2.6.32.patch: removed
+
2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on autoconf for `autoreconf`
* PRE_BUILD: Apply headers-2.6.32.patch and run `autoreconf`
diff --git a/devel/strace/PRE_BUILD b/devel/strace/PRE_BUILD
deleted file mode 100755
index 06633cd..0000000
--- a/devel/strace/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch $SOURCE_DIRECTORY/configure.ac $SCRIPT_DIRECTORY/headers-2.6.32.patch
&&
-autoreconf
diff --git a/devel/strace/headers-2.6.32.patch
b/devel/strace/headers-2.6.32.patch
deleted file mode 100644
index a92ac40..0000000
--- a/devel/strace/headers-2.6.32.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# From
http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commit;h=f0df31e71a58c6e79ba77c1a9d84b2f38d44bec7
-#
-From f0df31e71a58c6e79ba77c1a9d84b2f38d44bec7 Mon Sep 17 00:00:00 2001
-From: Dmitry V. Levin <ldv AT altlinux.org>
-Date: Tue, 3 Nov 2009 16:49:49 +0000
-Subject: [PATCH] Fix check for linux/netlink.h on Linux 2.6.32-rc5+
-
-* configure.ac (AC_CHECK_HEADERS): In check for linux/netlink.h, include
-sys/socket.h instead of linux/socket.h beforehand.
----
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c8450cd..96c1c24 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -258,7 +258,7 @@ AC_CHECK_HEADERS([ \
- ], [], [])
- AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h
linux/if_packet.h],
- [], [], [#include <stddef.h>
--#include <linux/socket.h>])
-+#include <sys/socket.h>])
- AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
- AC_CHECK_TYPES([struct sigcontext_struct,
- struct sigcontext],,, [#include <signal.h>])
---
-1.6.3
-
diff --git a/disk/di/BUILD b/disk/di/BUILD
index c375557..8f58e6d 100755
--- a/disk/di/BUILD
+++ b/disk/di/BUILD
@@ -1,2 +1 @@
-sedit 's! sed! /bin/sed!' features/cflags.sh &&
-CC=gcc prefix=/usr ./Build -mkc
+make
diff --git a/disk/di/DETAILS b/disk/di/DETAILS
index 167caea..58d89d6 100755
--- a/disk/di/DETAILS
+++ b/disk/di/DETAILS
@@ -1,9 +1,9 @@
SPELL=di
- VERSION=4.18
+ VERSION=4.20
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.gentoo.com/di/$SOURCE
-
SOURCE_HASH=sha512:57c9ee1b38ad237af134b725e6e25d1723ffb1f0f93d5410302cb97789e066b579277abfe58cb573e32a6d929eba301e5406e69515c87f912d954dd66c7c6a22
+
SOURCE_HASH=sha512:995634a703fd76254aec4be5eeaa1a342820b8e92d26104617dab3bb755c674d8a8038460f4cda867c523abc4299a6ff45b7eac027bb1c6f588579a41909c470
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.gentoo.com/di/
ENTERED=20020527
diff --git a/disk/di/HISTORY b/disk/di/HISTORY
index d04ec4b..2cc19f2 100644
--- a/disk/di/HISTORY
+++ b/disk/di/HISTORY
@@ -1,3 +1,8 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.20
+ * PRE_BUILD: added
+ * INSTALL: removed
+
2009-12-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.18

diff --git a/disk/di/INSTALL b/disk/di/INSTALL
deleted file mode 100755
index 7497e20..0000000
--- a/disk/di/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-CC=gcc prefix=/usr ./Build -mkc install
diff --git a/disk/di/PRE_BUILD b/disk/di/PRE_BUILD
new file mode 100755
index 0000000..e1c3e44
--- /dev/null
+++ b/disk/di/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sedit "s:/usr/local:/usr:" Makefile
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index aca6c2e..5f60413 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,10 +1,10 @@
SPELL=lvm
- VERSION=2.02.62
+ VERSION=2.02.63
SOURCE=LVM2.$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE
SOURCE_URL[1]=ftp://sources.redhat.com/pub/lvm2/old/$SOURCE
-
SOURCE_HASH=sha512:ac6068f5f33e9cf10c2696504a9b2397bfe562093b1ccd5a1dec90c81af2844fd8a6a8c707275bb7b3ab9bc293af3acdb8712e409ab95dc8ea42acbd9ecdf739
+
SOURCE_HASH=sha512:3b0e52d32c8ac35a13397d6954f018c49442a615b42963b9a7cd8afb19c5b078feed596aa67ab6c3d2c12ffefd09f6c0058ee19766102f74a2b5830f7f184e1e
WEB_SITE=http://sources.redhat.com/lvm2/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 7ecbd97..13151f9 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.02.63
+
2010-03-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.02.62

diff --git a/disk/sdparm/DETAILS b/disk/sdparm/DETAILS
index 1d1b146..d53d305 100755
--- a/disk/sdparm/DETAILS
+++ b/disk/sdparm/DETAILS
@@ -1,6 +1,6 @@
SPELL=sdparm
- VERSION=1.04
-
SOURCE_HASH=sha512:46f4358a585fc1e42f3025cc5d35479aca14eec4e551bba0eb6de73d962cf353a96eb4ce507ab6fe6d588cd0e657804ce731d1760cf2dfaf8ed4f5a0a04037ac
+ VERSION=1.05
+
SOURCE_HASH=sha512:b8faddf645330b20c4c08278f392e9080baa6cb696834949e9fa94be497bcdb5ad8560aec58f1036f4f1699b8cdbebfe38a370dd63fba720a5a8a3e98ad132c5
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://sg.danny.cz/sg/p/$SOURCE
diff --git a/disk/sdparm/HISTORY b/disk/sdparm/HISTORY
index 61eb785..903369f 100644
--- a/disk/sdparm/HISTORY
+++ b/disk/sdparm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.05
+
2009-07-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.04, new WEB_SITE and SOURCE_URL[0]

diff --git a/editors/nano/DETAILS b/editors/nano/DETAILS
index 83659be..1f804c9 100755
--- a/editors/nano/DETAILS
+++ b/editors/nano/DETAILS
@@ -1,5 +1,6 @@
SPELL=nano
- VERSION=2.2.3
+ VERSION=2.2.4
+ SECURITY_PATCH=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
diff --git a/editors/nano/HISTORY b/editors/nano/HISTORY
index f1d30da..1cc6469 100644
--- a/editors/nano/HISTORY
+++ b/editors/nano/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.4, SECURITY_PATCH=1, #15674
+
2010-02-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.3
* PRE_BUILD, nowrap.patch: removed
diff --git a/editors/nano/nano-2.2.3.tar.gz.sig
b/editors/nano/nano-2.2.3.tar.gz.sig
deleted file mode 100644
index a1e220a..0000000
Binary files a/editors/nano/nano-2.2.3.tar.gz.sig and /dev/null differ
diff --git a/editors/nano/nano-2.2.4.tar.gz.sig
b/editors/nano/nano-2.2.4.tar.gz.sig
new file mode 100644
index 0000000..708623d
Binary files /dev/null and b/editors/nano/nano-2.2.4.tar.gz.sig differ
diff --git a/ftp-libs/rb-libtorrent/CONFLICTS
b/ftp-libs/rb-libtorrent/CONFLICTS
new file mode 100755
index 0000000..5474590
--- /dev/null
+++ b/ftp-libs/rb-libtorrent/CONFLICTS
@@ -0,0 +1 @@
+conflicts rb-libtorrent y
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index 4f47b72..7c0b082 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,7 @@
+2010-04-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFLICTS: added self conflict, a bug in the build system leads to
+ the python binding being linked to the old lib otherwise
+
2010-04-10 Mark Bainter <mbainter AT sourcemage.org>
* DETAILS: updated spell to 0.15.0

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 6899fb6..4d7bac8 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
SPELL=curl
- VERSION=7.20.0
+ VERSION=7.20.1
SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 3266afa..f4bd2fb 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.20.1
+
2010-02-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.20.0, SECURITY_PATCH=6
http://curl.haxx.se/docs/adv_20100209.html
diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index ba8b5cb..4b27aec 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,10 +1,10 @@
SPELL=abiword
if [[ $DEVEL == y ]]; then
- VERSION=2.8.3
+ VERSION=2.8.4
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
else
- VERSION=2.8.3
+ VERSION=2.8.4
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
fi
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 8b52bd8..de7cf61 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,7 @@
+2010-04-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.8.4
+ * PRE_BUILD, delete.patch: removed
+
2010-04-05 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: depends on librsvg2

diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
deleted file mode 100755
index a74c8e1..0000000
--- a/gnome2-apps/abiword/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/delete.patch"
diff --git a/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig
deleted file mode 100644
index dea8c44..0000000
Binary files a/gnome2-apps/abiword/abiword-2.8.3.tar.gz.sig and /dev/null
differ
diff --git a/gnome2-apps/abiword/abiword-2.8.4.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.8.4.tar.gz.sig
new file mode 100644
index 0000000..d2484f6
Binary files /dev/null and b/gnome2-apps/abiword/abiword-2.8.4.tar.gz.sig
differ
diff --git a/gnome2-apps/abiword/delete.patch
b/gnome2-apps/abiword/delete.patch
deleted file mode 100644
index 3b0236d..0000000
--- a/gnome2-apps/abiword/delete.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/text/fmt/xp/fp_TextRun.cpp.orig 2009/12/19 00:44:28
-+++ src/text/fmt/xp/fp_TextRun.cpp 2010/04/03 13:54:44
-@@ -3396,7 +3396,7 @@
-
- m_pRenderInfo->m_pText = text;
- m_pRenderInfo->m_iOffset = iDocumentPosition - iRunOffset;
-- m_pRenderInfo->m_iLength = getLength();
-+ m_pRenderInfo->m_iLength = iCount;
- if(!getGraphics()->needsSpecialCaretPositioning(*m_pRenderInfo))
- {
- DELETEP(text);
diff --git a/gnome2-apps/empathy/DETAILS b/gnome2-apps/empathy/DETAILS
index 2c9ae23..844cdf2 100755
--- a/gnome2-apps/empathy/DETAILS
+++ b/gnome2-apps/empathy/DETAILS
@@ -1,5 +1,5 @@
SPELL=empathy
- VERSION=2.30.0
+ VERSION=2.30.0.1
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-apps/empathy/HISTORY b/gnome2-apps/empathy/HISTORY
index 1d236ae..35da796 100644
--- a/gnome2-apps/empathy/HISTORY
+++ b/gnome2-apps/empathy/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated spell to 2.30.0.1
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-apps/empathy/empathy-2.30.0.1.tar.bz2.sig
b/gnome2-apps/empathy/empathy-2.30.0.1.tar.bz2.sig
new file mode 100644
index 0000000..33db235
Binary files /dev/null and b/gnome2-apps/empathy/empathy-2.30.0.1.tar.bz2.sig
differ
diff --git a/gnome2-apps/empathy/empathy-2.30.0.tar.bz2.sig
b/gnome2-apps/empathy/empathy-2.30.0.tar.bz2.sig
deleted file mode 100644
index 3f188b0..0000000
Binary files a/gnome2-apps/empathy/empathy-2.30.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/glade2/HISTORY b/gnome2-apps/glade2/HISTORY
index 1a78c11..4d74f98 100644
--- a/gnome2-apps/glade2/HISTORY
+++ b/gnome2-apps/glade2/HISTORY
@@ -1,3 +1,7 @@
+2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * glade-2.12.2_gtk.patch, PRE_BUILD: added patch to make the
+ spell build with newer versions of gtk
+
2007-12-24 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated VERSION to 2.12.2

diff --git a/gnome2-apps/glade2/PRE_BUILD b/gnome2-apps/glade2/PRE_BUILD
new file mode 100755
index 0000000..0a49506
--- /dev/null
+++ b/gnome2-apps/glade2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/glade-2.12.2_gtk.patch
diff --git a/gnome2-apps/glade2/glade-2.12.2_gtk.patch
b/gnome2-apps/glade2/glade-2.12.2_gtk.patch
new file mode 100644
index 0000000..43dd9be
--- /dev/null
+++ b/gnome2-apps/glade2/glade-2.12.2_gtk.patch
@@ -0,0 +1,80 @@
+diff -pruN glade-2.12.2.orig/glade/gbwidgets/gbclist.c
glade-2.12.2/glade/gbwidgets/gbclist.c
+--- glade-2.12.2.orig/glade/gbwidgets/gbclist.c 2009-01-17
12:23:45.000000000 +0100
++++ glade-2.12.2/glade/gbwidgets/gbclist.c 2009-01-17 12:33:18.000000000
+0100
+@@ -19,10 +19,7 @@
+
+ #include <string.h>
+
+-#include <gtk/gtkclist.h>
+-#include <gtk/gtkhbox.h>
+-#include <gtk/gtkmain.h>
+-#include <gtk/gtkspinbutton.h>
++#include <gtk/gtk.h>
+ #include "../gb.h"
+
+ /* Include the 21x21 icon pixmap for this widget, to be used in the palette
*/
+diff -pruN glade-2.12.2.orig/glade/glade_keys_dialog.c
glade-2.12.2/glade/glade_keys_dialog.c
+--- glade-2.12.2.orig/glade/glade_keys_dialog.c 2009-01-17
12:23:45.000000000 +0100
++++ glade-2.12.2/glade/glade_keys_dialog.c 2009-01-17 12:32:20.000000000
+0100
+@@ -23,11 +23,7 @@
+
+ #include <string.h>
+
+-#include <gtk/gtkbox.h>
+-#include <gtk/gtkbutton.h>
+-#include <gtk/gtkclist.h>
+-#include <gtk/gtkstock.h>
+-#include <gtk/gtkscrolledwindow.h>
++#include <gtk/gtk.h>
+
+ #include "gladeconfig.h"
+
+diff -pruN glade-2.12.2.orig/glade/glade_menu_editor.c
glade-2.12.2/glade/glade_menu_editor.c
+--- glade-2.12.2.orig/glade/glade_menu_editor.c 2009-01-17
12:23:45.000000000 +0100
++++ glade-2.12.2/glade/glade_menu_editor.c 2009-01-17 12:40:06.000000000
+0100
+@@ -26,32 +26,7 @@
+ #include <time.h>
+
+ #include <gdk/gdkkeysyms.h>
+-#include <gtk/gtkarrow.h>
+-#include <gtk/gtkaccellabel.h>
+-#include <gtk/gtkclist.h>
+-#include <gtk/gtkcombo.h>
+-#include <gtk/gtkentry.h>
+-#include <gtk/gtkeventbox.h>
+-#include <gtk/gtkfilechooserdialog.h>
+-#include <gtk/gtkframe.h>
+-#include <gtk/gtkhbox.h>
+-#include <gtk/gtkhbbox.h>
+-#include <gtk/gtkhseparator.h>
+-#include <gtk/gtkiconfactory.h>
+-#include <gtk/gtkimage.h>
+-#include <gtk/gtkimagemenuitem.h>
+-#include <gtk/gtklist.h>
+-#include <gtk/gtkmain.h>
+-#include <gtk/gtkmenu.h>
+-#include <gtk/gtkmenubar.h>
+-#include <gtk/gtkradiobutton.h>
+-#include <gtk/gtkradiomenuitem.h>
+-#include <gtk/gtkscrolledwindow.h>
+-#include <gtk/gtkseparatormenuitem.h>
+-#include <gtk/gtkstock.h>
+-#include <gtk/gtktable.h>
+-#include <gtk/gtktearoffmenuitem.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+
+ #include "gladeconfig.h"
+
+diff -pruN glade-2.12.2.orig/glade/glade_project_view.h
glade-2.12.2/glade/glade_project_view.h
+--- glade-2.12.2.orig/glade/glade_project_view.h 2009-01-17
12:23:45.000000000 +0100
++++ glade-2.12.2/glade/glade_project_view.h 2009-01-17 12:42:37.000000000
+0100
+@@ -18,7 +18,7 @@
+ #ifndef GLADE_PROJECT_VIEW_H
+ #define GLADE_PROJECT_VIEW_H
+
+-#include <gtk/gtkclist.h>
++#include <gtk/gtk.h>
+
+ #include "glade_project.h"
+
diff --git a/gnome2-apps/glademm/HISTORY b/gnome2-apps/glademm/HISTORY
index 8688aa6..e27639d 100644
--- a/gnome2-apps/glademm/HISTORY
+++ b/gnome2-apps/glademm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * gcc-4.4.patch, PRE_BUILD: fixed build with gcc 4.4
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/gnome2-apps/glademm/PRE_BUILD b/gnome2-apps/glademm/PRE_BUILD
new file mode 100755
index 0000000..1b8fb01
--- /dev/null
+++ b/gnome2-apps/glademm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch
diff --git a/gnome2-apps/glademm/gcc-4.4.patch
b/gnome2-apps/glademm/gcc-4.4.patch
new file mode 100644
index 0000000..477ff72
--- /dev/null
+++ b/gnome2-apps/glademm/gcc-4.4.patch
@@ -0,0 +1,136 @@
+--- glademm-2.6.0/src/writers/bonobo_dock.cc.orig 2010-04-17
18:03:45.605704595 +0200
++++ glademm-2.6.0/src/writers/bonobo_dock.cc 2010-04-17 18:04:15.178695540
+0200
+@@ -19,6 +19,7 @@
+ */
+
+ #include "container.hh"
++#include <cstring>
+
+ class Bonobo_Dock : public Gtk_Container
+ {public:
+--- glademm-2.6.0/src/writers/bonobo_dockitem.cc.orig 2010-04-17
18:04:40.993696230 +0200
++++ glademm-2.6.0/src/writers/bonobo_dockitem.cc 2010-04-17
18:04:52.224157567 +0200
+@@ -19,6 +19,7 @@
+ */
+
+ #include "bin.hh"
++#include <cstring>
+
+ class Bonobo_DockItem : public Gtk_Bin
+ {public:
+--- glademm-2.6.0/src/writers/clist.cc.orig 2010-04-17 18:05:27.062695862
+0200
++++ glademm-2.6.0/src/writers/clist.cc 2010-04-17 18:05:41.749695340 +0200
+@@ -20,6 +20,7 @@
+
+ #include "clist.hh"
+ #include "../strsep.h"
++#include <cstring>
+
+ static Gtk_CList Gtk_CList(false);
+
+--- glademm-2.6.0/src/writers/combo.cc.orig 2010-04-17 18:06:05.262086301
+0200
++++ glademm-2.6.0/src/writers/combo.cc 2010-04-17 18:06:16.569695784 +0200
+@@ -20,6 +20,7 @@
+
+ #include "combo.hh"
+ #include "../strsep.h"
++#include <cstring>
+
+ static Gtk_Combo Gtk_Combo(false);
+
+--- glademm-2.6.0/src/writers/ctree.cc.orig 2003-01-06 08:27:14.000000000
+0100
++++ glademm-2.6.0/src/writers/ctree.cc 2010-04-17 18:06:54.279943195 +0200
+@@ -20,6 +20,7 @@
+ // copied from clist -- might work
+
+ #include "container.hh"
++#include <cstring>
+
+ class Gtk_CTree : public Gtk_Container
+ {public:
+--- glademm-2.6.0/src/writers/gnome_about.cc.orig 2010-04-17
18:07:50.565696875 +0200
++++ glademm-2.6.0/src/writers/gnome_about.cc 2010-04-17 18:08:02.687419261
+0200
+@@ -20,6 +20,7 @@
+
+ #include "gnome_dialog.hh"
+ #include "../strsep.h"
++#include <cstring>
+
+ class Gnome_About : public Gnome_Dialog
+ {public:
+--- glademm-2.6.0/src/writers/gnome_app.hh.orig 2010-04-17
18:09:09.877764845 +0200
++++ glademm-2.6.0/src/writers/gnome_app.hh 2010-04-17 18:09:38.534195424
+0200
+@@ -28,7 +28,7 @@
+ virtual bool NeedExplicitCtor(const Widget &w) const;
+ virtual void ConstructionArgs(const Widget &w, CxxFile &f) const;
+ virtual void Configure(const Widget &w, CxxFile &f,const std::string
&instance) const;
+- virtual Subwidget Gnome_App::IsSubwidget(const Widget &w,const Widget
&ch) const;
++ virtual Subwidget IsSubwidget(const Widget &w,const Widget &ch) const;
+ virtual const std::string InternalInstance(const Widget &parent,const
Widget &w2) const;
+ virtual void AddChildren(const Widget &w,CxxFile &f,const std::string
&instance,const WriterBase &writer_for_subw, const Widget &widget_for_subw)
const;
+ };
+--- glademm-2.6.0/src/writers/optionmenu.cc.orig 2010-04-17
18:10:15.389695809 +0200
++++ glademm-2.6.0/src/writers/optionmenu.cc 2010-04-17 18:10:23.446675794
+0200
+@@ -20,6 +20,7 @@
+
+ #include "button.hh"
+ #include "../strsep.h"
++#include <cstring>
+
+ class Gtk_OptionMenu : public Gtk_Button
+ { static const char * const MenuTags;
+--- glademm-2.6.0/src/writers/xpmname.cc.orig 2010-04-17 18:11:09.910695451
+0200
++++ glademm-2.6.0/src/writers/xpmname.cc 2010-04-17 18:11:18.385695785
+0200
+@@ -1,6 +1,7 @@
+ #include <cstdio>
+ #include <string>
+ #include <Configuration.hh>
++#include <cstring>
+
+ // parts taken from
+ /* xpmtoppm.c - read an X11 pixmap file and produce a portable pixmap
+--- glademm-2.6.0/src/Tag.cc.orig 2010-04-17 18:11:57.921695792 +0200
++++ glademm-2.6.0/src/Tag.cc 2010-04-17 18:12:06.153698327 +0200
+@@ -22,6 +22,7 @@
+ #include <utility> // pair
+ #include <locale.h>
+ #include <iostream>
++#include <cstring>
+
+ const Tag *Tag::find(const std::string &tp) const
+ { const_iterator i=find(begin(),tp);
+--- glademm-2.6.0/src/TagStream.hh.orig 2010-04-17 18:12:37.619195903
+0200
++++ glademm-2.6.0/src/TagStream.hh 2010-04-17 18:12:52.726183340 +0200
+@@ -25,6 +25,7 @@
+ #include "Tag.hh"
+ #include <fstream>
+ #include <strstream>
++#include <cstring>
+
+ class TagStream : public Tag
+ { // ---- for reading -----
+--- glademm-2.6.0/src/TagStream.cc.orig 2010-04-17 18:13:34.830195720
+0200
++++ glademm-2.6.0/src/TagStream.cc 2010-04-17 18:18:15.777695538 +0200
+@@ -20,7 +20,8 @@
+ #include "TagStream.hh"
+ #include <cstring>
+ #include <unistd.h>
+-#include <algo.h>
++#include <algorithm>
++#include <iostream>
+
+ //#define REMEMBER_EMPTY_SPACE
+
+@@ -73,10 +74,10 @@
+ { std::string ret;
+ std::string::const_iterator i(cont.begin());
+ while (i!=cont.end())
+- { std::string::const_iterator verbatim(::find(i,cont.end(),'&'));
++ { std::string::const_iterator verbatim(std::find(i,cont.end(),'&'));
+ ret+=std::string(i,verbatim);
+ if (verbatim!=cont.end())
+- { std::string::const_iterator
endtag(::find(verbatim,cont.end(),';'));
++ { std::string::const_iterator
endtag(std::find(verbatim,cont.end(),';'));
+ if (endtag!=cont.end()) ++endtag;
+ std::string tag(verbatim,endtag);
+ if (tag[1]=='#' && tag[2]=='x')
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index 3fcc1dc..b447356 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,10 +1,10 @@
SPELL=gnumeric
if [[ $GNUMERIC_DEVEL == y ]]; then
- VERSION=1.10.1
+ VERSION=1.10.2

SOURCE_HASH=sha512:e2f7984f869dbfaf9a5fdeee0aae544a0070c1e4edac3ffb085fb196ef1fb1e40df6f922bc9ec1eeb67ee3d2dd0b28aaf9ec2731e7120c1d485617bd0ad4d7ce
SOURCE=$SPELL-$VERSION.tar.bz2
else
- VERSION=1.10.1
+ VERSION=1.10.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG=gurus.gpg:$SOURCE.sig
fi
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 37ffe7c..eff0f68 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated spell to 1.10.2
+
2010-03-13 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.10.1

diff --git a/gnome2-apps/gnumeric/gnumeric-1.10.1.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.10.1.tar.bz2.sig
deleted file mode 100644
index 2ab08d8..0000000
Binary files a/gnome2-apps/gnumeric/gnumeric-1.10.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/gnumeric/gnumeric-1.10.2.tar.bz2.sig
b/gnome2-apps/gnumeric/gnumeric-1.10.2.tar.bz2.sig
new file mode 100644
index 0000000..ae51004
Binary files /dev/null and b/gnome2-apps/gnumeric/gnumeric-1.10.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/exempi/DETAILS b/gnome2-libs/exempi/DETAILS
index 3a863c8..3abf38d 100755
--- a/gnome2-libs/exempi/DETAILS
+++ b/gnome2-libs/exempi/DETAILS
@@ -1,8 +1,8 @@
SPELL=exempi
- VERSION=2.0.2
+ VERSION=2.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://libopenraw.freedesktop.org/download/exempi-2.0.2.tar.gz
+
SOURCE_URL[0]=http://libopenraw.freedesktop.org/download/$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=BSD
WEB_SITE=http://libopenraw.freedesktop.org/wiki/Exempi
@@ -10,5 +10,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="gnome2 libs"
SHORT="XMP implementation"
cat << EOF
-Exempi is an implementation of XMP. Version 2.0.x is based on Adobe XMP SDK
4.1.1
+Exempi is an implementation of XMP. Version 2.0.x is based on Adobe XMP
+SDK 4.1.1
EOF
diff --git a/gnome2-libs/exempi/HISTORY b/gnome2-libs/exempi/HISTORY
index 8902465..d08813f 100644
--- a/gnome2-libs/exempi/HISTORY
+++ b/gnome2-libs/exempi/HISTORY
@@ -1,3 +1,7 @@
+2010-04-15 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated spell to 2.1.1
+ fixed long description wrap
+
2008-10-05 Robin Cook <rcook AT wyrms.net>
* New spell: DETAILS, DEPENDS

diff --git a/gnome2-libs/exempi/exempi-2.0.2.tar.gz.sig
b/gnome2-libs/exempi/exempi-2.0.2.tar.gz.sig
deleted file mode 100644
index f090177..0000000
Binary files a/gnome2-libs/exempi/exempi-2.0.2.tar.gz.sig and /dev/null differ
diff --git a/gnome2-libs/exempi/exempi-2.1.1.tar.gz.sig
b/gnome2-libs/exempi/exempi-2.1.1.tar.gz.sig
new file mode 100644
index 0000000..7c88d31
Binary files /dev/null and b/gnome2-libs/exempi/exempi-2.1.1.tar.gz.sig differ
diff --git a/gnome2-libs/glibmm/DETAILS b/gnome2-libs/glibmm/DETAILS
index c28b5aa..e47a788 100755
--- a/gnome2-libs/glibmm/DETAILS
+++ b/gnome2-libs/glibmm/DETAILS
@@ -1,5 +1,5 @@
SPELL=glibmm
- VERSION=2.24.0
+ VERSION=2.24.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index 437fea0..41db14e 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.24.1
+
2010-04-09 Vasil Yonkov <spirtbrat AT sourcemage.org>
* REPAIR^none^PRE_SUB_DEPENDS: added
* SUB_DEPENDS: added persistent_add FULLDOCS
diff --git a/gnome2-libs/glibmm/glibmm-2.24.0.tar.bz2.sig
b/gnome2-libs/glibmm/glibmm-2.24.0.tar.bz2.sig
deleted file mode 100644
index 135f2d7..0000000
Binary files a/gnome2-libs/glibmm/glibmm-2.24.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/glibmm/glibmm-2.24.1.tar.bz2.sig
b/gnome2-libs/glibmm/glibmm-2.24.1.tar.bz2.sig
new file mode 100644
index 0000000..06e5e42
Binary files /dev/null and b/gnome2-libs/glibmm/glibmm-2.24.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-icon-theme/DETAILS
b/gnome2-libs/gnome-icon-theme/DETAILS
index f4db9f2..3d986ab 100755
--- a/gnome2-libs/gnome-icon-theme/DETAILS
+++ b/gnome2-libs/gnome-icon-theme/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-icon-theme
- VERSION=2.30.0
+ VERSION=2.30.1
BRANCH=${VERSION:0:4}
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/gnome-icon-theme/HISTORY
b/gnome2-libs/gnome-icon-theme/HISTORY
index 0bc2b4f..fab5b82 100644
--- a/gnome2-libs/gnome-icon-theme/HISTORY
+++ b/gnome2-libs/gnome-icon-theme/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Laidslav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.30.1
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.29.0.tar.bz2.sig
b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.29.0.tar.bz2.sig
deleted file mode 100644
index b0be01f..0000000
Binary files
a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.29.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.30.0.tar.bz2.sig
b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.30.0.tar.bz2.sig
deleted file mode 100644
index 3c60cf7..0000000
Binary files
a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.30.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.30.1.tar.bz2.sig
b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.30.1.tar.bz2.sig
new file mode 100644
index 0000000..3712bba
Binary files /dev/null and
b/gnome2-libs/gnome-icon-theme/gnome-icon-theme-2.30.1.tar.bz2.sig differ
diff --git a/gnome2-libs/goffice/DETAILS b/gnome2-libs/goffice/DETAILS
index 77d8500..5a5173a 100755
--- a/gnome2-libs/goffice/DETAILS
+++ b/gnome2-libs/goffice/DETAILS
@@ -1,5 +1,5 @@
SPELL=goffice
- VERSION=0.8.1
+ VERSION=0.8.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index d24e353..1c65c85 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.2
+
2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
* CONFLICTS: added goffice-dev
* DEPENDS: removed libart_lgpl, libgnomeui, made cairo a hard
diff --git a/gnome2-libs/goffice/goffice-0.8.1.tar.bz2.sig
b/gnome2-libs/goffice/goffice-0.8.1.tar.bz2.sig
deleted file mode 100644
index 9448c5a..0000000
Binary files a/gnome2-libs/goffice/goffice-0.8.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/goffice/goffice-0.8.2.tar.bz2.sig
b/gnome2-libs/goffice/goffice-0.8.2.tar.bz2.sig
new file mode 100644
index 0000000..b60060e
Binary files /dev/null and b/gnome2-libs/goffice/goffice-0.8.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/gtk-engines2/DETAILS
b/gnome2-libs/gtk-engines2/DETAILS
index 36dfeb6..99a472c 100755
--- a/gnome2-libs/gtk-engines2/DETAILS
+++ b/gnome2-libs/gtk-engines2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtk-engines2
- VERSION=2.20.0
+ VERSION=2.20.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gtk-engines-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gtk-engines-$VERSION
diff --git a/gnome2-libs/gtk-engines2/HISTORY
b/gnome2-libs/gtk-engines2/HISTORY
index 75b859a..41b05bf 100644
--- a/gnome2-libs/gtk-engines2/HISTORY
+++ b/gnome2-libs/gtk-engines2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.20.1
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.20.0

diff --git a/gnome2-libs/gtk-engines2/gtk-engines-2.20.0.tar.bz2.sig
b/gnome2-libs/gtk-engines2/gtk-engines-2.20.0.tar.bz2.sig
deleted file mode 100644
index 4657048..0000000
Binary files a/gnome2-libs/gtk-engines2/gtk-engines-2.20.0.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gtk-engines2/gtk-engines-2.20.1.tar.bz2.sig
b/gnome2-libs/gtk-engines2/gtk-engines-2.20.1.tar.bz2.sig
new file mode 100644
index 0000000..064bb78
Binary files /dev/null and
b/gnome2-libs/gtk-engines2/gtk-engines-2.20.1.tar.bz2.sig differ
diff --git a/gnome2-libs/pangomm/DETAILS b/gnome2-libs/pangomm/DETAILS
index 5e356c8..b651499 100755
--- a/gnome2-libs/pangomm/DETAILS
+++ b/gnome2-libs/pangomm/DETAILS
@@ -1,5 +1,5 @@
SPELL=pangomm
- VERSION=2.26.0
+ VERSION=2.26.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/pangomm/HISTORY b/gnome2-libs/pangomm/HISTORY
index 5de7efe..f18f424 100644
--- a/gnome2-libs/pangomm/HISTORY
+++ b/gnome2-libs/pangomm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.26.1
+
2010-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: don't build documentation since this causes
the installation to fail, made the build process less
diff --git a/gnome2-libs/pangomm/pangomm-2.26.0.tar.bz2.sig
b/gnome2-libs/pangomm/pangomm-2.26.0.tar.bz2.sig
deleted file mode 100644
index e88f072..0000000
Binary files a/gnome2-libs/pangomm/pangomm-2.26.0.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/pangomm/pangomm-2.26.1.tar.bz2.sig
b/gnome2-libs/pangomm/pangomm-2.26.1.tar.bz2.sig
new file mode 100644
index 0000000..4b670e7
Binary files /dev/null and b/gnome2-libs/pangomm/pangomm-2.26.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/tracker/BUILD b/gnome2-libs/tracker/BUILD
index 0670a04..4c4ba12 100755
--- a/gnome2-libs/tracker/BUILD
+++ b/gnome2-libs/tracker/BUILD
@@ -1,5 +1,17 @@
-OPTS="--enable-video-extractor=${TRACKER_EXTRACTOR} ${OPTS}" &&
-OPTS="--enable-file-monitoring=${TRACKER_MONITOR} ${OPTS}" &&
+if [[ "${TRACKER_AC}" == "devicekit-power" ]]; then
+ OPTS="--enable-devkit-power --disable-hal ${OPTS}"
+else
+ OPTS="--disable-devkit-power --enable-hal ${OPTS}"
+fi &&
+
+OPTS="--enable-video-extractor=${TRACKER_EXTRACTOR} \
+ ${TRACKER_SEARCH_TOOL} \
+ ${TRACKER_PREFERENCES} \
+ ${TRACKER_STATUS} \
+ ${TRACKER_EXPLORER} \
+ ${TRACKER_SEARCH_BAR} \
+ ${OPTS}" &&
+
make_single &&
default_build &&
make_normal
diff --git a/gnome2-libs/tracker/CONFIGURE b/gnome2-libs/tracker/CONFIGURE
index 55c0d9c..62b6783 100755
--- a/gnome2-libs/tracker/CONFIGURE
+++ b/gnome2-libs/tracker/CONFIGURE
@@ -7,8 +7,27 @@ elif spell_ok xine-lib; then
else
config_query_list TRACKER_EXTRACTOR "Which video extractor to use?" \
external gstreamer xine
-fi &&
+fi &&

-config_query_list TRACKER_MONITOR "Which file monitoring to use?" \
- inotify fam polling &&
-config_query TRACKER_GUI "Do you want to build the GUI(adds gnome as
dependency)" y
+config_query_list TRACKER_AC "Which AC power detection to use?" \
+ devicekit-power hal &&
+
+config_query_option TRACKER_SEARCH_TOOL "Build tracker-search-tool?" y \
+ "--enable-tracker-search-tool" \
+ "--disable-tracker-search-tool" &&
+
+config_query_option TRACKER_PREFERENCES "Build tracker-preferences?" y \
+ "--enable-tracker-preferences" \
+ "--disable-tracker-preferences" &&
+
+config_query_option TRACKER_STATUS "Build tracker-status-icon?" y \
+ "--enable-tracker-status-icon" \
+ "--disable-tracker-status-icon" &&
+
+config_query_option TRACKER_EXPLORER "Build tracker-explorer?" y \
+ "--enable-tracker-explorer" \
+ "--disable-tracker-explorer" &&
+
+config_query_option TRACKER_SEARCH_BAR "Build tracker-search-bar?" y \
+ "--enable-tracker-search-bar" \
+ "--disable-tracker-search-bar"
diff --git a/gnome2-libs/tracker/DEPENDS b/gnome2-libs/tracker/DEPENDS
index da48b22..53b35d9 100755
--- a/gnome2-libs/tracker/DEPENDS
+++ b/gnome2-libs/tracker/DEPENDS
@@ -1,41 +1,129 @@
-depends libgee &&
-depends dbus-glib &&
-depends bzip2 &&
-depends zlib &&
-depends libpng &&
-depends intltool &&
-depends perl &&
-depends xml-parser-expat &&
-depends pango &&
-depends gmime &&
-depends sqlite "--enable-external-sqlite" &&
-optional_depends libgsf \
- "--enable-gsf" \
- "--disable-gsf" \
- "GSF data extractor" &&
-optional_depends libexif \
- "--enable-exif" \
- "--disable-exif" \
- "exif data extractor" &&
-optional_depends poppler \
- "--enable-pdf" \
- "--disable-pdf" \
- "PDF data extractor support" &&
-
-if [[ ${TRACKER_GUI} == y ]]; then
-depends gtk+2 &&
-depends gnome-vfs2 &&
-depends gnome-desktop &&
-optional_depends xdg-utils "" "" "for automatic adaption of programs
used by tracker-search-tool to the desktop environment"
-fi &&
+depends dbus &&
+depends dbus-glib &&
+depends zlib &&
+depends libpng &&
+depends intltool &&
+depends perl &&
+depends xml-parser-expat &&
+depends pango &&
+depends -sub TSAFE sqlite &&
+depends data-uuid &&
+depends glib2 &&
+
+optional_depends id3lib \
+ "--enable-id3lib" \
+ "--disable-id3lib" \
+ "for writeback for MP3 data" &&
+
+optional_depends libxml2 \
+ "--enable-libxml2" \
+ "--disable-libxml2" \
+ "for HTML/XML extractors" &&
+
+optional_depends libnotify \
+ "--enable-libinotify" \
+ "--disable-libinotify" \
+ "for the filesystem monitoring" &&
+
+optional_depends libgnome-keyring \
+ "--enable-gnome-keyring" \
+ "--disable-gnome-keyring" \
+ "for Gnome Keyring support" &&
+
+optional_depends libgsf \
+ "--enable-libgsf" \
+ "--disable-libgsf" \
+ "GSF data extractor" &&
+
+optional_depends libexif \
+ "--enable-libexif" \
+ "--disable-libexif" \
+ "exif data extractor" &&
+
+optional_depends poppler \
+ "--enable-poppler-glib" \
+ "--disable-poppler-glib" \
+ "PDF data extractor support" &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation" &&
+
+if is_depends_enabled $SPELL gtk-doc; then
+ depends graphviz
+fi &&
+
+optional_depends enca \
+ "--with-enca" \
+ "--without-enca" \
+ "for Cyrillic language detection in MP3s" &&
+
+optional_depends libvorbis \
+ "--enable-libvorbis" \
+ "--disable-libvorbis" \
+ "for vorbis data (ogg) extractor" &&
+
+optional_depends flac \
+ "--enable-libflac" \
+ "--disable-libflac" \
+ "for flac data extractor" &&
+
+optional_depends totem-pl-parser \
+ "--enable-playlist" \
+ "--disable-playlist" \
+ "to enable playlist support" &&
+
+optional_depends nautilus2 \
+ "--enable-nautilus-extension" \
+ "--disable-nautilus-extension" \
+ "for the nautilus extension (tagging widget)" &&
+
+optional_depends exempi \
+ "--enable-exempi" \
+ "--disable-exempi" \
+ "for XMP data extractor" &&
+
+optional_depends jpeg \
+ "--enable-libjpeg" \
+ "--disable-libjpeg" \
+ "for JPEG data extractor" &&
+
+optional_depends tiff \
+ "--enable-libtiff" \
+ "--disable-libtiff" \
+ "for TIFF data extractor" &&
+
+optional_depends libiptcdata \
+ "--enable-libiptcdata" \
+ "--disable-libiptcdata" \
+ "for iptc data extractor" &&

if [[ "${TRACKER_EXTRACTOR}" == "gstreamer" ]]; then
-depends gstreamer
+ depends gstreamer
elif [[ "${TRACKER_EXTRACTOR}" == "xine" ]]; then
-depends xine-lib
-fi &&
+ depends xine-lib
+fi &&
+
+if [[ "${TRACKER_AC}" == "devicekit-power" ]]; then
+ depends devicekit-power
+else
+ depends hal
+fi &&
+
+if [[ "${TRACKER_SEARCH_TOOL}" == "--enable-tracker-search-tool" ]] ||
+ [[ "${TRACKER_PREFERENCES}" == "--enable-tracker-preferences" ]] ||
+ [[ "${TRACKER_STATUS}" == "--enable-tracker-status-icon" ]] ||
+ [[ "${TRACKER_EXPLORER}" == "--enable-tracker-explorer" ]] ||
+ [[ "${TRACKER_SEARCH_BAR}" == "--enable-tracker-search-bar" ]]; then
+ depends gtk+2
+fi &&
+
+if [[ "${TRACKER_SEARCH_TOOL}" == "--enable-tracker-search-tool" ]] ||
+ [[ "${TRACKER_EXPLORER}" == "--enable-tracker-explorer" ]]; then
+ depends libgee
+fi &&

-if [[ "${TRACKER_MONITOR}" == "fam" ]]; then
-depends FAM
+if [[ "${TRACKER_SEARCH_BAR}" == "--enable-tracker-search-bar" ]]; then
+ depends gnome-panel
fi
-
diff --git a/gnome2-libs/tracker/DETAILS b/gnome2-libs/tracker/DETAILS
index 8abb3c9..14fc58b 100755
--- a/gnome2-libs/tracker/DETAILS
+++ b/gnome2-libs/tracker/DETAILS
@@ -1,22 +1,14 @@
SPELL=tracker
-if [[ $TRACKER_SCM == y ]] ;then
-if [[ $TRACKER_SCM_AUTO == y ]] ;then
- VERSION=0.7.28
+if [[ "$TRACKER_DEVEL" == "y" ]]; then
+ VERSION=0.9.1
else
- VERSION=0.7.28
+ VERSION=0.8.2
fi
- SOURCE=$SPELL-svn.tar.bz2
- SOURCE_IGNORE=volatile
- SOURCE_URL=svn_http://svn.gnome.org/svn/tracker/trunk:tracker-svn
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- FORCE_DOWNLOAD=1
-else
- VERSION=0.7.28
+ BRANCH=${VERSION:0:3}
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/${SPELL}/0.7/${SOURCE}
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-fi
+ SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.tracker-project.org/
ENTERED=20060524
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index d08b8a6..f41ef3f 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,17 @@
+2010-04-15 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * BUILD, CONFIGURE: removed TRACKER_MONITOR, TRACKER_GUI,
+ added TRACKER_AC, TRACKER_SEARCH_TOOL, TRACKER_PREFERENCES,
+ TRACKER_STATUS, TRACKER_EXPLORER, TRACKER_SEARCH_BAR
+ * DEPENDS: removed libgee, bzip2, gmime, removed optional gnome-vfs2,
+ xdg-utils, gnome-desktop, added optional id3lib, libxml2, libnotify,
+ libgnome-keyring, gtk-doc, graphviz, enca, libvorbis, flac,
+ totem-pl-parser, nautilus2, jpeg, tiff, libiptcdata,
devicekit-power,
+ hal, gtk+2, libgee, gnome-panel, exempi
+ * DETAILS, PREPARE: removed SCM version, added developement version
+ updated developement to 0.9.1
+ updated stable to 0.8.2
+ * PRE_BUILD: removed
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 0.7.28

diff --git a/gnome2-libs/tracker/PREPARE b/gnome2-libs/tracker/PREPARE
index c1ba866..c4b2a76 100755
--- a/gnome2-libs/tracker/PREPARE
+++ b/gnome2-libs/tracker/PREPARE
@@ -1,7 +1 @@
-config_query TRACKER_SCM "Do you want SCM version" n &&
-if [[ "${TRACKER_SCM}" == "y" ]]
-then
-config_query TRACKER_SCM_AUTO \
- "Automaticaly update the spell on sorcery queue/system-update?" \
- n
-fi
+config_query TRACKER_DEVEL "Build devel version?" n
diff --git a/gnome2-libs/tracker/PRE_BUILD b/gnome2-libs/tracker/PRE_BUILD
deleted file mode 100755
index 9d9091f..0000000
--- a/gnome2-libs/tracker/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-if [[ $TRACKER_SCM == y ]] ; then
-NOCONFIGURE=X ./autogen.sh
-fi
diff --git a/gnome2-libs/tracker/tracker-0.7.28.tar.bz2.sig
b/gnome2-libs/tracker/tracker-0.7.28.tar.bz2.sig
deleted file mode 100644
index 3530e8a..0000000
Binary files a/gnome2-libs/tracker/tracker-0.7.28.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/tracker/tracker-0.8.2.tar.bz2.sig
b/gnome2-libs/tracker/tracker-0.8.2.tar.bz2.sig
new file mode 100644
index 0000000..e332b92
Binary files /dev/null and b/gnome2-libs/tracker/tracker-0.8.2.tar.bz2.sig
differ
diff --git a/gnome2-libs/tracker/tracker-0.9.1.tar.bz2.sig
b/gnome2-libs/tracker/tracker-0.9.1.tar.bz2.sig
new file mode 100644
index 0000000..8e1a720
Binary files /dev/null and b/gnome2-libs/tracker/tracker-0.9.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/zenity/DEPENDS b/gnome2-libs/zenity/DEPENDS
index a381cb8..0a88abd 100755
--- a/gnome2-libs/zenity/DEPENDS
+++ b/gnome2-libs/zenity/DEPENDS
@@ -1,5 +1,5 @@
depends gtk+2 &&
-
+depends gnome-doc-utils &&
optional_depends libnotify \
"--enable-libnotify" "--disable-libnotify" \
"Enable libnotify support?" &&
diff --git a/gnome2-libs/zenity/HISTORY b/gnome2-libs/zenity/HISTORY
index d05a86b..d1a3a50 100644
--- a/gnome2-libs/zenity/HISTORY
+++ b/gnome2-libs/zenity/HISTORY
@@ -1,3 +1,6 @@
+2010-04-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added missing dependency on gnome-doc-utils
+
2010-03-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 0040410..c9586eb 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -6,9 +6,9 @@ depends gegl &&
depends intltool &&
optional_depends iso-codes &&

-optional_depends poppler "" "" "pdf support" &&
-optional_depends lcms "" "" "for color proof module" &&
-optional_depends libwmf "" "" "for Windows Metafile Format support" &&
+optional_depends poppler "" "--without-poppler" "for pdf support" &&
+optional_depends lcms "" "--without-lcms" "for color proof module" &&
+optional_depends libwmf "" "--without-wmf" "for Windows Metafile Format
support" &&

optional_depends pygtk2 \
"--enable-python" \
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index fcecebf..4a4afb1 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added disable options for poppler, lcms and libwmf
+
2009-12-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.8

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 79869a9..2d3190b 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.6.1-1
+ VERSION=6.6.1-3
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 303e956..16b2336 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2010-04-16 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.6.1-3
+
2010-04-10 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 6.6.1-1

diff --git a/graphics/imagemagick/ImageMagick-6.6.1-1.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.6.1-1.tar.bz2.sig
deleted file mode 100644
index 5752d5f..0000000
Binary files a/graphics/imagemagick/ImageMagick-6.6.1-1.tar.bz2.sig and
/dev/null differ
diff --git a/graphics/imagemagick/ImageMagick-6.6.1-3.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.6.1-3.tar.bz2.sig
new file mode 100644
index 0000000..77ebd18
Binary files /dev/null and
b/graphics/imagemagick/ImageMagick-6.6.1-3.tar.bz2.sig differ
diff --git a/graphics/rawstudio/HISTORY b/graphics/rawstudio/HISTORY
index 2488d0f..25ab5d5 100644
--- a/graphics/rawstudio/HISTORY
+++ b/graphics/rawstudio/HISTORY
@@ -1,3 +1,7 @@
+2010-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, gcc-4.4.patch: added patch to make the spell
+ compile with gcc 4.4
+
2009-08-16 Finn Haedicke <finn_haedicke AT gmx.net>
* DETAILS: updated spell to 1.2

diff --git a/graphics/rawstudio/PRE_BUILD b/graphics/rawstudio/PRE_BUILD
index c00f9e7..d81cd9f 100755
--- a/graphics/rawstudio/PRE_BUILD
+++ b/graphics/rawstudio/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch &&
if [[ $RAWSTUDIO_SCM == y ]]; then
NOCONFIGURE=X ./autogen.sh
fi
diff --git a/graphics/rawstudio/gcc-4.4.patch
b/graphics/rawstudio/gcc-4.4.patch
new file mode 100644
index 0000000..60818af
--- /dev/null
+++ b/graphics/rawstudio/gcc-4.4.patch
@@ -0,0 +1,11 @@
+--- rawstudio-1.2/src/dcraw.cc 2009-04-09 23:21:45.000000000 +0200
++++ rawstudio-1.2.fixed/src/dcraw.cc 2010-04-15 11:38:21.188270444 +0200
+@@ -8510,7 +8510,7 @@
+ argv[argc] = "";
+ for (arg=1; (((opm = argv[arg][0]) - 2) | 2) == '+'; ) {
+ opt = argv[arg++][1];
+- if ((cp = strchr (sp="nbrkStqmHACg", opt)))
++ if ((cp = const_cast<char *>(strchr (sp="nbrkStqmHACg", opt))))
+ for (i=0; i < "114111111422"[cp-sp]-'0'; i++)
+ if (!isdigit(argv[arg+i][0])) {
+ dcraw_message (DCRAW_ERROR,_("Non-numeric argument to \"-%c\"\n"),
opt);
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 754d2cc..8a84e07 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -79,10 +79,11 @@ optional_depends lirc
\
'--disable-lirc' \
'for Linux infra-red controller support' &&

-optional_depends GECKO \
- '--enable-xpcom' \
- '--disable-xpcom' \
- 'Enable xpcom support in NPAPI plugin' &&
+# http://bugs.sourcemage.org/show_bug.cgi?id=15660
+# optional_depends GECKO \
+# '--enable-xpcom' \
+# '--disable-xpcom' \
+# 'Enable xpcom support in NPAPI plugin' &&

optional_depends giflib \
'' \
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 36a3ba5..f79afbb 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: disabled xpcom support in NPAPI plugin temporarily #15660
+
2010-04-11 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: docbook-utils -> docbook2x, added pygtk2 #15660

diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index e6680cf..8e7082d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD, webkit-icu44.patch: added patch to fix icu 4.4 issues
+
2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.0
* DEPENDS: used devel dependencies for both stable and devel now
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
new file mode 100755
index 0000000..f7ec6ef
--- /dev/null
+++ b/http/webkitgtk/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+if [ "$(installed_version icu)" == '4.4' ]; then
+ patch -p1 < "${SCRIPT_DIRECTORY}/webkit-icu44.patch"
+fi
diff --git a/http/webkitgtk/webkit-icu44.patch
b/http/webkitgtk/webkit-icu44.patch
new file mode 100644
index 0000000..3ff1d6f
--- /dev/null
+++ b/http/webkitgtk/webkit-icu44.patch
@@ -0,0 +1,136 @@
+diff -Naur webkit-1.2.0/WebCore/ChangeLog
webkit-1.2.0.fixed/WebCore/ChangeLog
+--- webkit-1.2.0/WebCore/ChangeLog 2010-04-05 14:51:20.000000000 +0200
++++ webkit-1.2.0.fixed/WebCore/ChangeLog 2010-04-08 15:40:42.227947390
+0200
+@@ -1,3 +1,24 @@
++2010-03-20 Darin Adler <darin AT apple.com>
++
++ Reviewed by NOBODY (OOPS!).
++
++ TextBreakIteratorICU.cpp is incompatible with new UBreakIterator
type in ICU 4.4
++ https://bugs.webkit.org/show_bug.cgi?id=36381
++
++ * platform/text/TextBreakIteratorICU.cpp:
++ (WebCore::setUpIterator): Use reinterpret_cast instead of
static_cast or relying
++ on conversion to void*.
++ (WebCore::textBreakFirst): Ditto.
++ (WebCore::textBreakLast): Ditto.
++ (WebCore::textBreakNext): Ditto.
++ (WebCore::textBreakPrevious): Ditto.
++ (WebCore::textBreakPreceding): Ditto.
++ (WebCore::textBreakFollowing): Ditto.
++ (WebCore::textBreakCurrent): Ditto.
++ (WebCore::isTextBreak): Ditto.
++ (WebCore::setUpIteratorWithRules): Ditto.
++
++
+ 2010-04-01 MORITA Hajime <morrita AT google.com>
+
+ Reviewed by Darin Adler.
+diff -Naur webkit-1.2.0/WebCore/platform/text/TextBreakIteratorICU.cpp
webkit-1.2.0.fixed/WebCore/platform/text/TextBreakIteratorICU.cpp
+--- webkit-1.2.0/WebCore/platform/text/TextBreakIteratorICU.cpp
2010-04-05 14:51:20.000000000 +0200
++++ webkit-1.2.0.fixed/WebCore/platform/text/TextBreakIteratorICU.cpp
2010-04-08 15:38:04.705203914 +0200
+@@ -24,7 +24,6 @@
+
+ #include "PlatformString.h"
+ #include "TextBreakIteratorInternalICU.h"
+-
+ #include <unicode/ubrk.h>
+ #include <wtf/Assertions.h>
+
+@@ -38,7 +37,7 @@
+
+ if (!createdIterator) {
+ UErrorCode openStatus = U_ZERO_ERROR;
+- iterator = static_cast<TextBreakIterator*>(ubrk_open(type,
currentTextBreakLocaleID(), 0, 0, &openStatus));
++ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type,
currentTextBreakLocaleID(), 0, 0, &openStatus));
+ createdIterator = true;
+ ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a
break iterator: %s (%d)", u_errorName(openStatus), openStatus);
+ }
+@@ -46,7 +45,7 @@
+ return 0;
+
+ UErrorCode setTextStatus = U_ZERO_ERROR;
+- ubrk_setText(iterator, string, length, &setTextStatus);
++ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string,
length, &setTextStatus);
+ if (U_FAILURE(setTextStatus))
+ return 0;
+
+@@ -85,44 +84,44 @@
+ staticSentenceBreakIterator, UBRK_SENTENCE, string, length);
+ }
+
+-int textBreakFirst(TextBreakIterator* bi)
++int textBreakFirst(TextBreakIterator* iterator)
+ {
+- return ubrk_first(bi);
++ return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+
+-int textBreakLast(TextBreakIterator* bi)
++int textBreakLast(TextBreakIterator* iterator)
+ {
+- return ubrk_last(bi);
++ return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+
+-int textBreakNext(TextBreakIterator* bi)
++int textBreakNext(TextBreakIterator* iterator)
+ {
+- return ubrk_next(bi);
++ return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+
+-int textBreakPrevious(TextBreakIterator* bi)
++int textBreakPrevious(TextBreakIterator* iterator)
+ {
+- return ubrk_previous(bi);
++ return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+
+-int textBreakPreceding(TextBreakIterator* bi, int pos)
++int textBreakPreceding(TextBreakIterator* iterator, int pos)
+ {
+- return ubrk_preceding(bi, pos);
++ return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
+ }
+
+-int textBreakFollowing(TextBreakIterator* bi, int pos)
++int textBreakFollowing(TextBreakIterator* iterator, int pos)
+ {
+- return ubrk_following(bi, pos);
++ return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
+ }
+
+-int textBreakCurrent(TextBreakIterator* bi)
++int textBreakCurrent(TextBreakIterator* iterator)
+ {
+- return ubrk_current(bi);
++ return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+
+-bool isTextBreak(TextBreakIterator* bi, int pos)
++bool isTextBreak(TextBreakIterator* iterator, int position)
+ {
+- return ubrk_isBoundary(bi, pos);
++ return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator),
position);
+ }
+
+ #ifndef BUILDING_ON_TIGER
+@@ -136,7 +135,7 @@
+ UParseError parseStatus;
+ UErrorCode openStatus = U_ZERO_ERROR;
+ String rules(breakRules);
+- iterator =
static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(),
rules.length(), 0, 0, &parseStatus, &openStatus));
++ iterator =
reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(),
rules.length(), 0, 0, &parseStatus, &openStatus));
+ createdIterator = true;
+ ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a
break iterator: %s (%d)", u_errorName(openStatus), openStatus);
+ }
+@@ -144,7 +143,7 @@
+ return 0;
+
+ UErrorCode setTextStatus = U_ZERO_ERROR;
+- ubrk_setText(iterator, string, length, &setTextStatus);
++ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string,
length, &setTextStatus);
+ if (U_FAILURE(setTextStatus))
+ return 0;
+
diff --git a/libs/libffi/DETAILS b/libs/libffi/DETAILS
index b289f95..304184f 100755
--- a/libs/libffi/DETAILS
+++ b/libs/libffi/DETAILS
@@ -1,10 +1,10 @@
SPELL=libffi
- VERSION=3.0.8
+ VERSION=3.0.9
+
SOURCE_HASH=sha512:8fc6787aa99f608f08e22bcd77b522ac55582d6890eeb0a18f650a36bc43cbea6cbfa1731d414ab3fd3a347b4cfcd2a81a30a4933eeae24a6612576d70de30e2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=ftp://sourceware.org/pub/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:9476316fef780f9566d05af03cc2c46d0f5a89c7c93a2e5aa646140d0ace5864d6a70f696922b1a9d69e95abf2a16a48c683d70dd56c32349da8a4d3e9d44f9f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://gnustep.org";
+ WEB_SITE=http://sourceware.org/libffi/
LICENSE[0]=GPL
ENTERED=20090424
SHORT="a message forwarding lib"
diff --git a/libs/libffi/HISTORY b/libs/libffi/HISTORY
index 821ea76..12ec09d 100644
--- a/libs/libffi/HISTORY
+++ b/libs/libffi/HISTORY
@@ -1,3 +1,7 @@
+2010-04-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.9
+ new WEB_SITE
+
2009-04-24 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: spell created

diff --git a/libs/libsigc++3/DETAILS b/libs/libsigc++3/DETAILS
index 147d0ee..48e9344 100755
--- a/libs/libsigc++3/DETAILS
+++ b/libs/libsigc++3/DETAILS
@@ -1,5 +1,5 @@
SPELL=libsigc++3
- VERSION=2.2.5
+ VERSION=2.2.6
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=libsigc++-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/libsigc++-$VERSION"
diff --git a/libs/libsigc++3/HISTORY b/libs/libsigc++3/HISTORY
index 995202b..c8b4121 100644
--- a/libs/libsigc++3/HISTORY
+++ b/libs/libsigc++3/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.6
+
2010-03-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.5

diff --git a/libs/libsigc++3/libsigc++-2.2.5.tar.gz.sig
b/libs/libsigc++3/libsigc++-2.2.5.tar.gz.sig
deleted file mode 100644
index 4baa626..0000000
Binary files a/libs/libsigc++3/libsigc++-2.2.5.tar.gz.sig and /dev/null differ
diff --git a/libs/libsigc++3/libsigc++-2.2.6.tar.gz.sig
b/libs/libsigc++3/libsigc++-2.2.6.tar.gz.sig
new file mode 100644
index 0000000..1026234
Binary files /dev/null and b/libs/libsigc++3/libsigc++-2.2.6.tar.gz.sig differ
diff --git a/libs/libxml++/BUILD b/libs/libxml++/BUILD
new file mode 100755
index 0000000..a4413e6
--- /dev/null
+++ b/libs/libxml++/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS --disable-documentation" &&
+default_build
diff --git a/libs/libxml++/HISTORY b/libs/libxml++/HISTORY
index e9bbea5..e89ce7b 100644
--- a/libs/libxml++/HISTORY
+++ b/libs/libxml++/HISTORY
@@ -1,3 +1,7 @@
+2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: disabled building of documentation so the build
+ doesn't fail
+
2010-04-01 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/mail/mailx/HISTORY b/mail/mailx/HISTORY
index 4ecb6c2..dbe5962 100644
--- a/mail/mailx/HISTORY
+++ b/mail/mailx/HISTORY
@@ -1,3 +1,7 @@
+2010-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * openssl-1.patch: added, to fix compilation with openssl 1
+
2009-01-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 12.4; quoting paths; fixed short desc
* INSTALL: quoting paths
diff --git a/mail/mailx/PRE_BUILD b/mail/mailx/PRE_BUILD
new file mode 100755
index 0000000..bd753af
--- /dev/null
+++ b/mail/mailx/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if spell_ok openssl && [[ $(installed_version openssl) > 1.0 ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/openssl-1.patch"
+fi
diff --git a/mail/mailx/openssl-1.patch b/mail/mailx/openssl-1.patch
new file mode 100644
index 0000000..5820dee
--- /dev/null
+++ b/mail/mailx/openssl-1.patch
@@ -0,0 +1,69 @@
+--- openssl.c.orig 2007-08-04 11:38:03.000000000 +0000
++++ openssl.c 2010-04-04 20:37:40.000000000 +0000
+@@ -105,7 +105,7 @@
+ static void ssl_load_verifications(struct sock *sp);
+ static void ssl_certificate(struct sock *sp, const char *uhp);
+ static enum okay ssl_check_host(const char *server, struct sock *sp);
+-static int smime_verify(struct message *m, int n, STACK *chain,
++static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
+ X509_STORE *store);
+ static EVP_CIPHER *smime_cipher(const char *name);
+ static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
+@@ -308,7 +308,7 @@
+ X509 *cert;
+ X509_NAME *subj;
+ char data[256];
+- /*GENERAL_NAMES*/STACK *gens;
++ /*GENERAL_NAMES*/STACK_OF(GENERAL_NAMES) *gens;
+ GENERAL_NAME *gen;
+ int i;
+
+@@ -496,7 +496,7 @@
+ }
+
+ static int
+-smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
++smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE
*store)
+ {
+ struct message *x;
+ char *cp, *sender, *to, *cc, *cnttype;
+@@ -505,7 +505,8 @@
+ off_t size;
+ BIO *fb, *pb;
+ PKCS7 *pkcs7;
+- STACK *certs, *gens;
++ STACK_OF(X509) *certs;
++ STACK_OF(GENERAL_NAMES) *gens;
+ X509 *cert;
+ X509_NAME *subj;
+ char data[LINESIZE];
+@@ -614,7 +615,7 @@
+ {
+ int *msgvec = vp, *ip;
+ int ec = 0;
+- STACK *chain = NULL;
++ STACK_OF(X509) *chain = NULL;
+ X509_STORE *store;
+ char *ca_dir, *ca_file;
+
+@@ -687,7 +688,7 @@
+ X509 *cert;
+ PKCS7 *pkcs7;
+ BIO *bb, *yb;
+- STACK *certs;
++ STACK_OF(X509) *certs;
+ EVP_CIPHER *cipher;
+
+ certfile = expand((char *)certfile);
+@@ -950,9 +951,9 @@
+ off_t size;
+ BIO *fb, *pb;
+ PKCS7 *pkcs7;
+- STACK *certs;
++ STACK_OF(X509) *certs;
+ X509 *cert;
+- STACK *chain = NULL;
++ STACK_OF(X509) *chain = NULL;
+ enum okay ok = OKAY;
+
+ message_number = n;
diff --git a/net/nsd/DETAILS b/net/nsd/DETAILS
index 2863b12..ab2f241 100755
--- a/net/nsd/DETAILS
+++ b/net/nsd/DETAILS
@@ -1,9 +1,9 @@
SPELL=nsd
- VERSION=3.2.4
+ VERSION=3.2.5
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:1218980ba0974dc4ee2f67022c84c6d135cfa2b26a023f4568e84c8caf8a6e9b0c1ea0cfeef6cf281c9e3596d0f18c1efd89e8994ddbb939bb4a86e5dab34f94
+
SOURCE_HASH=sha512:083a8baf5f57b38cd1deab8c75fc846d5abc993952be37f33b11ac09196f590e492488744a21af4250bacb587e6922755d4e858bdd8fbbd35b7f63ffa47583e0
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.nlnetlabs.nl/projects/nsd/
LICENSE[0]=BSD
diff --git a/net/nsd/HISTORY b/net/nsd/HISTORY
index 6a491e7..93480f2 100644
--- a/net/nsd/HISTORY
+++ b/net/nsd/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.5
+
2010-01-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.2.4

diff --git a/printer/system-config-printer/DETAILS
b/printer/system-config-printer/DETAILS
index 829d28b..68dd8e7 100755
--- a/printer/system-config-printer/DETAILS
+++ b/printer/system-config-printer/DETAILS
@@ -1,10 +1,10 @@
SPELL=system-config-printer
- VERSION=1.1.18
-
SOURCE_HASH=sha512:af5b439144175aff62b3f0bc890c66ff37ab29f4451bdc207349e22ffde42edb7fe6a5c3575a00c5a4b496891ee44df19cb6b8324bfacf02eb8ba47bfffff9f2
+ VERSION=1.2.1
+
SOURCE_HASH=sha512:5c3a427604f004c4ce6d86e43c3d6b68ed3badfc317f93d38a109261efa1cc327a1ce9429ab472db8398327115f9f8dcdb7153f37713e30b12829e5a5c9b3ec9
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://cyberelk.net/tim/data/system-config-printer/1.1/$SOURCE
+
SOURCE_URL[0]=http://cyberelk.net/tim/data/system-config-printer/1.2/$SOURCE
# SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
# SOURCE_GPG=tim.gpg:$SOURCE.sig:UPSTREAM_KEY
# SOURCE2_IGNORE=signature
diff --git a/printer/system-config-printer/HISTORY
b/printer/system-config-printer/HISTORY
index f456f2d..b55a3c6 100644
--- a/printer/system-config-printer/HISTORY
+++ b/printer/system-config-printer/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.1
+
2010-03-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.18

diff --git a/security/base/HISTORY b/security/base/HISTORY
index dc8136c..3360653 100644
--- a/security/base/HISTORY
+++ b/security/base/HISTORY
@@ -1,3 +1,8 @@
+2010-04-15 Arjan Bouter <abouter AT sourcemage.org>
+ * INSTALL: create install_dir before install,
+ don't put the default config file in place.
+ that's the SA's job
+
2009-06-12 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, INSTAL: spell created

diff --git a/security/base/INSTALL b/security/base/INSTALL
index 8f32164..be03305 100755
--- a/security/base/INSTALL
+++ b/security/base/INSTALL
@@ -1,9 +1,7 @@
cd ${SOURCE_DIRECTORY} &&
install_dir=${INSTALL_ROOT}/usr/share/www/${SPELL} &&
+mkdir -p "${install_dir}" &&
peardir="$(pear config-show | grep "PEAR directory"|awk '{print $4}')" &&

install_www_files &&
-install world_map6.png world_map6.txt ${peardir}/Image/Graph/Images/Maps/ &&
-
-[[ -e ${install_dir}/base_conf.php ]] || \
- cp ${install_dir}/base_conf.php.dist ${install_dir}/base_conf.php
+install world_map6.png world_map6.txt ${peardir}/Image/Graph/Images/Maps/
diff --git a/shell-term-fm/c3270/DETAILS b/shell-term-fm/c3270/DETAILS
index 467a78d..674e8e5 100755
--- a/shell-term-fm/c3270/DETAILS
+++ b/shell-term-fm/c3270/DETAILS
@@ -1,24 +1,22 @@
SPELL=c3270
- VERSION=3.3.7p8
- SOURCE=$SPELL-$VERSION.tgz
+ VERSION=3.3.10ga4
+ SOURCE=suite3270-$VERSION-src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-3.3
- SOURCE_URL[0]=$SOURCEFORGE_URL/x3270/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/c3270/$SOURCE
WEB_SITE=http://x3270.bgp.nu
ENTERED=20020411
-
SOURCE_HASH=sha512:bc4efd974437f342d644168898271397ef5bd3e9e3f3188fed2ef831e1384132934967abf80519cc6269f6d61b2666736f03754271022539935ffa084aadbb2e
+
SOURCE_HASH=sha512:d2ca4b7041c89def9c50cce9862d9fce4c8afb4ada077dce65cf632381c37b6ca6c2f9786fd3ac65fcee96992fd1b6434a830acba02ddf760aec04bdce248fe5
LICENSE[0]=GPL
KEYWORDS="emulator terminal console"
SHORT="c3270 is a curses based IBM 3270 terminal emulator."
cat << EOF
-c3270 is a curses based IBM 3270 terminal emulator.
-(If you don't know what an IBM 3270 terminal emulator is, then you probably
-don't need c3270).
+c3270 is a curses based IBM 3270 terminal emulator.
+(If you don't know what an IBM 3270 terminal emulator is, then you probably
+don't need c3270).

-c3270 runs over a TELNET connection (with or without TN3270E) and emulates
either an
-IBM 3279 (color) or 3278 (monochrome). It supports APL2 characters, IND$FILE
file
-transfer, NVT mode, a pop-up keypad for 3270-specific keys, a scrollbar, and
has
-extensive debugging and scripting facilities.
-c3270 is distributed as source code, and can be used for free.
+c3270 runs over a TELNET connection (with or without TN3270E) and emulates
either an
+IBM 3279 (color) or 3278 (monochrome). It supports APL2 characters, IND$FILE
file
+transfer, NVT mode, a pop-up keypad for 3270-specific keys, a scrollbar, and
has
+extensive debugging and scripting facilities.
+c3270 is distributed as source code, and can be used for free.
EOF
-
-
diff --git a/shell-term-fm/c3270/HISTORY b/shell-term-fm/c3270/HISTORY
index 9deddc5..1b0a42a 100644
--- a/shell-term-fm/c3270/HISTORY
+++ b/shell-term-fm/c3270/HISTORY
@@ -1,3 +1,6 @@
+2010-04-17 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: Update to 3.3.10ga4
+
2008-09-18 Tommy Boatman <tboatman AT sourcemage.org>
* DEPENDS, DETAILS, HISTORY, INSTALL: Created Spell version 3.3.7p8.

diff --git a/utils/qutescoop/BUILD b/utils/qutescoop/BUILD
index 8f58e6d..eec3de4 100755
--- a/utils/qutescoop/BUILD
+++ b/utils/qutescoop/BUILD
@@ -1 +1 @@
-make
+qt4_build
diff --git a/utils/qutescoop/DETAILS b/utils/qutescoop/DETAILS
index e44a7c2..1e5631a 100755
--- a/utils/qutescoop/DETAILS
+++ b/utils/qutescoop/DETAILS
@@ -1,9 +1,10 @@
SPELL=qutescoop
- VERSION=1.0.0
- SOURCE="QuteScoop.tgz"
- SOURCE_URL[0]=http://www.${SPELL}.org/${SOURCE}
-
SOURCE_HASH=sha512:1efe80ce24665ffa5b913149c613cafebf3232e81d02d1e79470584ca4858cd8ca114240548e39c6079d070643244b876e8628e8e3a5eea294aefa57f53ec632
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/QuteScoop"
+ VERSION=1.0.2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+
SOURCE_URL[0]=svn_https://${SPELL}.svn.sourceforge.net/svnroot/${SPELL}/tags/${VERSION}/QuteScoop:${SPELL}
+ SOURCE_HINTS[0]=no-check-certificate
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xivap.linuxpunk.org/index.php/QuteScoop";
LICENSE[0]=GPL
ENTERED=20080102
diff --git a/utils/qutescoop/HISTORY b/utils/qutescoop/HISTORY
index 1b20761..5563ff3 100644
--- a/utils/qutescoop/HISTORY
+++ b/utils/qutescoop/HISTORY
@@ -1,3 +1,8 @@
+2010-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.2
+ * BUILD: use qt4_build
+ * PRE_BUILD, teamspeak.patch: removed
+
2008-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD: don't pull in is_depends_enabled.function, is not
necessary anymore.
diff --git a/utils/qutescoop/PRE_BUILD b/utils/qutescoop/PRE_BUILD
deleted file mode 100755
index 57c6039..0000000
--- a/utils/qutescoop/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if is_depends_enabled $SPELL ts2_client; then
- patch -p1 < $SCRIPT_DIRECTORY/teamspeak.patch
-fi &&
-${INSTALL_ROOT}/usr/bin/qt4/qmake
diff --git a/utils/qutescoop/teamspeak.patch b/utils/qutescoop/teamspeak.patch
deleted file mode 100644
index 4ba3baf..0000000
--- a/utils/qutescoop/teamspeak.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naupr QuteScoop.orig/ControllerDetails.cpp
QuteScoop.linux/ControllerDetails.cpp
---- QuteScoop.orig/ControllerDetails.cpp 2007-12-30 21:43:01.000000000
+0100
-+++ QuteScoop.linux/ControllerDetails.cpp 2008-01-12 23:48:39.740908442
+0100
-@@ -99,6 +99,8 @@ void ControllerDetails::on_btnJoinChanne
-
- #ifdef Q_WS_WIN
- QString program = "start";
-+#elif defined Q_WS_X11
-+ QString program = "teamspeak";
- #else
- QString program = "open";
- #endif
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index e5479c7..0a23156 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
SPELL=sudo
- VERSION=1.7.2p5
+ VERSION=1.7.2p6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
SOURCE2_IGNORE=signature
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE_GPG=sudo.gpg:$SOURCE.sig:UPSTREAM_KEY
WEB_SITE=http://www.courtesan.com/sudo
KEYWORDS="utils"
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index 8fa507d..39f140a 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.7.2p6, SECURITY_PATCH=3, #15674
+
2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: Fails during install with multiple make jobs

diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index ef5b764..8bcc365 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,5 +1,5 @@
SPELL=live
- VERSION=2010.02.10
+ VERSION=2010.04.09
SOURCE=$SPELL.$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index 10deee1..2b5e493 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: updated to 2010.04.09
+
2010-02-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 2010.02.10

diff --git a/video-libs/live/live.2010.02.10.tar.gz.sig
b/video-libs/live/live.2010.02.10.tar.gz.sig
deleted file mode 100644
index 21fd0bf..0000000
Binary files a/video-libs/live/live.2010.02.10.tar.gz.sig and /dev/null differ
diff --git a/video-libs/live/live.2010.04.09.tar.gz.sig
b/video-libs/live/live.2010.04.09.tar.gz.sig
new file mode 100644
index 0000000..04fa18d
Binary files /dev/null and b/video-libs/live/live.2010.04.09.tar.gz.sig differ
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index 77ed333..eb2e556 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,7 @@
+2010-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, gcc-4.4.patch: added patch to make the spell
+ compile with gcc 4.4
+
2009-01-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.0
* PRE_BUILD, mjpegtools-configure.ac-pkgconfig.diff, gcc-4.3.patch,
diff --git a/video/mjpegtools/PRE_BUILD b/video/mjpegtools/PRE_BUILD
new file mode 100755
index 0000000..1b8fb01
--- /dev/null
+++ b/video/mjpegtools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch
diff --git a/video/mjpegtools/gcc-4.4.patch b/video/mjpegtools/gcc-4.4.patch
new file mode 100644
index 0000000..3db1ad0
--- /dev/null
+++ b/video/mjpegtools/gcc-4.4.patch
@@ -0,0 +1,11 @@
+--- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2005-10-13 18:43:10.000000000
+0200
++++ mjpegtools-1.9.0.fixed/mplex/lpcmstrm_in.cpp 2010-04-15
11:16:46.103830391 +0200
+@@ -53,7 +53,7 @@
+
+ bool LPCMStream::Probe(IBitStream &bs )
+ {
+- char *last_dot = strrchr( bs.StreamName(), '.' );
++ const char *last_dot = strrchr( bs.StreamName(), '.' );
+ return
+ last_dot != NULL
+ && strcmp( last_dot+1, "lpcm") == 0;
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 718f413..dff28b5 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.1.42
+ VERSION=1.1.43
else
VERSION=1.0.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index ea50b76..f624de8 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2010-04-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.43
+
2010-04-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.42

diff --git a/x11-toolkits/gtkmm2/DETAILS b/x11-toolkits/gtkmm2/DETAILS
index 5b381df..4edefd9 100755
--- a/x11-toolkits/gtkmm2/DETAILS
+++ b/x11-toolkits/gtkmm2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gtkmm2
- VERSION=2.20.1
+ VERSION=2.20.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL%?}-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%?}-$VERSION"
diff --git a/x11-toolkits/gtkmm2/HISTORY b/x11-toolkits/gtkmm2/HISTORY
index d2d849d..0e60e2a 100644
--- a/x11-toolkits/gtkmm2/HISTORY
+++ b/x11-toolkits/gtkmm2/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.20.2
+
2010-04-08 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DEPENDS: depends on glibmm with DOC to build documentation

diff --git a/x11-toolkits/gtkmm2/gtkmm-2.20.1.tar.bz2.sig
b/x11-toolkits/gtkmm2/gtkmm-2.20.1.tar.bz2.sig
deleted file mode 100644
index b38a6a2..0000000
Binary files a/x11-toolkits/gtkmm2/gtkmm-2.20.1.tar.bz2.sig and /dev/null
differ
diff --git a/x11-toolkits/gtkmm2/gtkmm-2.20.2.tar.bz2.sig
b/x11-toolkits/gtkmm2/gtkmm-2.20.2.tar.bz2.sig
new file mode 100644
index 0000000..352b734
Binary files /dev/null and b/x11-toolkits/gtkmm2/gtkmm-2.20.2.tar.bz2.sig
differ
diff --git a/x11/xscreensaver/DETAILS b/x11/xscreensaver/DETAILS
index e439268..9fae3c9 100755
--- a/x11/xscreensaver/DETAILS
+++ b/x11/xscreensaver/DETAILS
@@ -1,10 +1,10 @@
SPELL=xscreensaver
- VERSION=5.10
+ VERSION=5.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.jwz.org/$SPELL/$SOURCE
WEB_SITE=http://www.jwz.org/xscreensaver/
-
SOURCE_HASH=sha512:40f8fcb5ccb6cfe2deb8d1a673e4dd5bf54b3aee940a406afae07186756ad00521384c823affa2f3867ed7305903b2676678bb78d52b4b81aeeb10a6f5dc52d7
+
SOURCE_HASH=sha512:b88dfc2c49aaadb8d78f4a3bd89b02b005c07837f382057d8417a5ccb32ec39a5d5f2f8a40b6e0a2cc7dbda79dcf66ec41ee873541132bcb476391214b62d569
ENTERED=20010922
LICENSE[0]=BSD
KEYWORDS="x11"
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index d1bdb25..6f78c12 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,6 @@
+2010-04-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.11
+
2009-09-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.10




  • [SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (28b6f3bef79f8a468d14fed657e3dbfc78007972), Eric Sandall, 04/18/2010

Archive powered by MHonArc 2.6.24.

Top of Page