diff options
author | Alexander Tsamutali | 2007-10-30 22:19:21 +0500 |
---|---|---|
committer | Alexander Tsamutali | 2007-10-30 22:19:21 +0500 |
commit | 791d56c4a2414c531f068ad49aa53e88235c22f1 (patch) | |
tree | da1dc4764fed80a9f18f8afac89d885d8ad125bc | |
parent | 04535b97bd2d8e986ad6e1a78a158639c05464c9 (diff) | |
parent | f98c1622562f7a657147202f7499d942dd00764b (diff) |
Merge branch 'master' of ssh://astsmtl@scm.sourcemage.org/smgl/grimoire
Conflicts:
ChangeLog
-rw-r--r-- | ChangeLog | 3 | ||||
-rwxr-xr-x | chat-im/tmsnc/DETAILS | 2 | ||||
-rw-r--r-- | chat-im/tmsnc/HISTORY | 3 | ||||
-rw-r--r-- | chat-im/tmsnc/tmsnc-0.3.1.tar.gz.sig | bin | 280 -> 0 bytes | |||
-rw-r--r-- | chat-im/tmsnc/tmsnc-0.3.2.tar.gz.sig | bin | 0 -> 280 bytes | |||
-rwxr-xr-x | disk/ntfs-3g/DETAILS | 4 | ||||
-rw-r--r-- | disk/ntfs-3g/HISTORY | 3 | ||||
-rwxr-xr-x | groups | 1 | ||||
-rwxr-xr-x | kde4/kdebase-workspace4/DEPENDS | 8 | ||||
-rw-r--r-- | kde4/kdebase-workspace4/HISTORY | 19 | ||||
-rwxr-xr-x | kde4/kdebase-workspace4/INSTALL | 4 | ||||
-rwxr-xr-x | kde4/kdebase-workspace4/PRE_BUILD | 3 | ||||
-rw-r--r-- | kde4/kdebase-workspace4/kde4.desktop | 4 | ||||
-rw-r--r-- | kde4/kdebase-workspace4/kde4.sh | 28 | ||||
-rwxr-xr-x | news/liferea/DETAILS | 4 | ||||
-rw-r--r-- | news/liferea/HISTORY | 3 | ||||
-rw-r--r-- | news/liferea/liferea-1.4.5b.tar.gz.sig | bin | 280 -> 0 bytes | |||
-rw-r--r-- | news/liferea/liferea-1.4.6.tar.gz.sig | bin | 0 -> 280 bytes | |||
-rwxr-xr-x | utils/strigi/DETAILS | 7 | ||||
-rw-r--r-- | utils/strigi/HISTORY | 4 | ||||
-rwxr-xr-x | utils/which/DETAILS | 4 | ||||
-rw-r--r-- | utils/which/HISTORY | 3 |
22 files changed, 91 insertions, 16 deletions
@@ -1,6 +1,9 @@ 2007-10-30 Alexander Tsamutali <astsmtl@gmail.com> * python-devel/rabbyt: new spell, a fast sprite library for Python +2007-10-30 Treeve Jelbert <treeve@sourcemage.org> + * groups: add kde4 + 2007-10-27 Treeve Jelbert <treeve@sourcemage.org> * archive-libs/libzip: new spell, manipulate zip archives diff --git a/chat-im/tmsnc/DETAILS b/chat-im/tmsnc/DETAILS index ca06e223aa..f500ea7f87 100755 --- a/chat-im/tmsnc/DETAILS +++ b/chat-im/tmsnc/DETAILS @@ -1,5 +1,5 @@ SPELL=tmsnc - VERSION=0.3.1 + VERSION=0.3.2 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://superb-east.dl.sourceforge.net/sourceforge/tmsnc/$SOURCE diff --git a/chat-im/tmsnc/HISTORY b/chat-im/tmsnc/HISTORY index 48cd8d899e..6b74b2b34a 100644 --- a/chat-im/tmsnc/HISTORY +++ b/chat-im/tmsnc/HISTORY @@ -1,3 +1,6 @@ +2007-10-30 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to version 0.3.2 + 2006-08-12 George Sherwood <george@beernabeer.com> * DETAILS: Removed BUILD_API=2. GPG Checking. Added KEYWORDS diff --git a/chat-im/tmsnc/tmsnc-0.3.1.tar.gz.sig b/chat-im/tmsnc/tmsnc-0.3.1.tar.gz.sig Binary files differdeleted file mode 100644 index f692d17ec9..0000000000 --- a/chat-im/tmsnc/tmsnc-0.3.1.tar.gz.sig +++ /dev/null diff --git a/chat-im/tmsnc/tmsnc-0.3.2.tar.gz.sig b/chat-im/tmsnc/tmsnc-0.3.2.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..efa7404150 --- /dev/null +++ b/chat-im/tmsnc/tmsnc-0.3.2.tar.gz.sig diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS index 752ca63c8d..280d0c4c5a 100755 --- a/disk/ntfs-3g/DETAILS +++ b/disk/ntfs-3g/DETAILS @@ -1,6 +1,6 @@ SPELL=ntfs-3g - VERSION=1.1004 - SOURCE_HASH=sha512:0f0ffba403b119b17807eca9ea71c12fe0e433d81f5b612125183233c450c4d4090ab4662c0ebdaf85117180dc7042a65b281aada71c282eeadb94d4b2659097 + VERSION=1.1030 + SOURCE_HASH=sha512:63128c82ddbe6704114d58f3d0846fa505933e2abc1ebb7c41248eee8f4df41e966e0b8ce541a654436309ec98356edbd829790aaec363d045fbd16c4b515cd2 SOURCE=$SPELL-$VERSION.tgz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://www.ntfs-3g.org/ diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY index ac6c845106..5c6ad279a9 100644 --- a/disk/ntfs-3g/HISTORY +++ b/disk/ntfs-3g/HISTORY @@ -1,3 +1,6 @@ +2007-10-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.1030 + 2007-10-15 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.1004 @@ -80,5 +80,6 @@ stb-admin:157: davfs2:158: dovecot:159: netdev:160: +kde4:161 users:1000: nogroup:65534: diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS index cfd7dc529d..6a42ed1105 100755 --- a/kde4/kdebase-workspace4/DEPENDS +++ b/kde4/kdebase-workspace4/DEPENDS @@ -2,9 +2,12 @@ source $SECTION_DIRECTORY/KDE_DEPENDS && source $GRIMOIRE/FUNCTIONS && if check_if_xorg_modular_libs qt4 ; then + depends xproto && + depends xmessage && depends libxdmcp && depends libxrandr && - depends libxxf86misc + depends libxxf86misc && + suggest_depends xkeyboard-config y "allow multiple consoles ctl-alt-Fn" fi && optional_depends freetype2 '' '' 'anti-aliasing of fonts' && @@ -16,5 +19,6 @@ optional_depends libusb '' '' 'usb support' && optional_depends bluez-libs '' '' 'Bluetooth support ' && optional_depends openldap '' '' 'LDAP authentication' && optional_depends cyrus-sasl '' '' 'Cyrus SASL authentication' && -optional_depends OPENGL '' '' 'OpenGL support in plasma' +optional_depends OPENGL '' '' 'OpenGL support in plasma' && +optional_depends plasma '' '' 'additional plasma features' #optional_depends networkmanager '' '' '' && diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY index 914245d638..f12686f175 100644 --- a/kde4/kdebase-workspace4/HISTORY +++ b/kde4/kdebase-workspace4/HISTORY @@ -1,3 +1,22 @@ +2007-10-30 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: fix typo in suggest_depends + +2007-10-29 Treeve Jelbert <treeve@sourcemage.org> + * kde4.desktop: refer to correct file + * kde4.sh: added + * PRE_BUILD: added, to create kde4 group + * INSTALL: install kde4.sh + it is now possible to start a kde4 session and have a working desktop + beware that if kde3 is also installed, kde4 will take precedence!!! + by default, only users who belong to group kde4 can use this + they will also have a separate desktop configuration for kde3/4 + this is controlled by the variable KDEHOME + reset KDEHOME to share the same desktop in kde3/4 + you will then get a mixture of kde3/4 applications + +2007-10-18 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: add xproto, xmessage, xkeyboard-config, plasma + 2007-10-18 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.94.0 diff --git a/kde4/kdebase-workspace4/INSTALL b/kde4/kdebase-workspace4/INSTALL index 92b4dbbf71..2f4602e364 100755 --- a/kde4/kdebase-workspace4/INSTALL +++ b/kde4/kdebase-workspace4/INSTALL @@ -1,4 +1,6 @@ default_install && mkdir -p $INSTALL_ROOT/usr/share/xsessions && install -m 0644 -o root -g root $SCRIPT_DIRECTORY/kde4.desktop \ - $INSTALL_ROOT/usr/share/xsessions + $INSTALL_ROOT/usr/share/xsessions && +install -m 0640 -o root -g kde4 $SCRIPT_DIRECTORY/kde4.sh \ + $INSTALL_ROOT/etc/profile.d diff --git a/kde4/kdebase-workspace4/PRE_BUILD b/kde4/kdebase-workspace4/PRE_BUILD new file mode 100755 index 0000000000..ed31e3f6ec --- /dev/null +++ b/kde4/kdebase-workspace4/PRE_BUILD @@ -0,0 +1,3 @@ +create_group kde4 && +default_pre_build + diff --git a/kde4/kdebase-workspace4/kde4.desktop b/kde4/kdebase-workspace4/kde4.desktop index 31b20b3983..9337d5411a 100644 --- a/kde4/kdebase-workspace4/kde4.desktop +++ b/kde4/kdebase-workspace4/kde4.desktop @@ -2,8 +2,8 @@ Encoding=UTF-8 Name=KDE4 Comment=This session logs you into KDE4 -Exec=/opt/bin/kstart -TryExec=/opt/bin/kstart +Exec=/opt/bin/startkde +TryExec=/opt/bin/startkde # no icon yet, only the top three are currently used Icon= Type=Application diff --git a/kde4/kdebase-workspace4/kde4.sh b/kde4/kdebase-workspace4/kde4.sh new file mode 100644 index 0000000000..d92dfaffb4 --- /dev/null +++ b/kde4/kdebase-workspace4/kde4.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# setup KDE4 environment for SMGL +source /etc/profile.d/qt.sh + +export PATH=$QTDIR/bin/qt4:$PATH +export KDEDIR=/opt +export KDEDIRS=$KDEDIR +export KDE_DATA_DIRS=$KDEDIR/share +export PATH=$KDEDIR/bin:$PATH +export XDG_CONFIG_DIRS=$KDEDIR/etc/xdg +export QT_PLUGIN_PATH=$KDEDIR/lib/plugins +export LD_LIBRARY_PATH=$KDEDIR/lib:$LD_LIBRARY_PATH +export PKG_CONFIG_PATH=$KDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH +#export KDE_COLOR_DEBUG=1 + +# this will keep the kde3/4 desktops separate +export KDEHOME=$HOME/.kde4 + +# temporary runtime directories +export KDETMP=${TMPDIR-/tmp}/kde4-$USER +export KDEVARTMP=/var/tmp/kde4cache-$USER + +# Ensure that they exist +mkdir -p $KDEDIR $KDETMP $KDEVARTMP + + + + diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS index e3f9b7e7c9..f2e5fdc70f 100755 --- a/news/liferea/DETAILS +++ b/news/liferea/DETAILS @@ -1,9 +1,9 @@ SPELL=liferea if [ "$LIFEREA_DEVEL" == "y" ]; then - VERSION=1.4.5b + VERSION=1.4.6 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION else - VERSION=1.4.5b + VERSION=1.4.6 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION fi SOURCE=$SPELL-$VERSION.tar.gz diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY index ff0e59ef93..dd8e542f56 100644 --- a/news/liferea/HISTORY +++ b/news/liferea/HISTORY @@ -1,3 +1,6 @@ +2007-10-30 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to version 1.4.6 + 2007-10-11 George Sherwood <george@beernabeer.com> * DETAILS: Updated to version 1.4.5b diff --git a/news/liferea/liferea-1.4.5b.tar.gz.sig b/news/liferea/liferea-1.4.5b.tar.gz.sig Binary files differdeleted file mode 100644 index ae43bff74c..0000000000 --- a/news/liferea/liferea-1.4.5b.tar.gz.sig +++ /dev/null diff --git a/news/liferea/liferea-1.4.6.tar.gz.sig b/news/liferea/liferea-1.4.6.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..d156a22b46 --- /dev/null +++ b/news/liferea/liferea-1.4.6.tar.gz.sig diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS index 530a0a6169..7edf986b07 100755 --- a/utils/strigi/DETAILS +++ b/utils/strigi/DETAILS @@ -12,17 +12,16 @@ fi SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk//kdesupport/$SPELL:$SPELL SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL else - VERSION=0.5.5 - SOURCE_HASH=sha512:c1ab6ee24016e89a02cfaeeee28141afc829eb6087fb97fc425200f046ab69444621ef8e3ccb92a73bd0e0705e270faac0bbe7616fbe72acd848fa6b47218f9e + VERSION=0.5.7 + SOURCE_HASH=sha512:184f7d40623bc7192dd83703b424f7f9aabc3c40b38745b0ef0d6789675f0b23cb0a4fc326f5c0acd1c149a9bb97386b9d02d5e4232ae6b263869bda6ddcc0ba SOURCE=$SPELL-$VERSION.tar.bz2 # SOURCE_URL[0]=$KDE_URL/unstable/${KDEVER//.0}/src/$SOURCE - SOURCE_URL[0]=$WEB_SITE/$SOURCE + SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION fi WEB_SITE=http://strigi.sourceforge.net/ LICENSE[0]=LGPL ENTERED=20070309 - PATCHLEVEL=2 KEYWORDS="search engine" SHORT="desktop search engine" cat << EOF diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY index 2b461a35c9..000812d6b9 100644 --- a/utils/strigi/HISTORY +++ b/utils/strigi/HISTORY @@ -1,3 +1,7 @@ +2007-10-30 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 0.5.7 + use SOURCEFORGE_URL + 2007-10-19 Treeve Jelbert <treeve@sourcemage.org> * strigi.sh: add /opt/share to XDG_DATA_DIRS, for use by kde4 * DETAILS: PATCHLEVEL++ diff --git a/utils/which/DETAILS b/utils/which/DETAILS index 73f3addc2d..023c004ffb 100755 --- a/utils/which/DETAILS +++ b/utils/which/DETAILS @@ -1,7 +1,7 @@ SPELL=which - VERSION=2.16 + VERSION=2.18 SOURCE=$SPELL-$VERSION.tar.gz - SOURCE_HASH=sha512:a058a0c4b97442954164e8386fc67303e3982506b3e6280a69706ac4e3d6445f077d0079be6c2e075840fcb87058d79d988a8e39237f937c9da664bb6b8da12b + SOURCE_HASH=sha512:c88b586d431a87e842280d4b18b3156c31444da43753489491714ffb4f80ef849b2ebd3a2787ab9375e9e0b908ce2440b542f2c3d828ea4a30b49ffcdf3e3e3d SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE diff --git a/utils/which/HISTORY b/utils/which/HISTORY index bf1ce615de..18f7563d55 100644 --- a/utils/which/HISTORY +++ b/utils/which/HISTORY @@ -1,3 +1,6 @@ +2007-10-30 Elisamuel Resto <ryuji@mages.ath.cx> + * DETAILS" version bump 2.16 -> 2.18 + 2006-06-28 Eric Sandall <sandalle@sourcemage.org> * DETAILS: Removed BUILD_API=2, set grimoire-wide |