Skip to Content.
Sympa Menu

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

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 (94e2fbcee6038b0baaaf7b837b463c04d82a65c5)
  • Date: Fri, 13 Jul 2012 17:56:03 -0500

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

ChangeLog | 7
audio-libs/libgpod/DEPENDS | 20
audio-libs/libgpod/HISTORY | 4
chat-libs/opal/DETAILS | 37
chat-libs/opal/HISTORY | 9
chat-libs/opal/PREPARE | 3
chat-libs/opal/PRE_BUILD | 6
chat-libs/opal/opal-3.10.1.tar.bz2.sig | 0
chat-libs/opal/opal-3.10.5.tar.bz2.sig |binary
chat-libs/opal/opal-ffmpeg.patch | 193 +++
chat-libs/ptlib/DETAILS | 21
chat-libs/ptlib/HISTORY | 7
chat-libs/ptlib/PREPARE | 2
chat-libs/ptlib/ptlib-2.10.1.tar.bz2.sig | 0
chat-libs/ptlib/ptlib-2.10.5.tar.bz2.sig |binary
crypto/gpgme/DETAILS | 4
crypto/gpgme/HISTORY | 3
crypto/openssh/HISTORY | 3
crypto/openssh/PRE_BUILD | 2
crypto/openssh/openssh-lpk-5.9p1.patch.bz2 | 0
crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2 |binary
dev/null |binary
devel/automake/DETAILS | 3
devel/automake/HISTORY | 3
disk/partclone/DETAILS | 4
disk/partclone/HISTORY | 3
doc/docutils/DETAILS | 5
doc/docutils/HISTORY | 3
doc/docutils/docutils-0.9.1.tar.gz.sig |binary
e-17/ephysics/DEPENDS | 6
e-17/ephysics/DETAILS | 21
e-17/ephysics/HISTORY | 2
e-17/ephysics/PREPARE | 2
e-17/ephysics/PRE_BUILD | 4
e-17/evas/DEPENDS | 8
e-17/evas/HISTORY | 3
e-17/terminology/DEPENDS | 4
e-17/terminology/DETAILS | 19
e-17/terminology/HISTORY | 2
e-17/terminology/PREPARE | 2
e-17/terminology/PRE_BUILD | 4
gnome2-libs/libgda3/DEPENDS | 4
gnome2-libs/libgda3/DETAILS | 2
gnome2-libs/libgda3/HISTORY | 7
gnome2-libs/libgda3/PRE_BUILD | 4
gnome2-libs/libgda3/libgda-3.1.4.tar.bz2.sig | 0
gnome2-libs/libgda3/libgda-3.1.5.tar.bz2.sig |binary
gnome2-libs/libgda3/libgda-glib.patch | 545
++++++++
gnome2-libs/nautilus-dropbox/DEPENDS | 5
gnome2-libs/nautilus-dropbox/DETAILS | 5
gnome2-libs/nautilus-dropbox/HISTORY | 5
gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.4.0.tar.bz2.sig |binary
gnome2-libs/nautilus2/DEPENDS | 4
gnome2-libs/nautilus2/HISTORY | 3
graphics-libs/opencv/DETAILS | 2
graphics-libs/opencv/HISTORY | 3
graphics-libs/opencv/OpenCV-2.4.1.tar.bz2.sig | 0
graphics-libs/opencv/OpenCV-2.4.2.tar.bz2.sig |binary
graphics-libs/poppler/DETAILS | 8
graphics-libs/poppler/HISTORY | 3
graphics/libgphoto2/DETAILS | 4
graphics/libgphoto2/HISTORY | 7
graphics/libgphoto2/INSTALL | 2
graphics/libgphoto2/UP_TRIGGERS | 10
http/xombrero/DETAILS | 2
http/xombrero/HISTORY | 4
http/xombrero/PRE_BUILD | 2
http/xombrero/xombrero-1.1.0.tgz.sig | 0
http/xombrero/xombrero-1.1.1.tgz.sig |binary
http/xombrero/xombrero-TAILQ_FOREACH_SAFE.patch | 19
libs/boost/DETAILS | 4
libs/boost/HISTORY | 5
libs/boost/PRE_BUILD | 1
libs/boost/converter_policies_hpp.patch | 24
libs/libexif/DETAILS | 4
libs/libexif/HISTORY | 3
libs/pcre/DETAILS | 2
libs/pcre/HISTORY | 4
libs/pcre/INSTALL | 2
mobile/pilot-link/HISTORY | 4
mobile/pilot-link/PRE_BUILD | 4
mobile/pilot-link/perl.patch | 625
++++++++++
science/speedcrunch/BUILD | 11
science/speedcrunch/DEPENDS | 2
science/speedcrunch/DETAILS | 14
science/speedcrunch/HISTORY | 2
x11-toolkits/gtk-sharp-2/DETAILS | 8
x11-toolkits/gtk-sharp-2/HISTORY | 7
x11-toolkits/gtk-sharp-2/PRE_BUILD | 1
x11-toolkits/gtk-sharp-2/glib_fix.patch | 117 +
x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig | 0
x11-toolkits/wxgtk-new/DEPENDS | 6
x11-toolkits/wxgtk-new/DETAILS | 4
x11-toolkits/wxgtk-new/HISTORY | 4
94 files changed, 1811 insertions(+), 116 deletions(-)

New commits:
commit 0a433121fc5386811dd7b25aa2d41e3ac9315d60
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

pilot-link: actually add files

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

libgphoto2 - fix instal in some cases

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

libexif: => 0.6.21

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

pilot-link: fix compilation with perl>=5.14

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

e-17/terminology: new spell, EFL terminal emulator

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

e-17/ephysics: new spell, EFL wrapper for physics engine

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

evas configure options sdl updated

configure: WARNING: unrecognized options: --enable-software-sdl

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

wxgtk-new - libxpm is optional

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

wxgtk-new: => 2.9.4

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

openssh: updated LPK patch to 6.0p1 (fixes #404)

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

opencv 2.4.2

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

poppler 0.20.2

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

gpgme 1.3.2

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

xombrero 1.1.1

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

nautilus-dropbox: Updated to 1.4.0
Suggest pygpgme to verify binary signatures

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

nautilus2: Suggest gvfs for Connect to Server funcionality

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

docutils: Updated to 0.9.1

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

nautilus-dropbox: Depends on docutils

checking for docutils... no
configure: error: couldn't find docutils

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

libgda3: => 3.1.5
fix compilation with glib >= 2.31

* DEPENDS: fixed postgresql flags
* PRE_BUILD: added, to apply patch
* libgda-glib.patch: added, to fix compilation on glib>=2.31 from openSUSE

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

libgpod: added optional_depends gtk-sharp-2 & udev
changed GTK2 to gdk-pixbuf2

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

opal: => 3.10.5
Fixed SOURCE_URL[0]
fixed SCM info and switched to prepare_select_branch
updated License, WEB_SITE, SHORT, and description

* PREPARE: switch to prepare_select_branch
* PRE_BUILD: added to apply patch
* opal-ffmpeg.patch: added, fix ffmpeg codecs. From Arch Linux

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

ptlib: => 2.10.5
Fixed SOURCE_URL[0]
Added scm branch to go with opal
Updated licence and WEB_SITE

* PREPARE: added to use prepare_select_branch

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

libgphoto2: => 2.5.0

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

pcre: => 8.31

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

gtk-sharp-2: issue #407 - fix build with glib2 >= 2.31

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

partclone: => 0.2.50

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

boost: => 1_50_0

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

automake 1.12.2, SECURITY_PATCH=1, CVE-2012-3386

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

speedcrunch: new spell, Desktop calculator

diff --git a/ChangeLog b/ChangeLog
index edaf6a6..4b581e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * e-17/ephysics: new spell, EFL wrapper for physics engine
+ * e-17/terminology: new spell, EFL terminal emulator
+
+2012-07-09 Ismael Luceno <ismael AT sourcemage.org>
+ * science/speedcrunch: new spell, Desktop calculator
+
2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
* graphics/mutiara: new spell, motif designer

diff --git a/audio-libs/libgpod/DEPENDS b/audio-libs/libgpod/DEPENDS
index 6876988..86b6d64 100755
--- a/audio-libs/libgpod/DEPENDS
+++ b/audio-libs/libgpod/DEPENDS
@@ -4,23 +4,31 @@ depends xml-parser-expat &&
optional_depends libxml2 \
'--enable-libxml' \
'--disable-libxml' \
- 'To parse SysInfoExtended' &&
-optional_depends GTK2 \
+ 'to parse SysInfoExtended' &&
+optional_depends gdk-pixbuf2 \
'--enable-gdk-pixbuf' \
'--disable-gdk-pixbuf' \
- 'Enable ArtworkDB' &&
+ 'to enable ArtworkDB' &&
+optional_depends gtk-sharp-2 \
+ '--with-mono' \
+ '--without-mono' \
+ 'to build mono binding' &&
optional_depends pygobject \
'--enable-pygobject' \
'--without-python --disable-pygobject' \
- 'Enable python bindings?' &&
+ 'to enable python bindings' &&
if is_depends_enabled $SPELL pyobject; then
depends mutagen
fi &&
optional_depends gtk-doc \
'--enable-gtk-doc' \
'--disable-gtk-doc' \
- 'Build documentation?' &&
+ 'to build documentation' &&
+optional_depends udev \
+ '--enable-udev' \
+ '--disable-udev' \
+ 'to enable udev support' &&
optional_depends hal \
'--with-hal' \
'--without-hal' \
- 'Enable hal support'
+ 'to enable hal support'
diff --git a/audio-libs/libgpod/HISTORY b/audio-libs/libgpod/HISTORY
index d7b43fa..acbc238 100644
--- a/audio-libs/libgpod/HISTORY
+++ b/audio-libs/libgpod/HISTORY
@@ -1,3 +1,7 @@
+2012-07-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: added optional_depends gtk-sharp-2 & udev
+ changed GTK2 to gdk-pixbuf2
+
2011-08-18 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.8.2
Changed SOURCE[0] extension
diff --git a/chat-libs/opal/DETAILS b/chat-libs/opal/DETAILS
index 5b9e836..693fe75 100755
--- a/chat-libs/opal/DETAILS
+++ b/chat-libs/opal/DETAILS
@@ -1,28 +1,33 @@
SPELL=opal
-if [ "$CVS" == "y" ]; then
- VERSION=cvs
- SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL[0]=http://snapshots.seconix.com/cvs/$SOURCE
- FORCE_DOWNLOAD=1
+if [[ $OPAL_BRANCH == scm ]]; then
+ if [[ $OPAL_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
+ SOURCE=${SPELL}-scm.tar.bz2
+
SOURCE_URL[0]=svn_https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk:opalvoip
+ FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
else
- VERSION=3.10.1
+ VERSION=3.10.5
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/opalvoip/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
fi
- LICENSE[0]=GPL
- MAKE_NJOBS=1
- WEB_SITE=http://www.gnomemeeting.org
+ LICENSE[0]=MPL
+ WEB_SITE=http://www.opalvoip.org/
ENTERED=20060106
KEYWORDS="chat libs"
- SHORT="A Portable Text and GUI C/C++ Class Libarary."
+ SHORT="The OPAL VoIP library."
cat << EOF
-PWLib is a moderately large class library that has its genesis many years
ago
-as a method to product applications to run on both Microsoft Windows and Unix
-X-Windows systems. It also was to have a Macintosh port as well but this
never
-eventuated.
+OPAL implements the commonly used protocols used to send voice, video and fax
+data over IP networks.
+
+Originally part of the OpenH323 project, OpalVoip has grown to include SIP
+and IAX2. OPAL is released under the Mozilla Public License 1.0 Open Source
+license.
EOF
diff --git a/chat-libs/opal/HISTORY b/chat-libs/opal/HISTORY
index f7be350..74ef7f7 100644
--- a/chat-libs/opal/HISTORY
+++ b/chat-libs/opal/HISTORY
@@ -1,3 +1,12 @@
+2012-07-10 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 3.10.5
+ Fixed SOURCE_URL[0]
+ fixed SCM info and switched to prepare_select_branch
+ updated License, WEB_SITE, SHORT, and description
+ * PREPARE: switch to prepare_select_branch
+ * PRE_BUILD: added to apply patch
+ * opal-ffmpeg.patch: added, fix ffmpeg codecs. From Arch Linux
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/chat-libs/opal/PREPARE b/chat-libs/opal/PREPARE
index 8064306..98d27e4 100755
--- a/chat-libs/opal/PREPARE
+++ b/chat-libs/opal/PREPARE
@@ -1 +1,2 @@
-config_query CVS "Would you like to build the latest cvs version?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-libs/opal/PRE_BUILD b/chat-libs/opal/PRE_BUILD
new file mode 100755
index 0000000..c3f6c84
--- /dev/null
+++ b/chat-libs/opal/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [[ $OPAL_BRANCH != scm ]]; then
+ patch -p1 < $SPELL_DIRECTORY/opal-ffmpeg.patch
+fi
diff --git a/chat-libs/opal/opal-3.10.1.tar.bz2.sig
b/chat-libs/opal/opal-3.10.1.tar.bz2.sig
deleted file mode 100644
index a873671..0000000
Binary files a/chat-libs/opal/opal-3.10.1.tar.bz2.sig and /dev/null differ
diff --git a/chat-libs/opal/opal-3.10.5.tar.bz2.sig
b/chat-libs/opal/opal-3.10.5.tar.bz2.sig
new file mode 100644
index 0000000..7c5944b
Binary files /dev/null and b/chat-libs/opal/opal-3.10.5.tar.bz2.sig differ
diff --git a/chat-libs/opal/opal-ffmpeg.patch
b/chat-libs/opal/opal-ffmpeg.patch
new file mode 100644
index 0000000..743a608
--- /dev/null
+++ b/chat-libs/opal/opal-ffmpeg.patch
@@ -0,0 +1,193 @@
+diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx
opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx
+--- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx 2012-04-26
06:56:01.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-06-10
16:39:35.447021150 +0200
+@@ -51,6 +51,7 @@
+ #endif
+
+ #include "h263-1998.h"
++#include <libavutil/opt.h>
+ #include <limits>
+ #include <iomanip>
+ #include <stdio.h>
+@@ -324,9 +325,9 @@
+ // Level 2+
+ // works with eyeBeam, signaled via non-standard "D"
+ if (atoi(value) == 1)
+- m_context->flags |= CODEC_FLAG_H263P_UMV;
++ av_opt_set_int(m_context->priv_data, "umv", 1, 0);
+ else
+- m_context->flags &= ~CODEC_FLAG_H263P_UMV;
++ av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+ return;
+ }
+
+@@ -335,9 +336,9 @@
+ // Annex F: Advanced Prediction Mode
+ // does not work with eyeBeam
+ if (atoi(value) == 1)
+- m_context->flags |= CODEC_FLAG_OBMC;
++ av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
+ else
+- m_context->flags &= ~CODEC_FLAG_OBMC;
++ av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
+ return;
+ }
+ #endif
+@@ -367,9 +368,9 @@
+ // Annex K: Slice Structure
+ // does not work with eyeBeam
+ if (atoi(value) != 0)
+- m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT;
++ av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
+ else
+- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
++ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
+ return;
+ }
+
+@@ -377,9 +378,9 @@
+ // Annex S: Alternative INTER VLC mode
+ // does not work with eyeBeam
+ if (atoi(value) == 1)
+- m_context->flags |= CODEC_FLAG_H263P_AIV;
++ av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
+ else
+- m_context->flags &= ~CODEC_FLAG_H263P_AIV;
++ av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
+ return;
+ }
+ }
+@@ -445,15 +446,6 @@
+ PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
+ PTRACE(5, m_prefix, "payload size set to " <<
m_context->rtp_payload_size);
+
+- #define CODEC_TRACER_FLAG(tracer, flag) \
+- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ?
"enabled" : "disabled"));
+- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
+- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
+- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
+- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
+- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
+- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
+-
+ return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
+ }
+
+@@ -516,7 +508,7 @@
+
+ // Need to copy to local buffer to guarantee 16 byte alignment
+ memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header),
header->width*header->height*3/2);
+- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ?
FF_I_TYPE : AV_PICTURE_TYPE_NONE;
++ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ?
AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
+
+ /*
+ m_inputFrame->pts =
(int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
+@@ -598,13 +590,13 @@
+ m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
+ m_context->opaque = this; // used to separate out packets from different
encode threads
+
+- m_context->flags &= ~CODEC_FLAG_H263P_UMV;
++ av_opt_set_int(m_context->priv_data, "umv", 0, 0);
+ m_context->flags &= ~CODEC_FLAG_4MV;
+ #if LIBAVCODEC_RTP_MODE
+ m_context->flags &= ~CODEC_FLAG_H263P_AIC;
+ #endif
+- m_context->flags &= ~CODEC_FLAG_H263P_AIV;
+- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
++ av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
++ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
+
+ return true;
+ }
+diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx
opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx
+--- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx 2012-04-26
06:56:00.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx
2012-06-10 16:49:11.210568639 +0200
+@@ -25,6 +25,7 @@
+ #include <fstream>
+ #include <stdlib.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+
+
+ #ifndef PLUGINCODEC_TRACING
+diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx
opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.5/plugins/video/H.264/h264-x264.cxx 2012-04-26
06:56:00.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx 2012-06-10
17:04:19.695646950 +0200
+@@ -1035,13 +1035,10 @@
+ return false;
+
+ m_context->workaround_bugs = FF_BUG_AUTODETECT;
+- m_context->error_recognition = FF_ER_AGGRESSIVE;
+ m_context->idct_algo = FF_IDCT_H264;
+ m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
+ m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
+- m_context->flags2 = CODEC_FLAG2_BRDO |
+- CODEC_FLAG2_MEMC_ONLY |
+- CODEC_FLAG2_DROP_FRAME_TIMECODE |
++ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
+ CODEC_FLAG2_SKIP_RD |
+ CODEC_FLAG2_CHUNKS;
+
+diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx
opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx
+--- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx 2012-04-26
06:56:00.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx
2012-06-10 17:04:46.012171051 +0200
+@@ -33,6 +33,7 @@
+
+ #include <codec/opalplugin.hpp>
+ #include <stdio.h>
++#include <unistd.h>
+
+
+ #if defined(X264_LICENSED) || defined(GPL_HELPER_APP)
+diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+--- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-04-26
06:56:02.000000000 +0200
++++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-06-10
16:46:33.498089705 +0200
+@@ -101,8 +101,10 @@
+ #include <libavutil/bswap.h>
+ #include <libavcodec/mpegvideo.h>
+
++
+ #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
+ #include LIBAVCODEC_HEADER
++#include <libavutil/opt.h>
+ #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
+ }
+
+@@ -589,17 +591,17 @@
+ m_avpicture->quality = m_videoQMin;
+
+ #ifdef USE_ORIG
+- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning
++ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+ m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors
+ #else
+ m_avcontext->max_b_frames=0; /*don't use b frames*/
+ m_avcontext->flags|=CODEC_FLAG_AC_PRED;
+- m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
++ av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
+ /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces
profile_level to advanced simple profile */
+ m_avcontext->flags|=CODEC_FLAG_4MV;
+ m_avcontext->flags|=CODEC_FLAG_GMC;
+ m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
+- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
++ av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
+ #endif
+ m_avcontext->opaque = this; // for use in RTP callback
+ }
+@@ -804,7 +806,7 @@
+ // Should the next frame be an I-Frame?
+ if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
+ {
+- m_avpicture->pict_type = FF_I_TYPE;
++ m_avpicture->pict_type = AV_PICTURE_TYPE_I;
+ }
+ else // No IFrame requested, let avcodec decide what to do
+ {
+@@ -1325,7 +1327,7 @@
+
+ void MPEG4DecoderContext::SetStaticDecodingParams() {
+ m_avcontext->flags |= CODEC_FLAG_4MV;
+- m_avcontext->flags |= CODEC_FLAG_PART;
++ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
+ m_avcontext->workaround_bugs = 0; // no workaround for buggy
implementations
+ }
diff --git a/chat-libs/ptlib/DETAILS b/chat-libs/ptlib/DETAILS
index 8db14b0..6b859bc 100755
--- a/chat-libs/ptlib/DETAILS
+++ b/chat-libs/ptlib/DETAILS
@@ -1,12 +1,25 @@
SPELL=ptlib
- VERSION=2.10.1
+if [[ $PTLIB_BRANCH == scm ]]; then
+ if [[ $PTLIB_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
+ SOURCE=${SPELL}-scm.tar.bz2
+
SOURCE_URL[0]=svn_https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk:opalvoip
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-scm
+else
+ VERSION=2.10.5
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
- SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/opalvoip/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- LICENSE[0]=GPL
- WEB_SITE=http://www.ekiga.org
+fi
+ LICENSE[0]=MPL
+ WEB_SITE=http://www.opalvoip.org/
ENTERED=20080924
KEYWORDS="chat libs"
SHORT="A Portable Text and GUI C/C++ Class Libarary."
diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY
index aa08f4f..3b7cce5 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,10 @@
+2012-07-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.5
+ Fixed SOURCE_URL[0]
+ Added scm branch to go with opal
+ Updated licence and WEB_SITE
+ * PREPARE: added to use prepare_select_branch
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/chat-libs/ptlib/PREPARE b/chat-libs/ptlib/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/chat-libs/ptlib/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-libs/ptlib/ptlib-2.10.1.tar.bz2.sig
b/chat-libs/ptlib/ptlib-2.10.1.tar.bz2.sig
deleted file mode 100644
index 421ca06..0000000
Binary files a/chat-libs/ptlib/ptlib-2.10.1.tar.bz2.sig and /dev/null differ
diff --git a/chat-libs/ptlib/ptlib-2.10.5.tar.bz2.sig
b/chat-libs/ptlib/ptlib-2.10.5.tar.bz2.sig
new file mode 100644
index 0000000..9c63fdc
Binary files /dev/null and b/chat-libs/ptlib/ptlib-2.10.5.tar.bz2.sig differ
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index acb1c5e..cfef60c 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -23,8 +23,8 @@ case $GPGME_BRANCH in
SOURCE=$SPELL-$VERSION.tar.gz
;;
1.3)
- VERSION=1.3.1
-
SOURCE_HASH=sha512:3e661e8c7c146c3e920efcbaf3fae93917af7dd387cecf3890c936b575a3c1f979c9da6f652e5caa81abd70fe923f2df303b8de8f0d06fa6825f8f482f83e1ca
+ VERSION=1.3.2
+
SOURCE_HASH=sha512:5452aa663a85f7853f8194746ee3f7a70f46af719490df240401b0b9d97b0e2d3656d73dd469f136dc4ba0f878f5ef445f43e682a049a3a99c3ac22de29d79c5
SOURCE=$SPELL-$VERSION.tar.bz2
;;
esac
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index d78a343..71d006f 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,6 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.3.2
+
2011-06-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.1, gz -> bz2

diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index b8624ad..7f10685 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2012-07-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: updated LPK patch to 6.0p1, from Gentoo
+
2012-04-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.0p1

diff --git a/crypto/openssh/PRE_BUILD b/crypto/openssh/PRE_BUILD
index 38764e6..86a99df 100755
--- a/crypto/openssh/PRE_BUILD
+++ b/crypto/openssh/PRE_BUILD
@@ -2,6 +2,6 @@ default_pre_build &&

if [ "${OPENSSH_LPK}" == "y" ]; then
cd "${SOURCE_DIRECTORY}" &&
- bzcat "${SCRIPT_DIRECTORY}"/openssh-lpk-5.9p1.patch.bz2 | patch -p1 &&
+ bzcat $SPELL_DIRECTORY/openssh-lpk-6.0p1-0.3.14.patch.bz2 | patch -p1 &&
autoconf
fi
diff --git a/crypto/openssh/openssh-lpk-5.9p1.patch.bz2
b/crypto/openssh/openssh-lpk-5.9p1.patch.bz2
deleted file mode 100644
index 1b97684..0000000
Binary files a/crypto/openssh/openssh-lpk-5.9p1.patch.bz2 and /dev/null differ
diff --git a/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2
b/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2
new file mode 100644
index 0000000..bc9e221
Binary files /dev/null and
b/crypto/openssh/openssh-lpk-6.0p1-0.3.14.patch.bz2 differ
diff --git a/devel/automake/DETAILS b/devel/automake/DETAILS
index 67e5cd2..ed11bc2 100755
--- a/devel/automake/DETAILS
+++ b/devel/automake/DETAILS
@@ -1,5 +1,6 @@
SPELL=automake
- VERSION=1.12.1
+ VERSION=1.12.2
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/automake/HISTORY b/devel/automake/HISTORY
index 73f03c8..a745ee6 100644
--- a/devel/automake/HISTORY
+++ b/devel/automake/HISTORY
@@ -1,3 +1,6 @@
+2012-07-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.2, SECURITY_PATCH=1, CVE-2012-3386
+
2012-06-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12.1

diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index 044b0f3..5c6be6c 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.2.49
-
SOURCE_HASH=sha512:d40ce7aff661592710f8b1de638404e98c7d1166da3ffa6cb941bbc6ec64f013431930d231027abc1bce0ac8b7c7b5580d87294e8504ee0130ebf961aa210eaa
+ VERSION=0.2.50
+
SOURCE_HASH=sha512:77fc61cfea83045d5b6a6df3dab39dadd7f4a70e104730eb5f275fa754790a0565e580b2e08c4676825291130fdbb0ba4ce0890a4bd11582bcdb7e7aa6f60271
SOURCE=${SPELL}_${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index 2552a0d..4f04fb3 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2012-07-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.50
+
2012-06-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.49
* DEPENDS: add docbook-xsl, gtettext, util-linux
diff --git a/doc/docutils/DETAILS b/doc/docutils/DETAILS
index 6306fcb..feec22a 100755
--- a/doc/docutils/DETAILS
+++ b/doc/docutils/DETAILS
@@ -1,7 +1,8 @@
SPELL=docutils
- VERSION=0.9
-
SOURCE_HASH=sha512:ce015d79093e8fa0e14851c5f122a2c2d38981c82358bb1a9219271af2d12bf3219abbeed362114342ebd5a7173e0bf4a3686987c70bb950c72c2ffa3fed2440
+ VERSION=0.9.1
+#
SOURCE_HASH=sha512:ce015d79093e8fa0e14851c5f122a2c2d38981c82358bb1a9219271af2d12bf3219abbeed362114342ebd5a7173e0bf4a3686987c70bb950c72c2ffa3fed2440
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://$SPELL.sourceforge.net
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/docutils/HISTORY b/doc/docutils/HISTORY
index 4d8cc27..8172a17 100644
--- a/doc/docutils/HISTORY
+++ b/doc/docutils/HISTORY
@@ -1,3 +1,6 @@
+2012-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.9.1
+
2012-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.9

diff --git a/doc/docutils/docutils-0.9.1.tar.gz.sig
b/doc/docutils/docutils-0.9.1.tar.gz.sig
new file mode 100644
index 0000000..c87dd02
Binary files /dev/null and b/doc/docutils/docutils-0.9.1.tar.gz.sig differ
diff --git a/e-17/ephysics/DEPENDS b/e-17/ephysics/DEPENDS
new file mode 100755
index 0000000..8fad5a2
--- /dev/null
+++ b/e-17/ephysics/DEPENDS
@@ -0,0 +1,6 @@
+depends eina &&
+depends evas &&
+depends ecore &&
+depends bullet "" "" games &&
+
+optional_depends elementary "" "" "to build a test application ephysics_test"
diff --git a/e-17/ephysics/DETAILS b/e-17/ephysics/DETAILS
new file mode 100755
index 0000000..ab1c2f7
--- /dev/null
+++ b/e-17/ephysics/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=ephysics
+ PATCHLEVEL=0
+if [ "$EPHYSICS_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+ SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+ WEB_SITE=http://www.enlightenment.org/
+ ENTERED=20120712
+ LICENSE[0]=BSD
+ SHORT="EFL wrapper for physics engine"
+cat << EOF
+EPhysics is a library that manages Ecore, Evas and Bullet Physics into
+an easy to use way. It's a kind of wrapper, a glue, between these libraries.
+It's not intended to be a physics library (we already have many out there).
+EOF
diff --git a/e-17/ephysics/HISTORY b/e-17/ephysics/HISTORY
new file mode 100644
index 0000000..40a8536
--- /dev/null
+++ b/e-17/ephysics/HISTORY
@@ -0,0 +1,2 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created
diff --git a/e-17/ephysics/PREPARE b/e-17/ephysics/PREPARE
new file mode 100755
index 0000000..f8b7d7e
--- /dev/null
+++ b/e-17/ephysics/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/ephysics/PRE_BUILD b/e-17/ephysics/PRE_BUILD
new file mode 100755
index 0000000..1af1b77
--- /dev/null
+++ b/e-17/ephysics/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+NOCONFIGURE=ON ./autogen.sh
diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index cda43be..07a4570 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -37,10 +37,10 @@ optional_depends directfb \
"--disable-directfb" \
"for DirectFB rendering backend" &&

-optional_depends sdl \
- "--enable-software-sdl" \
- "--disable-software-sdl" \
- "Enable software SDL rendering backend?" &&
+optional_depends sdl \
+ "--enable-software-16-sdl" \
+ "--disable-software-16-sdl" \
+ "Enable software 16bit SDL rendering backend?" &&

optional_depends xorg-libs \
"--enable-software-xlib --with-x" \
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index 9cdf2c0..f09afd2 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DEPENDS: configure options updated
+
2011-12-30 Ladislav Hagara <hgr AT vabo.cz>
* BUILD: --disable-wayland-{shm,egl} added

diff --git a/e-17/terminology/DEPENDS b/e-17/terminology/DEPENDS
new file mode 100755
index 0000000..fdc4fc0
--- /dev/null
+++ b/e-17/terminology/DEPENDS
@@ -0,0 +1,4 @@
+depends eina &&
+depends evas &&
+depends ecore &&
+depends emotion
diff --git a/e-17/terminology/DETAILS b/e-17/terminology/DETAILS
new file mode 100755
index 0000000..34a4d3b
--- /dev/null
+++ b/e-17/terminology/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=terminology
+ PATCHLEVEL=0
+if [ "$TERMINOLOGY_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+ SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
+ FORCE_DOWNLOAD=on
+ SOURCE_IGNORE=volatile
+ WEB_SITE=http://www.enlightenment.org/
+ ENTERED=20120712
+ LICENSE[0]=BSD
+ SHORT="EFL terminal emulator"
+cat << EOF
+This is an EFL terminal emulator with some extra bells and whistles.
+EOF
diff --git a/e-17/terminology/HISTORY b/e-17/terminology/HISTORY
new file mode 100644
index 0000000..40a8536
--- /dev/null
+++ b/e-17/terminology/HISTORY
@@ -0,0 +1,2 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created
diff --git a/e-17/terminology/PREPARE b/e-17/terminology/PREPARE
new file mode 100755
index 0000000..f8b7d7e
--- /dev/null
+++ b/e-17/terminology/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/e-17/terminology/PRE_BUILD b/e-17/terminology/PRE_BUILD
new file mode 100755
index 0000000..1af1b77
--- /dev/null
+++ b/e-17/terminology/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+NOCONFIGURE=ON ./autogen.sh
diff --git a/gnome2-libs/libgda3/DEPENDS b/gnome2-libs/libgda3/DEPENDS
index 4e854a2..bd6bf41 100755
--- a/gnome2-libs/libgda3/DEPENDS
+++ b/gnome2-libs/libgda3/DEPENDS
@@ -19,8 +19,8 @@ optional_depends MYSQL \
"Enable MySQL DB Support" &&

optional_depends postgresql \
- "--with-postgresql" \
- "--without-postgresql" \
+ "--with-postgres" \
+ "--without-postgres" \
"Enable Postgresql DB Support" &&

optional_depends xbase \
diff --git a/gnome2-libs/libgda3/DETAILS b/gnome2-libs/libgda3/DETAILS
index 2879a99..c8e5c83 100755
--- a/gnome2-libs/libgda3/DETAILS
+++ b/gnome2-libs/libgda3/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgda3
- VERSION=3.1.4
+ VERSION=3.1.5
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=libgda-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/libgda-$VERSION
diff --git a/gnome2-libs/libgda3/HISTORY b/gnome2-libs/libgda3/HISTORY
index c48b299..d4b2ab9 100644
--- a/gnome2-libs/libgda3/HISTORY
+++ b/gnome2-libs/libgda3/HISTORY
@@ -1,3 +1,10 @@
+2012-07-11 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 3.1.5
+ * DEPENDS: fixed postgresql flags
+ * PRE_BUILD: added, to apply patch
+ * libgda-glib.patch: added, to fix compilation on glib>=2.31
+ from openSUSE
+
2010-04-06 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: updated mysql dependency to MYSQL provider

diff --git a/gnome2-libs/libgda3/PRE_BUILD b/gnome2-libs/libgda3/PRE_BUILD
new file mode 100755
index 0000000..2792a94
--- /dev/null
+++ b/gnome2-libs/libgda3/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/libgda-glib.patch
diff --git a/gnome2-libs/libgda3/libgda-3.1.4.tar.bz2.sig
b/gnome2-libs/libgda3/libgda-3.1.4.tar.bz2.sig
deleted file mode 100644
index 4e96687..0000000
Binary files a/gnome2-libs/libgda3/libgda-3.1.4.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgda3/libgda-3.1.5.tar.bz2.sig
b/gnome2-libs/libgda3/libgda-3.1.5.tar.bz2.sig
new file mode 100644
index 0000000..64c63cd
Binary files /dev/null and b/gnome2-libs/libgda3/libgda-3.1.5.tar.bz2.sig
differ
diff --git a/gnome2-libs/libgda3/libgda-glib.patch
b/gnome2-libs/libgda3/libgda-glib.patch
new file mode 100644
index 0000000..61db67b
--- /dev/null
+++ b/gnome2-libs/libgda3/libgda-glib.patch
@@ -0,0 +1,545 @@
+Index: libgda-3.1.5/libgda/gda-command.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-command.h
++++ libgda-3.1.5/libgda/gda-command.h
+@@ -25,8 +25,8 @@
+ #define __GDA_COMMAND_H__
+
+ #include <glib-object.h>
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+Index: libgda-3.1.5/libgda/gda-column.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-column.h
++++ libgda-3.1.5/libgda/gda-column.h
+@@ -28,7 +28,7 @@
+
+ #include <glib-object.h>
+ #include <libgda/gda-value.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-decl.h>
+
+ G_BEGIN_DECLS
+Index: libgda-3.1.5/libgda/gda-value.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-value.h
++++ libgda-3.1.5/libgda/gda-value.h
+@@ -27,8 +27,7 @@
+ #define __GDA_VALUE_H__
+
+ #include <time.h>
+-#include <glib/glist.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <libxml/tree.h>
+ #include <libgda/gda-decl.h>
+Index: libgda-3.1.5/libgda/gda-config.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-config.h
++++ libgda-3.1.5/libgda/gda-config.h
+@@ -23,7 +23,7 @@
+ #ifndef __GDA_CONFIG_H__
+ #define __GDA_CONFIG_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-data-model.h>
+ #include <libgda/gda-parameter.h>
+
+Index: libgda-3.1.5/libgda/gda-log.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-log.h
++++ libgda-3.1.5/libgda/gda-log.h
+@@ -20,8 +20,7 @@
+ #if !defined(__gda_log_h__)
+ # define __gda_log_h__
+
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <time.h>
+
+ G_BEGIN_DECLS
+Index: libgda-3.1.5/libgda/gda-quark-list.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-quark-list.h
++++ libgda-3.1.5/libgda/gda-quark-list.h
+@@ -24,8 +24,7 @@
+ #ifndef __GDA_QUARK_LIST_H__
+ #define __GDA_QUARK_LIST_H__
+
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glib-object.h>
+
+ G_BEGIN_DECLS
+Index: libgda-3.1.5/libgda/gda-row.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-row.h
++++ libgda-3.1.5/libgda/gda-row.h
+@@ -27,7 +27,7 @@
+
+ #include <glib-object.h>
+ #include <libgda/gda-column.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-decl.h>
+
+ G_BEGIN_DECLS
+Index: libgda-3.1.5/libgda/gda-util.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-util.h
++++ libgda-3.1.5/libgda/gda-util.h
+@@ -24,8 +24,7 @@
+ #ifndef __GDA_UTIL_H__
+ #define __GDA_UTIL_H__
+
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "gda-parameter.h"
+ #include "gda-row.h"
+ #include "gda-connection.h"
+Index: libgda-3.1.5/libgda/gda-column.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-column.c
++++ libgda-3.1.5/libgda/gda-column.c
+@@ -23,8 +23,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <libgda/gda-column.h>
+ #include <string.h>
+ #include "gda-marshal.h"
+Index: libgda-3.1.5/libgda/gda-command.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-command.c
++++ libgda-3.1.5/libgda/gda-command.c
+@@ -21,9 +21,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <libgda/gda-command.h>
+
+ GType
+Index: libgda-3.1.5/libgda/gda-config.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-config.c
++++ libgda-3.1.5/libgda/gda-config.c
+@@ -38,7 +38,6 @@
+ #include <sys/stat.h>
+ #ifdef HAVE_FAM
+ #include <fam.h>
+-#include <glib/giochannel.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+Index: libgda-3.1.5/libgda/gda-data-model-array.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-data-model-array.c
++++ libgda-3.1.5/libgda/gda-data-model-array.c
+@@ -22,7 +22,7 @@
+ */
+
+ #include <string.h>
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <libgda/gda-data-model-array.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-row.h>
+Index: libgda-3.1.5/libgda/gda-data-model-filter-sql.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-data-model-filter-sql.c
++++ libgda-3.1.5/libgda/gda-data-model-filter-sql.c
+@@ -21,7 +21,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gdataset.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <libsql/sql_parser.h>
+ #include <glib/gi18n-lib.h>
+Index: libgda-3.1.5/libgda/gda-data-model-hash.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-data-model-hash.c
++++ libgda-3.1.5/libgda/gda-data-model-hash.c
+@@ -23,7 +23,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-data-model-hash.h>
+ #include <libgda/gda-data-model-extra.h>
+Index: libgda-3.1.5/libgda/gda-data-model.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-data-model.c
++++ libgda-3.1.5/libgda/gda-data-model.c
+@@ -24,7 +24,7 @@
+ */
+
+ #include <glib/gi18n-lib.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <libgda/gda-data-model.h>
+ #include <libgda/gda-data-model-private.h>
+ #include <libgda/gda-data-model-extra.h>
+Index: libgda-3.1.5/libgda/gda-init.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-init.c
++++ libgda-3.1.5/libgda/gda-init.c
+@@ -17,7 +17,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gmodule.h>
+ #include <libgda/libgda.h>
+ #include <glib/gi18n-lib.h>
+Index: libgda-3.1.5/libgda/gda-log.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-log.c
++++ libgda-3.1.5/libgda/gda-log.c
+@@ -24,10 +24,6 @@
+ #include <syslog.h>
+ #endif
+ #include <time.h>
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gutils.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-log.h>
+
+Index: libgda-3.1.5/libgda/gda-quark-list.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-quark-list.c
++++ libgda-3.1.5/libgda/gda-quark-list.c
+@@ -22,10 +22,7 @@
+ */
+
+ #include <libgda/gda-quark-list.h>
+-#include <glib/ghash.h>
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+
+ struct _GdaQuarkList {
+ GHashTable *hash_table;
+Index: libgda-3.1.5/libgda/gda-server-operation.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-server-operation.c
++++ libgda-3.1.5/libgda/gda-server-operation.c
+@@ -21,7 +21,7 @@
+ */
+
+ #include <stdlib.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <libgda/gda-marshal.h>
+ #include <libgda/gda-dict.h>
+ #include <libgda/gda-dict-type.h>
+Index: libgda-3.1.5/libgda/gda-server-provider.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-server-provider.c
++++ libgda-3.1.5/libgda/gda-server-provider.c
+@@ -22,7 +22,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <libgda/gda-server-provider-extra.h>
+ #include <libgda/gda-server-provider-private.h>
+Index: libgda-3.1.5/libgda/gda-util.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-util.c
++++ libgda-3.1.5/libgda/gda-util.c
+@@ -27,10 +27,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <glib/gfileutils.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <libsql/sql_parser.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-log.h>
+Index: libgda-3.1.5/libgda/gda-value.c
+===================================================================
+--- libgda-3.1.5.orig/libgda/gda-value.c
++++ libgda-3.1.5/libgda/gda-value.c
+@@ -28,10 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <time.h>
+-#include <glib/gdate.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-value.h>
+ #include <libgda/gda-blob-op.h>
+Index: libgda-3.1.5/libgda/sqlite/gda-sqlite.h
+===================================================================
+--- libgda-3.1.5.orig/libgda/sqlite/gda-sqlite.h
++++ libgda-3.1.5/libgda/sqlite/gda-sqlite.h
+@@ -25,8 +25,7 @@
+ #ifndef __GDA_SQLITE_H__
+ #define __GDA_SQLITE_H__
+
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <libgda/gda-value.h>
+ #include <libgda/gda-connection.h>
+
+Index: libgda-3.1.5/providers/bdb/gda-bdb.h
+===================================================================
+--- libgda-3.1.5.orig/providers/bdb/gda-bdb.h
++++ libgda-3.1.5/providers/bdb/gda-bdb.h
+@@ -25,7 +25,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <db.h>
+Index: libgda-3.1.5/providers/firebird/gda-firebird-provider.c
+===================================================================
+--- libgda-3.1.5.orig/providers/firebird/gda-firebird-provider.c
++++ libgda-3.1.5/providers/firebird/gda-firebird-provider.c
+@@ -27,7 +27,7 @@
+ #include <libgda/gda-server-provider-extra.h>
+ #include <libgda/gda-command.h>
+ #include <libgda/gda-parameter-list.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <string.h>
+ #include "gda-firebird-provider.h"
+ #include "gda-firebird-recordset.h"
+Index: libgda-3.1.5/providers/firebird/gda-firebird-recordset.c
+===================================================================
+--- libgda-3.1.5.orig/providers/firebird/gda-firebird-recordset.c
++++ libgda-3.1.5/providers/firebird/gda-firebird-recordset.c
+@@ -28,7 +28,7 @@
+ #include <libgda/gda-quark-list.h>
+ #include <libgda/gda-parameter-list.h>
+ #include <glib/gi18n-lib.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <string.h>
+ #include <math.h>
+

+Index: libgda-3.1.5/providers/freetds/gda-freetds-message.h
+===================================================================
+--- libgda-3.1.5.orig/providers/freetds/gda-freetds-message.h
++++ libgda-3.1.5/providers/freetds/gda-freetds-message.h
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
+Index: libgda-3.1.5/providers/freetds/gda-freetds-types.h
+===================================================================
+--- libgda-3.1.5.orig/providers/freetds/gda-freetds-types.h
++++ libgda-3.1.5/providers/freetds/gda-freetds-types.h
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
+Index: libgda-3.1.5/providers/freetds/gda-freetds.h
+===================================================================
+--- libgda-3.1.5.orig/providers/freetds/gda-freetds.h
++++ libgda-3.1.5/providers/freetds/gda-freetds.h
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
+Index: libgda-3.1.5/providers/postgres/gda-postgres.h
+===================================================================
+--- libgda-3.1.5.orig/providers/postgres/gda-postgres.h
++++ libgda-3.1.5/providers/postgres/gda-postgres.h
+@@ -24,7 +24,7 @@
+ #ifndef __GDA_POSTGRES_H__
+ #define __GDA_POSTGRES_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include "gda-postgres-provider.h"
+Index: libgda-3.1.5/providers/ibmdb2/gda-ibmdb2-types.h
+===================================================================
+--- libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2-types.h
++++ libgda-3.1.5/providers/ibmdb2/gda-ibmdb2-types.h
+@@ -23,7 +23,7 @@
+ #ifndef __GDA_IBMDB2_TYPES_H__
+ #define __GDA_IBMDB2_TYPES_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <sqlcli1.h>
+Index: libgda-3.1.5/providers/ibmdb2/gda-ibmdb2.h
+===================================================================
+--- libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2.h
++++ libgda-3.1.5/providers/ibmdb2/gda-ibmdb2.h
+@@ -23,12 +23,11 @@
+ #if !defined(__gda_ibmdb2_h__)
+ # define __gda_ibmdb2_h__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <libgda/gda-value.h>
+-#include <glib/gi18n-lib.h>
+ #include <sqlcli1.h>
+ #include "gda-ibmdb2-provider.h"
+
+Index: libgda-3.1.5/providers/ldap/gda-ldap.h
+===================================================================
+--- libgda-3.1.5.orig/providers/ldap/gda-ldap.h
++++ libgda-3.1.5/providers/ldap/gda-ldap.h
+@@ -26,7 +26,7 @@
+ #if !defined(__gda_ldap_h__)
+ # define __gda_ldap_h__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+Index: libgda-3.1.5/providers/mdb/gda-mdb-provider.c
+===================================================================
+--- libgda-3.1.5.orig/providers/mdb/gda-mdb-provider.c
++++ libgda-3.1.5/providers/mdb/gda-mdb-provider.c
+@@ -22,7 +22,7 @@
+ */
+
+ #include <stdlib.h>
+-#include <glib/gbacktrace.h>
++#include <glib.h>
+ #include <virtual/gda-vconnection-data-model.h>
+ #include <libgda/gda-data-model-array.h>
+ #include <libgda/gda-data-model-private.h>
+Index: libgda-3.1.5/providers/mdb/gda-mdb.h
+===================================================================
+--- libgda-3.1.5.orig/providers/mdb/gda-mdb.h
++++ libgda-3.1.5/providers/mdb/gda-mdb.h
+@@ -24,7 +24,7 @@
+ #ifndef __GDA_MDB_H__
+ #define __GDA_MDB_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+Index: libgda-3.1.5/providers/msql/gda-msql.h
+===================================================================
+--- libgda-3.1.5.orig/providers/msql/gda-msql.h
++++ libgda-3.1.5/providers/msql/gda-msql.h
+@@ -22,7 +22,7 @@
+ #ifndef __gda_msql_h__
+ #define __gda_msql_h__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+Index: libgda-3.1.5/providers/mysql/gda-mysql.h
+===================================================================
+--- libgda-3.1.5.orig/providers/mysql/gda-mysql.h
++++ libgda-3.1.5/providers/mysql/gda-mysql.h
+@@ -25,7 +25,7 @@
+ #ifndef __GDA_MYSQL_H__
+ #define __GDA_MYSQL_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+Index: libgda-3.1.5/providers/odbc/gda-odbc.h
+===================================================================
+--- libgda-3.1.5.orig/providers/odbc/gda-odbc.h
++++ libgda-3.1.5/providers/odbc/gda-odbc.h
+@@ -25,7 +25,7 @@
+ #if !defined(__gda_odbc_h__)
+ # define __gda_odbc_h__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+Index: libgda-3.1.5/providers/oracle/gda-oracle.h
+===================================================================
+--- libgda-3.1.5.orig/providers/oracle/gda-oracle.h
++++ libgda-3.1.5/providers/oracle/gda-oracle.h
+@@ -31,7 +31,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+Index: libgda-3.1.5/providers/sybase/gda-sybase.h
+===================================================================
+--- libgda-3.1.5.orig/providers/sybase/gda-sybase.h
++++ libgda-3.1.5/providers/sybase/gda-sybase.h
+@@ -32,7 +32,7 @@
+ # include <config.h>
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <ctpublic.h>
diff --git a/gnome2-libs/nautilus-dropbox/DEPENDS
b/gnome2-libs/nautilus-dropbox/DEPENDS
index e89d445..4a6ebd4 100755
--- a/gnome2-libs/nautilus-dropbox/DEPENDS
+++ b/gnome2-libs/nautilus-dropbox/DEPENDS
@@ -1 +1,4 @@
-depends nautilus2
+depends docutils &&
+depends nautilus2 &&
+
+suggest_depends pygpgme '' '' 'to verify binary signatures'
diff --git a/gnome2-libs/nautilus-dropbox/DETAILS
b/gnome2-libs/nautilus-dropbox/DETAILS
index cc66b27..4965aa5 100755
--- a/gnome2-libs/nautilus-dropbox/DETAILS
+++ b/gnome2-libs/nautilus-dropbox/DETAILS
@@ -1,8 +1,9 @@
SPELL=nautilus-dropbox
- VERSION=0.6.9
+ VERSION=1.4.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_URL[0]=http://linux.dropbox.com/packages/${SOURCE}
-
SOURCE_HASH=sha512:c4aa24bae2769e8cbaff09f6e55756423256ffc5a899129bb15fa59647c256e2825efa89be0bbc1d295a10768fee3395abb9572ddbfc24e19d689b00ccb8e686
+#
SOURCE_HASH=sha512:c4aa24bae2769e8cbaff09f6e55756423256ffc5a899129bb15fa59647c256e2825efa89be0bbc1d295a10768fee3395abb9572ddbfc24e19d689b00ccb8e686
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.dropbox.com";
LICENSE[0]="GPL"
diff --git a/gnome2-libs/nautilus-dropbox/HISTORY
b/gnome2-libs/nautilus-dropbox/HISTORY
index 7140a1c..28887ca 100644
--- a/gnome2-libs/nautilus-dropbox/HISTORY
+++ b/gnome2-libs/nautilus-dropbox/HISTORY
@@ -1,3 +1,8 @@
+2012-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4.0
+ * DEPENDS: Depends on docutils
+ Suggest pygpgme to verify binary signatures
+
2011-08-26 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS, DETAILS: spell created

diff --git a/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.4.0.tar.bz2.sig
b/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.4.0.tar.bz2.sig
new file mode 100644
index 0000000..7cabd08
Binary files /dev/null and
b/gnome2-libs/nautilus-dropbox/nautilus-dropbox-1.4.0.tar.bz2.sig differ
diff --git a/gnome2-libs/nautilus2/DEPENDS b/gnome2-libs/nautilus2/DEPENDS
index 1f9223a..a63d4ef 100755
--- a/gnome2-libs/nautilus2/DEPENDS
+++ b/gnome2-libs/nautilus2/DEPENDS
@@ -20,4 +20,6 @@ optional_depends libselinux "" "" "Enable SELiunx support?"
&&
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "to build documentation"
+ "to build documentation" &&
+
+suggest_depends gvfs "" "" "for Connect to Server functionality"
diff --git a/gnome2-libs/nautilus2/HISTORY b/gnome2-libs/nautilus2/HISTORY
index e205495..19ae3e1 100644
--- a/gnome2-libs/nautilus2/HISTORY
+++ b/gnome2-libs/nautilus2/HISTORY
@@ -1,3 +1,6 @@
+2012-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Suggest gvfs for Connect to Server funcionality
+
2012-05-17 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 3.4.2

diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index 8c0a0e2..8694929 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,6 +1,6 @@
SPELL=opencv
SPELLX=OpenCV
- VERSION=2.4.1
+ VERSION=2.4.2
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 0890e21..933c3e9 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,6 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.2
+
2012-06-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.4.1

diff --git a/graphics-libs/opencv/OpenCV-2.4.1.tar.bz2.sig
b/graphics-libs/opencv/OpenCV-2.4.1.tar.bz2.sig
deleted file mode 100644
index 7a2c6c9..0000000
Binary files a/graphics-libs/opencv/OpenCV-2.4.1.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/opencv/OpenCV-2.4.2.tar.bz2.sig
b/graphics-libs/opencv/OpenCV-2.4.2.tar.bz2.sig
new file mode 100644
index 0000000..78c5347
Binary files /dev/null and b/graphics-libs/opencv/OpenCV-2.4.2.tar.bz2.sig
differ
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index ffe4f4e..1636386 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.20.1
-
SOURCE_HASH=sha512:601a9d15d56d0241ebdfdb4314bd185fac3fcca78ca994d378b124e50400dcd0417bd60c822bd8d7adf245c9ce4ea4f28cf78b05b8275837706d7c436b72e0da
+ VERSION=0.20.2
+
SOURCE_HASH=sha512:7a9a9e94298be025d8ee2dcba2be61c9d6bf167cee238a2599e211999ce0dcb59b5ef3418c5f3a6ddc8f1600e7ef2954c53f4a4149742a8a87879b1c58e77bed
else
- VERSION=0.20.1
-
SOURCE_HASH=sha512:601a9d15d56d0241ebdfdb4314bd185fac3fcca78ca994d378b124e50400dcd0417bd60c822bd8d7adf245c9ce4ea4f28cf78b05b8275837706d7c436b72e0da
+ VERSION=0.20.2
+
SOURCE_HASH=sha512:7a9a9e94298be025d8ee2dcba2be61c9d6bf167cee238a2599e211999ce0dcb59b5ef3418c5f3a6ddc8f1600e7ef2954c53f4a4149742a8a87879b1c58e77bed
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index b4f6905..32a498b 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.20.2
+
2012-06-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.20.1

diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index 2191675..6ffe74c 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,6 +1,6 @@
SPELL=libgphoto2
- VERSION=2.4.14
-
SOURCE_HASH=sha512:4abc89ee2d714deab98cdba84d0497b7262105ade3b3c43eaa8936b6e5359a8dc50c49c217fff37f013e0ce7404b82b4c7c2f90af49274a3ecb9f15e10747a73
+ VERSION=2.5.0
+
SOURCE_HASH=sha512:160ca4efba3d3fecf9b9f53234169121c9910b15736b6bd9b813763ae80b50632243f6dc5b5ef8bc9bae4450bf1d17fd9c1fe1eadd682e2d0c48b813fe97998c
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 63008c9..c90cdda 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,10 @@
+2012-07-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: run ldconfig before using print-camera-list
+
+2012-07-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.0
+ * UP_TRIGGERS: added, this update is BINARY INCOMPATIBLE
+
2012-06-11 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: LIBUSB => libusb-compat

diff --git a/graphics/libgphoto2/INSTALL b/graphics/libgphoto2/INSTALL
index cad06f2..8f24276 100755
--- a/graphics/libgphoto2/INSTALL
+++ b/graphics/libgphoto2/INSTALL
@@ -1,7 +1,7 @@
default_install &&
cd doc &&
make install-man &&
-
+ldconfig &&
local CAMERALIST &&
CAMERALIST=$TRACK_ROOT/usr/lib/libgphoto2/print-camera-list &&
# Installs fdi files for use with HAL
diff --git a/graphics/libgphoto2/UP_TRIGGERS b/graphics/libgphoto2/UP_TRIGGERS
new file mode 100755
index 0000000..b7667ee
--- /dev/null
+++ b/graphics/libgphoto2/UP_TRIGGERS
@@ -0,0 +1,10 @@
+# this makes ABI changes automatically cast those that depend on
+# libgphoto2 via an up_trigger
+
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION}" != "${OLD_SPELL_VERSION}" ]; then
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/http/xombrero/DETAILS b/http/xombrero/DETAILS
index 3450822..1546cd5 100755
--- a/http/xombrero/DETAILS
+++ b/http/xombrero/DETAILS
@@ -1,5 +1,5 @@
SPELL=xombrero
- VERSION=1.1.0
+ VERSION=1.1.1
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://opensource.conformal.com/snapshots/$SPELL/$SOURCE
diff --git a/http/xombrero/HISTORY b/http/xombrero/HISTORY
index cd9b47d..db2332c 100644
--- a/http/xombrero/HISTORY
+++ b/http/xombrero/HISTORY
@@ -1,3 +1,7 @@
+2012-07-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.1
+ * PRE_BUILD, xombrero-TAILQ_FOREACH_SAFE.patch: patch removed
+
2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.0
* PRE_BUILD, xombrero-TAILQ_FOREACH_SAFE.patch: upstream patch added
diff --git a/http/xombrero/PRE_BUILD b/http/xombrero/PRE_BUILD
index 6ece1cf..db84343 100755
--- a/http/xombrero/PRE_BUILD
+++ b/http/xombrero/PRE_BUILD
@@ -1,7 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p1 < $SPELL_DIRECTORY/xombrero-TAILQ_FOREACH_SAFE.patch &&
-
sed -i "s:/local::" linux/Makefile &&
sed -i 's:/usr/local/share/xombrero/:/usr/share/xombrero/:' xombrero.conf
unix.c
diff --git a/http/xombrero/xombrero-1.1.0.tgz.sig
b/http/xombrero/xombrero-1.1.0.tgz.sig
deleted file mode 100644
index cf28fd5..0000000
Binary files a/http/xombrero/xombrero-1.1.0.tgz.sig and /dev/null differ
diff --git a/http/xombrero/xombrero-1.1.1.tgz.sig
b/http/xombrero/xombrero-1.1.1.tgz.sig
new file mode 100644
index 0000000..f4076d7
Binary files /dev/null and b/http/xombrero/xombrero-1.1.1.tgz.sig differ
diff --git a/http/xombrero/xombrero-TAILQ_FOREACH_SAFE.patch
b/http/xombrero/xombrero-TAILQ_FOREACH_SAFE.patch
deleted file mode 100644
index 93cea4b..0000000
--- a/http/xombrero/xombrero-TAILQ_FOREACH_SAFE.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/linux/util.h b/linux/util.h
-index 2f329bb..cce1453 100644
---- a/linux/util.h
-+++ b/linux/util.h
-@@ -39,6 +39,14 @@ int fmt_scaled(long long number, char *result);
- #define TAILQ_END(head) NULL
- #endif
-
-+#ifndef TAILQ_FOREACH_SAFE
-+#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \
-+ for ((var) = TAILQ_FIRST(head); \
-+ (var) != TAILQ_END(head) && \
-+ ((tvar) = TAILQ_NEXT(var, field), 1); \
-+ (var) = (tvar))
-+#endif
-+
- /*
- * fmt_scaled(3) specific flags. (from OpenBSD util.h)
- */
diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index a0523c1..ef43f3f 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,6 +1,6 @@
SPELL=boost
- VERSION=1_49_0
-
SOURCE_HASH=sha512:9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d
+ VERSION=1_50_0
+
SOURCE_HASH=sha512:5909a2eca520a28af31de6a36c51f57b11fddcc0a51493a1e500ade00d9c4e78175c4892c04857ee385f3874f96e561b74b6427e1a155102e926421067d889fe
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE=${SPELL}_${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION}
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 5d0a681..b9bc812 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,8 @@
+2012-07-10 Treeeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1_50_0
+ * converter_policies_hpp.patch: deleted
+ * PRE_BUILD: do not apply patch
+
2012-04-23 Treeeve Jelbert <treeve AT sourcemage.org>
* DEPENDS, *SUB_DEPENDS: python => PYTHON
* PRE_BUILD: fix detection of python3
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index 5bdb55c..c70df8d 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -2,7 +2,6 @@ default_pre_build &&
message "${MESSAGE_COLOR}Allow providing our own
CXXFLAGS...${DEFAULT_COLOR}" &&
patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
$SCRIPT_DIRECTORY/boost-use-cxxflags.patch &&
-patch -p1 -d $SOURCE_DIRECTORY <
$SCRIPT_DIRECTORY/converter_policies_hpp.patch &&

if is_depends_enabled $SPELL python3;then
cd $SOURCE_DIRECTORY &&
diff --git a/libs/boost/converter_policies_hpp.patch
b/libs/boost/converter_policies_hpp.patch
deleted file mode 100644
index 4065b21..0000000
--- a/libs/boost/converter_policies_hpp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 1.1/boost/numeric/conversion/converter_policies.hpp 2009-07-13
14:41:34 +01:00
-+++ edited/boost/numeric/conversion/converter_policies.hpp 2011-01-14
12:06:18 +00:00
-@@ -21,6 +21,8 @@
- #include "boost/mpl/if.hpp"
- #include "boost/mpl/integral_c.hpp"
-
-+#include "boost/throw_exception.hpp"
-+
- namespace boost { namespace numeric
- {
-
-@@ -159,9 +161,9 @@
- void operator() ( range_check_result r ) //
throw(negative_overflow,positive_overflow)
- {
- if ( r == cNegOverflow )
-- throw negative_overflow() ;
-+ boost::throw_exception(negative_overflow()) ;
- else if ( r == cPosOverflow )
-- throw positive_overflow() ;
-+ boost::throw_exception(positive_overflow()) ;
- }
- } ;
-
-
diff --git a/libs/libexif/DETAILS b/libs/libexif/DETAILS
index b9c159f..5d16873 100755
--- a/libs/libexif/DETAILS
+++ b/libs/libexif/DETAILS
@@ -11,8 +11,8 @@ if [ "$LIBEXIF_CVS" == "y" ]; then
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.6.20
-
SOURCE_HASH=sha512:1578fb160ea926a95bd05e4b356442b569bcbf5543287481c7f87faec0712b17e89335ee9e014f55b1dbec347d1f95cd592931a4bc9c81b65cb60fd18475da5d
+ VERSION=0.6.21
+
SOURCE_HASH=sha512:4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libexif/HISTORY b/libs/libexif/HISTORY
index 494df13..63581cb 100644
--- a/libs/libexif/HISTORY
+++ b/libs/libexif/HISTORY
@@ -1,3 +1,6 @@
+2012-07-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.6.21
+
2010-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.20

diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 12f0beb..75d7a0a 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,5 +1,5 @@
SPELL=pcre
- VERSION=8.30
+ VERSION=8.31
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 8848e4c..db6d563 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,7 @@
+2012-07-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.31
+ * INSTALL: update symlink
+
2012-02-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 8.30
* BUILD, CONFIGURE: support 16-bit characters
diff --git a/libs/pcre/INSTALL b/libs/pcre/INSTALL
index ebccaa8..0030e40 100755
--- a/libs/pcre/INSTALL
+++ b/libs/pcre/INSTALL
@@ -1,2 +1,2 @@
default_install &&
-ln -sf $TRACK_ROOT/usr/lib/libpcre.so.1.0.0
$INSTALL_ROOT/usr/lib/libpcre.so.0
+ln -sf $TRACK_ROOT/usr/lib/libpcre.so.1.0.1
$INSTALL_ROOT/usr/lib/libpcre.so.0
diff --git a/mobile/pilot-link/HISTORY b/mobile/pilot-link/HISTORY
index 0848c13..310c885 100644
--- a/mobile/pilot-link/HISTORY
+++ b/mobile/pilot-link/HISTORY
@@ -1,3 +1,7 @@
+2012-07-12 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * perl.patch: added, to fix compilation with perl>=5.14
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

diff --git a/mobile/pilot-link/PRE_BUILD b/mobile/pilot-link/PRE_BUILD
new file mode 100755
index 0000000..ec88f61
--- /dev/null
+++ b/mobile/pilot-link/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/perl.patch
diff --git a/mobile/pilot-link/perl.patch b/mobile/pilot-link/perl.patch
new file mode 100644
index 0000000..72d68d4
--- /dev/null
+++ b/mobile/pilot-link/perl.patch
@@ -0,0 +1,625 @@
+From ef1794b51e327cc80ec4cd95d6c97f954b912860 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni AT debian.org>
+Date: Sun, 10 Jul 2011 10:28:51 +0300
+Subject: [PATCH] Don't use PERL_POLLUTE macros
+
+The sv_yes, sv_no, sv_undef, etc. symbol names are compatibility
+macros that have been deprecated since Perl 5.6.
+
+Perl 5.14.0 removes support for defining PERL_POLLUTE to get these
+compatibility macros, so replace them all with the current names
+(PL_sv_yes, PL_sv_no, etc.) and don't define PERL_POLLUTE any more.
+
+This should work on all Perls since 5.6; it's been verified with 5.12.4
+and 5.14.0.
+---
+ bindings/Perl/Makefile.PL.in | 1 -
+ bindings/Perl/Pilot.xs | 158
+++++++++++++++++++++---------------------
+ bindings/Perl/typemap | 4 +-
+ 3 files changed, 81 insertions(+), 82 deletions(-)
+
+diff --git a/bindings/Perl/Makefile.PL.in b/bindings/Perl/Makefile.PL.in
+index 853e6eb..337cac0 100644
+--- a/bindings/Perl/Makefile.PL.in
++++ b/bindings/Perl/Makefile.PL.in
+@@ -39,7 +39,6 @@ WriteMakefile(
+ 'VERSION' =>
'@PILOT_LINK_VERS@.@PILOT_LINK_MAJOR@.@PILOT_LINK_MINOR@@PILOT_LINK_PATCH@',
+ 'XSPROTOARG' => '-noprototypes',
+ 'INC' => "-I$plincdir",
+- 'DEFINE' => '-DPERL_POLLUTE',
+ 'PREFIX' => "$prefix",
+ 'INSTALLDIRS'=> 'vendor',
+ 'dynamic_lib'=> {'OTHERLDFLAGS' => $lib},
+diff --git a/bindings/Perl/Pilot.xs b/bindings/Perl/Pilot.xs
+index 5a633ff..366d646 100644
+--- a/bindings/Perl/Pilot.xs
++++ b/bindings/Perl/Pilot.xs
+@@ -160,7 +160,7 @@ SvChar4(arg)
+
+ #define pack_dbinfo(arg, var, failure) { \
+ if (failure < 0) { \
+- arg = &sv_undef; \
++ arg = &PL_sv_undef; \
+ self->errnop = failure; \
+ } else { \
+ HV * i = newHV(); \
+@@ -214,15 +214,15 @@ SvChar4(arg)
+ var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ?
SvIV(*s) : 0;\
+ var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ?
SvIV(*s) : 0;\
+ var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ?
SvIV(*s) : 0;\
+- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)
\
+- strncpy(var.name, SvPV(*s, na), sizeof(var.name));
\
++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)
\
++ strncpy(var.name, SvPV(*s, PL_na), sizeof(var.name));
\
+ } else {\
+ croak("argument is not a hash reference");
\
+ }
+
+ #define pack_userinfo(arg, var, failure) { \
+ if (failure < 0) { \
+- arg = &sv_undef; \
++ arg = &PL_sv_undef; \
+ self->errnop = failure; \
+ } else { \
+ HV * i = newHV(); \
+@@ -246,8 +246,8 @@ SvChar4(arg)
+ var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC",
10, 0)) ? SvIV(*s) : 0;\
+ var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate",
12, 0)) ? SvIV(*s) : 0;\
+ var.successfulSyncDate = (s = hv_fetch(i,
"successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\
+- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\
+- strncpy(var.username, SvPV(*s, na),
sizeof(var.username));\
++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\
++ strncpy(var.username, SvPV(*s, PL_na),
sizeof(var.username));\
+ } else {\
+ croak("argument is not a hash reference");\
+ }
+@@ -287,7 +287,7 @@ SvChar4(arg)
+ }\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ #define PackSI\
+@@ -329,7 +329,7 @@ SvChar4(arg)
+ }\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ #define PackRecord {\
+@@ -421,7 +421,7 @@ SvChar4(arg)
+ }\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ #define PackResource\
+@@ -473,7 +473,7 @@ SvChar4(arg)
+ }\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ #define PackPref\
+@@ -536,7 +536,7 @@ SvChar4(arg)
+ croak("Unable to create resource");\
+ } else {\
+ self->errnop = result;\
+- PUSHs(&sv_undef);\
++ PUSHs(&PL_sv_undef);\
+ }
+
+ void doUnpackCategory(HV * self, struct CategoryAppInfo * c)
+@@ -576,7 +576,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo *
c)
+
+ if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s)
&& (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
+ for (i=0;i<16;i++)
+- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) :
"", 16);
++ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) :
"", 16);
+ else
+ for (i=0;i<16;i++)
+ strcpy(c->name[i], "");
+@@ -602,7 +602,7 @@ void doPackCategory(HV * self, struct CategoryAppInfo *
c)
+ int SvList(SV * arg, char **list)
+ {
+ int i;
+- char * str = SvPV(arg, na);
++ char * str = SvPV(arg, PL_na);
+ for (i=0;list[i];i++)
+ if (strcasecmp(list[i], str)==0)
+ return i;
+@@ -781,11 +781,11 @@ Pack(record)
+ croak("Invalid advance unit %d encountered", u);
+ }
+ } else {
+- if (strEQ(SvPV(*s, na), "minutes"))
++ if (strEQ(SvPV(*s, PL_na), "minutes"))
+ u = 0;
+- else if (strEQ(SvPV(*s, na), "hours"))
++ else if (strEQ(SvPV(*s, PL_na), "hours"))
+ u = 1;
+- else if (strEQ(SvPV(*s, na), "days"))
++ else if (strEQ(SvPV(*s, PL_na), "days"))
+ u = 2;
+ else
+ croak("Invalid advance unit %d encountered", u);
+@@ -850,10 +850,10 @@ Pack(record)
+ }
+ }
+
+- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) :
0;
++ a.description = (s = hv_fetch(h, "description", 11, 0)) ?
SvPV(*s,PL_na) : 0;
+ if (!a.description)
+ croak("appointments must contain a description");
+- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0;
++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0;
+
+ if (pack_Appointment(&a, &pibuf, datebook_v1) < 0) {
+ croak("pack_Appointment failed");
+@@ -897,7 +897,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1023,8 +1023,8 @@ Pack(record)
+ a.indefinite = 1;
+ }
+
+- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) :
0;
+- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0;
++ a.description = (s = hv_fetch(h, "description", 11, 0)) ?
SvPV(*s,PL_na) : 0;
++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0;
+
+ if (pack_ToDo(&a, &pibuf, todo_v1) < 0) {
+ croak("pack_ToDo failed");
+@@ -1065,7 +1065,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1160,7 +1160,7 @@ Unpack(record)
+ hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0);
+
+ for (i=0;i<19;i++) {
+- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef);
++ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef);
+ }
+
+ hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0);
+@@ -1200,7 +1200,7 @@ Pack(record)
+
+ if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) &&
(SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
+ for (i=0;i<19;i++)
+- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ?
SvPV(*s,na) : 0;
++ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ?
SvPV(*s,PL_na) : 0;
+ else
+ for (i=0;i<19;i++)
+ a.entry[i] = 0;
+@@ -1249,7 +1249,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1309,13 +1309,13 @@ PackAppBlock(record)
+ a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s)
: 0;
+
+ if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) &&
(SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
+- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ?
SvPV(*s,na) : "", 16);
++ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ?
SvPV(*s,PL_na) : "", 16);
+ else
+ for (i=0;i<22;i++) a.labels[i][0] = 0;
+ for (i=0;i<22;i++) a.labels[i][15] = 0;
+
+ if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) &&
(SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
+- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ?
SvPV(*s,na) : "", 16);
++ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ?
SvPV(*s,PL_na) : "", 16);
+ else
+ for (i=0;i<8;i++) a.phoneLabels[i][0] = 0;
+ for (i=0;i<8;i++) a.phoneLabels[i][15] = 0;
+@@ -1396,7 +1396,7 @@ Pack(record)
+ else {
+
+ if ((s = hv_fetch(h, "text", 4, 0)))
+- a.text = SvPV(*s,na);
++ a.text = SvPV(*s,PL_na);
+ else
+ a.text = 0;
+
+@@ -1438,7 +1438,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1510,7 +1510,7 @@ Unpack(record)
+
+ SvPV(record,len);
+ if (len > 0) { /* len == 0 if deleted flag is set */
+- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0);
+ hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0);
+@@ -1570,15 +1570,15 @@ Pack(record)
+ avtotm((AV*)SvRV(*s), &e.date);
+ else
+ croak("expense record must contain date");
+- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na);
++ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na);
+ else e.amount = 0;
+- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na);
++ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na);
+ else e.vendor = 0;
+- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na);
++ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na);
+ else e.city = 0;
+- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na);
++ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na);
+ else e.attendees = 0;
+- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na);
++ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na);
+ else e.note = 0;
+
+ len = pack_Expense(&e, mybuf, 0xffff);
+@@ -1619,7 +1619,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ hv_store(ret, "sortOrder", 9,
newSVlist(e.sortOrder,ExpenseSortNames),0);
+ a = newAV();
+@@ -1662,15 +1662,15 @@ PackAppBlock(record)
+ HV * hv;
+ if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) &&
(SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) {
+ if (s = hv_fetch(hv, "name", 4, 0)) {
+- strncpy(e.currencies[i].name,
SvPV(*s, na), 16);
++ strncpy(e.currencies[i].name,
SvPV(*s, PL_na), 16);
+ e.currencies[i].name[15] = 0;
+ }
+ if (s = hv_fetch(hv, "symbol", 6, 0)) {
+- strncpy(e.currencies[i].symbol,
SvPV(*s, na), 4);
++ strncpy(e.currencies[i].symbol,
SvPV(*s, PL_na), 4);
+ e.currencies[i].symbol[3] = 0;
+ }
+ if (s = hv_fetch(hv, "rate", 4, 0)) {
+- strncpy(e.currencies[i].rate,
SvPV(*s, na), 8);
++ strncpy(e.currencies[i].rate,
SvPV(*s, PL_na), 8);
+ e.currencies[i].rate[7] = 0;
+ }
+ }
+@@ -1718,7 +1718,7 @@ UnpackPref(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance,
ExpenseDistanceNames), 0);
+ hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory),
0);
+@@ -1811,7 +1811,7 @@ Unpack(record)
+
+ SvPV(record,len);
+ if (len > 0) { /* len == 0 if deleted flag is set */
+- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0),
0);
+ if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0);
+@@ -1858,14 +1858,14 @@ Pack(record)
+ }
+ else {
+
+- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0;
+- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0;
+- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0;
+- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0;
+- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0;
+- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0;
+- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0;
+- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0;
++ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0;
++ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0;
++ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0;
++ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0;
++ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0;
++ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0;
++ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0;
++ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0;
+
+ a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0;
+ a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0;
+@@ -1913,7 +1913,7 @@ UnpackAppBlock(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ doUnpackCategory(ret, &a.category);
+
+@@ -1989,7 +1989,7 @@ UnpackSyncPref(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ hv_store(ret, "syncType", 8, newSVlist(a.syncType,
MailSyncTypeNames), 0);
+ hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0);
+@@ -2033,9 +2033,9 @@ PackSyncPref(record, id)
+ a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0;
+ a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0;
+
+- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0;
+- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0;
+- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na)
: 0;
++ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0;
++ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0;
++ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ?
SvPV(*s,PL_na) : 0;
+
+ len = pack_MailSyncPref(&a, mybuf, 0xffff);
+
+@@ -2073,7 +2073,7 @@ UnpackSignaturePref(record)
+ }
+
+ SvPV(record,len);
+- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) {
++ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
+
+ if (a.signature)
+ hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0);
+@@ -2099,7 +2099,7 @@ PackSignaturePref(record, id)
+ RETVAL = record;
+ else {
+
+- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0;
++ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0;
+
+ len = pack_MailSignaturePref(&a, mybuf, 0xffff);
+
+@@ -2129,7 +2129,7 @@ write(socket, msg)
+ {
+ STRLEN len;
+ SvPV(msg, len);
+- RETVAL = pi_write(socket,SvPV(msg,na),len);
++ RETVAL = pi_write(socket,SvPV(msg,PL_na),len);
+ }
+
+ SV *
+@@ -2146,7 +2146,7 @@ read(socket, len)
+ if (result >=0)
+ RETVAL = newSVpvn((char *) pibuf.data, result);
+ else
+- RETVAL = &sv_undef;
++ RETVAL = &PL_sv_undef;
+ }
+ OUTPUT:
+ RETVAL
+@@ -2282,7 +2282,7 @@ class(self, name=0)
+ croak("DBClasses doesn't exist");
+ if (SvOK(name)) {
+ (void)SvPV(name,len);
+- s = hv_fetch(h, SvPV(name,na), len, 0);
++ s = hv_fetch(h, SvPV(name,PL_na), len, 0);
+ }
+ if (!s)
+ s = hv_fetch(h, "", 0, 0);
+@@ -2577,7 +2577,7 @@ getRecords(self)
+ {
+ int result = dlp_ReadOpenDBInfo(self->socket, self->handle,
&RETVAL);
+ if (result < 0) {
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ self->errnop = result;
+ }
+ }
+@@ -2745,7 +2745,7 @@ setResource(self, data)
+ result = dlp_WriteResource(self->socket, self->handle, type,
id, c, len);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else
+ RETVAL = newSViv(result);
+ }
+@@ -2798,7 +2798,7 @@ getPref(self, id=0, backup=1)
+ r = dlp_CloseDB(self->socket, self->handle);
+ result = dlp_ReadAppPreference(self->socket, creator, id, backup,
0xFFFF, mybuf, &len, &version);
+ if (pi_version(self->socket)< 0x101)
+- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode,
SvPV(self->dbname,na), &self->handle);
++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode,
SvPV(self->dbname,PL_na), &self->handle);
+ ReturnReadPref(mybuf, len);
+ }
+
+@@ -2822,10 +2822,10 @@ setPref(self, data)
+ r = dlp_CloseDB(self->socket, self->handle);
+ result = dlp_WriteAppPreference(self->socket, creator, id,
backup, version, buf, len);
+ if (pi_version(self->socket)< 0x101)
+- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode,
SvPV(self->dbname,na), &self->handle);
++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode,
SvPV(self->dbname,PL_na), &self->handle);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ RETVAL = newSViv(result);
+ }
+@@ -2861,7 +2861,7 @@ setPrefRaw(self, data, number, version, backup=1)
+ result = dlp_WriteAppPreference(self->socket, creator, number,
backup, version, buf, len);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ RETVAL = newSViv(result);
+ }
+@@ -2904,7 +2904,7 @@ getTime(self)
+ int result = dlp_GetSysDateTime(self->socket, &t);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else
+ RETVAL = newSViv(t);
+ }
+@@ -2929,7 +2929,7 @@ getSysInfo(self)
+ int result = dlp_ReadSysInfo(self->socket, &si);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ HV * i = newHV();
+ hv_store(i, "romVersion", 10, newSViv(si.romVersion),
0);\
+@@ -2951,7 +2951,7 @@ getCardInfo(self, cardno=0)
+ int result = dlp_ReadStorageInfo(self->socket, cardno, &c);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ HV * i = newHV();
+ hv_store(i, "card", 6, newSViv(c.card), 0);\
+@@ -3037,7 +3037,7 @@ newPref(self, creator, id=0, version=0, backup=0)
+ croak("Default PrefClass not defined");

+ PUSHMARK(sp);

+ XPUSHs(newSVsv(*s));

+- XPUSHs(&sv_undef);

++ XPUSHs(&PL_sv_undef);

+ XPUSHs(sv_2mortal(newSVChar4(creator)));
+ if (id)
+ XPUSHs(id);
+@@ -3107,7 +3107,7 @@ open(self, name, mode=0, cardno=0)
+ result = dlp_OpenDB(self->socket, cardno, nummode, name,
&handle);
+ if (result<0) {
+ self->errnop = result;
+- RETVAL = &sv_undef;
++ RETVAL = &PL_sv_undef;
+ } else {
+ int type;
+ PDA__Pilot__DLP__DB * x =
malloc(sizeof(PDA__Pilot__DLP__DB));
+@@ -3156,7 +3156,7 @@ create(self, name, creator, type, flags, version,
cardno=0)
+ int result = dlp_CreateDB(self->socket, creator, type,
cardno, flags, version, name, &handle);
+ if (result<0) {
+ self->errnop = result;
+- RETVAL = &sv_undef;
++ RETVAL = &PL_sv_undef;
+ } else {
+ PDA__Pilot__DLP__DB * x =
malloc(sizeof(PDA__Pilot__DLP__DB));
+ SV * sv = newSViv((IV)(void*)x);
+@@ -3224,7 +3224,7 @@ setPref(self, data)
+ result = dlp_WriteAppPreference(self->socket, creator, id,
backup, version, buf, len);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ RETVAL = newSViv(result);
+ }
+@@ -3248,7 +3248,7 @@ setPrefRaw(self, data, creator, number, version,
backup=1)
+ result = dlp_WriteAppPreference(self->socket, creator, number,
backup, version, buf, len);
+ if (result < 0) {
+ self->errnop = result;
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ } else {
+ RETVAL = newSViv(result);
+ }
+@@ -3350,7 +3350,7 @@ findDBInfo(self, start, name, creator, type, cardno=0)
+ else
+ t = 0;
+ result = dlp_FindDBInfo(self->socket, cardno, start,
+- SvOK(name) ? SvPV(name,na) : 0,
++ SvOK(name) ? SvPV(name,PL_na) : 0,
+ t, c, &info);
+ pack_dbinfo(RETVAL, info, result);
+ }
+@@ -3367,7 +3367,7 @@ getFeature(self, creator, number)
+ unsigned long f;
+ int result;
+ if ((result = dlp_ReadFeature(self->socket, creator, number,
&f))<0) {
+- RETVAL = newSVsv(&sv_undef);
++ RETVAL = newSVsv(&PL_sv_undef);
+ self->errnop = result;
+ } else {
+ RETVAL = newSViv(f);
+@@ -3397,7 +3397,7 @@ getROMToken(self,token)
+ }
+
+ void
+-callApplication(self, creator, type, action, data=&sv_undef)
++callApplication(self, creator, type, action, data=&PL_sv_undef)
+ PDA::Pilot::DLP *self
+ Char4 creator
+ Char4 type
+@@ -3410,7 +3410,7 @@ callApplication(self, creator, type, action,
data=&sv_undef)
+ int result;
+ (void)SvPV(data,len);
+ result = dlp_CallApplication(self->socket, creator,
+- type, action, len, SvPV(data,na),
++ type, action, len, SvPV(data,PL_na),
+ &retcode, &pibuf);
+ EXTEND(sp, 2);
+ if (result >= 0) {
+@@ -3419,7 +3419,7 @@ callApplication(self, creator, type, action,
data=&sv_undef)
+ PUSHs(sv_2mortal(newSViv(retcode)));
+ }
+ } else
+- PUSHs(&sv_undef);
++ PUSHs(&PL_sv_undef);
+ }
+
+ int
+@@ -3530,7 +3530,7 @@ class(self, name=0)
+ croak("DBClasses doesn't exist");
+ if (SvOK(name)) {
+ (void)SvPV(name, len);
+- s = hv_fetch(h, SvPV(name, na), len, 0);
++ s = hv_fetch(h, SvPV(name, PL_na), len, 0);
+ }
+ if (!s)
+ s = hv_fetch(h, "", 0, 0);
+diff --git a/bindings/Perl/typemap b/bindings/Perl/typemap
+index 347a6a7..eeffa4c 100644
+--- a/bindings/Perl/typemap
++++ b/bindings/Perl/typemap
+@@ -50,9 +50,9 @@ T_CHAR4
+
+ T_RESULT
+ if ($var < 0) {
+- sv_setsv($arg, &sv_no);
++ sv_setsv($arg, &PL_sv_no);
+ self->errnop = $var;
+ } else
+- sv_setsv($arg, &sv_yes);
++ sv_setsv($arg, &PL_sv_yes);
+ T_PTROBJ
+ sv_setref_pv($arg, \"${ntype}\", (void*)$var);
+--
+1.7.5.4
+
diff --git a/science/speedcrunch/BUILD b/science/speedcrunch/BUILD
new file mode 100755
index 0000000..7b652e7
--- /dev/null
+++ b/science/speedcrunch/BUILD
@@ -0,0 +1,11 @@
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+PATH="$QTDIR/bin/qt4:$PATH"
+cd $SOURCE_DIRECTORY &&
+mkdir -p build &&
+cd build &&
+prepare_cmake_flags &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr
-DSYSCONFDIR=$INSTALL_ROOT/etc $OPTS ../src &&
+make &&
+if ! [ -f "$SOURCE_DIRECTORY"/src/ca.qm ]; then
+ lrelease "$SOURCE_DIRECTORY"/src/speedcrunch.pro
+fi
diff --git a/science/speedcrunch/DEPENDS b/science/speedcrunch/DEPENDS
new file mode 100755
index 0000000..fb97c4f
--- /dev/null
+++ b/science/speedcrunch/DEPENDS
@@ -0,0 +1,2 @@
+depends cmake &&
+depends qt4
diff --git a/science/speedcrunch/DETAILS b/science/speedcrunch/DETAILS
new file mode 100755
index 0000000..f60cbb5
--- /dev/null
+++ b/science/speedcrunch/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=speedcrunch
+ VERSION=0.10.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+
SOURCE_HASH=sha512:cafd2dc80d4925e0228648883e0117dfe8f7f80b715fc1a97586c19d4f5790833d422aacc117f5beafc18918c116004cb8fce5701b801280f1e9e74a5933d037
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://speedcrunch.org";
+ LICENSE[0]="GPL"
+ ENTERED=20120709
+ KEYWORDS=""
+ SHORT="Desktop calculator"
+cat << EOF
+SpeedCrunch is a fast, high precision and powerful desktop calculator.
+EOF
diff --git a/science/speedcrunch/HISTORY b/science/speedcrunch/HISTORY
new file mode 100644
index 0000000..19d8d53
--- /dev/null
+++ b/science/speedcrunch/HISTORY
@@ -0,0 +1,2 @@
+2012-07-09 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: spell created
diff --git a/x11-toolkits/gtk-sharp-2/DETAILS
b/x11-toolkits/gtk-sharp-2/DETAILS
index 7e785f6..bf4c228 100755
--- a/x11-toolkits/gtk-sharp-2/DETAILS
+++ b/x11-toolkits/gtk-sharp-2/DETAILS
@@ -1,11 +1,9 @@
SPELL=gtk-sharp-2
- VERSION=2.12.10
- BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ VERSION=2.12.11
SOURCE=gtk-sharp-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/gtk-sharp-${VERSION}
- SOURCE_URL[0]=${GNOME_URL}/sources/gtk-sharp/${BRANCH}/$SOURCE
-# SOURCE_URL[1]=http://ftp.novell.com/pub/mono/sources/gtk-sharp212/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_URL[0]=http://download.mono-project.com/sources/gtk-sharp212/$SOURCE
+
SOURCE_HASH=sha512:870ddc559bcac3071f13ddb9e04a02022e2eea5f7a8335b574a747b726c0e5ecd005847f726069c555b64a289d625071f4b319c1b1242d6d1c05e62a46b7db88
WEB_SITE=http://www.mono-project.com/
LICENSE[0]=LGPL
ENTERED=20050611
diff --git a/x11-toolkits/gtk-sharp-2/HISTORY
b/x11-toolkits/gtk-sharp-2/HISTORY
index c53f694..8a0b7a9 100644
--- a/x11-toolkits/gtk-sharp-2/HISTORY
+++ b/x11-toolkits/gtk-sharp-2/HISTORY
@@ -1,3 +1,10 @@
+2012-07-10 Tommy Boatman <tboatman AT sourcemage.org>
+ * DETAILS: 2.12.11, changed SOURCE_URL to reflect new home
+ at mono-project
+ * glib_fix.patch: created to address build failure with newer
+ versions of glib2 (bug #407)
+ * PRE_BUILD: patch application before libtoolize
+
2010-03-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: commented out SOURCE_URL[1], same content but different
size
* gtk-sharp-2.12.10.tar.bz2.sig: updated to SOURCE_URL[0] tarball
diff --git a/x11-toolkits/gtk-sharp-2/PRE_BUILD
b/x11-toolkits/gtk-sharp-2/PRE_BUILD
index ac2a160..266664a 100755
--- a/x11-toolkits/gtk-sharp-2/PRE_BUILD
+++ b/x11-toolkits/gtk-sharp-2/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
touch INSTALL &&
+patch -p1 < $SCRIPT_DIRECTORY/glib_fix.patch &&
libtoolize -f &&
autoreconf -f
diff --git a/x11-toolkits/gtk-sharp-2/glib_fix.patch
b/x11-toolkits/gtk-sharp-2/glib_fix.patch
new file mode 100644
index 0000000..5825f27
--- /dev/null
+++ b/x11-toolkits/gtk-sharp-2/glib_fix.patch
@@ -0,0 +1,117 @@
+diff -urN old/configure.in new/configure.in
+--- old/configure.in 2012-07-08 14:43:54.333939345 -0500
++++ new/configure.in 2012-07-08 14:39:06.505947046 -0500
+@@ -223,6 +223,16 @@
+ AM_CONDITIONAL(ENABLE_MSI, test "x$enable_msi" = "xyes")
+ AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue")
+
++PKG_CHECK_MODULES(GLIB_2_31,
++ glib-2.0 >= 2.31,
++ HAVE_GLIB_2_31_OR_HIGHER=yes, HAVE_GLIB_2_31_OR_HIGHER=no)
++
++if test "x$HAVE_GLIB_2_31_OR_HIGHER" = "xyes" ; then
++ CFLAGS="$CFLAGS -DDISABLE_GTHREAD_CHECK"
++ CSFLAGS="$CSFLAGS -define:DISABLE_GTHREAD_CHECK"
++fi
++
++AC_SUBST(CSFLAGS)
+ AC_SUBST(CFLAGS)
+
+ AC_OUTPUT([
+diff -urN old/glib/Thread.cs new/glib/Thread.cs
+--- old/glib/Thread.cs 2012-07-08 14:44:51.373937819 -0500
++++ new/glib/Thread.cs 2012-07-08 14:46:02.825935908 -0500
+@@ -21,29 +21,42 @@
+
+ namespace GLib
+ {
+- using System;
+- using System.Runtime.InteropServices;
++ using System;
++ using System.Runtime.InteropServices;
+
+- public class Thread
+- {
+- private Thread () {}
+-
+- [DllImport("libgthread-2.0-0.dll")]
+- static extern void g_thread_init (IntPtr i);
+-
+- public static void Init ()
+- {
+- g_thread_init (IntPtr.Zero);
+- }
+-
+- [DllImport("glibsharpglue-2")]
+- static extern bool glibsharp_g_thread_supported ();
+-
+- public static bool Supported
+- {
+- get {
+- return glibsharp_g_thread_supported ();
+- }
+- }
+- }
+-}
++ public class Thread
++ {
++ private Thread () {}
++
++#if DISABLE_GTHREAD_CHECK
++ public static void Init ()
++ {
++ // GLib automatically inits threads in 2.31 and above
++ //
http://developer.gnome.org/glib/unstable/glib-Deprecated-Thread-APIs.html#g-thread-init
++ }
++
++ public static bool Supported {
++ get { return true; }
++ }
++#else
++ [DllImport("libgthread-2.0-0.dll")]
++ static extern void g_thread_init (IntPtr i);
++
++ public static void Init ()
++ {
++ g_thread_init (IntPtr.Zero);
++ }
++
++ [DllImport("glibsharpglue-2")]
++ static extern bool glibsharp_g_thread_supported ();
++
++ public static bool Supported
++ {
++ get {
++ return glibsharp_g_thread_supported ();
++ }
++ }
++#endif
++
++ }
++}
+\ No newline at end of file
+diff -urN old/glib/glue/thread.c new/glib/glue/thread.c
+--- old/glib/glue/thread.c 2012-07-07 18:38:18.693593075 -0500
++++ new/glib/glue/thread.c 2012-07-07 20:19:22.973430852 -0500
+@@ -19,14 +19,21 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-
++#ifdef DISABLE_GTHREAD_CHECK
++#include <glib.h>
++#else
+ #include <glib/gthread.h>
++#endif
+
+ gboolean glibsharp_g_thread_supported (void);
+
+ gboolean
+ glibsharp_g_thread_supported ()
+ {
++#ifdef DISABLE_GTHREAD_CHECK
++ return TRUE;
++#else
+ return g_thread_supported ();
++#endif
+ }
diff --git a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig
b/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig
deleted file mode 100644
index cd3c880..0000000
Binary files a/x11-toolkits/gtk-sharp-2/gtk-sharp-2.12.10.tar.bz2.sig and
/dev/null differ
diff --git a/x11-toolkits/wxgtk-new/DEPENDS b/x11-toolkits/wxgtk-new/DEPENDS
index 4d2b1e7..46600b0 100755
--- a/x11-toolkits/wxgtk-new/DEPENDS
+++ b/x11-toolkits/wxgtk-new/DEPENDS
@@ -1,7 +1,6 @@
depends -sub CXX gcc &&
depends gtk+2 &&
depends libx11 '--with-x' &&
-depends libxpm '--with-libxpm' &&

# all of the "depends" below strictly speaking are not required, e.g. we can
# use included library by specifying --with-*=builtin, but we want to use the
@@ -45,4 +44,7 @@ optional_depends libiodbc \
optional_depends sdl \
'--with-sdl --enable-sound' \
'--without-sdl' \
- 'for sound system support'
+ 'for sound system support' &&
+optional_depends libxpm '--with-libxpm' \
+ '--without-libxpm' \
+ 'support XPM file format'
diff --git a/x11-toolkits/wxgtk-new/DETAILS b/x11-toolkits/wxgtk-new/DETAILS
index c669a14..bce5e2b 100755
--- a/x11-toolkits/wxgtk-new/DETAILS
+++ b/x11-toolkits/wxgtk-new/DETAILS
@@ -1,8 +1,8 @@
SPELL=wxgtk-new
SPELLX=wxGTK
SPELLX=wxWidgets
- VERSION=2.9.3
-
SOURCE_HASH=sha512:f81d0b8f6b8964d2b98d630bdd14266fb69534eba6e613d2bb14451449097b84f98d841abc857cd3f0e228ec8bc300b1c1d01baa211be61babf04fcd1fe0bf91
+ VERSION=2.9.4
+
SOURCE_HASH=sha512:6306b99480081f3517eb73d10de76560fbee59c487a1070596347ec05c592400d7110f1447190521afbc39cb5308aec8bd442e650280350b19a6e43bf8fc5749
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index 573fe73..85d5081 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,7 @@
+2012-07-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.9.4
+ * DEPENDS: libxpm is optional
+
2012-01-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.9.3




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (94e2fbcee6038b0baaaf7b837b463c04d82a65c5), Eric Sandall, 07/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page