diff options
| -rw-r--r-- | system/slim/README.SLACKWARE | 9 | ||||
| -rw-r--r-- | system/slim/slack-desc | 2 | ||||
| -rw-r--r-- | system/slim/slackware-black.tar.bz2 | bin | 13425 -> 10199 bytes | |||
| -rw-r--r-- | system/slim/slim-1.3.6_freetype-2.5.1.diff | 22 | ||||
| -rw-r--r-- | system/slim/slim.SlackBuild | 7 | ||||
| -rw-r--r-- | system/slim/slim.info | 4 |
6 files changed, 34 insertions, 10 deletions
diff --git a/system/slim/README.SLACKWARE b/system/slim/README.SLACKWARE index c4d08f12bd..81d62b68a8 100644 --- a/system/slim/README.SLACKWARE +++ b/system/slim/README.SLACKWARE @@ -1,10 +1,5 @@ README.SLACKWARE for SLiM -Frank Caraballo took the time to create a custom Slackware theme which goes -nicely with the lilo boot theme. -If you would like to use that theme, you will need to edit /etc/slim.conf -and change the 'current_theme' directive from 'default' to 'slackware-black' - If you would like to use SLiM as the login manager in runlevel 4, add the following lines to /etc/rc.d/rc.4 just above the section that tries to start gdm: @@ -15,3 +10,7 @@ start gdm: exec /usr/bin/slim fi +Frank Caraballo took the time to create a custom Slackware theme which goes +nicely with the lilo boot theme. If you would like to use Frank's theme, you +will need to edit /etc/slim.conf and change the 'current_theme' directive from +'default' to 'slackware-black'. diff --git a/system/slim/slack-desc b/system/slim/slack-desc index 4f22b1dbd7..d5e1c5947e 100644 --- a/system/slim/slack-desc +++ b/system/slim/slack-desc @@ -12,7 +12,7 @@ slim: SLiM is a lightweight login manager based on GNUstep's Login.app. It slim: makes a great replacement for XDM for those who want something that slim: looks good, but still do not want Gnome or KDE. slim: -slim: Homepage: http://slim.berlios.de/ +slim: Homepage: http://sourceforge.net/projects/slim.berlios/ slim: slim: slim: diff --git a/system/slim/slackware-black.tar.bz2 b/system/slim/slackware-black.tar.bz2 Binary files differindex 418205670e..edf8e9531b 100644 --- a/system/slim/slackware-black.tar.bz2 +++ b/system/slim/slackware-black.tar.bz2 diff --git a/system/slim/slim-1.3.6_freetype-2.5.1.diff b/system/slim/slim-1.3.6_freetype-2.5.1.diff new file mode 100644 index 0000000000..7f4f48a9f9 --- /dev/null +++ b/system/slim/slim-1.3.6_freetype-2.5.1.diff @@ -0,0 +1,22 @@ +From 98822d549689f09bd454b1cf462aae231931f64d Mon Sep 17 00:00:00 2001 +From: mancha <mancha1 AT zoho DOT com> +Date: Sat, 14 Feb 2015 +Subject: Fix compile with FreeType 2.5.1+ + +FREETYPE_INCLUDE_DIR_freetype2 & FREETYPE_INCLUDE_DIR_ft2build +might differ. Include both. + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -171,6 +171,7 @@ include_directories( + ${X11_Xrender_INCLUDE_PATH} + ${X11_Xrandr_INCLUDE_PATH} + ${FREETYPE_INCLUDE_DIR_freetype2} ++ ${FREETYPE_INCLUDE_DIR_ft2build} + ${X11_Xmu_INCLUDE_PATH} + ${ZLIB_INCLUDE_DIR} + ${JPEG_INCLUDE_DIR} diff --git a/system/slim/slim.SlackBuild b/system/slim/slim.SlackBuild index 83d755e84f..67c197780a 100644 --- a/system/slim/slim.SlackBuild +++ b/system/slim/slim.SlackBuild @@ -2,11 +2,10 @@ # Slackware build script for SLiM -# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com - # Copyright 2006 Martin Lefebvre <dadexter@gmail.com> # Copyright 2007-2009 Frank Caraballo <fecaraballo{at}gmail{dot}com> # Copyright 2010,2013 Niels Horn, Rio de Janeiro, Brazil +# Copyright 2014 Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,6 +24,8 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Maintained by David Spencer <baildon.research@googlemail.com> PRGNAM=slim VERSION=${VERSION:-1.3.6} @@ -77,6 +78,8 @@ find -L . \ patch -p0 < $CWD/slim.conf.patch # disable slimlock build patch -p0 < $CWD/CMakeLists.txt.patch +# Fix for freetype-2.5.5 headers +patch -p1 < $CWD/slim-1.3.6_freetype-2.5.1.diff # Fix location of man-pages sed "s/share\/man/man/" -i CMakeLists.txt diff --git a/system/slim/slim.info b/system/slim/slim.info index 6148a46f07..562b7beaa5 100644 --- a/system/slim/slim.info +++ b/system/slim/slim.info @@ -6,5 +6,5 @@ MD5SUM="d40d256394f9ef34cef34d2aa9cb52e6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Ryan P.C. McQuen" -EMAIL="ryan.q@linux.com" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" |