[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (fab6a12cfdf3cafad00edf8ca5642876a6bd70b5)

Treeve Jelbert scm at sourcemage.org
Wed May 16 11:23:42 EDT 2007


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 ChangeLog                            |    3 +++
 kde4/FUNCTIONS                       |   30 ++++++++++++++----------------
 kde4/HISTORY                         |    7 +++++++
 kde4/KDE_DEPENDS                     |    1 +
 kde4/NOTES                           |    9 +++++++--
 kde4/kdebase4/FINAL                  |   18 ++++++++++++++++++
 kde4/kdebase4/HISTORY                |    7 +++++++
 kde4/kdebase4/init.d/kdm4            |    3 ++-
 kde4/kdelibs4/HISTORY                |    3 +++
 kde4/kdelibs4/INSTALL                |   15 +++++++++++++++
 kde4/kdesdk4/CONFIGURE               |    8 ++++++++
 kde4/kdesdk4/DEPENDS                 |    7 +++++++
 kde4/kdesdk4/DETAILS                 |   16 ++++++++++++++++
 kde4/kdesdk4/HISTORY                 |    4 ++++
 kde4/kdewebdev4/CONFIGURE            |    1 +
 kde4/kdewebdev4/DEPENDS              |    3 +++
 kde4/kdewebdev4/DETAILS              |   16 ++++++++++++++++
 kde4/kdewebdev4/HISTORY              |    4 ++++
 telephony/telepathy-sofiasip/DETAILS |    4 ++--
 telephony/telepathy-sofiasip/HISTORY |    3 +++
 20 files changed, 141 insertions(+), 21 deletions(-)

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

    kde4 - more new spells

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

    kde4 - general build updates

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

    telepathy-sofiasip-0.3.17

diff --git a/ChangeLog b/ChangeLog
index 4d649dd..94711d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-05-16 Treeve Jelbert <treeve at sourcemage.org>
+	* kde4/kdewebdev4, kde4/kdesdk: new kde4 spells
+
 2007-05-16 Martin Spitzbarth <m.spitzbarth at gmx.de>
 	* audio-plugins/xmms-mp3cue: new spell, xmms plugin for cue file
 	  support
diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 1c4106b..f41c6ca 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -1,23 +1,21 @@
 default_build() {
-QTDIR=/usr
-PATH=$QTDIR/bin/qt4:$PATH
+QTDIR=$INSTALL_ROOT/usr                         &&
+PATH=$QTDIR/bin/qt4:$PATH                       &&
 
-KDEDIR=/opt/kde4
-PATH=$KDEDIR/bin:$PATH
-LD_LIBRARY_PATH=$KDEDIR/lib:$LD_LIBRARY_PATH
-QT_PLUGIN_PATH=$KDEDIR/lib/kde4/plugins
+persistent_add KDE4DIR                          &&
+KDE4DIR=$INSTALL_ROOT/opt                       &&
 
-XDG_DATA_DIRS=$KDEDIR/share
-KDEHOME=$HOME/.kde4
-KDETMP=/tmp/$USER-kde4
-mkdir -p $KDETMP
-KDEVARTMP=/var/tmp/$USER-kde4
+PATH=$KDE4DIR/bin:$PATH                         &&
+LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH   &&
+QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins        &&
 
+XDG_DATA_DIRS=$KDE4DIR/share                    &&
 
-cd $SOURCE_DIRECTORY  &&
-mkdir -p build        &&
-cd build              &&
-cmake -DCMAKE_INSTALL_PREFIX=$KDEDIR \
-      -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION ../  &&
+cd $SOURCE_DIRECTORY                            &&
+mkdir -p build                                  &&
+cd build                                        &&
+cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR           \
+      -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION      \
+      ../                                       &&
 make
 }
diff --git a/kde4/HISTORY b/kde4/HISTORY
new file mode 100644
index 0000000..433fa57
--- /dev/null
+++ b/kde4/HISTORY
@@ -0,0 +1,7 @@
+2007-05-13 Treeve Jelbert <treeve at sourcemage.org>
+	* FUNCTIONS: use INSTALL_ROOT
+	  add missing &&'s
+	  install to /opt instead of /opt/kde4
+	  delete user specific code, not needed here
+	  make KDE4DIR persistent
+	* KDE_DEPENDS: add pkgconfig
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 0de1f04..90f5305 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -3,6 +3,7 @@ depends cmake    &&
 case $SPELL in
   kdelibs4)   depends qt4              &&
               depends dbus             &&
+              depends pkgconfig        &&
               depends openssl          &&
               sub_depends qt4 DBUS     &&
               sub_depends qt4 SSL      &&
diff --git a/kde4/NOTES b/kde4/NOTES
index 12e1cdc..638e0d6 100644
--- a/kde4/NOTES
+++ b/kde4/NOTES
@@ -1,5 +1,5 @@
 1. all the code in this section is very experimental.
-   however, it has compiled for me.
+   however, it has compiled for me, and I have run some kde4 programs.
 
 2. the dependencies of the spells are very much in a state of flux.
 
@@ -18,4 +18,9 @@
 8. need to check startup scripts (kdm4?), session manager?
    coexistence with kde3?
 
-9. must setup session bus (dbus) correctly
+#9. must setup session bus (dbus) correctly, should not be necessary to do this
+#   add 'eval `dbus-launch --auto-syntax` ' to ~./.xsession
+
+10. add an entry for kde4 to /usr/share/xsessions (similar to that for kde3),
+     so that can run kde4 from kdm
+
diff --git a/kde4/kdebase4/FINAL b/kde4/kdebase4/FINAL
new file mode 100755
index 0000000..5229db7
--- /dev/null
+++ b/kde4/kdebase4/FINAL
@@ -0,0 +1,18 @@
+if check_if_xorg_modular_libs qt4; then
+  message "$PROBLEM_COLOR"
+  message "kdm does not work out-of-the-box with xorg-modular since the "
+  message "paths changed. Edit /usr/share/config/kdm/kdmrc and modify "
+  message "ServerCmd to point to /usr/bin/X . If needed, set Xrdb, "
+  message "FailsafeClient and Session to point to correct paths (no X11R6/)."
+  message "$DEFAULT_COLOR"
+fi &&
+
+message '
+To get pmount working with hal on kde >= 3.5.4 a policy for the plugdev group
+has to be created in /etc/dbus-1/system.d/hal.conf:
+
+<policy group="plugdev">
+  <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
+  <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+</policy>
+'
diff --git a/kde4/kdebase4/HISTORY b/kde4/kdebase4/HISTORY
index fb75447..7ce49d0 100644
--- a/kde4/kdebase4/HISTORY
+++ b/kde4/kdebase4/HISTORY
@@ -1,3 +1,10 @@
+2007-05-15 Treeve Jelbert <treeve at sourcemage.org>
+	* init.d/kdm: fix program location
+	* FINAL: added (copied from kde3)
+
+2007-05-13 Treeve Jelbert <treeve at sourcemage.org>
+	* init.d/kdm: add "NEEDS=smgl-messagebus"
+
 2007-05-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: remove optional openssl, already needed by kdelibs4
 	  add bluez-libs
diff --git a/kde4/kdebase4/init.d/kdm4 b/kde4/kdebase4/init.d/kdm4
index e4f04ab..815445a 100755
--- a/kde4/kdebase4/init.d/kdm4
+++ b/kde4/kdebase4/init.d/kdm4
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-PROGRAM=/opt/kde4/bin/kdm
+PROGRAM=/opt/bin/kdm
 RUNLEVEL=5
 PROVIDES=display_manager
+NEEDS="smgl-messagebus"
 
 . /etc/init.d/smgl_init
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index b14c61b..e8f7c02 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,6 @@
+2007-05-14 Treeve Jelbert <treeve at sourcemage.org>
+	* INSTALL: added, so dbus suff is in standard place
+
 2007-05-12 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: add alsa-lib, avahi, python
 
