[SM-Commit] GIT changes to master grimoire by Eric Sandall (461cd6b5b965a9171f887fce790513b4686ab09b)

Eric Sandall scm at mail.sourcemage.org
Sat Dec 2 12:14:58 EST 2006


GIT changes to master grimoire by Eric Sandall <sandalle at moby.(none)>:

 dev/null                                         |binary
 windowmanagers/windowmaker/DEPENDS               |    2 +-
 windowmanagers/windowmaker/HISTORY               |    3 +++
 wm-addons/wdm/DEPENDS                            |    2 +-
 wm-addons/wdm/HISTORY                            |    3 +++
 x11/slim-themes/DETAILS                          |    7 ++++---
 x11/slim-themes/HISTORY                          |    4 ++++
 x11/slim-themes/slim-1.2.3-themepack1.tar.gz.sig |binary
 x11/slim/DEPENDS                                 |   21 +++++++++++++++++----
 x11/slim/DETAILS                                 |    6 +++---
 x11/slim/HISTORY                                 |    8 ++++++++
 x11/slim/PRE_BUILD                               |    4 ++++
 x11/slim/slim-1.2.3.tar.gz.sig                   |    0 
 x11/slim/slim-1.2.6.tar.gz.sig                   |binary
 14 files changed, 48 insertions(+), 12 deletions(-)

New commits:
commit 461cd6b5b965a9171f887fce790513b4686ab09b
Author: Eric Sandall <sandalle at moby.(none)>
Commit: Eric Sandall <sandalle at moby.(none)>

    wdm may use any LIBGIF provider

commit 1392d15329234b50e093daac11cf99d91fb664a2
Author: Eric Sandall <sandalle at moby.(none)>
Commit: Eric Sandall <sandalle at moby.(none)>

    windowmaker may use any LIBGIF provider

commit 3cd86af0d61515610f0bbc7cf3ce60b9e7a6a6b3
Author: Eric Sandall <sandalle at moby.(none)>
Commit: Eric Sandall <sandalle at moby.(none)>

    Updated slim-themes to 1.2.3

commit 783d400fd008acd433678d2846019867c794f253
Author: Eric Sandall <sandalle at moby.(none)>
Commit: Eric Sandall <sandalle at moby.(none)>

    Updated slim to 1.2.6 and now works with xorg-modular

diff --git a/windowmanagers/windowmaker/DEPENDS b/windowmanagers/windowmaker/DEPENDS
index 317eecb..d7f5bc8 100755
--- a/windowmanagers/windowmaker/DEPENDS
+++ b/windowmanagers/windowmaker/DEPENDS
@@ -3,7 +3,7 @@ depends  tiff      &&
 depends  libpng    &&
 depends  zlib      &&
 depends  jpeg      &&
-depends  libungif  &&
+depends  LIBGIF    &&
 
 if [[ "${WINDOWMAKER_CVS}" == "y" ]] ; then
     depends CVS        &&
diff --git a/windowmanagers/windowmaker/HISTORY b/windowmanagers/windowmaker/HISTORY
index ab0ff0b..ad5cb12 100644
--- a/windowmanagers/windowmaker/HISTORY
+++ b/windowmanagers/windowmaker/HISTORY
@@ -1,3 +1,6 @@
+2006-12-02 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Changed dependency on libungif to LIBGIF
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/wm-addons/wdm/DEPENDS b/wm-addons/wdm/DEPENDS
index b5b6c82..cbf2ac2 100755
--- a/wm-addons/wdm/DEPENDS
+++ b/wm-addons/wdm/DEPENDS
@@ -22,7 +22,7 @@ optional_depends  jpeg
                   "--disable-jpeg"             \
                   "for JPEG graphics support"  &&
 
-optional_depends  libungif                    \
+optional_depends  LIBGIF                      \
                   "--enable-gif"              \
                   "--disable-gif"             \
                   "for GIF graphics support"  &&
diff --git a/wm-addons/wdm/HISTORY b/wm-addons/wdm/HISTORY
index e745f01..4175000 100644
--- a/wm-addons/wdm/HISTORY
+++ b/wm-addons/wdm/HISTORY
@@ -1,3 +1,6 @@
+2006-12-02 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Changed dependency on libungif to LIBGIF
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.
 
diff --git a/x11/slim-themes/DETAILS b/x11/slim-themes/DETAILS
index d04c16c..e89e191 100755
--- a/x11/slim-themes/DETAILS
+++ b/x11/slim-themes/DETAILS
@@ -1,12 +1,13 @@
            SPELL=slim-themes
-         VERSION=1.2.1
+         VERSION=1.2.3
           SOURCE=slim-$VERSION-themepack1.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.berlios.de/slim/$SOURCE
-     SOURCE_HASH=sha512:bbc8065b71dee38f9953ed2bf3c800cdd1fe1f0048af43b92f8c573c8ae062a033ff7e2a68cc9b7e13a5b15173d2195bef8a4292d6756271300499a9085129dc
+#     SOURCE_HASH=sha512:bbc8065b71dee38f9953ed2bf3c800cdd1fe1f0048af43b92f8c573c8ae062a033ff7e2a68cc9b7e13a5b15173d2195bef8a4292d6756271300499a9085129dc
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
         WEB_SITE=http://slim.berlios.de/index.php
-         ENTERED=20050518
         KEYWORDS="theme x11"
+         ENTERED=20050518
            SHORT="SLiM Themes"
 cat << EOF
 Themes pack for the SliM login manager
diff --git a/x11/slim-themes/HISTORY b/x11/slim-themes/HISTORY
index b2b550c..2081446 100644
--- a/x11/slim-themes/HISTORY
+++ b/x11/slim-themes/HISTORY
@@ -1,3 +1,6 @@
+2006-12-02 Eric Sandall <eric at sandall.us>
+	* DETAILS: Updated to 1.2.3
+
 2006-06-28 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
@@ -9,3 +12,4 @@
 
 2005-05-18 Rafael George <george.rafael at gmail.com>
     * Created spell
+
diff --git a/x11/slim-themes/slim-1.2.3-themepack1.tar.gz.sig b/x11/slim-themes/slim-1.2.3-themepack1.tar.gz.sig
new file mode 100644
index 0000000..05bc02b
Binary files /dev/null and b/x11/slim-themes/slim-1.2.3-themepack1.tar.gz.sig differ
diff --git a/x11/slim/DEPENDS b/x11/slim/DEPENDS
index 0116de2..3603e1c 100755
--- a/x11/slim/DEPENDS
+++ b/x11/slim/DEPENDS
@@ -1,4 +1,17 @@
-depends X11-LIBS    &&
-depends libpng      &&
-depends jpeg        &&
-depends freetype2
+depends  fontconfig  &&
+depends  freetype2   &&
+depends  jpeg        &&
+depends  libpng      &&
+depends  X11-LIBS    &&
+depends  zlib        &&
+
+.  $GRIMOIRE/FUNCTIONS  &&
+
+if  check_if_xorg_modular_libs;  then
+  depends  libx11      &&
+  depends  libxft      &&
+  depends  libxmu      &&
+  depends  libxrender  &&
+  depends  xauth       &&
+  depends  xterm
+fi
diff --git a/x11/slim/DETAILS b/x11/slim/DETAILS
index 96b4d56..1569b0e 100755
--- a/x11/slim/DETAILS
+++ b/x11/slim/DETAILS
@@ -1,13 +1,13 @@
            SPELL=slim
-         VERSION=1.2.3
+         VERSION=1.2.6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.berlios.de/slim/$SOURCE
       SOURCE_GPG=gurus.gpg:${SOURCE}.sig
         WEB_SITE=http://slim.berlios.de/index.php
-         ENTERED=20050518
         KEYWORDS="x11"
-           SHORT="SLiM is a Desktop-independent graphical login manager for X11"
+         ENTERED=20050518
+           SHORT="Desktop-independent graphical login manager for X11"
 cat << EOF
 SLiM It aims to be light and simple, although completely configurable through themes
 and an option file; is suitable for machines on which remote login functionalities 
diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index b8f4442..67829b6 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,11 @@
+2006-12-02 Eric Sandall <eric at sandall.us>
+	* DETAILS: Updated to 1.2.6
+	* DEPENDS: Depends on libx11, libxft, libxmu, libxrender, xauth, and xterm
+	  if using xorg-modular.
+	  Added dependencies on fontconfig and zlib.
+	  Source $GRIMOIRE/FUNCTIONS for check_if_xorg_modular_libs
+	* PRE_BUILD: Modify slim.conf for xorg-modular, if warranted
+
 2006-06-28 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/x11/slim/PRE_BUILD b/x11/slim/PRE_BUILD
new file mode 100755
index 0000000..014f854
--- /dev/null
+++ b/x11/slim/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build  &&
+if  check_if_xorg_modular_libs;  then
+  sedit  's:X11R6\/::g'  $SOURCE_DIRECTORY/slim.conf
+fi
diff --git a/x11/slim/slim-1.2.3.tar.gz.sig b/x11/slim/slim-1.2.3.tar.gz.sig
deleted file mode 100644
index 1635266..0000000
Binary files a/x11/slim/slim-1.2.3.tar.gz.sig and /dev/null differ
diff --git a/x11/slim/slim-1.2.6.tar.gz.sig b/x11/slim/slim-1.2.6.tar.gz.sig
new file mode 100644
index 0000000..cce451d
Binary files /dev/null and b/x11/slim/slim-1.2.6.tar.gz.sig differ



More information about the SM-Commit mailing list