Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert 
<treeve AT sourcemage.org>:

 gnome2-libs/goffice/HISTORY   |    3 +++
 gnome2-libs/goffice/PRE_BUILD |    4 ++++
 video/mplayer2/DEPENDS        |    6 ++++--
 video/mplayer2/DETAILS        |    2 +-
 video/mplayer2/HISTORY        |    4 ++++
 x11-toolkits/qt4/HISTORY      |    3 +++
 x11-toolkits/qt4/PRE_BUILD    |    7 ++++++-
 7 files changed, 25 insertions(+), 4 deletions(-)

New commits:
commit a624dedda3fcad26517f1d740264b1aa69ac9322
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    qt4: added a fix for icu, so webkit support can be enabled again.

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

    goffice: pcre_info is replaced by pcre_fullinfo, I added a fix from
    opensuse so we can build spells that depend on goffice again.
    see 
http://lists.opensuse.org/archive/opensuse-commit/2012-02/msg01190.html
    for more info

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

    video/mplayer2: changed git url, disabled esound and arts dependencies 
for scm branch

diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index e26e828..ed633b5 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,6 @@
+2012-05-29 Arjan Bouter <abouter AT sourcemage.org>
+       * PRE_BUILD: added a fix for pcre
+
 2011-08-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.8.17
 
diff --git a/gnome2-libs/goffice/PRE_BUILD b/gnome2-libs/goffice/PRE_BUILD
new file mode 100755
index 0000000..abbc84c
--- /dev/null
+++ b/gnome2-libs/goffice/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+# pcre_info is gone
+sedit 's/pcre_info (r, NULL, NULL)/pcre_fullinfo (r, NULL, 0, NULL)/' 
goffice/utils/regutf8.c
diff --git a/video/mplayer2/DEPENDS b/video/mplayer2/DEPENDS
index a28ed50..c4cf995 100755
--- a/video/mplayer2/DEPENDS
+++ b/video/mplayer2/DEPENDS
@@ -32,8 +32,10 @@ optional_depends  x264    "" "" "for x264 codec"
 optional_depends  twolame "" "" "Twolame (MPEG layer 2 audio) support in 
mencoder"  &&
 
 # audio devices
-optional_depends  esound "" "--disable-esd" "for direct esd audio output"  &&
-optional_depends  arts "" "--disable-arts" "for arts audio output"  &&
+if  [ "$MPLAYER2_BRANCH" != "scm" ];  then
+  optional_depends  esound "" "--disable-esd" "for direct esd audio output"  
&&
+  optional_depends  arts "" "--disable-arts" "for arts audio output"
+fi  &&
 optional_depends  alsa-lib "" "--disable-alsa" "for alsa audio output"  &&
 optional_depends  nas "" "--disable-nas" "for NAS audio output"  &&
 optional_depends  pulseaudio "" "--disable-pulse" "for pulseaudio audio 
output" &&
diff --git a/video/mplayer2/DETAILS b/video/mplayer2/DETAILS
index e64d3d5..018512a 100755
--- a/video/mplayer2/DETAILS
+++ b/video/mplayer2/DETAILS
@@ -6,7 +6,7 @@ if  [ "$MPLAYER2_BRANCH" == "scm" ];  then
          VERSION=git
   fi
           SOURCE=$SPELL-git.tar.bz2
-   SOURCE_URL[0]=git_http://git.mplayer2.org/$SPELL:$SPELL-git
+   SOURCE_URL[0]=git://git.mplayer2.org/$SPELL:$SPELL-git
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
diff --git a/video/mplayer2/HISTORY b/video/mplayer2/HISTORY
index caa59db..457812c 100644
--- a/video/mplayer2/HISTORY
+++ b/video/mplayer2/HISTORY
@@ -1,3 +1,7 @@
+2012-05-29 Pol Vinogradov <vin.public AT gmail.com>
+       * DETAILS: git_http -> git in scm branch
+       * DEPENDS: esound and arts are for stable branch only now
+
 2012-01-01 Pol Vinogradov <vin.public AT gmail.com>
        * DEPENDS: added LIBAVCODEC, fixed some flags
 
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 6215f28..51f0d19 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2012-05-29 Arjan Bouter <abouter AT sourcemage.org>
+       * PRE_BUILD: added a fix for icu
+
 2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.8.2, URI removed, SOURCE_URL[0] updated
        * qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch: removed
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 9ed4608..5f9e084 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -33,4 +33,9 @@ fi  &&
 # fix use of firebird
 sed -i "s/-lgds/-lfbclient/" config.tests/unix/ibase/ibase.pro \
                              src/sql/drivers/drivers.pri  \
-                             src/plugins/sqldrivers/ibase/ibase.pro
+                             src/plugins/sqldrivers/ibase/ibase.pro &&
+
+# fix icu support
+echo "fixing icu support" &&
+sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
+          src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri