Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (975795301c240886ffee857d02dc1361a6a5a52c)
  • Date: Mon, 21 May 2012 12:46:07 -0500

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

ChangeLog | 5 ++
audio-soft/qjackctl/DETAILS | 4 -
audio-soft/qjackctl/HISTORY | 3 +
chat-libs/loudmouth/HISTORY | 3 +
chat-libs/loudmouth/PRE_BUILD | 3 -
dev/null |binary
devel/qwtplot3d/HISTORY | 4 +
devel/qwtplot3d/PRE_BUILD | 5 +-
devel/qwtplot3d/qwtplot3d-qt48.patch | 19 +++++++++
disk/udisks2/DEPENDS | 7 ++-
disk/udisks2/DETAILS | 4 -
disk/udisks2/HISTORY | 5 ++
gnome2-apps/abiword/HISTORY | 3 +
gnome2-apps/abiword/PRE_BUILD | 4 +
gnome2-apps/file-roller/DETAILS | 4 -
gnome2-apps/file-roller/HISTORY | 4 +
gnome2-apps/file-roller/file-roller-3.2.2.tar.bz2.sig | 0
gnome2-apps/file-roller/file-roller-3.4.2.tar.xz.sig |binary
gnome2-libs/pygobject/DEPENDS | 7 ++-
gnome2-libs/pygobject/HISTORY | 3 +
haskell/haskell-haxml/DEPENDS | 2
haskell/haskell-haxml/DETAILS | 14 ++++++
haskell/haskell-haxml/HISTORY | 3 +
haskell/haskell-mtl/DETAILS | 4 -
haskell/haskell-mtl/HISTORY | 3 +
haskell/haskell-polyparse/DEPENDS | 2
haskell/haskell-polyparse/DETAILS | 17 ++++++++
haskell/haskell-polyparse/HISTORY | 3 +
haskell/haskell-syb/DETAILS | 4 -
haskell/haskell-syb/HISTORY | 3 +
haskell/haskell-text/DETAILS | 4 -
haskell/haskell-text/HISTORY | 3 +
haskell/haskell-transformers/DETAILS | 4 -
haskell/haskell-transformers/HISTORY | 3 +
kernels/linux/HISTORY | 5 ++
kernels/linux/info/kernels/3.4 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.4 | 5 ++
kernels/linux/latest.defaults | 4 -
libs/libvdpau/DETAILS | 1
libs/libvdpau/HISTORY | 3 +
libs/tzdata/HISTORY | 4 +
libs/tzdata/INSTALL | 4 +
lxde/lxdm/HISTORY | 4 +
lxde/lxdm/PRE_BUILD | 3 -
lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch | 27
+++++++++++++
python-pypi/distribute/DETAILS | 2
python-pypi/distribute/HISTORY | 3 +
python-pypi/distribute/distribute-0.6.26.tar.gz.sig | 0
python-pypi/distribute/distribute-0.6.27.tar.gz.sig |binary
science/gpsbabel/BUILD | 11 +++++
science/gpsbabel/DEPENDS | 4 +
science/gpsbabel/DETAILS | 18 ++++++++
science/gpsbabel/HISTORY | 8 +++
science/gpsbabel/INSTALL | 9 ++++
science/gpsbabel/PREPARE | 2
science/gpsbabel/PRE_BUILD | 6 ++
science/gpsbabel/gpsbabel-xmldoc.patch | 14 ++++++
science/proj/BUILD | 2
science/proj/DETAILS | 4 -
science/proj/HISTORY | 3 +
60 files changed, 279 insertions(+), 28 deletions(-)

New commits:
commit eb199c90f307187500e2381e06acc883d3e4cd30
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

pygobjec: added missing optional dep on libffi

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

linux LATEST_3=3.4

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

linux 3.4

commit 89d053bc8ca18be9ef5767feda1271394c05b8bf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

udisks2 - depends libacl

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

udisks2: => 1.97.0

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

abiword: fixed glib includes, only glib.h can be included.

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

Revert "haskell/haskell-x11: version 1.6.0"

This reverts commit 6d4976bb1019ac3bfa77ca62e4e1b57558d99c23.

incompatible with xmonad 0.10

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

loudmouth: fixed glib2 includes

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

tzdata: use ln instead of zic so the spell works if /etc and /usr are on
different partitions. Note that the SA still has to clean
/usr/share/zoneinfo or the spell will fail.

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

libvdpau: PATCHLEVEL=1
recast to ensure new TRIGGERS are active

commit f1f211ed25cac176735e738fd79177f8efae408b
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

lxde/lxdm/HISTORY: corrected formatting

commit e9865e0ad7de2fd508ae8581382bc07e0ce2bb1d
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

lxde/lxdm: added high CPU load fix

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

devel/qwtplot3d: fix compile error with qt 4.8

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

haskell/haskell-haxml: new spell, utilities for manipulating XML documents

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

haskell/haskell-polyparse: new spell, a variety of alternative parser
combinator libraries

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

haskell/haskell-text: version 0.11.2.1

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

haskell/haskell-x11: version 1.6.0

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

haskell/haskell-mtl: version 2.1.1

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

haskell/haskell-transformers: version 0.3.0.0

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

haskell/haskell-syb: version 0.3.6.1

commit 4dc89c277a173d899fd07f56c5242b51f22f1f1a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qjackctl: update spell to 0.3.9

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

science/proj: version 4.8.0

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

science/gpsbabel: add patch from gentoo to prevent downloading in BUILD

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

file-roller: => 3.4.2
bz2 -> xz
I'm assuming that it is no longer necessary have a PRE_BUILD for xz files.

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

distribute: => 0.6.27

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

science/gpsbabel: add support for the scm version

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

science/gpsbabel: added optional dependencies on qt4 and perl

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

pygobjec: added missing optional dep on libffi

diff --git a/ChangeLog b/ChangeLog
index 467168b..872d0b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * haskell/haskell-polyparse: new spell, a variety of alternative
parser
+ combinator libraries
+ * haskell/haskell-haxml: new spell, utilities for manipulating XML
documents
+
2012-05-17 Sukneet Basuta <sukneet AT sourcemage.org>
* libs/tzdata: new spell, the Time Zone Database

diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index 137c595..4c9dd1e 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.3.5
+ VERSION=0.3.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:f6ad2ae22ca4101c9f1f72ebb68a04b70c5a8595c4fc75a67b1f6d2799ab996dc216a361bb0e3daab31dd3d0eb4287f06a35b8d11354316458a6ab89ca34c77c
+
SOURCE_HASH=sha512:a7a06cc002101816ddc38860cfa66f4bc75f867b50c2ccaefb1c3bc43a799fbc1e6a13f31b2e2e88c4de4c27254d1f5e72972207e66359e3016c4ea9b95c3bd5

fi
WEB_SITE=http://qjackctl.sf.net
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index b390281..33b9488 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.9
+
2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

diff --git a/chat-libs/loudmouth/HISTORY b/chat-libs/loudmouth/HISTORY
index e6427ef..e20fa20 100644
--- a/chat-libs/loudmouth/HISTORY
+++ b/chat-libs/loudmouth/HISTORY
@@ -1,3 +1,6 @@
+2012-05-20 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: fix for glib2 includes
+
2011-09-14 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS: fix ssl dependency

diff --git a/chat-libs/loudmouth/PRE_BUILD b/chat-libs/loudmouth/PRE_BUILD
index fce4a96..4fe4605 100755
--- a/chat-libs/loudmouth/PRE_BUILD
+++ b/chat-libs/loudmouth/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-
+sedit 's#glib/gerror.h#glib.h#' loudmouth/lm-error.c &&
+sedit '#*glib/gi18n.h*#d' loudmouth/lm-sock.c &&
if [ $(installed_version glibc | cut -d. -f2) -gt 9 ]; then
sedit 's/HAVE_STRNDUP/__USE_XOPEN2K8/' loudmouth/asyncns.c
fi
diff --git a/devel/qwtplot3d/HISTORY b/devel/qwtplot3d/HISTORY
index c93ee5a..ceca561 100644
--- a/devel/qwtplot3d/HISTORY
+++ b/devel/qwtplot3d/HISTORY
@@ -1,3 +1,7 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, qwtplot3d-qt48.patch: added patch from gentoo to fix
compile
+ error
+
2011-06-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, gcc-4.5.patch: fixed build with gcc 4.5

