mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-04 20:29:09 +01:00
system/slim: Fix build for new freetype.
Thanks to mancha, Alan Ianson, and many more :-) Signed-off-by: David Spencer <baildon.research@googlemail.com>
This commit is contained in:
parent
01b084c830
commit
8dc1198e5a
6 changed files with 34 additions and 10 deletions
|
@ -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'.
|
||||
|
|
|
@ -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:
|
||||
|
|
Binary file not shown.
22
system/slim/slim-1.3.6_freetype-2.5.1.diff
Normal file
22
system/slim/slim-1.3.6_freetype-2.5.1.diff
Normal file
|
@ -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}
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue