[SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (1c9a0cecbe00a7364b1d3208be800ad4dc5a7a38)

Treeve Jelbert scm at sourcemage.org
Fri Oct 2 10:52:07 EDT 2009


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

 audio-libs/taglib-extras/DETAILS                    |    7 +++++++
 audio-libs/taglib-extras/HISTORY                    |    4 ++++
 audio-libs/taglib-extras/PREPARE                    |    1 +
 dev/null                                            |binary
 gnome2-libs/libcanberra/DETAILS                     |    2 +-
 gnome2-libs/libcanberra/HISTORY                     |    3 +++
 gnome2-libs/libcanberra/libcanberra-0.16.tar.gz.sig |    0 
 gnome2-libs/libcanberra/libcanberra-0.18.tar.gz.sig |binary
 graphics/wings3d/DETAILS                            |    2 +-
 graphics/wings3d/HISTORY                            |    4 ++++
 graphics/wings3d/wings-1.0.1.tar.bz2.sig            |    0 
 graphics/wings3d/wings-1.0.2.tar.bz2.sig            |binary
 graphics/wings3d/wings3d                            |    2 +-
 kde4-apps/amarok2/DETAILS                           |    4 ++--
 kde4-apps/amarok2/HISTORY                           |    3 +++
 kde4/kdebase-workspace4/DEPENDS                     |    1 -
 kde4/kdebase-workspace4/HISTORY                     |    4 ++++
 kde4/kdebase-workspace4/PRE_BUILD                   |    9 +--------
 kde4/kdebase4-runtime/DEPENDS                       |    3 ---
 kde4/kdebase4-runtime/HISTORY                       |    3 +++
 kde4/kdebase4/DEPENDS                               |    3 ---
 kde4/kdebase4/HISTORY                               |    3 +++
 video/miro/HISTORY                                  |    3 +++
 video/miro/PRE_BUILD                                |    1 +
 video/miro/boost_function.diff                      |   11 +++++++++++
 25 files changed, 53 insertions(+), 20 deletions(-)

New commits:
commit 5e0f1cf164d67b33ae006304cf2b8fac5a805e54
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdebase4 - remove unneed depends

commit 6bd7a83b70c773697b12f76ddbc45b6ffaf32615
Author: Finn Haedicke <finn_haedicke at gmx.net>
Commit: Finn Haedicke <finn_haedicke at gmx.net>

    miro: patch to include boost/function.hpp

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

    kdebase-workspace4 - remove unneeded fix

commit abf1246df16dea6caecaaaf818509f031b6e60fd
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    amarok2: => 2.2.0

commit d2577519d108057579ccf6dc906491b5da9c382d
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    taglib-extras: added version 1.0.1 to allready existing svn version

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

    kdebase-workspace4 - remove unneed depends

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

    kdebase4-runtime - remove unneed depends

commit 4320743d713b02eae0f5006993dbdd85b8c48af0
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    wings3d 1.0.2

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

    libcanberra 0.18

diff --git a/audio-libs/taglib-extras/DETAILS b/audio-libs/taglib-extras/DETAILS
index ea24191..bb805f3 100755
--- a/audio-libs/taglib-extras/DETAILS
+++ b/audio-libs/taglib-extras/DETAILS
@@ -1,9 +1,16 @@
            SPELL=taglib-extras
+if [[ $TAGLIB_EXTRAS_SVN ]];then
          VERSION=svn
    SOURCE_IGNORE=volatile
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/kdesupport/$SPELL:$SPELL
   FORCE_DOWNLOAD=on
+else
+			VERSION=1.0.1
+	  SOURCE_HASH=sha512:282f9c9cde81a250d8d6f4416658167665044d53cd10d8ecfa490df60a1fb95e1309feb17f69963f8dbfccc83ebb76af7275c25339931117435f34a56c4f1a65
+			 SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=http://www.kollide.net/~jefferai/$SOURCE
+fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=
       LICENSE[0]=LGPL
diff --git a/audio-libs/taglib-extras/HISTORY b/audio-libs/taglib-extras/HISTORY
index 98f3add..9d41f40 100644
--- a/audio-libs/taglib-extras/HISTORY
+++ b/audio-libs/taglib-extras/HISTORY
@@ -1,3 +1,7 @@
+2009-10-01 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: changed added normal version (not svn)
+	* PREPARE: added, question for using svn version or not
+
 2009-04-24 Julien "_kaze_" ROZO <julien at rozo.org>
 	* BUILD, DEPENDS, DETAILS, HISTORY: created this spell
 
diff --git a/audio-libs/taglib-extras/PREPARE b/audio-libs/taglib-extras/PREPARE
new file mode 100755
index 0000000..45ba2f5
--- /dev/null
+++ b/audio-libs/taglib-extras/PREPARE
@@ -0,0 +1 @@
+config_query TAGLIB_EXTRAS_SVN 'build svn version?' n
diff --git a/gnome2-libs/libcanberra/DETAILS b/gnome2-libs/libcanberra/DETAILS
index 28d8079..18ea38c 100755
--- a/gnome2-libs/libcanberra/DETAILS
+++ b/gnome2-libs/libcanberra/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libcanberra
-         VERSION=0.16
+         VERSION=0.18
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://0pointer.de/lennart/projects/$SPELL/$SOURCE
diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY
index 82ebf31..9f634ab 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,6 @@
+2009-10-02 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.18
+
 2009-09-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.16
 
diff --git a/gnome2-libs/libcanberra/libcanberra-0.16.tar.gz.sig b/gnome2-libs/libcanberra/libcanberra-0.16.tar.gz.sig
deleted file mode 100644
index fdab521..0000000
Binary files a/gnome2-libs/libcanberra/libcanberra-0.16.tar.gz.sig and /dev/null differ
diff --git a/gnome2-libs/libcanberra/libcanberra-0.18.tar.gz.sig b/gnome2-libs/libcanberra/libcanberra-0.18.tar.gz.sig
new file mode 100644
index 0000000..38af5b9
Binary files /dev/null and b/gnome2-libs/libcanberra/libcanberra-0.18.tar.gz.sig differ
diff --git a/graphics/wings3d/DETAILS b/graphics/wings3d/DETAILS
index 5c5a720..d6264d1 100755
--- a/graphics/wings3d/DETAILS
+++ b/graphics/wings3d/DETAILS
@@ -1,5 +1,5 @@
            SPELL=wings3d
-         VERSION=1.0.1
+         VERSION=1.0.2
           SOURCE=wings-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/wings-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/wings/$SOURCE
diff --git a/graphics/wings3d/HISTORY b/graphics/wings3d/HISTORY
index b46eeda..2de2e32 100644
--- a/graphics/wings3d/HISTORY
+++ b/graphics/wings3d/HISTORY
@@ -1,3 +1,7 @@
+2009-10-02 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0.2
+	* wings3d: added "-smp disable"
+
 2009-06-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.0.1
 
diff --git a/graphics/wings3d/wings-1.0.1.tar.bz2.sig b/graphics/wings3d/wings-1.0.1.tar.bz2.sig
deleted file mode 100644
index fb7901a..0000000
Binary files a/graphics/wings3d/wings-1.0.1.tar.bz2.sig and /dev/null differ
diff --git a/graphics/wings3d/wings-1.0.2.tar.bz2.sig b/graphics/wings3d/wings-1.0.2.tar.bz2.sig
new file mode 100644
index 0000000..1f711a9
Binary files /dev/null and b/graphics/wings3d/wings-1.0.2.tar.bz2.sig differ
diff --git a/graphics/wings3d/wings3d b/graphics/wings3d/wings3d
index 88910e5..bbb20cd 100755
--- a/graphics/wings3d/wings3d
+++ b/graphics/wings3d/wings3d
@@ -3,6 +3,6 @@
    ESDL_PATH=/usr/lib/esdl
 WINGS3D_PATH=/usr/lib/wings
 
-erl -pa $ESDL_PATH/ebin $WINGS3D_PATH/ebin -run wings_start start_halt ${1+"$@"}
+erl -smp disable -pa $ESDL_PATH/ebin $WINGS3D_PATH/ebin -run wings_start start_halt ${1+"$@"}
 
 echo
diff --git a/kde4-apps/amarok2/DETAILS b/kde4-apps/amarok2/DETAILS
index dfe0a9e..56169cf 100755
--- a/kde4-apps/amarok2/DETAILS
+++ b/kde4-apps/amarok2/DETAILS
@@ -7,8 +7,8 @@ if [[ $AMR_SVN == y ]];then
    SOURCE_URL[0]=git://gitorious.org/amarok/amarok.git
   FORCE_DOWNLOAD=1
 else
-         VERSION=2.1.1
-     SOURCE_HASH=sha512:fd5451cd15f589098f996a61e71833a149c3ad5da2b573ff898b55588798c6ced8af9720726bae68651c35e5b7fe699c568ff34d67e97eac3eb06d0e64191a28
+         VERSION=2.2.0
+     SOURCE_HASH=sha512:f4ea03fef1840551ae2f924f258a70454782df1023431473718b09b209c325587df605712c749670866d01b609ab20305e280dfe149872741befef89df38bbb4
           SOURCE=$SPELLX-$VERSION.tar.bz2
 #   SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
    SOURCE_URL[0]=$KDE_URL/stable/$SPELLX/$VERSION/src/$SOURCE
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index 289eac7..608b304 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,6 @@
+2009-10-02 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 2.2.0
+
 2009-09-29 Bor Kraljič <pyrobor at ver.si>
 	* DEPENDS: added optional_depends to liblastfm
 
diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
index 267a1cd..c1b56e8 100755
--- a/kde4/kdebase-workspace4/DEPENDS
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -5,7 +5,6 @@ depends  xextproto     &&
 depends  xmessage      &&
 depends  libxdmcp      &&
 depends  libxrandr     &&
-depends  libxxf86misc  &&
 
 runtime_depends  xprop  &&
 
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 64f06a8..f7b9f91 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,7 @@
+2009-10-02 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: remove libxxf86misc
+	* PRE_BUILD: remove xtest fix
+
 2009-09-28 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.3.69svn1027298 (unstable)
 	* PRE_BUILD: added, for recent libxcb
diff --git a/kde4/kdebase-workspace4/PRE_BUILD b/kde4/kdebase-workspace4/PRE_BUILD
index 14a2738..2a8ec76 100755
--- a/kde4/kdebase-workspace4/PRE_BUILD
+++ b/kde4/kdebase-workspace4/PRE_BUILD
@@ -1,9 +1,2 @@
 create_group  kde4    &&
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-if [[ "${KDE_VER}" == "unstable" ]];then
-# for new libxcb
-  if [[ `installed_version libxcb` != "1.1" ]];then
-    sed -i 's|X11/extensions/XTest|xcb/xtest|' plasma/netbook/applets/currentappcontrol/currentappcontrol.cpp
-  fi
-fi
+default_pre_build
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 44b3ab5..4c35f3e 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -9,9 +9,6 @@ depends  libxfixes      &&
 depends  libxft         &&
 depends  libxrandr      &&
 depends  libxtst        &&
-depends  libxxf86misc   &&
-depends  xsetroot       &&
-depends  xset           &&
 
 depends xine-lib                        &&
 if [[ "${KDE_VER}" == "stable" ]];then
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index de835b9..ae550a2 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2009-10-02 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: remove unneeded libxxf86misc xsetroot xset
+
 2009-10-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: add optional libssh
 
diff --git a/kde4/kdebase4/DEPENDS b/kde4/kdebase4/DEPENDS
index 1ff31b2..ac6bd03 100755
--- a/kde4/kdebase4/DEPENDS
+++ b/kde4/kdebase4/DEPENDS
@@ -10,9 +10,6 @@ depends  libxfixes      &&
 depends  libxft         &&
 depends  libxrandr      &&
 depends  libxtst        &&
-depends  libxxf86misc   &&
-depends  xsetroot       &&
-depends  xset           &&
 
 optional_depends  xine-lib   '' ''   'video player'            &&
 if is_depends_enabled $SPELL xine-lib;then
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index dde3026..b32b26f 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,6 @@
+2009-10-02 Treeve Jelbert <treeve at sourcemage.org
+	* DEPENDS: remove unneeded libxxf86misc, xsetroot, xset
+
 2009-09-28 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.3.69svn1027298 (unstable)
 
diff --git a/video/miro/HISTORY b/video/miro/HISTORY
index bfefde6..399b34e 100644
--- a/video/miro/HISTORY
+++ b/video/miro/HISTORY
@@ -1,3 +1,6 @@
+2009-10-02 Finn Haedicke <finn_haedicke at gmx.net>
+	* PRE_BUILD, boost_function.diff: patch to work with current boost
+
 2009-08-23 Finn Haedicke <finn_haedicke at gmx.net>
 	* BUILD, INSTALL: split into ./setup.py build and ./setup.py install
 	* DEPENDS: added xine-lib, XULRUNNER, gst-python, boost
diff --git a/video/miro/PRE_BUILD b/video/miro/PRE_BUILD
index 3d4a0e1..1c76eef 100755
--- a/video/miro/PRE_BUILD
+++ b/video/miro/PRE_BUILD
@@ -1,4 +1,5 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
 
+patch  -p1 < $SPELL_DIRECTORY/boost_function.diff &&
 patch  -p1 < $SPELL_DIRECTORY/run.sh.diff
diff --git a/video/miro/boost_function.diff b/video/miro/boost_function.diff
new file mode 100644
index 0000000..4773f4e
--- /dev/null
+++ b/video/miro/boost_function.diff
@@ -0,0 +1,11 @@
+diff -ru Miro-2.5.2/portable/libtorrent/include/libtorrent/storage.hpp Miro-2.5.2-patched/portable/libtorrent/include/libtorrent/storage.hpp
+--- Miro-2.5.2/portable/libtorrent/include/libtorrent/storage.hpp	2009-07-31 11:56:04.000000000 +0900
++++ Miro-2.5.2-patched/portable/libtorrent/include/libtorrent/storage.hpp	2009-10-02 22:10:11.869173280 +0900
+@@ -42,6 +42,7 @@
+ 
+ #include <boost/limits.hpp>
+ #include <boost/thread.hpp>
++#include <boost/function.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/intrusive_ptr.hpp>
+ #include <boost/filesystem/path.hpp>



More information about the SM-Commit mailing list