[SM-Commit] GIT changes to devel-gcc grimoire by Eric Sandall (f641cff2660134444de5566d83f9abb2ada81820)

Eric Sandall scm at sourcemage.org
Wed May 19 17:00:15 EDT 2010


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

 ChangeLog                                             |    3 
 audio-creation/gtkpod/DEPENDS                         |    2 
 audio-creation/gtkpod/DETAILS                         |    5 
 audio-creation/gtkpod/HISTORY                         |    5 
 audio-creation/gtkpod/gtkpod-0.99.16.tar.gz.sig       |binary
 audio-libs/faad2/DEPENDS                              |    2 
 audio-libs/faad2/HISTORY                              |    3 
 audio-libs/libgpod/DETAILS                            |    5 
 audio-libs/libgpod/HISTORY                            |    3 
 audio-libs/libgpod/libgpod-0.7.2.tar.gz.sig           |binary
 audio-libs/libmp4v2/BUILD                             |    1 
 audio-libs/libmp4v2/DEPENDS                           |    1 
 audio-libs/libmp4v2/DETAILS                           |    8 
 audio-libs/libmp4v2/HISTORY                           |    6 
 audio-libs/libmp4v2/INSTALL                           |    1 
 audio-libs/libmp4v2/PRE_BUILD                         |    1 
 audio-libs/libmp4v2/PROVIDES                          |    1 
 audio-libs/libmp4v2/UP_TRIGGERS                       |    6 
 audio-libs/libtunepimp/DEPENDS                        |    2 
 audio-libs/libtunepimp/HISTORY                        |    4 
 audio-libs/libtunepimp/PRE_BUILD                      |    9 
 audio-libs/mp4v2/CONFLICTS                            |    1 
 audio-libs/mp4v2/HISTORY                              |    5 
 audio-libs/mp4v2/PROVIDES                             |    1 
 audio-players/cmus/DEPENDS                            |    4 
 audio-players/cmus/HISTORY                            |    4 
 audio-soft/easytag/DEPENDS                            |    2 
 audio-soft/easytag/HISTORY                            |    7 
 audio-soft/easytag/PRE_BUILD                          |    3 
 audio-soft/easytag/mp4v2-1.9.patch                    |   52 ++
 audio-soft/mediatomb/DEPENDS                          |    2 
 audio-soft/mediatomb/HISTORY                          |    3 
 database/dbd-interbase/HISTORY                        |    3 
 database/dbd-interbase/Makefile.PL.bz2                |binary
 ftp/ncftp/DETAILS                                     |    2 
 ftp/ncftp/HISTORY                                     |    3 
 kde4-apps/kid3-kde4/DEPENDS                           |    2 
 kde4-apps/kid3-kde4/HISTORY                           |    3 
 mail/offlineimap/DETAILS                              |   10 
 mail/offlineimap/HISTORY                              |    4 
 net/samba/DETAILS                                     |    4 
 net/samba/HISTORY                                     |    3 
 perl-cpan/alien-wxwidgets/DEPENDS                     |    2 
 perl-cpan/alien-wxwidgets/DETAILS                     |    4 
 perl-cpan/alien-wxwidgets/HISTORY                     |    9 
 perl-cpan/alien-wxwidgets/PRE_BUILD                   |    4 
 perl-cpan/dbi/DETAILS                                 |    4 
 perl-cpan/dbi/HISTORY                                 |    3 
 perl-cpan/file-next/DETAILS                           |    4 
 perl-cpan/file-next/HISTORY                           |    3 
 perl-cpan/html-parser/DETAILS                         |    4 
 perl-cpan/html-parser/HISTORY                         |    3 
 perl-cpan/lwp/DETAILS                                 |    4 
 perl-cpan/lwp/HISTORY                                 |    3 
 x11-toolkits/wxgtk/DEPENDS                            |    4 
 x11-toolkits/wxgtk/DETAILS                            |    5 
 x11-toolkits/wxgtk/HISTORY                            |    6 
 x11-toolkits/wxgtk/PRE_BUILD                          |    3 
 x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch |   59 --
 x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch         |  461 ------------------
 60 files changed, 196 insertions(+), 575 deletions(-)

New commits:
commit 2e82412183a168d3d3f072780fa786c5d2a97d28
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    kid3-kde4: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 1b0063f048a8adac8065b505b56d0f5ca5c770a6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mediatomb: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit b90871b34b126b613696be7bd56a0d3f63008535
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    easytag: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 665da96a1e5663efd3d54a2d4812289588332d5e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    cmus: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 1bd60fe840900638ddd3d8e6fcba77eb810c751d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libtunepimp: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 259ef0d781aaeaee3226d6c4b5b82ff342e2b60d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    faad2: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 898cc65c003583bde94169ba2ec266f58790e2bf
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gtkpod: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 8259a1cf9a0a6d73fec21087fcb34daa3488a797
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libmp4v2: Also trigger recast of dependees for API change

commit a7a93f61adf4fca8c883c50171c1b52402b23a23
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mp4v2: Fix old date

commit f65629f60a00df9a60922349565427568e184e20
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libmp4v2: Fix old date

commit 36e4162ccf8f2958fadbd3dbe14d69e7238e3034
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libmp4v2: Deprecate in favour of mp4v2

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

    mail/offlineimap: use ubuntu's tarball since upstream's tarball isn't
    downloadable

commit 928898b70e4cb8d690103de55f1a2319b5e28c19
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gtkpod: May now use either provider of MP4V2 (Bug #15684)

commit e0a3d0fbbcf9499130835ac6f72dfde9ad299988
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gtkpod: Updated to 0.99.16 (website page is out-of-date)

commit b4f759bdaf3db7813092a8577cf0ab53b3a2455e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libgpod: Updated to 0.7.2

commit ce05c70cf9239ca212fe45e976c0f80f3ce1bbc3
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    cmus: Properly depend on faad2 for providers of MP4V2

commit e5fdaa7c9067c7eead39d0997fde6346a0142cc1
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    easytag: May use either provider of MP4V2 (Bug #15683)
    Added patch from http://www.mail-archive.com/arch-commits@archlinux.org/msg14295.html
    (cherry picked from commit bb9f0b4cfd3dadecc7345307a08454329f176dd7)

commit bb9f0b4cfd3dadecc7345307a08454329f176dd7
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    easytag: May use either provider of MP4V2 (Bug #15683)
    Added patch from http://www.mail-archive.com/arch-commits@archlinux.org/msg14295.html

commit 4116e8f28441e4025f0762552aea6f5a58ac36ab
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    alien-wxwidgets - prevent it downloading wxwidgets

commit 47f30a508877159d00e7d50a8c4fdcdfd34efc8a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    ncftp: SOURCE_HASH updated, #15713

commit 7de00c8267ec90706ffc18659f02d1c1a9863909
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    samba 3.5.3

commit 49aff33efe3339e1927cb919e97c5a7b21aeb5f6
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    dbd-interbase - fix build with latest perl

commit ca51329e75fd0d71ff843def6a9dc504731c0f99
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    dbi: => 1.611

commit 2703721206fe804554858c78ce36177a1c0392dc
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    lwp: => 5.836

commit 5e92ce843f5463169a9833f1b9d7badded574494
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    html-parser: => 3.65

commit 5177921479bafa8252c08e9dd979b413ecb3f12d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    file-next: => 1.06

commit 9c2d2d69bfe78bb1872a5404daad56996d0c8eca
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    wxgtk: => 2.8.11

commit 84239262a97e08fae349c3cab3f09eeb9ae4f1cc
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    alien-wxwidgets: => 0.51

diff --git a/ChangeLog b/ChangeLog
index 594f163..5436fc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* audio-libs/libmp4v2: Deprecate in favour of mp4v2
+
 2010-05-10 Vlad Glagolev <stealth at sourcemage.org>
 	* gnu.gpg: added key F059B1D1 (Bruno Haible (Open Source Development)
 	  <bruno at clisp.org>)
diff --git a/audio-creation/gtkpod/DEPENDS b/audio-creation/gtkpod/DEPENDS
index 55a109a..28086cc 100755
--- a/audio-creation/gtkpod/DEPENDS
+++ b/audio-creation/gtkpod/DEPENDS
@@ -23,7 +23,7 @@ optional_depends  "hal" \
                   "--without-hal" \
                   "HAL device autodetection support" &&
 
-optional_depends  "libmp4v2" \
+optional_depends  "mp4v2" \
                   "--with-mp4v2" \
                   "--without-mp4v2" \
                   "MP4/AAC support" &&
diff --git a/audio-creation/gtkpod/DETAILS b/audio-creation/gtkpod/DETAILS
index f0b9c86..4791662 100755
--- a/audio-creation/gtkpod/DETAILS
+++ b/audio-creation/gtkpod/DETAILS
@@ -1,7 +1,8 @@
            SPELL=gtkpod
-         VERSION=0.99.14
-     SOURCE_HASH=sha512:e31e63ed5b5e5c3f8489b6126f97ca8018dbd15169ef58e8c6593319e3a4740a0b75c743ae45f771a60c287301c1fb557417fe13a3665d251b6a44b7df54cfca
+         VERSION=0.99.16
+#     SOURCE_HASH=sha512:e31e63ed5b5e5c3f8489b6126f97ca8018dbd15169ef58e8c6593319e3a4740a0b75c743ae45f771a60c287301c1fb557417fe13a3665d251b6a44b7df54cfca
           SOURCE=$SPELL-$VERSION.tar.gz
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
         WEB_SITE=http://gtkpod.sourceforge.net/
diff --git a/audio-creation/gtkpod/HISTORY b/audio-creation/gtkpod/HISTORY
index 893bde1..d056b88 100644
--- a/audio-creation/gtkpod/HISTORY
+++ b/audio-creation/gtkpod/HISTORY
@@ -1,3 +1,8 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.99.16 (website page is out-of-date)
+	* DEPENDS: May now use either provider of MP4V2 (Bug #15684)
+	  libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+
 2009-04-25 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: s/glib/glib2/
 
diff --git a/audio-creation/gtkpod/gtkpod-0.99.16.tar.gz.sig b/audio-creation/gtkpod/gtkpod-0.99.16.tar.gz.sig
new file mode 100644
index 0000000..0cf58ff
Binary files /dev/null and b/audio-creation/gtkpod/gtkpod-0.99.16.tar.gz.sig differ
diff --git a/audio-libs/faad2/DEPENDS b/audio-libs/faad2/DEPENDS
index 546a316..1f1c4a3 100755
--- a/audio-libs/faad2/DEPENDS
+++ b/audio-libs/faad2/DEPENDS
@@ -12,7 +12,7 @@ if [ "$FAAD_CVS" = "y" ]; then
   depends  CVS
 fi
 
-optional_depends  MP4V2                \
+optional_depends  mp4v2                \
                   "--with-mpeg4ip"        \
                   "--without-mpeg4ip"     \
                   "For MPEG4v2 support"
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index 8e2c38d..a7866ef 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+
 2010-04-22 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: May use any provider of MP4V2
 
diff --git a/audio-libs/libgpod/DETAILS b/audio-libs/libgpod/DETAILS
index a6ea307..1e7ff9a 100755
--- a/audio-libs/libgpod/DETAILS
+++ b/audio-libs/libgpod/DETAILS
@@ -1,7 +1,8 @@
            SPELL=libgpod
-         VERSION=0.7.0
-     SOURCE_HASH=sha512:e490d58509bb58941e9905fb8bc342a0657b06b759f78e86df21f32632f167ce7c3e5864d97928a280474d2746a22b48ab5f7cbce3eab1e5f849a4b2d495cb33
+         VERSION=0.7.2
+#     SOURCE_HASH=sha512:e490d58509bb58941e9905fb8bc342a0657b06b759f78e86df21f32632f167ce7c3e5864d97928a280474d2746a22b48ab5f7cbce3eab1e5f849a4b2d495cb33
           SOURCE=$SPELL-$VERSION.tar.gz
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/gtkpod/$SOURCE
         WEB_SITE=http://www.gtkpod.org/
diff --git a/audio-libs/libgpod/HISTORY b/audio-libs/libgpod/HISTORY
index d8e3ef2..f263655 100644
--- a/audio-libs/libgpod/HISTORY
+++ b/audio-libs/libgpod/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.7.2
+
 2009-07-26 Arjan Bouter <abouter at sourcemage.org>
 	* DEPENDS: added missing optional_depends on
 	  GTK2, libxml2, pygobject, gtk-doc and hal
diff --git a/audio-libs/libgpod/libgpod-0.7.2.tar.gz.sig b/audio-libs/libgpod/libgpod-0.7.2.tar.gz.sig
new file mode 100644
index 0000000..12a0482
Binary files /dev/null and b/audio-libs/libgpod/libgpod-0.7.2.tar.gz.sig differ
diff --git a/audio-libs/libmp4v2/BUILD b/audio-libs/libmp4v2/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libmp4v2/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libmp4v2/DEPENDS b/audio-libs/libmp4v2/DEPENDS
deleted file mode 100755
index fd0b0eb..0000000
--- a/audio-libs/libmp4v2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends g++
diff --git a/audio-libs/libmp4v2/DETAILS b/audio-libs/libmp4v2/DETAILS
index 5d7c16e..cd8017a 100755
--- a/audio-libs/libmp4v2/DETAILS
+++ b/audio-libs/libmp4v2/DETAILS
@@ -1,14 +1,10 @@
            SPELL=libmp4v2
          VERSION=1.5.0.1
-          SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:8335db8eb60935d4597e1c950678156b15ce2802227ba6c39289feeeee57cca8d39cfb51e07d79e028f8ec9a924966738f601d328f23ae140e7293ee613367d5
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://resare.com/libmp4v2/dist/$SOURCE
-      LICENSE[0]=MPL
+      PATCHLEVEL=1
         WEB_SITE=http://http://resare.com/libmp4v2/
          ENTERED=20070709
         KEYWORDS="library audio"
-       BUILD_API=2
+         ARCHIVE="off"
            SHORT="Library to read and manipulate the mp4 container format"
 cat << EOF
 Library to read and manipulate the mp4 container format.
diff --git a/audio-libs/libmp4v2/HISTORY b/audio-libs/libmp4v2/HISTORY
index 477816d..2ea3652 100644
--- a/audio-libs/libmp4v2/HISTORY
+++ b/audio-libs/libmp4v2/HISTORY
@@ -1,4 +1,8 @@
-2010-09-20 Eric Sandall <sandalle at sourcemage.org>
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* Deprecate in favour of mp4v2
+	* UP_TRIGGERS: Also trigger recast of dependees for API change
+
+2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Corrected WEB_SITE
 	* PROVIDES: Provides MP4V2
 
diff --git a/audio-libs/libmp4v2/INSTALL b/audio-libs/libmp4v2/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libmp4v2/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libmp4v2/PRE_BUILD b/audio-libs/libmp4v2/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libmp4v2/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libmp4v2/PROVIDES b/audio-libs/libmp4v2/PROVIDES
deleted file mode 100755
index 5e0d485..0000000
--- a/audio-libs/libmp4v2/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-provides MP4V2
diff --git a/audio-libs/libmp4v2/UP_TRIGGERS b/audio-libs/libmp4v2/UP_TRIGGERS
new file mode 100755
index 0000000..b3b456f
--- /dev/null
+++ b/audio-libs/libmp4v2/UP_TRIGGERS
@@ -0,0 +1,6 @@
+up_trigger libmp4v2 dispel_self
+up_trigger mp4v2 cast_self
+
+for each in $(show_up_depends $SPELL 1); do
+  up_trigger $each cast_self
+done
diff --git a/audio-libs/libtunepimp/DEPENDS b/audio-libs/libtunepimp/DEPENDS
index 030abcb..f85bea8 100755
--- a/audio-libs/libtunepimp/DEPENDS
+++ b/audio-libs/libtunepimp/DEPENDS
@@ -3,7 +3,7 @@ if [[ "${LIBTUNEPIMP_PYTHON}" == "y" ]]
 then depends python
 fi                     &&
 depends libofa         &&
-optional_depends MP4V2 "" "" "for MPEG4 support" &&
+optional_depends mp4v2 "" "" "for MPEG4 support" &&
 optional_depends libmad "" "" "mp3 support?" &&
 optional_depends libvorbis "" "" "ogg support?" &&
 optional_depends flac "" "" "FLAC support?" &&
diff --git a/audio-libs/libtunepimp/HISTORY b/audio-libs/libtunepimp/HISTORY
index 4618c08..672d2f7 100644
--- a/audio-libs/libtunepimp/HISTORY
+++ b/audio-libs/libtunepimp/HISTORY
@@ -1,3 +1,7 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+	* PRE_BUILD: Always apply mp4v2 patch
+
 2010-04-25 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Optionally depends on any provider of MP4V2 (Bug #15687)
 	* PRE_BUILD: Apply mp4v2-1.9.patch if mp4v2 is providing MP4V2 (Bug #15687)
diff --git a/audio-libs/libtunepimp/PRE_BUILD b/audio-libs/libtunepimp/PRE_BUILD
index d345568..9fd0f0a 100755
--- a/audio-libs/libtunepimp/PRE_BUILD
+++ b/audio-libs/libtunepimp/PRE_BUILD
@@ -5,9 +5,6 @@ zcat $SCRIPT_DIRECTORY/gcc43.patch | patch -p1  &&
 message "${MESSAGE_COLOR}Patching for GCC 4.4...${DEFAULT_COLOR}" &&
 patch $SOURCE_DIRECTORY/lib/fileio.cpp \
       $SCRIPT_DIRECTORY/gcc44.patch &&
-
-if [[ "$(get_spell_provider $SPELL MP4V2)" == "mp4v2" ]]; then
-  message "${MESSAGE_COLOR}Patching for mp4v2...${DEFAULT_COLOR}" &&
-  patch $SOURCE_DIRECTORY/plugins/mp4/mp4.cpp \
-        $SCRIPT_DIRECTORY/mp4v2-1.9.patch
-fi
+message "${MESSAGE_COLOR}Patching for mp4v2...${DEFAULT_COLOR}" &&
+patch $SOURCE_DIRECTORY/plugins/mp4/mp4.cpp \
+      $SCRIPT_DIRECTORY/mp4v2-1.9.patch
diff --git a/audio-libs/mp4v2/CONFLICTS b/audio-libs/mp4v2/CONFLICTS
new file mode 100755
index 0000000..eeb6e8b
--- /dev/null
+++ b/audio-libs/mp4v2/CONFLICTS
@@ -0,0 +1 @@
+conflicts libmp4v2 y
diff --git a/audio-libs/mp4v2/HISTORY b/audio-libs/mp4v2/HISTORY
index 9ff815c..2eec359 100644
--- a/audio-libs/mp4v2/HISTORY
+++ b/audio-libs/mp4v2/HISTORY
@@ -1,4 +1,7 @@
-2010-09-20 Eric Sandall <sandalle at sourcemage.org>
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Conflict with deprecated libmp4v2
+
+2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS, DEPENDS: Created
 	* PROVIDES: Provides MP4V2
 
diff --git a/audio-libs/mp4v2/PROVIDES b/audio-libs/mp4v2/PROVIDES
deleted file mode 100755
index 5e0d485..0000000
--- a/audio-libs/mp4v2/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-provides MP4V2
diff --git a/audio-players/cmus/DEPENDS b/audio-players/cmus/DEPENDS
index d497a9c..c65310d 100755
--- a/audio-players/cmus/DEPENDS
+++ b/audio-players/cmus/DEPENDS
@@ -33,12 +33,12 @@ optional_depends  "wavpack"              \
                   "CONFIG_WAVPACK=n"     \
                   "for WAVPACK support"  &&
 
-optional_depends  "MP4V2"         \
+optional_depends  "mp4v2"            \
                   "CONFIG_MP4=y"     \
                   "CONFIG_MP4=n"     \
                   "for MP4 support"  &&
 
-if is_depends_enabled $SPELL "libmp4v2"  ;  then
+if is_depends_enabled $SPELL mp4v2;  then
   depends  "faad2"
 fi  &&
 
diff --git a/audio-players/cmus/HISTORY b/audio-players/cmus/HISTORY
index d90e52a..db5d3ee 100644
--- a/audio-players/cmus/HISTORY
+++ b/audio-players/cmus/HISTORY
@@ -1,3 +1,7 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Properly depend on faad2 for providers of MP4V2
+	  libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+
 2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: May use any provider of MP4V2
 
diff --git a/audio-soft/easytag/DEPENDS b/audio-soft/easytag/DEPENDS
index 0a1d347..2f1d0f8 100755
--- a/audio-soft/easytag/DEPENDS
+++ b/audio-soft/easytag/DEPENDS
@@ -28,7 +28,7 @@ optional_depends  faad2                           \
                   "--enable-mp4"                  \
                   ""                              \
                   "Enable Mp4 container support"  &&
-optional_depends  libmp4v2                        \
+optional_depends  mp4v2                           \
                   "--enable-mp4"                  \
                   ""                              \
                   "Use libmp4v2 for Mp4 support"  &&
diff --git a/audio-soft/easytag/HISTORY b/audio-soft/easytag/HISTORY
index 8974b61..89e3a89 100644
--- a/audio-soft/easytag/HISTORY
+++ b/audio-soft/easytag/HISTORY
@@ -1,3 +1,10 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: May use either provider of MP4V2 (Bug #15683)
+	  libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+	* PRE_BUILD: Apply mp4v2-1.9.patch
+	* mp4v2-1.9.patch: Added from 
+	  http://www.mail-archive.com/arch-commits@archlinux.org/msg14295.html
+
 2008-09-28 Arjan Bouter <abouter at sourcemage.org>
 	* BUILD: disable test for gtk
 	* DEPENDS: added missing optional_depends on speex
diff --git a/audio-soft/easytag/PRE_BUILD b/audio-soft/easytag/PRE_BUILD
new file mode 100755
index 0000000..5d24985
--- /dev/null
+++ b/audio-soft/easytag/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/mp4v2-1.9.patch
diff --git a/audio-soft/easytag/mp4v2-1.9.patch b/audio-soft/easytag/mp4v2-1.9.patch
new file mode 100644
index 0000000..f4e4461
--- /dev/null
+++ b/audio-soft/easytag/mp4v2-1.9.patch
@@ -0,0 +1,52 @@
+# http://www.mail-archive.com/arch-commits@archlinux.org/msg14295.html
+diff -ur easytag-2.1.6.orig/configure easytag-2.1.6/configure
+--- easytag-2.1.6.orig/configure       2008-07-12 17:57:44.000000000 +0300
++++ easytag-2.1.6/configure    2009-07-10 16:44:39.000000000 +0300
+@@ -22418,12 +22418,12 @@
+ /* end confdefs.h.  */
+ 
+                 #include <stdio.h>
+-                #include <mpeg4ip_config.h>
++                #include <mp4v2/mp4v2.h>
+                 int main (void)
+                 {
+                     FILE *output;
+                     output=fopen("conftest.mp4v2","w");
+-                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
++                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
+                     fclose(output);
+                     exit(0);
+                 }
+@@ -22471,7 +22471,7 @@
+ 
+                 cat >conftest.$ac_ext <<_ACEOF
+ 
+-           #include <mp4.h>
++           #include <mp4v2/mp4v2.h>
+            main () {
+            MP4FileHandle hFile;
+            MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
+diff -ur easytag-2.1.6.orig/src/mp4_header.c easytag-2.1.6/src/mp4_header.c
+--- easytag-2.1.6.orig/src/mp4_header.c        2007-11-28 10:54:35.000000000 
+0200
++++ easytag-2.1.6/src/mp4_header.c     2009-07-10 16:44:54.000000000 +0300
+@@ -44,7 +44,7 @@
+ #undef PACKAGE_STRING
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ 
+ 
+ /****************
+diff -ur easytag-2.1.6.orig/src/mp4_tag.c easytag-2.1.6/src/mp4_tag.c
+--- easytag-2.1.6.orig/src/mp4_tag.c   2007-12-11 00:08:11.000000000 +0200
++++ easytag-2.1.6/src/mp4_tag.c        2009-07-10 16:45:08.000000000 +0300
+@@ -50,7 +50,7 @@
+ #undef PACKAGE_STRING
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ 
+ 
diff --git a/audio-soft/mediatomb/DEPENDS b/audio-soft/mediatomb/DEPENDS
index 94aa311..65600be 100755
--- a/audio-soft/mediatomb/DEPENDS
+++ b/audio-soft/mediatomb/DEPENDS
@@ -48,7 +48,7 @@ optional_depends LIBAVCODEC \
                  "--enable-ffmpeg" \
                  "--disable-ffmpeg" \
                  "to gather metadata from video files" &&
-optional_depends MP4V2 \
+optional_depends mp4v2 \
                  "" "--disable-libmp4v2" \
                  "to enable MP4 support" &&
 optional_depends liblastfm \
diff --git a/audio-soft/mediatomb/HISTORY b/audio-soft/mediatomb/HISTORY
index ba00254..f0fb75f 100644
--- a/audio-soft/mediatomb/HISTORY
+++ b/audio-soft/mediatomb/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+
 2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* INSTALL: Create mediatomb account/group (Bug #15685)
 	* DEPENDS: May use any provider of MP4V2
diff --git a/database/dbd-interbase/HISTORY b/database/dbd-interbase/HISTORY
index 6da9ec7..064e37f 100644
--- a/database/dbd-interbase/HISTORY
+++ b/database/dbd-interbase/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Treeve Jelbert <treeve at sourcemage.org>
+	* Makefile.PL.bz2: updated, fix for latest perl
+
 2010-01-30 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: firebird => FIREBIRD
 
diff --git a/database/dbd-interbase/Makefile.PL.bz2 b/database/dbd-interbase/Makefile.PL.bz2
index ffde591..fefd977 100644
Binary files a/database/dbd-interbase/Makefile.PL.bz2 and b/database/dbd-interbase/Makefile.PL.bz2 differ
diff --git a/ftp/ncftp/DETAILS b/ftp/ncftp/DETAILS
index 2d957d3..08f126d 100755
--- a/ftp/ncftp/DETAILS
+++ b/ftp/ncftp/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=$SPELL-$VERSION-src.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/$SOURCE
-     SOURCE_HASH=sha512:1bcd7eb54788da34ae0a2bdbd83f0e7bcee9fa939e5f0e7a039d7f6edac1055fe30735786c8bc1a4b33914bbcc747227fe212cd4600c0babd579f5df2b03d0aa
+     SOURCE_HASH=sha512:2e7824fab5956a0b3647f99282afa465930d050d3b85097db26ad6836c0fa7b4f3d4d0ec1487c17e759fe637de5fe9a7eb4e3920d27543b71a867df44ca0ce0e
 
 if [[ "$NCFTP_IPV6" == "y" ]]; then
          VERSION=3.2.2
diff --git a/ftp/ncftp/HISTORY b/ftp/ncftp/HISTORY
index 0d59286..81d6e6f 100644
--- a/ftp/ncftp/HISTORY
+++ b/ftp/ncftp/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: SOURCE_HASH updated, #15713
+
 2010-04-14 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.4
 
diff --git a/kde4-apps/kid3-kde4/DEPENDS b/kde4-apps/kid3-kde4/DEPENDS
index 95b9030..e9210ee 100755
--- a/kde4-apps/kid3-kde4/DEPENDS
+++ b/kde4-apps/kid3-kde4/DEPENDS
@@ -1,7 +1,7 @@
 source  "$SECTION_DIRECTORY/KDE_DEPENDS" &&
 depends  taglib    &&
 depends  id3lib    &&
-depends  MP4V2  &&
+depends  mp4v2     &&
 optional_depends  libvorbis '' '' 'to use Ogg Vorbis' &&
 
 if is_depends_enabled $SPELL libvorbis
diff --git a/kde4-apps/kid3-kde4/HISTORY b/kde4-apps/kid3-kde4/HISTORY
index e3515f2..3f6ba5e 100644
--- a/kde4-apps/kid3-kde4/HISTORY
+++ b/kde4-apps/kid3-kde4/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+
 2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: May use any provider of MP4V2
 
diff --git a/mail/offlineimap/DETAILS b/mail/offlineimap/DETAILS
index 10c8481..4bf4e3a 100755
--- a/mail/offlineimap/DETAILS
+++ b/mail/offlineimap/DETAILS
@@ -1,9 +1,9 @@
            SPELL=offlineimap
-         VERSION=6.2.0
-          SOURCE=${SPELL}_${VERSION}.orig.tar.gz
-   SOURCE_URL[0]=http://software.complete.org/software/attachments/download/413/${SOURCE}
-     SOURCE_HASH=sha512:94808aca6d6ab080cf7e233017c751302302a80ca975bce1f3dd4007baa7c9eb0ce45e5441f8b068df3078c186541b9315af1969875189e71480c0e6c29f88a3
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
+         VERSION=6.2.0+nmu2ubuntu1
+          SOURCE=${SPELL}_${VERSION}.tar.gz
+   SOURCE_URL[0]=http://archive.ubuntu.com/ubuntu/pool/universe/o/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:dc59e36782447cec978b4eb698078a2d535af048e760ad61df9997a358cd9865ff18f3e6c3394caa9bafb314f4deb754c28af2a6ceab1a13d82bb8d8e2ed1b40
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=http://software.complete.org/offlineimap
          ENTERED=20060804
       LICENSE[0]=GPL
diff --git a/mail/offlineimap/HISTORY b/mail/offlineimap/HISTORY
index c877717..3fb7dd0 100644
--- a/mail/offlineimap/HISTORY
+++ b/mail/offlineimap/HISTORY
@@ -1,3 +1,7 @@
+2010-05-19 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: changed source url to download ubuntu's tarball
+	  since upstream's tarball is once again un-downloadable
+
 2009-12-27 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: updated to 6.2.0
 
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 70cc910..ae7c60c 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,11 +1,11 @@
            SPELL=samba
-         VERSION=3.5.2
+         VERSION=3.5.3
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
    SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
    SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-     SOURCE_HASH=sha512:0e2b9d51e1dfc439552a05f5e8c55e585f63e5000ba66b6cc8edeac992631d4e9f171a2fcb965dd046f8c69e9a9f757365fc4b62f2dc899ac651b58d2ff2a80a
+     SOURCE_HASH=sha512:a9897d0033b663b3c155b0b96aa8d4d3484c99248cd252a135f796bfcabc2e25a037fa1f6825f3b565a5a8280f6e73935d8ca89ed3e9cf6ce517732d90ad4531
 if [[ "$SAMBA_VSCAN" == "y" ]] ; then
    VSCAN_VERSION=0.3.6c-beta4
          SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index fdf7f1c..7ad6288 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.5.3
+
 2010-04-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.5.2
 
diff --git a/perl-cpan/alien-wxwidgets/DEPENDS b/perl-cpan/alien-wxwidgets/DEPENDS
index 6263eb3..2545d75 100755
--- a/perl-cpan/alien-wxwidgets/DEPENDS
+++ b/perl-cpan/alien-wxwidgets/DEPENDS
@@ -1,2 +1,4 @@
 depends perl &&
+depends g++  &&
+depends WXWIDGET &&
 depends extutils-cbuilder
diff --git a/perl-cpan/alien-wxwidgets/DETAILS b/perl-cpan/alien-wxwidgets/DETAILS
index acd215a..1aee8d8 100755
--- a/perl-cpan/alien-wxwidgets/DETAILS
+++ b/perl-cpan/alien-wxwidgets/DETAILS
@@ -1,7 +1,7 @@
            SPELL=alien-wxwidgets
            SNAME=Alien-wxWidgets
-         VERSION=0.50
-     SOURCE_HASH=sha512:96508af5d6a7986edfbf51ebd93b2e44660c5f2b0b007a8523df8915be0bd6e8cf4b3df7710f38ba46a8591e06d6a350d6cec497c2e35c4f463fa2f9057702b6
+         VERSION=0.51
+     SOURCE_HASH=sha512:910334756631c47d118afa057450869a3052312556190a99a359ef1946438571e238a552f0fc6ffe76924cb4f4aac77c118a0812b42e2f5cdb265287a7949701
           SOURCE=$SNAME-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SNAME-$VERSION
    SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MB/MBARBON/$SOURCE
diff --git a/perl-cpan/alien-wxwidgets/HISTORY b/perl-cpan/alien-wxwidgets/HISTORY
index 9936f8b..65ce3a4 100644
--- a/perl-cpan/alien-wxwidgets/HISTORY
+++ b/perl-cpan/alien-wxwidgets/HISTORY
@@ -1,3 +1,12 @@
+2010-05-19 Treeve Jelbert <treeve at sourcemage.org>
+	* PRE_BUILD: added
+	  don't let it download its own copy of wxwidgets
+	* DEPENDS: add WXWIDGET
+
+2010-05-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.51
+	* DEPENDS: add g++
+
 2010-03-11 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.50
 
diff --git a/perl-cpan/alien-wxwidgets/PRE_BUILD b/perl-cpan/alien-wxwidgets/PRE_BUILD
new file mode 100755
index 0000000..99d57e4
--- /dev/null
+++ b/perl-cpan/alien-wxwidgets/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY &&
+# don't let it download its own copy of wxwidgets
+sed -i '/$build_script/D' Makefile.PL
diff --git a/perl-cpan/dbi/DETAILS b/perl-cpan/dbi/DETAILS
index 0d4e3dc..d00e153 100755
--- a/perl-cpan/dbi/DETAILS
+++ b/perl-cpan/dbi/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dbi
-         VERSION=1.609
-     SOURCE_HASH=sha512:f234eb6d7c739411c5eced4037fcde86f28b9f14043a6d9855254c3f097b2d622a78caa984ee67c5e2f507b942881db964a9089231486676c5ea6d8b671eba3f
+         VERSION=1.611
+     SOURCE_HASH=sha512:65011c2cf8c7031bf4b737475a35b8aeeba68d02b991d4108d706f163906f0038183ab896de5382e557ee76231eecbc7c982fc42c267472970f4211b0ddceb09
           SOURCE=DBI-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBI-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/TIMB/$SOURCE
diff --git a/perl-cpan/dbi/HISTORY b/perl-cpan/dbi/HISTORY
index 11f1d01..ba29b00 100644
--- a/perl-cpan/dbi/HISTORY
+++ b/perl-cpan/dbi/HISTORY
@@ -1,3 +1,6 @@
+2010-05-18  Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.611
+
 2009-06-10  Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.609
 
diff --git a/perl-cpan/file-next/DETAILS b/perl-cpan/file-next/DETAILS
index 45adaf9..de43475 100755
--- a/perl-cpan/file-next/DETAILS
+++ b/perl-cpan/file-next/DETAILS
@@ -1,7 +1,7 @@
            SPELL=file-next
           SPELLX=File-Next
-         VERSION=1.02
-     SOURCE_HASH=sha512:ed2521438b449887438b9507cc42a22ecff153d910bf4b90ce6255bcf828cde3be6e6e6e99e8315c16c34ca8c4ce29cb0a7e396d33d0f0e228037d178ccc4883
+         VERSION=1.06
+     SOURCE_HASH=sha512:f21a17f496bc83da556d9f012746891be7f83168854694abf18056c45f3de8d62635064faf894665780511ac5f3e8116c8a5a9a947eb82e2cb1088f195854a51
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=http://search.cpan.org/~petdance
diff --git a/perl-cpan/file-next/HISTORY b/perl-cpan/file-next/HISTORY
index 2c1c466..bb10d49 100644
--- a/perl-cpan/file-next/HISTORY
+++ b/perl-cpan/file-next/HISTORY
@@ -1,3 +1,6 @@
+2010-05-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.06
+
 2009-01-25 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.02
 	  spell created
diff --git a/perl-cpan/html-parser/DETAILS b/perl-cpan/html-parser/DETAILS
index 2ca92a7..f0499f9 100755
--- a/perl-cpan/html-parser/DETAILS
+++ b/perl-cpan/html-parser/DETAILS
@@ -1,6 +1,6 @@
            SPELL=html-parser
-         VERSION=3.64
-     SOURCE_HASH=sha512:287caeaaa49d7880b21abc9b0fbd5ae0ab2726f82ba378b0fa417c1ca6927144ef099d5134e26430670dcbd75f03edd8298661daa84bce8990bbaa5408cdf577
+         VERSION=3.65
+     SOURCE_HASH=sha512:873f36abee1c16827de9ad5904e4e3f4e6d7f739a1e69345deb4ea8fcc1cd32e8a706db13e3c51fa2ca1869ec295dd981e524f671ea4e4f547795d1fb74d8623
           SOURCE=HTML-Parser-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/HTML-Parser-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
diff --git a/perl-cpan/html-parser/HISTORY b/perl-cpan/html-parser/HISTORY
index 38843e3..8bd56ce 100644
--- a/perl-cpan/html-parser/HISTORY
+++ b/perl-cpan/html-parser/HISTORY
@@ -1,3 +1,6 @@
+2010-06=18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.65
+
 2010-03-29 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.64
 
diff --git a/perl-cpan/lwp/DETAILS b/perl-cpan/lwp/DETAILS
index 2a8af49..98087ec 100755
--- a/perl-cpan/lwp/DETAILS
+++ b/perl-cpan/lwp/DETAILS
@@ -1,6 +1,6 @@
            SPELL=lwp
-         VERSION=5.834
-     SOURCE_HASH=sha512:46cf4b5b7be139a8d2b2e3c0597bab27a68e05230ffd055bac2a57b86407aa89cf80d5475eada1dbefd1b60968011f3c317f0d1d0931ad2d9a0805e1d8f57c8f
+         VERSION=5.836
+     SOURCE_HASH=sha512:6ad57f56d4181a497dcc481badcd1329ee9b08c0b6487107968d791035285d1790a08d373c16d37326ee04550862bcc79cfa693587515b49928a37d4d1d77033
           SOURCE=libwww-perl-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/libwww-perl-$VERSION
    SOURCE_URL[0]=http://www.cpan.org/authors/id/G/GA/GAAS/$SOURCE
diff --git a/perl-cpan/lwp/HISTORY b/perl-cpan/lwp/HISTORY
index 2f5c2fe..3d9cc58 100644
--- a/perl-cpan/lwp/HISTORY
+++ b/perl-cpan/lwp/HISTORY
@@ -1,3 +1,6 @@
+2010-05-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 5.836
+
 2010-03-29 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 5.834
 
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index 2291965..1317a0e 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -2,8 +2,8 @@ depends  g++  &&
 
 depends  gtk+2 &&
 
-depends  xorg-libs  '--with-x  --with-libxpm'  &&
-
+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
 # system libraries, so we're saying --with-*[=sys] here.
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index ddd6cf8..0c319f8 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,9 +1,8 @@
            SPELL=wxgtk
           SPELLX=wxGTK
 if [[ "$WX_DEV" == "y" ]];then
-         VERSION=2.8.10
-    SOURCE_HASH=sha512:3a007846beff1ccc736d267d66793967350d1eaccc1d4707d7a9133cd5215d53158247a5f1882479a30e156ebcd86affe74633da392b295ad890f3819ca6bea5
- SECURITY_PATCH=1
+         VERSION=2.8.11
+    SOURCE_HASH=sha512:25439876fd3641cd469055681f9ec36ca8fe5bf93b15d98513ff82797945aa8b1ac557345475ceee80ec7d053f926c23592d2cc729af2bf4ff99e3bacc5519e8
 else
          VERSION=2.6.4
     SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 6d46db4..1044668 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,9 @@
+2010-05-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.8.11
+	* PRE_BUILD: don't patch this version
+	* wxgtk-2.8.10-gsocket.patch: deleted
+	* DEPENDS: xorg-libs =< libx11, libxpm
+
 2009-09-09 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD, wxgtk-2.8.10-gsocket.patch: added patch to make
 	  the spell compile with our version of glib
diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
index 91b0154..3b1d034 100755
--- a/x11-toolkits/wxgtk/PRE_BUILD
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -3,7 +3,4 @@ cd  $SOURCE_DIRECTORY  &&
 
 if [[ $WX_DEV != y ]]; then
   patch  -p1  <  $SPELL_DIRECTORY/debdiff.patch
-else
-  patch  -p1  <  ${SPELL_DIRECTORY}/wxGTK-2.8.10.1-CVE-2009-2369.patch &&
-  patch  -p1  <  ${SPELL_DIRECTORY}/wxgtk-2.8.10-gsocket.patch
 fi
diff --git a/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch b/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
deleted file mode 100644
index 42392c8..0000000
--- a/x11-toolkits/wxgtk/wxGTK-2.8.10.1-CVE-2009-2369.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp wxPython-src-2.8.10.1/src/common/imagpng.cpp
---- wxPython-src-2.8.10.1-orig/src/common/imagpng.cpp	2008-05-11 22:26:45.000000000 -0600
-+++ wxPython-src-2.8.10.1/src/common/imagpng.cpp	2009-07-18 19:54:13.128547627 -0600
-@@ -568,18 +568,16 @@ wxPNGHandler::LoadFile(wxImage *image,
-     if (!image->Ok())
-         goto error;
- 
--    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
-+    // initialize all line pointers to NULL to ensure that they can be safely
-+    // free()d if an error occurs before all of them could be allocated
-+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-     if ( !lines )
-         goto error;
- 
-     for (i = 0; i < height; i++)
-     {
-         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
--        {
--            for ( unsigned int n = 0; n < i; n++ )
--                free( lines[n] );
-             goto error;
--        }
-     }
- 
-     png_read_image( png_ptr, lines );
-diff -Naurp wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp wxPython-src-2.8.10.1/src/common/imagtiff.cpp
---- wxPython-src-2.8.10.1-orig/src/common/imagtiff.cpp	2007-09-21 14:27:05.000000000 -0600
-+++ wxPython-src-2.8.10.1/src/common/imagtiff.cpp	2009-07-18 19:54:35.801832862 -0600
-@@ -261,7 +261,6 @@ bool wxTIFFHandler::LoadFile( wxImage *i
-     }
- 
-     uint32 w, h;
--    uint32 npixels;
-     uint32 *raster;
- 
-     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
-@@ -275,9 +274,20 @@ bool wxTIFFHandler::LoadFile( wxImage *i
-                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
-                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
- 
--    npixels = w * h;
-+    // guard against integer overflow during multiplication which could result
-+    // in allocating a too small buffer and then overflowing it
-+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
-+    {
-+        if ( verbose )
-+            wxLogError( _("TIFF: Image size is abnormally big.") );
-+
-+        TIFFClose(tif);
-+
-+        return false;
-+    }
- 
--    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
- 
-     if (!raster)
-     {
diff --git a/x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch b/x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch
deleted file mode 100644
index 494be86..0000000
--- a/x11-toolkits/wxgtk/wxgtk-2.8.10-gsocket.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/checklst.cpp wxGTK-2.8.10/src/gtk/checklst.cpp
---- wxGTK-2.8.10.orig/src/gtk/checklst.cpp	2009-09-09 13:00:26.444051291 +0200
-+++ wxGTK-2.8.10/src/gtk/checklst.cpp	2009-09-09 13:09:57.719509230 +0200
-@@ -17,7 +17,9 @@
- #include "wx/gtk/private.h"
- #include "wx/gtk/treeentry_gtk.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- 
- //-----------------------------------------------------------------------------
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/colour.cpp wxGTK-2.8.10/src/gtk/colour.cpp
---- wxGTK-2.8.10.orig/src/gtk/colour.cpp	2009-09-09 13:00:26.296233293 +0200
-+++ wxGTK-2.8.10/src/gtk/colour.cpp	2009-09-09 13:10:05.992841830 +0200
-@@ -14,7 +14,9 @@
- 
- #include "wx/gtk/private.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- 
- //-----------------------------------------------------------------------------
- // wxColour
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/dcmemory.cpp wxGTK-2.8.10/src/gtk/dcmemory.cpp
---- wxGTK-2.8.10.orig/src/gtk/dcmemory.cpp	2009-09-09 13:00:26.299566494 +0200
-+++ wxGTK-2.8.10/src/gtk/dcmemory.cpp	2009-09-09 13:10:14.689507541 +0200
-@@ -12,7 +12,9 @@
- 
- #include "wx/dcmemory.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- 
- //-----------------------------------------------------------------------------
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/dcscreen.cpp wxGTK-2.8.10/src/gtk/dcscreen.cpp
---- wxGTK-2.8.10.orig/src/gtk/dcscreen.cpp	2009-09-09 13:00:26.479942581 +0200
-+++ wxGTK-2.8.10/src/gtk/dcscreen.cpp	2009-09-09 13:10:26.484662954 +0200
-@@ -16,7 +16,9 @@
-     #include "wx/window.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/dialog.cpp wxGTK-2.8.10/src/gtk/dialog.cpp
---- wxGTK-2.8.10.orig/src/gtk/dialog.cpp	2009-09-09 13:00:26.410098837 +0200
-+++ wxGTK-2.8.10/src/gtk/dialog.cpp	2009-09-09 13:10:38.459921951 +0200
-@@ -20,7 +20,9 @@
- 
- #include "wx/evtloop.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/gsockgtk.cpp wxGTK-2.8.10/src/gtk/gsockgtk.cpp
---- wxGTK-2.8.10.orig/src/gtk/gsockgtk.cpp	2009-09-09 13:00:26.296233293 +0200
-+++ wxGTK-2.8.10/src/gtk/gsockgtk.cpp	2009-09-09 13:10:47.456063068 +0200
-@@ -15,8 +15,10 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
- 
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/listbox.cpp wxGTK-2.8.10/src/gtk/listbox.cpp
---- wxGTK-2.8.10.orig/src/gtk/listbox.cpp	2009-09-09 13:00:26.463316585 +0200
-+++ wxGTK-2.8.10/src/gtk/listbox.cpp	2009-09-09 13:10:58.601494018 +0200
-@@ -32,7 +32,9 @@
-     #include "wx/tooltip.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/mdi.cpp wxGTK-2.8.10/src/gtk/mdi.cpp
---- wxGTK-2.8.10.orig/src/gtk/mdi.cpp	2009-09-09 13:00:26.296233293 +0200
-+++ wxGTK-2.8.10/src/gtk/mdi.cpp	2009-09-09 13:11:10.309501948 +0200
-@@ -23,8 +23,10 @@
- #include "wx/notebook.h"
- #include "wx/gtk/private.h"
- 
-+#define GSocket GlibGSocket
- #include <glib.h>
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include "wx/gtk/win_gtk.h"
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/pen.cpp wxGTK-2.8.10/src/gtk/pen.cpp
---- wxGTK-2.8.10.orig/src/gtk/pen.cpp	2009-09-09 13:00:26.487482771 +0200
-+++ wxGTK-2.8.10/src/gtk/pen.cpp	2009-09-09 13:11:22.560018111 +0200
-@@ -16,7 +16,9 @@
-     #include "wx/colour.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- 
- //-----------------------------------------------------------------------------
- // wxPen
-diff -Naupr wxGTK-2.8.10.orig/src/gtk/popupwin.cpp wxGTK-2.8.10/src/gtk/popupwin.cpp
---- wxGTK-2.8.10.orig/src/gtk/popupwin.cpp	2009-09-09 13:00:26.452899826 +0200
-+++ wxGTK-2.8.10/src/gtk/popupwin.cpp	2009-09-09 13:11:31.290815154 +0200
-@@ -20,7 +20,9 @@
-     #include "wx/cursor.h"
- #endif // WX_PRECOMP
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/bitmap.cpp wxGTK-2.8.10/src/gtk1/bitmap.cpp
---- wxGTK-2.8.10.orig/src/gtk1/bitmap.cpp	2009-09-09 13:00:23.832900225 +0200
-+++ wxGTK-2.8.10/src/gtk1/bitmap.cpp	2009-09-09 13:06:11.866198603 +0200
-@@ -23,7 +23,9 @@
- 
- #include "wx/filefn.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/brush.cpp wxGTK-2.8.10/src/gtk1/brush.cpp
---- wxGTK-2.8.10.orig/src/gtk1/brush.cpp	2009-09-09 13:00:23.370005417 +0200
-+++ wxGTK-2.8.10/src/gtk1/brush.cpp	2009-09-09 13:06:24.132864099 +0200
-@@ -16,7 +16,9 @@
-     #include "wx/colour.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- 
- //-----------------------------------------------------------------------------
- // wxBrush
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/checklst.cpp wxGTK-2.8.10/src/gtk1/checklst.cpp
---- wxGTK-2.8.10.orig/src/gtk1/checklst.cpp	2009-09-09 13:00:24.749566738 +0200
-+++ wxGTK-2.8.10/src/gtk1/checklst.cpp	2009-09-09 13:06:36.083053141 +0200
-@@ -15,7 +15,9 @@
- #include "wx/checklst.h"
- #include "wx/gtk1/private.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- 
- //-----------------------------------------------------------------------------
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/clipbrd.cpp wxGTK-2.8.10/src/gtk1/clipbrd.cpp
---- wxGTK-2.8.10.orig/src/gtk1/clipbrd.cpp	2009-09-09 13:00:23.339566955 +0200
-+++ wxGTK-2.8.10/src/gtk1/clipbrd.cpp	2009-09-09 13:06:49.169938590 +0200
-@@ -20,8 +20,10 @@
-     #include "wx/dataobj.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <glib.h>
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- 
- //-----------------------------------------------------------------------------
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/colour.cpp wxGTK-2.8.10/src/gtk1/colour.cpp
---- wxGTK-2.8.10.orig/src/gtk1/colour.cpp	2009-09-09 13:00:23.689566774 +0200
-+++ wxGTK-2.8.10/src/gtk1/colour.cpp	2009-09-09 13:06:59.551548662 +0200
-@@ -18,7 +18,9 @@
- 
- #include "wx/gtk1/private.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gdk/gdkx.h>
- #include <gdk/gdkprivate.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/cursor.cpp wxGTK-2.8.10/src/gtk1/cursor.cpp
---- wxGTK-2.8.10.orig/src/gtk1/cursor.cpp	2009-09-09 13:00:23.379566682 +0200
-+++ wxGTK-2.8.10/src/gtk1/cursor.cpp	2009-09-09 13:07:08.097026441 +0200
-@@ -17,7 +17,9 @@
-     #include "wx/utils.h"
- #endif // WX_PRECOMP
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- 
- //-----------------------------------------------------------------------------
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dataobj.cpp wxGTK-2.8.10/src/gtk1/dataobj.cpp
---- wxGTK-2.8.10.orig/src/gtk1/dataobj.cpp	2009-09-09 13:00:25.807886309 +0200
-+++ wxGTK-2.8.10/src/gtk1/dataobj.cpp	2009-09-09 13:07:17.808666606 +0200
-@@ -23,7 +23,9 @@
- #include "wx/mstream.h"
- #include "wx/uri.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- 
- //-------------------------------------------------------------------------
- // global data
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dcclient.cpp wxGTK-2.8.10/src/gtk1/dcclient.cpp
---- wxGTK-2.8.10.orig/src/gtk1/dcclient.cpp	2009-09-09 13:00:24.700932560 +0200
-+++ wxGTK-2.8.10/src/gtk1/dcclient.cpp	2009-09-09 13:07:29.259524380 +0200
-@@ -28,7 +28,9 @@
- 
- #include "wx/gtk1/win_gtk.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gdk/gdkx.h>
- #include <gdk/gdkprivate.h>
- #include <gtk/gtk.h>
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dc.cpp wxGTK-2.8.10/src/gtk1/dc.cpp
---- wxGTK-2.8.10.orig/src/gtk1/dc.cpp	2009-09-09 13:00:24.672899840 +0200
-+++ wxGTK-2.8.10/src/gtk1/dc.cpp	2009-09-09 13:07:39.036190063 +0200
-@@ -12,7 +12,9 @@
- 
- #include "wx/dc.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- 
- //-----------------------------------------------------------------------------
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dcmemory.cpp wxGTK-2.8.10/src/gtk1/dcmemory.cpp
---- wxGTK-2.8.10.orig/src/gtk1/dcmemory.cpp	2009-09-09 13:00:24.236764536 +0200
-+++ wxGTK-2.8.10/src/gtk1/dcmemory.cpp	2009-09-09 13:07:50.597700851 +0200
-@@ -12,7 +12,9 @@
- 
- #include "wx/dcmemory.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- 
- //-----------------------------------------------------------------------------
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dcscreen.cpp wxGTK-2.8.10/src/gtk1/dcscreen.cpp
---- wxGTK-2.8.10.orig/src/gtk1/dcscreen.cpp	2009-09-09 13:00:25.832899863 +0200
-+++ wxGTK-2.8.10/src/gtk1/dcscreen.cpp	2009-09-09 13:08:07.866187647 +0200
-@@ -16,7 +16,9 @@
-     #include "wx/window.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/dialog.cpp wxGTK-2.8.10/src/gtk1/dialog.cpp
---- wxGTK-2.8.10.orig/src/gtk1/dialog.cpp	2009-09-09 13:00:24.271183641 +0200
-+++ wxGTK-2.8.10/src/gtk1/dialog.cpp	2009-09-09 13:08:18.880334529 +0200
-@@ -20,7 +20,9 @@
- 
- #include "wx/evtloop.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/frame.cpp wxGTK-2.8.10/src/gtk1/frame.cpp
---- wxGTK-2.8.10.orig/src/gtk1/frame.cpp	2009-09-09 13:00:23.336233390 +0200
-+++ wxGTK-2.8.10/src/gtk1/frame.cpp	2009-09-09 13:12:46.792888514 +0200
-@@ -30,7 +30,9 @@
-     #include "wx/statusbr.h"
- #endif // WX_PRECOMP
- 
-+#define GSocket GlibGSocket
- #include <glib.h>
-+#undef GSocket
- #include "wx/gtk1/private.h"
- 
- #include <gdk/gdkkeysyms.h>
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/gsockgtk.cpp wxGTK-2.8.10/src/gtk1/gsockgtk.cpp
---- wxGTK-2.8.10.orig/src/gtk1/gsockgtk.cpp	2009-09-09 13:00:23.689566774 +0200
-+++ wxGTK-2.8.10/src/gtk1/gsockgtk.cpp	2009-09-09 13:08:36.662851137 +0200
-@@ -15,8 +15,10 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
- #include <glib.h>
-+#undef GSocket
- 
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/listbox.cpp wxGTK-2.8.10/src/gtk1/listbox.cpp
---- wxGTK-2.8.10.orig/src/gtk1/listbox.cpp	2009-09-09 13:00:25.782900228 +0200
-+++ wxGTK-2.8.10/src/gtk1/listbox.cpp	2009-09-09 13:08:47.052849741 +0200
-@@ -29,7 +29,9 @@
-     #include "wx/tooltip.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/mdi.cpp wxGTK-2.8.10/src/gtk1/mdi.cpp
---- wxGTK-2.8.10.orig/src/gtk1/mdi.cpp	2009-09-09 13:00:23.800739946 +0200
-+++ wxGTK-2.8.10/src/gtk1/mdi.cpp	2009-09-09 13:08:56.206812100 +0200
-@@ -23,8 +23,10 @@
- #include "wx/notebook.h"
- #include "wx/gtk1/private.h"
- 
-+#define GSocket GlibGSocket
- #include <glib.h>
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include "wx/gtk1/win_gtk.h"
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/minifram.cpp wxGTK-2.8.10/src/gtk1/minifram.cpp
---- wxGTK-2.8.10.orig/src/gtk1/minifram.cpp	2009-09-09 13:00:24.819844793 +0200
-+++ wxGTK-2.8.10/src/gtk1/minifram.cpp	2009-09-09 13:09:07.377676869 +0200
-@@ -22,7 +22,9 @@
- #include "wx/gtk1/win_gtk.h"
- #include "wx/gtk1/private.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gdk/gdkprivate.h>
- #include <gdk/gdkx.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/pen.cpp wxGTK-2.8.10/src/gtk1/pen.cpp
---- wxGTK-2.8.10.orig/src/gtk1/pen.cpp	2009-09-09 13:00:25.866325248 +0200
-+++ wxGTK-2.8.10/src/gtk1/pen.cpp	2009-09-09 13:09:15.342846791 +0200
-@@ -16,7 +16,9 @@
-     #include "wx/colour.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- 
- //-----------------------------------------------------------------------------
- // wxPen
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/popupwin.cpp wxGTK-2.8.10/src/gtk1/popupwin.cpp
---- wxGTK-2.8.10.orig/src/gtk1/popupwin.cpp	2009-09-09 13:00:24.956567244 +0200
-+++ wxGTK-2.8.10/src/gtk1/popupwin.cpp	2009-09-09 13:09:24.590053283 +0200
-@@ -20,7 +20,9 @@
-     #include "wx/cursor.h"
- #endif // WX_PRECOMP
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/settings.cpp wxGTK-2.8.10/src/gtk1/settings.cpp
---- wxGTK-2.8.10.orig/src/gtk1/settings.cpp	2009-09-09 13:00:23.756233537 +0200
-+++ wxGTK-2.8.10/src/gtk1/settings.cpp	2009-09-09 13:09:33.916908007 +0200
-@@ -20,7 +20,9 @@
- 
- #include "wx/fontutil.h"
- 
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gdk/gdkx.h>
- #include <gdk/gdkprivate.h>
- #include <gtk/gtk.h>
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/tbargtk.cpp wxGTK-2.8.10/src/gtk1/tbargtk.cpp
---- wxGTK-2.8.10.orig/src/gtk1/tbargtk.cpp	2009-09-09 13:00:25.832899863 +0200
-+++ wxGTK-2.8.10/src/gtk1/tbargtk.cpp	2009-09-09 13:13:02.026157608 +0200
-@@ -27,7 +27,9 @@
-     #include "wx/frame.h"
- #endif
- 
-+#define GSocket GlibGSocket
- #include <glib.h>
-+#undef GSocket
- #include "wx/gtk1/private.h"
- 
- // ----------------------------------------------------------------------------
-diff -Naupr wxGTK-2.8.10.orig/src/gtk1/toplevel.cpp wxGTK-2.8.10/src/gtk1/toplevel.cpp
---- wxGTK-2.8.10.orig/src/gtk1/toplevel.cpp	2009-09-09 13:00:25.807886309 +0200
-+++ wxGTK-2.8.10/src/gtk1/toplevel.cpp	2009-09-09 13:13:10.386249880 +0200
-@@ -37,8 +37,10 @@
- #include "wx/gtk1/private.h"
- #include "wx/evtloop.h"
- 
-+#define GSocket GlibGSocket
- #include <glib.h>
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- #include <gdk/gdkx.h>
-diff -Naupr wxGTK-2.8.10.orig/src/unix/fontutil.cpp wxGTK-2.8.10/src/unix/fontutil.cpp
---- wxGTK-2.8.10.orig/src/unix/fontutil.cpp	2009-09-09 13:00:27.852899602 +0200
-+++ wxGTK-2.8.10/src/unix/fontutil.cpp	2009-09-09 13:11:46.569498482 +0200
-@@ -390,7 +390,9 @@ bool wxGetNativeFontEncoding(wxFontEncod
-     // known not to work at least with Sun CC 6.01
-     #include <time.h>
- 
-+    #define GSocket GlibGSocket
-     #include <gdk/gdk.h>
-+    #undef GSocket
- #endif
- 
- 
-diff -Naupr wxGTK-2.8.10.orig/src/unix/taskbarx11.cpp wxGTK-2.8.10/src/unix/taskbarx11.cpp
---- wxGTK-2.8.10.orig/src/unix/taskbarx11.cpp	2009-09-09 13:00:27.871904636 +0200
-+++ wxGTK-2.8.10/src/unix/taskbarx11.cpp	2009-09-09 13:11:58.949669771 +0200
-@@ -76,7 +76,9 @@
- // ----------------------------------------------------------------------------
- 
- #if defined(__WXGTK__)
-+    #define GSocket GlibGSocket
-     #include <gdk/gdk.h>
-+    #undef GSocket
-     #include <gdk/gdkx.h>
-     #include <gtk/gtk.h>
-     #define GetDisplay()        GDK_DISPLAY()
-diff -Naupr wxGTK-2.8.10.orig/src/unix/utilsx11.cpp wxGTK-2.8.10/src/unix/utilsx11.cpp
---- wxGTK-2.8.10.orig/src/unix/utilsx11.cpp	2009-09-09 13:00:28.375125570 +0200
-+++ wxGTK-2.8.10/src/unix/utilsx11.cpp	2009-09-09 13:12:10.642829304 +0200
-@@ -36,7 +36,9 @@
- #endif
- 
- #ifdef __WXGTK__
-+#define GSocket GlibGSocket
- #include <gdk/gdk.h>
-+#undef GSocket
- #include <gdk/gdkx.h>
- #endif
- 



More information about the SM-Commit mailing list