diff --git a/devel/qwtplot3d/PRE_BUILD b/devel/qwtplot3d/PRE_BUILD
index 6809647..2f27e08 100755
--- a/devel/qwtplot3d/PRE_BUILD
+++ b/devel/qwtplot3d/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build &&
+default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p0 < ${SCRIPT_DIRECTORY}/gcc-4.5.patch
+patch -p0 < ${SCRIPT_DIRECTORY}/gcc-4.5.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/qwtplot3d-qt48.patch
diff --git a/devel/qwtplot3d/qwtplot3d-qt48.patch
b/devel/qwtplot3d/qwtplot3d-qt48.patch
new file mode 100644
index 0000000..4e558ed
--- /dev/null
+++ b/devel/qwtplot3d/qwtplot3d-qt48.patch
@@ -0,0 +1,19 @@
+ include/qwt3d_openglhelper.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h
+index e5499c2..a7ecddc 100644
+--- a/include/qwt3d_openglhelper.h
++++ b/include/qwt3d_openglhelper.h
+@@ -8,6 +8,11 @@
+ #include <QtOpenGL/qgl.h>
+ #endif
+
++#if QT_VERSION < 0x047999
++#include <GL/glu.h>
++#endif
++
++
+ namespace Qwt3D
+ {
+
diff --git a/disk/udisks2/DEPENDS b/disk/udisks2/DEPENDS
index 41e8122..d0cc91c 100755
--- a/disk/udisks2/DEPENDS
+++ b/disk/udisks2/DEPENDS
@@ -1,13 +1,18 @@
depends pkgconfig &&
depends glib2 &&
-depends gobject-introspection &&
depends udev &&
+depends libacl &&
depends libxslt &&
depends libatasmart &&
depends policykit &&
depends perl &&
depends xml-parser-expat &&

+optional_depends gobject-introspection \
+ "--enable-introspection=yes" \
+ "--enable-introspection=no" \
+ "Enable introspection?" &&
+
optional_depends man \
"--enable-man-pages" \
"--disable-man-pages" \
diff --git a/disk/udisks2/DETAILS b/disk/udisks2/DETAILS
index d782413..f31983f 100755
--- a/disk/udisks2/DETAILS
+++ b/disk/udisks2/DETAILS
@@ -1,6 +1,6 @@
SPELL=udisks2
- VERSION=1.94.0
-
SOURCE_HASH=sha512:f4eb4eb25809abd0251d4006fe1ecb18c22417e54ed9f9aebeefb366b3e23523bb96f9e1604ccb029dbff1db15370349a5f7faad92ab648262cf32355890c23f
+ VERSION=1.97.0
+
SOURCE_HASH=sha512:6bf9c1acdb2f80f7ad9b2844310badeace7f2fdb5d9eb62f45b69f2d74b6310775cdf625cdb133e6a6aaacc299e6788a28edc9a93bc160814f583c559fcf4435
# SECURITY_PATCH=2
SOURCE="${SPELL//2}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://udisks.freedesktop.org/releases/$SOURCE
diff --git a/disk/udisks2/HISTORY b/disk/udisks2/HISTORY
index 096af02..48e8825 100644
--- a/disk/udisks2/HISTORY
+++ b/disk/udisks2/HISTORY
@@ -1,3 +1,8 @@
+2012-05-21 Treeve Jelbert <treeve AT sourcemage.otg>
+ * DETAILS: 1.97.0
+ * DEPENDS: gobject-introspection is optional
+ add libacl
+
2012-04-15 Treeve Jelbert <treeve AT sourcemage.otg>
* DETAILS: 1.94.0

diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index 2a20157..9227111 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: only glib.h can be included or build will fail
+
2001-08-01 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added to apply patch
* abiword-gcc46.patch: Upstream patch to work with gcc 4.6.x
diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
index 410429d..ae86946 100755
--- a/gnome2-apps/abiword/PRE_BUILD
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&

cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch
+patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch &&
+# only glib.h can be included
+sedit 34d src/af/util/xp/ut_go_file.h
diff --git a/gnome2-apps/file-roller/DETAILS b/gnome2-apps/file-roller/DETAILS
index 08312a4..495809a 100755
--- a/gnome2-apps/file-roller/DETAILS
+++ b/gnome2-apps/file-roller/DETAILS
@@ -1,7 +1,7 @@
SPELL=file-roller
- VERSION=3.2.2
+ VERSION=3.4.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-apps/file-roller/HISTORY b/gnome2-apps/file-roller/HISTORY
index 2eeec3e..b3db8ff 100644
--- a/gnome2-apps/file-roller/HISTORY
+++ b/gnome2-apps/file-roller/HISTORY
@@ -1,3 +1,7 @@
+2012-05-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: bz2 -> xz
+ updated spell to 3.4.2
+
2011-11-14 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3.2.2
* CONFLICTS: removed, file-roller2 spell does not exist
diff --git a/gnome2-apps/file-roller/file-roller-3.2.2.tar.bz2.sig
b/gnome2-apps/file-roller/file-roller-3.2.2.tar.bz2.sig
deleted file mode 100644
index 4eb8841..0000000
Binary files a/gnome2-apps/file-roller/file-roller-3.2.2.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-apps/file-roller/file-roller-3.4.2.tar.xz.sig
b/gnome2-apps/file-roller/file-roller-3.4.2.tar.xz.sig
new file mode 100644
index 0000000..08c9b04
Binary files /dev/null and
b/gnome2-apps/file-roller/file-roller-3.4.2.tar.xz.sig differ
diff --git a/gnome2-libs/pygobject/DEPENDS b/gnome2-libs/pygobject/DEPENDS
index 909d1a4..26683a7 100755
--- a/gnome2-libs/pygobject/DEPENDS
+++ b/gnome2-libs/pygobject/DEPENDS
@@ -5,4 +5,9 @@ depends pycairo &&
optional_depends gobject-introspection \
"--enable-introspection" \
"--disable-introspection" \
- "to enable introspection"
+ "to enable introspection" &&
+
+optional_depends libffi \
+ "--with-ffi" \
+ "--without-ffi" \
+ "to enable libffi support"
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index 45aed17..b681377 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,6 @@
+2012-05-18 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added missing optional dep on libffi
+
2012-02-13 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing pycairo dep (fixes #361)

diff --git a/haskell/haskell-haxml/DEPENDS b/haskell/haskell-haxml/DEPENDS
new file mode 100755
index 0000000..db0454d
--- /dev/null
+++ b/haskell/haskell-haxml/DEPENDS
@@ -0,0 +1,2 @@
+depends ghc &&
+depends haskell-polyparse
diff --git a/haskell/haskell-haxml/DETAILS b/haskell/haskell-haxml/DETAILS
new file mode 100755
index 0000000..79d7177
--- /dev/null
+++ b/haskell/haskell-haxml/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=haskell-haxml
+ VERSION=1.22.5
+ SOURCE="HaXml-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/HaXml/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:0481737b7d45f0075541b9c67d147778450abb08db686e81ca663eecd9d1133de498e1065dc772d3166f63c4aeb624f5d260585a14b66dceb311d5dc7715346f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/HaXml-${VERSION}"
+ WEB_SITE="http://www.cs.york.ac.uk/fp/HaXml/";
+ LICENSE[0]=LGPL
+ ENTERED=20120519
+ SHORT="Utilities for manipulating XML documents"
+cat << EOF
+Haskell utilities for parsing, filtering, transforming and generating XML
+documents.
+EOF
diff --git a/haskell/haskell-haxml/HISTORY b/haskell/haskell-haxml/HISTORY
new file mode 100644
index 0000000..a86f244
--- /dev/null
+++ b/haskell/haskell-haxml/HISTORY
@@ -0,0 +1,3 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-mtl/DETAILS b/haskell/haskell-mtl/DETAILS
index c2814e0..f47375e 100755
--- a/haskell/haskell-mtl/DETAILS
+++ b/haskell/haskell-mtl/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-mtl
- VERSION=2.0.1.0
+ VERSION=2.1.1
SOURCE="mtl-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/mtl/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:8fd6e6f3a3c51f618b78c21234e64f0646e9078f76cebf4c5109e87ec28f00039daf3c79df8e7533239c6ce1ad3f810fc2391f30a7a59397d26d6c57c7fea028
+
SOURCE_HASH=sha512:2bd1d935f1f1ff0967c6b7f6d9f127b7173736a48a7684cfeb03d61c4299d8191636f963b749422d73e2b6fb5e5389d8ac712bda6860162a62282dd33fc4cbe4
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mtl-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/mtl";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-mtl/HISTORY b/haskell/haskell-mtl/HISTORY
index 13176e8..441cd01 100644
--- a/haskell/haskell-mtl/HISTORY
+++ b/haskell/haskell-mtl/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.1.1
+
2011-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS: version 2.0.1.0

diff --git a/haskell/haskell-polyparse/DEPENDS
b/haskell/haskell-polyparse/DEPENDS
new file mode 100755
index 0000000..83d2c1d
--- /dev/null
+++ b/haskell/haskell-polyparse/DEPENDS
@@ -0,0 +1,2 @@
+depends ghc &&
+depends haskell-text
diff --git a/haskell/haskell-polyparse/DETAILS
b/haskell/haskell-polyparse/DETAILS
new file mode 100755
index 0000000..9b80b45
--- /dev/null
+++ b/haskell/haskell-polyparse/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=haskell-polyparse
+ VERSION=1.8
+ SOURCE="polyparse-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/polyparse/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:f0a6b84945c1da009ae594089d2a5df51f37c0f8e776c07489671e6770abf68d7a6794c179b7c922aa1ea30c79bb1879fa3505848313bbfb51d46fecc1c9bfa4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/polyparse-${VERSION}"
+ WEB_SITE="http://code.haskell.org/~malcolm/polyparse/";
+ LICENSE[0]=LGPL
+ ENTERED=20120519
+ SHORT="A variety of alternative parser combinator libraries."
+cat << EOF
+A variety of alternative parser combinator libraries, including the original
+HuttonMeijer set. The Poly sets have features like good error reporting,
+arbitrary token type, running state, lazy parsing, and so on. Finally,
+Text.Parse is a proposed replacement for the standard Read class, for better
+deserialisation of Haskell values from Strings.
+EOF
diff --git a/haskell/haskell-polyparse/HISTORY
b/haskell/haskell-polyparse/HISTORY
new file mode 100644
index 0000000..a86f244
--- /dev/null
+++ b/haskell/haskell-polyparse/HISTORY
@@ -0,0 +1,3 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-syb/DETAILS b/haskell/haskell-syb/DETAILS
index 7d7a9d3..c28dd66 100755
--- a/haskell/haskell-syb/DETAILS
+++ b/haskell/haskell-syb/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-syb
- VERSION=0.3.6
+ VERSION=0.3.6.1
SOURCE="syb-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/syb/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:346a786aba6ca531981dff3dd5fbf76721bbbb3a515fc4667b9328f65e5985e8011a6d68399f7700be0a051ebb2871de0d789dc07d0417fc8b6d8bf009d4e8f1
+
SOURCE_HASH=sha512:514dcda360f8efd62321fd75544e60447adcd043f7527dd34772f452694d72c88afa72ef7b756cdb7860d6b1fe9887c8d62b5179edc70900eb6d1f6be792e0d5
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/syb-${VERSION}"
WEB_SITE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-syb/HISTORY b/haskell/haskell-syb/HISTORY
index 87d594f..6b95115 100644
--- a/haskell/haskell-syb/HISTORY
+++ b/haskell/haskell-syb/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.6.1
+
2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.6

diff --git a/haskell/haskell-text/DETAILS b/haskell/haskell-text/DETAILS
index d4a5dd0..66f47e6 100755
--- a/haskell/haskell-text/DETAILS
+++ b/haskell/haskell-text/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-text
- VERSION=0.11.1.5
+ VERSION=0.11.2.1
SOURCE="text-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/text/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:7623c4f548370f52b1a4dcdb6bbc24ceede5418b39d3a98c586b74cffd96f24f4715ed6bb7bfbe31efd2ce3aed4082656f5512834bfcb90e5eb67ffa1f52d1bb
+
SOURCE_HASH=sha512:bf1662aa7d57a05539fe8e56808dff304b781803a7798b1668bcd3a54dc9a6b45d451a3389a6b60e1041c6575740cb465481d4746af6b2714fb0836365911198
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/text-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/text";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-text/HISTORY b/haskell/haskell-text/HISTORY
index 0768d41..186d91a 100644
--- a/haskell/haskell-text/HISTORY
+++ b/haskell/haskell-text/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.2.1
+
2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.11.1.5
* DEPENDS: added dependency on haskell-deepseq
diff --git a/haskell/haskell-transformers/DETAILS
b/haskell/haskell-transformers/DETAILS
index cde6f0f..b26c350 100755
--- a/haskell/haskell-transformers/DETAILS
+++ b/haskell/haskell-transformers/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-transformers
- VERSION=0.2.2.0
+ VERSION=0.3.0.0
SOURCE="transformers-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/transformers/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:8b591e78bc5e6f08028fe7cfbcf7898f072d7bf8c6bb67e0df1e1e18f6527440e01d97666ed74953721e30cd4b4c95e4871d14c7d840e83b9265092be6032795
+
SOURCE_HASH=sha512:aa444d01ea2296f9a94908872f167f383b0299768b8599b7f488c1d7499b027a90ffd1ef56e250b474d7c547e0acd94ae91b1cc80cdbd4943b5dca2770e2ab93
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/transformers-${VERSION}"
WEB_SITE="http://hackage.haskell.org/package/transformers";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-transformers/HISTORY
b/haskell/haskell-transformers/HISTORY
index 3ce9312..719b8d3 100644
--- a/haskell/haskell-transformers/HISTORY
+++ b/haskell/haskell-transformers/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.3.0.0
+
2011-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 62a0f52..a7a8103 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,8 @@
+2012-05-21 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.4, LATEST_3=3.4
+ * info/kernels/3.4: added
+ * info/patches/maintenance_patches_3/patch-3.4: added
+
2012-05-13 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.3.6
* info/patches/maintenance_patches_3/patch-3.3.6: added
diff --git a/kernels/linux/info/kernels/3.4 b/kernels/linux/info/kernels/3.4
new file mode 100755
index 0000000..f3f67d5
--- /dev/null
+++ b/kernels/linux/info/kernels/3.4
@@ -0,0 +1,5 @@
+version="3.4"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4
new file mode 100755
index 0000000..036f057
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4
@@ -0,0 +1,5 @@
+patchversion="3.4.0"
+source=""
+source_url=""
+appliedkernels="3.4"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 4d93484..b79d113 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.3
+LATEST_3=3.4
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.3.6
+LATEST_maintenance_patches_3=patch-3.4
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/libvdpau/DETAILS b/libs/libvdpau/DETAILS
index 747d480..f5654dd 100755
--- a/libs/libvdpau/DETAILS
+++ b/libs/libvdpau/DETAILS
@@ -1,5 +1,6 @@
SPELL=libvdpau
VERSION=0.4.1
+ PATCHLEVEL=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://people.freedesktop.org/~aplattner/vdpau/${SOURCE}

SOURCE_HASH=sha512:503d75e034bb5bd0695747e4a7b9ba4c1d207512eb636e08d6f75035ac020ea75af523574257efd08b084ee699268366dfa93d9d94ea07b03507b88f088a59a4
diff --git a/libs/libvdpau/HISTORY b/libs/libvdpau/HISTORY
index 2cf9a57..5499948 100644
--- a/libs/libvdpau/HISTORY
+++ b/libs/libvdpau/HISTORY
@@ -1,3 +1,6 @@
+2012-05-20 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+
2012-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
* TRIGGERS: added, needs to be recast when nvidia_driver is

diff --git a/libs/tzdata/HISTORY b/libs/tzdata/HISTORY
index 049d838..31c6cfb 100644
--- a/libs/tzdata/HISTORY
+++ b/libs/tzdata/HISTORY
@@ -1,3 +1,7 @@
+2012-05-19 Arjan Bouter <abouter AT sourcemage.org>
+ * INSTALL: use ln instead of zic -l to avoid failure if /etc and /usr
are on
+ different partitions
+
2012-05-17 Sukneet Basuta <sukneet AT sourcemage.org>
* BUILD, CONFIGURE, DETAILS, INSTALL, PRE_BUILD, TRIGGERS: spell
created
* timezones: timezone list
diff --git a/libs/tzdata/INSTALL b/libs/tzdata/INSTALL
index 420f8e8..db96231 100755
--- a/libs/tzdata/INSTALL
+++ b/libs/tzdata/INSTALL
@@ -13,7 +13,9 @@ echo "Local TIme Zone: " $LOCAL_TIMEZONE &&
zic -y ./yearistype -d ${INSTALL_ROOT}/usr/share/zoneinfo ${TIMEZONES[@]}
&&
zic -y ./yearistype -d ${INSTALL_ROOT}/usr/share/zoneinfo/posix
${TIMEZONES[@]} &&
zic -y ./yearistype -d ${INSTALL_ROOT}/usr/share/zoneinfo/right -L
leapseconds ${TIMEZONES[@]} &&
-zic -y ./yearistype -d ${INSTALL_ROOT}/usr/share/zoneinfo -l
"$LOCAL_TIMEZONE" &&
+# zic -l breaks if /etc and /usr are on different partitions
+#zic -y ./yearistype -d ${INSTALL_ROOT}/usr/share/zoneinfo -l
"$LOCAL_TIMEZONE" &&
+ln -sf ${INSTALL_ROOT}/usr/share/zoneinfo/$LOCAL_TIMEZONE
${INSTALL_ROOT}/etc/localtime &&
#If you want POSIX compatibility, use "America/New_York".
zic -y ./yearistype -d ${INSTALL_ROOT}/usr/share/zoneinfo -p
America/New_York &&

diff --git a/lxde/lxdm/HISTORY b/lxde/lxdm/HISTORY
index 90882be..c65b56c 100644
--- a/lxde/lxdm/HISTORY
+++ b/lxde/lxdm/HISTORY
@@ -1,3 +1,7 @@
+2012-05-19 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, lxdm-0.4.1-high-cpu-load.patch: added high CPU load fix
+ from upstream SCM
+
2011-11-11 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: give a choice between gtk 2 and 3, added optional
dep on libxcb
diff --git a/lxde/lxdm/PRE_BUILD b/lxde/lxdm/PRE_BUILD
index 5b7f691..0982fae 100755
--- a/lxde/lxdm/PRE_BUILD
+++ b/lxde/lxdm/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-rm
${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf}
+rm
${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf}
&&
+patch -p1 < ${SPELL_DIRECTORY}/lxdm-0.4.1-high-cpu-load.patch
diff --git a/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
b/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
new file mode 100644
index 0000000..3de9730
--- /dev/null
+++ b/lxde/lxdm/lxdm-0.4.1-high-cpu-load.patch
@@ -0,0 +1,27 @@
+From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa AT gmail.com>
+Date: Sun, 25 Dec 2011 15:23:19 +0800
+Subject: [PATCH 1/1] fix event check bug caused cpu 100%
+
+---
+ src/lxcom.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint
*timeout)
+
+ static gboolean lxcom_check(GSource *source)
+ {
+- return TRUE;
++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc
callback,gpointer user_data)
+--
+1.7.4.1
+
+
+
diff --git a/python-pypi/distribute/DETAILS b/python-pypi/distribute/DETAILS
index e56951d..8c77267 100755
--- a/python-pypi/distribute/DETAILS
+++ b/python-pypi/distribute/DETAILS
@@ -1,5 +1,5 @@
SPELL=distribute
- VERSION=0.6.26
+ VERSION=0.6.27
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://pypi.python.org/packages/source/d/${SPELL}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/python-pypi/distribute/HISTORY b/python-pypi/distribute/HISTORY
index b6e90c8..09a81e0 100644
--- a/python-pypi/distribute/HISTORY
+++ b/python-pypi/distribute/HISTORY
@@ -1,3 +1,6 @@
+2012-05-18 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.27
+
2012-04-19 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.6.26

diff --git a/python-pypi/distribute/distribute-0.6.26.tar.gz.sig
b/python-pypi/distribute/distribute-0.6.26.tar.gz.sig
deleted file mode 100644
index 1198efc..0000000
Binary files a/python-pypi/distribute/distribute-0.6.26.tar.gz.sig and
/dev/null differ
diff --git a/python-pypi/distribute/distribute-0.6.27.tar.gz.sig
b/python-pypi/distribute/distribute-0.6.27.tar.gz.sig
new file mode 100644
index 0000000..d64e703
Binary files /dev/null and
b/python-pypi/distribute/distribute-0.6.27.tar.gz.sig differ
diff --git a/science/gpsbabel/BUILD b/science/gpsbabel/BUILD
new file mode 100755
index 0000000..42f8438
--- /dev/null
+++ b/science/gpsbabel/BUILD
@@ -0,0 +1,11 @@
+default_build &&
+if is_depends_enabled $SPELL qt4; then
+ pushd gui &&
+ ${TRACK_ROOT}/usr/bin/qt4/lrelease *.ts &&
+ qt4_build &&
+ popd
+fi &&
+if is_depends_enabled $SPELL perl; then
+ perl xmldoc/makedoc &&
+ make gpsbabel.html
+fi
diff --git a/science/gpsbabel/DEPENDS b/science/gpsbabel/DEPENDS
index 6bd1019..6292cde 100755
--- a/science/gpsbabel/DEPENDS
+++ b/science/gpsbabel/DEPENDS
@@ -1,3 +1,5 @@
depends libusb-compat &&
depends expat &&
-depends zlib "--with-zlib=system"
+depends zlib "--with-zlib=system" &&
+optional_depends qt4 "" "" "for GUI support" &&
+optional_depends perl "" "" "to install documentation"
diff --git a/science/gpsbabel/DETAILS b/science/gpsbabel/DETAILS
index f114fd1..e4bf346 100755
--- a/science/gpsbabel/DETAILS
+++ b/science/gpsbabel/DETAILS
@@ -1,9 +1,27 @@
SPELL=gpsbabel
+if [[ $GPSBABEL_BRANCH == "scm" ]]; then
+ if [[ $ELINKS_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
+ SOURCE="$SPELL-scm.tar.bz2"
+
SOURCE_URL[0]="svn_http://${SPELL}.googlecode.com/svn/trunk/gpsbabel:$SPELL-scm";
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
+else
VERSION=1.4.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://gentoo.osuosl.org/distfiles/${SOURCE}

SOURCE_HASH=sha512:4e0e5c6bb04a55a4ed809a769bbcf6eb61bdc115cbf24745d8ce51875d7e1044129a8c7249f560c652626317f44a56efb2eb2da4c2d564996793b0aa75e0cf75
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+fi
+if is_depends_enabled $SPELL perl; then
+ SOURCE2=gpsbabel.org-style3.css
+ SOURCE2_URL[0]=http://www.gpsbabel.org/style3.css
+ SOURCE2_IGNORE=unversioned
+fi
WEB_SITE="http://www.gpsbabel.org/";
LICENSE[0]=GPL
ENTERED=20120513
diff --git a/science/gpsbabel/HISTORY b/science/gpsbabel/HISTORY
index bbf9019..0a2de66 100644
--- a/science/gpsbabel/HISTORY
+++ b/science/gpsbabel/HISTORY
@@ -1,3 +1,11 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PRE_BUILD, gpsbabel-xmldoc.patch: added patch from
+ gentoo to prevent downloading in BUILD
+
+2012-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, INSTALL, BUILD: added optional dependencies on qt4 and perl
+ * DETAILS, PREPARE: added support for the scm version
+
2012-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
* DETAILS: fixed long description
diff --git a/science/gpsbabel/INSTALL b/science/gpsbabel/INSTALL
new file mode 100755
index 0000000..288c13b
--- /dev/null
+++ b/science/gpsbabel/INSTALL
@@ -0,0 +1,9 @@
+install -m755 ${SOURCE_DIRECTORY}/gpsbabel ${INSTALL_ROOT}/usr/bin/ &&
+if is_depends_enabled $SPELL qt4; then
+ install -m755 ${SOURCE_DIRECTORY}/gui/objects/gpsbabelfe-bin
${INSTALL_ROOT}/usr/bin/gpsbabelfe &&
+ install -m644 ${SOURCE_DIRECTORY}/gui/gpsbabel*_*.qm
${INSTALL_ROOT}/usr/share/doc/qt4/translations/
+fi &&
+if is_depends_enabled $SPELL perl; then
+ install -d ${INSTALL_ROOT}/usr/share/doc/gpsbabel &&
+ install -m644 ${SOURCE_DIRECTORY}/gpsbabel.html
${INSTALL_ROOT}/usr/share/doc/gpsbabel/
+fi
diff --git a/science/gpsbabel/PREPARE b/science/gpsbabel/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/science/gpsbabel/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/science/gpsbabel/PRE_BUILD b/science/gpsbabel/PRE_BUILD
new file mode 100755
index 0000000..c89241e
--- /dev/null
+++ b/science/gpsbabel/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+if is_depends_enabled $SPELL perl; then
+ patch -p1 < ${SCRIPT_DIRECTORY}/gpsbabel-xmldoc.patch &&
+ cp ${SOURCE_CACHE}/${SOURCE2} ${SOURCE_DIRECTORY}
+fi
diff --git a/science/gpsbabel/gpsbabel-xmldoc.patch
b/science/gpsbabel/gpsbabel-xmldoc.patch
new file mode 100644
index 0000000..2373fe1
--- /dev/null
+++ b/science/gpsbabel/gpsbabel-xmldoc.patch
@@ -0,0 +1,14 @@
+diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-xmldoc/Makefile.in
+--- gpsbabel-1.4.2/Makefile.in 2011-01-11 17:57:47.075777307 +0100
++++ gpsbabel-1.4.2-xmldoc/Makefile.in 2011-01-11 17:58:53.134094491 +0100
+@@ -234,8 +234,8 @@
+ xsltproc \
+ --output $@ \
+ --stringparam toc.section.depth "1" \
+- --stringparam html.stylesheet \
+- "http://www.gpsbabel.org/style3.css"; \
++ --nonet \
++ --stringparam html.stylesheet "gpsbabel.org-style3.css" \
+
http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+ xmldoc/readme.xml
+
diff --git a/science/proj/BUILD b/science/proj/BUILD
new file mode 100755
index 0000000..ef63980
--- /dev/null
+++ b/science/proj/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" --without-jni" &&
+default_build
diff --git a/science/proj/DETAILS b/science/proj/DETAILS
index d2d33dd..e5994c9 100755
--- a/science/proj/DETAILS
+++ b/science/proj/DETAILS
@@ -1,8 +1,8 @@
SPELL=proj
- VERSION=4.7.0
+ VERSION=4.8.0
SOURCE="$SPELL-${VERSION}.tar.gz"
SOURCE_URL[0]=http://download.osgeo.org/proj/${SOURCE}
-
SOURCE_HASH=sha512:fb1e2653c399b15cf323e63ef122af87daaae9bc19616558cd104d5a11f76967a5cffbe731ebaf2bd5f783b83bafa6a74d59a9376b2c68d2a9b1c7a97b82b469
+
SOURCE_HASH=sha512:6076289f8bdf1ca3b76ea879d8c221a668fcb4a6deec7cf6a293c489dfe0b21c36da0c6ed2c7a0b8042436106e851018aa429b4731f4ff018fea2fdb8887ec76
DGVER=1.5
SOURCE2="proj-datumgrid-$DGVER.zip"
SOURCE2_URL[0]=http://download.osgeo.org/proj/$SOURCE2
diff --git a/science/proj/HISTORY b/science/proj/HISTORY
index 1fe34b4..4d2ccfd 100644
--- a/science/proj/HISTORY
+++ b/science/proj/HISTORY
@@ -1,3 +1,6 @@
+2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, BUILD: version 4.8.0
+
2011-10-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: merged proj4 into proj (it's proj.4 actually)




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (975795301c240886ffee857d02dc1361a6a5a52c), Eric Sandall, 05/21/2012

Archive powered by MHonArc 2.6.24.

Top of Page