diff --git a/kde4/kdelibs4/INSTALL b/kde4/kdelibs4/INSTALL
new file mode 100755
index 0000000..d40bea2
--- /dev/null
+++ b/kde4/kdelibs4/INSTALL
@@ -0,0 +1,15 @@
+# we need to put some data in the usual places,
+# so that dbus can have its data in one place
+
+# get the location for dbus stuff
+DBUSDIR=`pkg-config --variable=session_bus_services_dir dbus-1 \
+       | cut -d/ -f-4`                  &&
+
+if [[ $KDE4DIR != /usr ]] ;then
+ if [[ ! -s $KDE4DIR/$DBUSDIR ]];then
+  mkdir -p $KDE4DIR/$DBUSDIR
+  ln -s $INSTALL_ROOT/$DBUSDIR $KDE4DIR/share
+  fi
+fi                                       &&
+     
+default_install
diff --git a/kde4/kdesdk4/CONFIGURE b/kde4/kdesdk4/CONFIGURE
new file mode 100755
index 0000000..29589c3
--- /dev/null
+++ b/kde4/kdesdk4/CONFIGURE
@@ -0,0 +1,8 @@
+source  $SECTION_DIRECTORY/KDE_CONFIGURE   &&
+if  provider_ok  APU          &&
+    spell_ok     subversion;  then
+  config_query  KDESDK_SUBVERSION  'Build Subversion SCM support?'  y
+else
+  config_query  KDESDK_SUBVERSION  'Build Subversion SCM support?'  n
+fi
+
diff --git a/kde4/kdesdk4/DEPENDS b/kde4/kdesdk4/DEPENDS
new file mode 100755
index 0000000..6b83f10
--- /dev/null
+++ b/kde4/kdesdk4/DEPENDS
@@ -0,0 +1,7 @@
+source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
+if  [  "$KDESDK_SUBVERSION"  ==  "y"  ];  then
+  depends  APU         &&
+  depends  subversion
+fi                                      &&
+optional_depends  db         '' '' 'Berkley DB support'
+#optional_depends  '' '' ''
diff --git a/kde4/kdesdk4/DETAILS b/kde4/kdesdk4/DETAILS
new file mode 100755
index 0000000..7b97c89
--- /dev/null
+++ b/kde4/kdesdk4/DETAILS
@@ -0,0 +1,16 @@
+          SPELL=kdesdk4
+        SPELLX=${SPELL//4}
+         VERSION=3.90.1
+     SOURCE_HASH=sha512:5147c80adfa37c7ea931964ca2cd71a184b36600ec9e80a07fe0ac711166cd90968e3ee41d8d741f9e8f97038ee96de9ddac1154d0a0fb0fa836878ab2f56675
+          SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+   SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0/}/src/$SOURCE
+        WEB_SITE=http://www.kde.org
+         ENTERED=20020912
+#  SECURITY_PATCH=1
+      LICENSE[0]=GPL
+        KEYWORDS="kde"
+           SHORT="software development tools for KDE"
+cat << EOF
+software development kit for KDE
+EOF
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
new file mode 100644
index 0000000..4d88043
--- /dev/null
+++ b/kde4/kdesdk4/HISTORY
@@ -0,0 +1,4 @@
+2007-05-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.90.1
+	  kde4 spell cloned from kde3 spell
+
diff --git a/kde4/kdewebdev4/CONFIGURE b/kde4/kdewebdev4/CONFIGURE
new file mode 100755
index 0000000..3e2e1ef
--- /dev/null
+++ b/kde4/kdewebdev4/CONFIGURE
@@ -0,0 +1 @@
+source  $SECTION_DIRECTORY/KDE_CONFIGURE
diff --git a/kde4/kdewebdev4/DEPENDS b/kde4/kdewebdev4/DEPENDS
new file mode 100755
index 0000000..c6fcec4
--- /dev/null
+++ b/kde4/kdewebdev4/DEPENDS
@@ -0,0 +1,3 @@
+source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
+optional_depends  kdesdk ''  '' 'Cervisia (CVS) and Kompare (diff) support'
+
diff --git a/kde4/kdewebdev4/DETAILS b/kde4/kdewebdev4/DETAILS
new file mode 100755
index 0000000..cd445d4
--- /dev/null
+++ b/kde4/kdewebdev4/DETAILS
@@ -0,0 +1,16 @@
+          SPELL=kdewebdev4
+        SPELLX=${SPELL//4}
+         VERSION=3.90.1
+     SOURCE_HASH=sha512:f89d547286c04e09922d522d034b279a658bad264eed51b795bf2a2010be5a20b7f7d36e622dd88fa156380e26baae84a9512a743c6c9bc1f51a887541af3dba
+          SOURCE=$SPELLX-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+   SOURCE_URL[0]=$KDE_URL/unstable/${VERSION//.0/}/src/$SOURCE
+        WEB_SITE=http://www.kde.org
+         ENTERED=20020912
+#  SECURITY_PATCH=1
+      LICENSE[0]=GPL
+        KEYWORDS="kde"
+           SHORT="web development tools for KDE"
+cat << EOF
+Various tools, including quanta and kommander, for web development
+EOF
diff --git a/kde4/kdewebdev4/HISTORY b/kde4/kdewebdev4/HISTORY
new file mode 100644
index 0000000..4d88043
--- /dev/null
+++ b/kde4/kdewebdev4/HISTORY
@@ -0,0 +1,4 @@
+2007-05-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.90.1
+	  kde4 spell cloned from kde3 spell
+
diff --git a/telephony/telepathy-sofiasip/DETAILS b/telephony/telepathy-sofiasip/DETAILS
index 3d33a55..ac0ec88 100755
--- a/telephony/telepathy-sofiasip/DETAILS
+++ b/telephony/telepathy-sofiasip/DETAILS
@@ -1,6 +1,6 @@
            SPELL=telepathy-sofiasip
-         VERSION=0.3.16
-     SOURCE_HASH=sha512:0911f403d8a25a56fd1d172d9cd24c57fa45431ec8346cbc61778b59db73c545a7b7871ec15ba0b1d29ca0f37ab573d8523681f08fcc7cf7d8afd1541a3ad4c5
+         VERSION=0.3.17
+     SOURCE_HASH=sha512:e8282af0092a739725673f6bf36f68cd2b3f3e022358a5adcfda1f10dfa045be9ed255a432059d296f40c07aa0070bd67f75ed7d7c38bbf0b683d8649b8785d9
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 
diff --git a/telephony/telepathy-sofiasip/HISTORY b/telephony/telepathy-sofiasip/HISTORY
index 1a88bc1..f4d0503 100644
--- a/telephony/telepathy-sofiasip/HISTORY
+++ b/telephony/telepathy-sofiasip/HISTORY
@@ -1,3 +1,6 @@
+2007-05-16 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.3.17
+
 2007-05-08 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.3.16
 



More information about the SM-Commit mailing list