[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ae503df8a0bf97674c2ef75fc3e39d176cecb28b)

Vlad Glagolev scm at sourcemage.org
Mon Apr 28 16:20:39 EDT 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ftp/linuxdcpp/DETAILS     |    8 ++++----
 ftp/linuxdcpp/HISTORY     |    4 ++++
 ftp/linuxdcpp/PRE_BUILD   |    3 +++
 ftp/linuxdcpp/gcc43.patch |   11 +++++++++++
 x11/slim-themes/DETAILS   |    5 +++--
 x11/slim-themes/HISTORY   |    7 +++++--
 x11/slim-themes/INSTALL   |    8 +-------
 x11/slim-themes/PRE_BUILD |    3 +++
 8 files changed, 34 insertions(+), 15 deletions(-)

New commits:
commit ae503df8a0bf97674c2ef75fc3e39d176cecb28b
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    slim-themes: fixed theme-installation

commit 274cefdd9d7af4b99c5548cf57a4bc6c26364f8d
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    linuxdcpp: fixed gcc 4.3 compilation

diff --git a/ftp/linuxdcpp/DETAILS b/ftp/linuxdcpp/DETAILS
index b011fee..b8d4d21 100755
--- a/ftp/linuxdcpp/DETAILS
+++ b/ftp/linuxdcpp/DETAILS
@@ -1,13 +1,13 @@
            SPELL=linuxdcpp
          VERSION=1.0.1
-          SOURCE=${SPELL}-${VERSION}.tar.bz2
-   SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
      SOURCE_HASH=sha512:8a4f88d84e8c86b3d38c647bde238b0f2c8ddf610d891a6c7b071918fb4e735284aa1258242b5b26bed1f3c41df48e9532270f4f9f857a225a3e7108a54fdc46
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://linuxdcpp.berlios.de/
       LICENSE[0]=GPL
          ENTERED=20071024
-           SHORT="A port of the DC++ direct connect client to Unix/Linux using GTK+"
+           SHORT="port of the DC++ direct connect client to Unix/Linux using GTK+"
 cat << EOF
 A port of the DC++ direct connect client to Unix/Linux using GTK+
 EOF
diff --git a/ftp/linuxdcpp/HISTORY b/ftp/linuxdcpp/HISTORY
index f9c315b..e47366a 100644
--- a/ftp/linuxdcpp/HISTORY
+++ b/ftp/linuxdcpp/HISTORY
@@ -1,3 +1,7 @@
+2008-04-27 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: fixed gcc 4.3 compilation, patch added
+	* DETAILS: cleaned up
+
 2008-04-03 Lalo Martins <lalo at sourcemage.org>
 	* DETAILS: new release 1.0.1
 
diff --git a/ftp/linuxdcpp/PRE_BUILD b/ftp/linuxdcpp/PRE_BUILD
new file mode 100755
index 0000000..4433eab
--- /dev/null
+++ b/ftp/linuxdcpp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/gcc43.patch
diff --git a/ftp/linuxdcpp/gcc43.patch b/ftp/linuxdcpp/gcc43.patch
new file mode 100644
index 0000000..664ed51
--- /dev/null
+++ b/ftp/linuxdcpp/gcc43.patch
@@ -0,0 +1,11 @@
+--- client/ShareManager.h.orig	2007/05/05 18:55:37	1.7
++++ client/ShareManager.h	2008/01/05 18:19:50	1.8
+@@ -37,6 +37,8 @@
+ #include "FastAlloc.h"
+ #include "MerkleTree.h"
+ 
++#include <memory>
++
+ STANDARD_EXCEPTION(ShareException);
+ 
+ class SimpleXML;
diff --git a/x11/slim-themes/DETAILS b/x11/slim-themes/DETAILS
index e89e191..a02d789 100755
--- a/x11/slim-themes/DETAILS
+++ b/x11/slim-themes/DETAILS
@@ -4,8 +4,9 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.berlios.de/slim/$SOURCE
 #     SOURCE_HASH=sha512:bbc8065b71dee38f9953ed2bf3c800cdd1fe1f0048af43b92f8c573c8ae062a033ff7e2a68cc9b7e13a5b15173d2195bef8a4292d6756271300499a9085129dc
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-        WEB_SITE=http://slim.berlios.de/index.php
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig
+     GATHER_DOCS=off
+        WEB_SITE=http://slim.berlios.de/
         KEYWORDS="theme x11"
          ENTERED=20050518
            SHORT="SLiM Themes"
diff --git a/x11/slim-themes/HISTORY b/x11/slim-themes/HISTORY
index b2ca011..16305bc 100644
--- a/x11/slim-themes/HISTORY
+++ b/x11/slim-themes/HISTORY
@@ -1,3 +1,7 @@
+2008-04-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: GATHER_DOCS=off
+	* INSTALL, PRE_BUILD: fixed theme-installation, added $INSTALL_ROOT
+
 2006-12-02 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 1.2.3
 
@@ -11,5 +15,4 @@
 	* DETAILS: MD5 -> SHA512
 
 2005-05-18 Rafael George <george.rafael at gmail.com>
-    * Created spell
-
+	* Created spell
diff --git a/x11/slim-themes/INSTALL b/x11/slim-themes/INSTALL
index c00dfd0..2c45edd 100755
--- a/x11/slim-themes/INSTALL
+++ b/x11/slim-themes/INSTALL
@@ -1,7 +1 @@
-INSTALLDIR=/usr/share/slim/themes
-
-cd $BUILD_DIRECTORY		&&
-mv capernoited $INSTALLDIR      &&
-mv flower2     $INSTALLDIR      &&
-mv mindlock    $INSTALLDIR      &&
-mv parallel-dimensions $INSTALLDIR
+cp -av $SOURCE_DIRECTORY/* $INSTALL_ROOT/usr/share/slim/themes
diff --git a/x11/slim-themes/PRE_BUILD b/x11/slim-themes/PRE_BUILD
new file mode 100755
index 0000000..fee3737
--- /dev/null
+++ b/x11/slim-themes/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file



More information about the SM-Commit mailing list