From 26768e90e352fed2605198288b5b26ef531a7eae Mon Sep 17 00:00:00 2001 From: milisbir Date: Wed, 9 Aug 2017 17:03:16 +0300 Subject: [PATCH] slim.guncellendi --- .../slim/slim-1.3.6-add-sessiondir.patch | 28 +++++++++++++++ .../slim-1.3.6-fix-libslim-libraries.patch | 20 +++++++++++ talimatname/genel/slim/slim.conf | 8 ++--- talimatname/genel/slim/slim.logrotate | 9 +++++ talimatname/genel/slim/slim.pam | 7 ++++ talimatname/genel/slim/slim.rc | 29 --------------- talimatname/genel/slim/talimat | 36 +++++++++++++------ 7 files changed, 92 insertions(+), 45 deletions(-) create mode 100644 talimatname/genel/slim/slim-1.3.6-add-sessiondir.patch create mode 100644 talimatname/genel/slim/slim-1.3.6-fix-libslim-libraries.patch create mode 100644 talimatname/genel/slim/slim.logrotate create mode 100644 talimatname/genel/slim/slim.pam delete mode 100644 talimatname/genel/slim/slim.rc diff --git a/talimatname/genel/slim/slim-1.3.6-add-sessiondir.patch b/talimatname/genel/slim/slim-1.3.6-add-sessiondir.patch new file mode 100644 index 000000000..f6abf0bc7 --- /dev/null +++ b/talimatname/genel/slim/slim-1.3.6-add-sessiondir.patch @@ -0,0 +1,28 @@ +From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Wed, 02 Oct 2013 23:23:24 +0000 +Subject: Update slim.conf. Add sessiondir. + +Signed-off-by: Nobuhiro Iwamatsu +--- +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 diff --git a/talimatname/genel/slim/slim-1.3.6-fix-libslim-libraries.patch b/talimatname/genel/slim/slim-1.3.6-fix-libslim-libraries.patch new file mode 100644 index 000000000..b6c90f9f4 --- /dev/null +++ b/talimatname/genel/slim/slim-1.3.6-fix-libslim-libraries.patch @@ -0,0 +1,20 @@ +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} + ) diff --git a/talimatname/genel/slim/slim.conf b/talimatname/genel/slim/slim.conf index 115e4905d..951328886 100644 --- a/talimatname/genel/slim/slim.conf +++ b/talimatname/genel/slim/slim.conf @@ -47,12 +47,8 @@ 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,mate,openbox,kde,lxqt - +# yüklü oturumları gösterir. +sessiondir /usr/share/xsessions/ # Executed when pressing F11 (requires imagemagick) screenshot_cmd import -window root /slim.png diff --git a/talimatname/genel/slim/slim.logrotate b/talimatname/genel/slim/slim.logrotate new file mode 100644 index 000000000..26ec3b0f4 --- /dev/null +++ b/talimatname/genel/slim/slim.logrotate @@ -0,0 +1,9 @@ +/var/log/slim.log { + compress + rotate 1 + size 1024k + notifempty + missingok + copytruncate + noolddir +} diff --git a/talimatname/genel/slim/slim.pam b/talimatname/genel/slim/slim.pam new file mode 100644 index 000000000..1ab7fb091 --- /dev/null +++ b/talimatname/genel/slim/slim.pam @@ -0,0 +1,7 @@ +#%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 diff --git a/talimatname/genel/slim/slim.rc b/talimatname/genel/slim/slim.rc deleted file mode 100644 index 400802af3..000000000 --- a/talimatname/genel/slim/slim.rc +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/slim: start/stop slim -# -. /lib/lsb/init-functions - -case $1 in -start) - log_info_msg "Yerel ayarlar eklendi..." - yerel_ayar - log_info_msg "SLIM başlatılıyor..." - /usr/bin/slim -d - ;; -stop) - log_info_msg "SLIM durduruluyor..." - killall /usr/bin/slim - ;; -restart) - log_info_msg "SLIM yebaşlatılıyor..." - $0 stop - sleep 2 - $0 start - ;; -*) - echo "usage: $0 [start|stop|restart]" - ;; -esac - -# End of file diff --git a/talimatname/genel/slim/talimat b/talimatname/genel/slim/talimat index a2b8f26f7..e01d3be8f 100644 --- a/talimatname/genel/slim/talimat +++ b/talimatname/genel/slim/talimat @@ -5,29 +5,37 @@ name=slim version=1.3.6 -release=3 +release=4 source=(http://downloads.sourceforge.net/project/slim.berlios/slim-$version.tar.gz - $name.rc background.jpg https://raw.githubusercontent.com/yakar/milis-linux-wallpapers/master/milis-linux-tree.png slim.conf - slim.rc + slim-1.3.6-fix-libslim-libraries.patch + slim-1.3.6-add-sessiondir.patch + slim.pam + slim.logrotate slim.theme) build () { cd $name-$version - # Slimlock inşa etmeyin (pam nedeniyle) - sed -i -e 's:${MANDIR}:/usr/man:g' -e '224d' CMakeLists.txt + sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt - cmake -DCMAKE_INSTALL_PREFIX=/usr + patch -Np1 -i ../slim-1.3.6-fix-libslim-libraries.patch + patch -Np1 -i ../slim-1.3.6-add-sessiondir.patch - make + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DUSE_PAM=yes \ + -DUSE_CONSOLEKIT=no + + make make DESTDIR=$PKG install mkdir $PKG/etc/rc.d/ mkdir $PKG/etc/rc.d/init.d cp $SRC/slim.conf $PKG/etc/ - install -m 755 ../$name.rc $PKG/etc/rc.d/init.d/$name cd ../ install -d $PKG/usr/share/slim/themes/milis @@ -35,10 +43,18 @@ build () { 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/lib $PKG/usr/man/man1/slimlock.1 + rm -r $PKG/usr/lib/systemd $PKG/usr/share/man cd /sources/milis.git/ayarlar/servisler make DESTDIR=$PKG kur-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" }