slim.guncellendi
This commit is contained in:
parent
4b1ac7258d
commit
ae7a74de5f
8 changed files with 96 additions and 98 deletions
14
talimatname/genel/slim/CMakeLists.txt.patch
Normal file
14
talimatname/genel/slim/CMakeLists.txt.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
--- CMakeLists.txt.orig 2014-08-08 07:24:01.864876514 -0700
|
||||||
|
+++ CMakeLists.txt 2014-08-08 07:24:51.980873088 -0700
|
||||||
|
@@ -221,7 +221,10 @@
|
||||||
|
####### install
|
||||||
|
# slim
|
||||||
|
install(TARGETS slim RUNTIME DESTINATION bin)
|
||||||
|
-install(TARGETS slimlock RUNTIME DESTINATION bin)
|
||||||
|
+## we have to comment this out or else
|
||||||
|
+## build will fail on slackware as pam
|
||||||
|
+## is required for slimlock
|
||||||
|
+#install(TARGETS slimlock RUNTIME DESTINATION bin)
|
||||||
|
|
||||||
|
if (BUILD_SHARED_LIBS)
|
||||||
|
set_target_properties(libslim PROPERTIES
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
|
|
||||||
Date: Wed, 02 Oct 2013 23:23:24 +0000
|
|
||||||
Subject: Update slim.conf. Add sessiondir.
|
|
||||||
|
|
||||||
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
|
|
||||||
---
|
|
||||||
diff --git a/slim.conf b/slim.conf
|
|
||||||
index a8e2e1c..c5f1d38 100644
|
|
||||||
--- a/slim.conf
|
|
||||||
+++ b/slim.conf
|
|
||||||
@@ -47,11 +47,9 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session
|
|
||||||
# options "-d" and "-nodaemon"
|
|
||||||
# daemon yes
|
|
||||||
|
|
||||||
-# Available sessions (first one is the default).
|
|
||||||
-# The current chosen session name is replaced in the login_cmd
|
|
||||||
-# above, so your login command can handle different sessions.
|
|
||||||
-# see the xinitrc.sample file shipped with slim sources
|
|
||||||
-sessions xfce4,icewm-session,wmaker,blackbox
|
|
||||||
+# Set directory that contains the xsessions.
|
|
||||||
+# slim reads xsesion from this directory, and be able to select.
|
|
||||||
+sessiondir /usr/share/xsessions/
|
|
||||||
|
|
||||||
# Executed when pressing F11 (requires imagemagick)
|
|
||||||
screenshot_cmd import -window root /slim.png
|
|
||||||
--
|
|
||||||
cgit v0.9.2
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
|
|
||||||
--- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300
|
|
||||||
+++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300
|
|
||||||
@@ -119,6 +119,7 @@ if(USE_PAM)
|
|
||||||
if(PAM_FOUND)
|
|
||||||
message("\tPAM Found")
|
|
||||||
set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
|
|
||||||
+ target_link_libraries(libslim ${PAM_LIBRARY})
|
|
||||||
target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
|
|
||||||
target_link_libraries(slimlock ${PAM_LIBRARY})
|
|
||||||
include_directories(${PAM_INCLUDE_DIR})
|
|
||||||
@@ -178,6 +179,8 @@ include_directories(
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_libraries(libslim
|
|
||||||
+ ${X11_Xft_LIB}
|
|
||||||
+ ${X11_Xrandr_LIB}
|
|
||||||
${JPEG_LIBRARIES}
|
|
||||||
${PNG_LIBRARIES}
|
|
||||||
)
|
|
||||||
22
talimatname/genel/slim/slim-1.3.6_freetype-2.5.1.diff
Normal file
22
talimatname/genel/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}
|
||||||
11
talimatname/genel/slim/slim.conf.patch
Normal file
11
talimatname/genel/slim/slim.conf.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- slim.conf.orig 2014-08-07 21:04:23.591900466 -0700
|
||||||
|
+++ slim.conf 2014-08-07 21:05:44.455894937 -0700
|
||||||
|
@@ -9,6 +9,8 @@
|
||||||
|
reboot_cmd /sbin/shutdown -r now
|
||||||
|
console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
|
||||||
|
#suspend_cmd /usr/sbin/suspend
|
||||||
|
+## slackware suspend command
|
||||||
|
+suspend_cmd /usr/sbin/pm-suspend
|
||||||
|
|
||||||
|
# Full path to the xauth binary
|
||||||
|
xauth_path /usr/bin/xauth
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
/var/log/slim.log {
|
/var/log/slim.log {
|
||||||
compress
|
compress
|
||||||
rotate 1
|
rotate 4
|
||||||
size 1024k
|
size=1M
|
||||||
notifempty
|
notifempty
|
||||||
missingok
|
missingok
|
||||||
copytruncate
|
copytruncate
|
||||||
noolddir
|
noolddir
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
#%PAM-1.0
|
|
||||||
|
|
||||||
auth include system-local-login
|
|
||||||
-auth optional pam_gnome_keyring.so
|
|
||||||
account include system-local-login
|
|
||||||
session include system-local-login
|
|
||||||
-session optional pam_gnome_keyring.so auto_start
|
|
||||||
|
|
@ -10,51 +10,57 @@ source=(http://downloads.sourceforge.net/project/slim.berlios/slim-$version.tar.
|
||||||
background.jpg
|
background.jpg
|
||||||
https://raw.githubusercontent.com/yakar/milis-linux-wallpapers/master/milis-linux-tree.png
|
https://raw.githubusercontent.com/yakar/milis-linux-wallpapers/master/milis-linux-tree.png
|
||||||
slim.conf
|
slim.conf
|
||||||
slim-1.3.6-fix-libslim-libraries.patch
|
slim.conf.patch
|
||||||
slim-1.3.6-add-sessiondir.patch
|
CMakeLists.txt.patch
|
||||||
slim.pam
|
slim-1.3.6_freetype-2.5.1.diff
|
||||||
slim.logrotate
|
slim.logrotate
|
||||||
slim.theme)
|
slim.theme)
|
||||||
|
|
||||||
build () {
|
build () {
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
|
|
||||||
sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
|
patch -p0 < $SRC/slim.conf.patch
|
||||||
|
patch -p0 < $SRC/CMakeLists.txt.patch
|
||||||
|
patch -p1 < $SRC/slim-1.3.6_freetype-2.5.1.diff
|
||||||
|
|
||||||
patch -Np1 -i ../slim-1.3.6-fix-libslim-libraries.patch
|
# Fix location of man-pages
|
||||||
patch -Np1 -i ../slim-1.3.6-add-sessiondir.patch
|
sed "s/share\/man/man/" -i CMakeLists.txt
|
||||||
|
sed -i "s/DESTINATION lib/DESTINATION lib64/" CMakeLists.txt
|
||||||
|
|
||||||
cmake \
|
mkdir -p build
|
||||||
|
|
||||||
|
|
||||||
|
cd build
|
||||||
|
cmake \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DUSE_CONSOLEKIT=no \
|
||||||
-DCMAKE_SKIP_RPATH=ON \
|
-DCMAKE_BUILD_TYPE=Release ..
|
||||||
-DUSE_PAM=yes \
|
make
|
||||||
-DUSE_CONSOLEKIT=no
|
make install DESTDIR=$PKG
|
||||||
|
cd ..
|
||||||
make
|
|
||||||
make DESTDIR=$PKG install
|
|
||||||
mkdir $PKG/etc/rc.d/
|
|
||||||
mkdir $PKG/etc/rc.d/init.d
|
|
||||||
cp $SRC/slim.conf $PKG/etc/
|
|
||||||
cd ../
|
|
||||||
|
|
||||||
install -d $PKG/usr/share/slim/themes/milis
|
mv $SRC/slim.conf $PKG/etc/slim.conf
|
||||||
cp $SRC/background.jpg $PKG/usr/share/slim/themes/milis/
|
|
||||||
cp $SRC/milis-linux-tree.png $PKG/usr/share/slim/themes/milis/panel.png
|
|
||||||
cp $SRC/slim.theme $PKG/usr/share/slim/themes/milis/
|
|
||||||
chmod 0644 $PKG/usr/share/slim/themes/milis/*
|
|
||||||
|
|
||||||
install -Dm644 "$SRC/slim.pam" "$PKG/etc/pam.d/slim"
|
|
||||||
install -Dm644 "$SRC/slim.logrotate" "$PKG/etc/logrotate.d/slim"
|
|
||||||
install -Dm644 $SRC/$name-$version/slimlock.conf "$PKG/etc/slimlock.conf"
|
|
||||||
|
|
||||||
# Systemd desteği yok
|
|
||||||
rm -r $PKG/usr/lib/systemd $PKG/usr/share/man
|
|
||||||
|
|
||||||
cd /sources/milis.git/ayarlar/servisler
|
mkdir -p $PKG/etc/logrotate.d
|
||||||
make DESTDIR=$PKG kur-slim
|
cat $SRC/slim.logrotate > $PKG/etc/logrotate.d/slim
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' -e 's|/var/run/slim.lock|/var/lock/slim.lock|' "$PKG/etc/slim.conf"
|
# Kill the incorrectly-placed (and useless anyway) systemd stuff
|
||||||
|
rm -rf $PKG/usr/usr
|
||||||
|
# Kill systemd stuff
|
||||||
|
rm -rf $PKG/lib
|
||||||
|
|
||||||
|
find $PKG/usr/man -type f -exec gzip -9 {} \;
|
||||||
|
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
|
||||||
|
|
||||||
|
# Remove slimlock as we don't build it
|
||||||
|
rm $PKG/usr/man/man1/slimlock.1.gz
|
||||||
|
|
||||||
|
install -d $PKG/usr/share/slim/themes/milis
|
||||||
|
cp $SRC/background.jpg $PKG/usr/share/slim/themes/milis/
|
||||||
|
cp $SRC/milis-linux-tree.png $PKG/usr/share/slim/themes/milis/panel.png
|
||||||
|
cp $SRC/slim.theme $PKG/usr/share/slim/themes/milis/
|
||||||
|
chmod 0644 $PKG/usr/share/slim/themes/milis/*
|
||||||
|
|
||||||
|
cd /sources/milis.git/ayarlar/servisler
|
||||||
|
make DESTDIR=$PKG kur-slim
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue