[arch-commits] Commit in slim/repos/extra-x86_64 (15 files)

Evangelos Foutras foutrelis at archlinux.org
Sat Jan 12 12:17:42 UTC 2019


    Date: Saturday, January 12, 2019 @ 12:17:41
  Author: foutrelis
Revision: 343713

archrelease: copy trunk to extra-x86_64

Added:
  slim/repos/extra-x86_64/PKGBUILD
    (from rev 343712, slim/trunk/PKGBUILD)
  slim/repos/extra-x86_64/slim-1.3.6-add-sessiondir.patch
    (from rev 343712, slim/trunk/slim-1.3.6-add-sessiondir.patch)
  slim/repos/extra-x86_64/slim-1.3.6-default-path.patch
    (from rev 343712, slim/trunk/slim-1.3.6-default-path.patch)
  slim/repos/extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch
    (from rev 343712, slim/trunk/slim-1.3.6-fix-libslim-libraries.patch)
  slim/repos/extra-x86_64/slim-1.3.6-systemd-session.patch
    (from rev 343712, slim/trunk/slim-1.3.6-systemd-session.patch)
  slim/repos/extra-x86_64/slim.logrotate
    (from rev 343712, slim/trunk/slim.logrotate)
  slim/repos/extra-x86_64/slim.pam
    (from rev 343712, slim/trunk/slim.pam)
  slim/repos/extra-x86_64/slimlock.pam
    (from rev 343712, slim/trunk/slimlock.pam)
Deleted:
  slim/repos/extra-x86_64/PKGBUILD
  slim/repos/extra-x86_64/slim-1.3.6-add-sessiondir.patch
  slim/repos/extra-x86_64/slim-1.3.6-default-path.patch
  slim/repos/extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch
  slim/repos/extra-x86_64/slim-1.3.6-systemd-session.patch
  slim/repos/extra-x86_64/slim.logrotate
  slim/repos/extra-x86_64/slim.pam

----------------------------------------+
 PKGBUILD                               |  150 +++++++++++++++----------------
 slim-1.3.6-add-sessiondir.patch        |   56 +++++------
 slim-1.3.6-default-path.patch          |   22 ++--
 slim-1.3.6-fix-libslim-libraries.patch |   40 ++++----
 slim-1.3.6-systemd-session.patch       |   58 +++++------
 slim.logrotate                         |   18 +--
 slim.pam                               |   14 +-
 slimlock.pam                           |    3 
 8 files changed, 183 insertions(+), 178 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-12 12:17:30 UTC (rev 343712)
+++ PKGBUILD	2019-01-12 12:17:41 UTC (rev 343713)
@@ -1,74 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Thayer Williams <thayer at archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Hugo Ideler <hugoideler at dse.nl>
-
-pkgname=slim
-pkgver=1.3.6
-pkgrel=7
-pkgdesc="Desktop-independent graphical login manager for X11"
-arch=('x86_64')
-url="http://sourceforge.net/projects/slim.berlios/"
-license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth'
-         'ttf-font')
-makedepends=('cmake' 'freeglut')
-backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim'
-        'etc/slimlock.conf')
-source=(https://downloads.sourceforge.net/project/slim.berlios/$pkgname-$pkgver.tar.gz
-        slim-1.3.6-fix-libslim-libraries.patch
-        slim-1.3.6-add-sessiondir.patch
-        slim-1.3.6-systemd-session.patch
-        slim-1.3.6-default-path.patch
-        slim.pam
-        slim.logrotate)
-sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df'
-            '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0'
-            '0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd'
-            '900b7ffe723b741c05bcc0ca857f300a2131a0029c6532eb17be935451bf2c70'
-            '1e303eda65a06edc8c2d938ab0751ae7744effae48cc185fd27d3cc5b2561522'
-            'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4'
-            '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Fix installation path of slim.service
-  sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
-
-  patch -Np1 -i ../slim-1.3.6-fix-libslim-libraries.patch
-  patch -Np1 -i ../slim-1.3.6-add-sessiondir.patch
-  patch -Np1 -i ../slim-1.3.6-systemd-session.patch
-  patch -Np1 -i ../slim-1.3.6-default-path.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DUSE_PAM=yes \
-    -DUSE_CONSOLEKIT=no
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim"
-  install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim"
-  install -Dm644 slimlock.conf "$pkgdir/etc/slimlock.conf"
-
-  # Provide sane defaults
-  sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \
-         -e 's|/var/run/slim.lock|/var/lock/slim.lock|' \
-    "$pkgdir/etc/slim.conf"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: slim/repos/extra-x86_64/PKGBUILD (from rev 343712, slim/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-12 12:17:41 UTC (rev 343713)
@@ -0,0 +1,76 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Thayer Williams <thayer at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Hugo Ideler <hugoideler at dse.nl>
+
+pkgname=slim
+pkgver=1.3.6
+pkgrel=8
+pkgdesc="Desktop-independent graphical login manager for X11"
+arch=('x86_64')
+url="http://sourceforge.net/projects/slim.berlios/"
+license=('GPL2')
+depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth'
+         'ttf-font')
+makedepends=('cmake' 'freeglut')
+backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim'
+        'etc/slimlock.conf')
+source=(https://downloads.sourceforge.net/project/slim.berlios/$pkgname-$pkgver.tar.gz
+        slim-1.3.6-fix-libslim-libraries.patch
+        slim-1.3.6-add-sessiondir.patch
+        slim-1.3.6-systemd-session.patch
+        slim-1.3.6-default-path.patch
+        slim.pam
+        slimlock.pam
+        slim.logrotate)
+sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df'
+            '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0'
+            '0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd'
+            '900b7ffe723b741c05bcc0ca857f300a2131a0029c6532eb17be935451bf2c70'
+            '1e303eda65a06edc8c2d938ab0751ae7744effae48cc185fd27d3cc5b2561522'
+            'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4'
+            'dfe35488b50f19fd96526374edc16850ed37dac919834dd579392b1a7518f2ab'
+            '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix installation path of slim.service
+  sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
+
+  patch -Np1 -i ../slim-1.3.6-fix-libslim-libraries.patch
+  patch -Np1 -i ../slim-1.3.6-add-sessiondir.patch
+  patch -Np1 -i ../slim-1.3.6-systemd-session.patch
+  patch -Np1 -i ../slim-1.3.6-default-path.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DUSE_PAM=yes \
+    -DUSE_CONSOLEKIT=no
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim"
+  install -Dm644 "$srcdir/slimlock.pam" "$pkgdir/etc/pam.d/slimlock"
+  install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim"
+  install -Dm644 slimlock.conf "$pkgdir/etc/slimlock.conf"
+
+  # Provide sane defaults
+  sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \
+         -e 's|/var/run/slim.lock|/var/lock/slim.lock|' \
+    "$pkgdir/etc/slim.conf"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: slim-1.3.6-add-sessiondir.patch
===================================================================
--- slim-1.3.6-add-sessiondir.patch	2019-01-12 12:17:30 UTC (rev 343712)
+++ slim-1.3.6-add-sessiondir.patch	2019-01-12 12:17:41 UTC (rev 343713)
@@ -1,28 +0,0 @@
-From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001
-From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
-Date: Wed, 02 Oct 2013 23:23:24 +0000
-Subject: Update slim.conf. Add sessiondir.
-
-Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at 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

Copied: slim/repos/extra-x86_64/slim-1.3.6-add-sessiondir.patch (from rev 343712, slim/trunk/slim-1.3.6-add-sessiondir.patch)
===================================================================
--- slim-1.3.6-add-sessiondir.patch	                        (rev 0)
+++ slim-1.3.6-add-sessiondir.patch	2019-01-12 12:17:41 UTC (rev 343713)
@@ -0,0 +1,28 @@
+From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001
+From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Date: Wed, 02 Oct 2013 23:23:24 +0000
+Subject: Update slim.conf. Add sessiondir.
+
+Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at 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

Deleted: slim-1.3.6-default-path.patch
===================================================================
--- slim-1.3.6-default-path.patch	2019-01-12 12:17:30 UTC (rev 343712)
+++ slim-1.3.6-default-path.patch	2019-01-12 12:17:41 UTC (rev 343713)
@@ -1,11 +0,0 @@
-diff -uprw slim-1.3.6.orig/slim.conf slim-1.3.6/slim.conf
---- slim-1.3.6.orig/slim.conf	2017-11-26 09:54:56.774671269 +0200
-+++ slim-1.3.6/slim.conf	2017-11-26 10:10:15.520730363 +0200
-@@ -1,6 +1,6 @@
- # Path, X server and arguments (if needed)
- # Note: -xauth $authfile is automatically appended
--default_path        /bin:/usr/bin:/usr/local/bin
-+default_path        /usr/local/bin:/usr/local/sbin:/usr/bin
- default_xserver     /usr/bin/X
- #xserver_arguments   -dpi 75
- 

Copied: slim/repos/extra-x86_64/slim-1.3.6-default-path.patch (from rev 343712, slim/trunk/slim-1.3.6-default-path.patch)
===================================================================
--- slim-1.3.6-default-path.patch	                        (rev 0)
+++ slim-1.3.6-default-path.patch	2019-01-12 12:17:41 UTC (rev 343713)
@@ -0,0 +1,11 @@
+diff -uprw slim-1.3.6.orig/slim.conf slim-1.3.6/slim.conf
+--- slim-1.3.6.orig/slim.conf	2017-11-26 09:54:56.774671269 +0200
++++ slim-1.3.6/slim.conf	2017-11-26 10:10:15.520730363 +0200
+@@ -1,6 +1,6 @@
+ # Path, X server and arguments (if needed)
+ # Note: -xauth $authfile is automatically appended
+-default_path        /bin:/usr/bin:/usr/local/bin
++default_path        /usr/local/bin:/usr/local/sbin:/usr/bin
+ default_xserver     /usr/bin/X
+ #xserver_arguments   -dpi 75
+ 

Deleted: slim-1.3.6-fix-libslim-libraries.patch
===================================================================
--- slim-1.3.6-fix-libslim-libraries.patch	2019-01-12 12:17:30 UTC (rev 343712)
+++ slim-1.3.6-fix-libslim-libraries.patch	2019-01-12 12:17:41 UTC (rev 343713)
@@ -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}
- )

Copied: slim/repos/extra-x86_64/slim-1.3.6-fix-libslim-libraries.patch (from rev 343712, slim/trunk/slim-1.3.6-fix-libslim-libraries.patch)
===================================================================
--- slim-1.3.6-fix-libslim-libraries.patch	                        (rev 0)
+++ slim-1.3.6-fix-libslim-libraries.patch	2019-01-12 12:17:41 UTC (rev 343713)
@@ -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}
+ )

Deleted: slim-1.3.6-systemd-session.patch
===================================================================
--- slim-1.3.6-systemd-session.patch	2019-01-12 12:17:30 UTC (rev 343712)
+++ slim-1.3.6-systemd-session.patch	2019-01-12 12:17:41 UTC (rev 343713)
@@ -1,29 +0,0 @@
---- a/app.cpp	2013-10-23 16:19:57.074100282 -0400
-+++ b/app.cpp	2013-10-23 16:33:13.302122574 -0400
-@@ -829,8 +829,13 @@
- 
- 	StopServer();
- 	RemoveLock();
--	while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
--	Run();
-+	if (force_nodaemon) {
-+		delete LoginPanel;
-+		exit(ERR_EXIT); /* use ERR_EXIT so that systemd's RESTART=on-failure works */
-+	} else {
-+		while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
-+		Run();
-+	}
- }
- 
- void App::KillAllClients(Bool top) {
---- a/slim.service	2013-10-23 16:19:57.074100282 -0400
-+++ b/slim.service	2013-10-23 16:45:14.901142776 -0400
-@@ -4,6 +4,7 @@
- 
- [Service]
- ExecStart=/usr/bin/slim -nodaemon
-+Restart=on-failure
- 
- [Install]
- Alias=display-manager.service
-Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes

Copied: slim/repos/extra-x86_64/slim-1.3.6-systemd-session.patch (from rev 343712, slim/trunk/slim-1.3.6-systemd-session.patch)
===================================================================
--- slim-1.3.6-systemd-session.patch	                        (rev 0)
+++ slim-1.3.6-systemd-session.patch	2019-01-12 12:17:41 UTC (rev 343713)
@@ -0,0 +1,29 @@
+--- a/app.cpp	2013-10-23 16:19:57.074100282 -0400
++++ b/app.cpp	2013-10-23 16:33:13.302122574 -0400
+@@ -829,8 +829,13 @@
+ 
+ 	StopServer();
+ 	RemoveLock();
+-	while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
+-	Run();
++	if (force_nodaemon) {
++		delete LoginPanel;
++		exit(ERR_EXIT); /* use ERR_EXIT so that systemd's RESTART=on-failure works */
++	} else {
++		while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
++		Run();
++	}
+ }
+ 
+ void App::KillAllClients(Bool top) {
+--- a/slim.service	2013-10-23 16:19:57.074100282 -0400
++++ b/slim.service	2013-10-23 16:45:14.901142776 -0400
+@@ -4,6 +4,7 @@
+ 
+ [Service]
+ ExecStart=/usr/bin/slim -nodaemon
++Restart=on-failure
+ 
+ [Install]
+ Alias=display-manager.service
+Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes

Deleted: slim.logrotate
===================================================================
--- slim.logrotate	2019-01-12 12:17:30 UTC (rev 343712)
+++ slim.logrotate	2019-01-12 12:17:41 UTC (rev 343713)
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}

Copied: slim/repos/extra-x86_64/slim.logrotate (from rev 343712, slim/trunk/slim.logrotate)
===================================================================
--- slim.logrotate	                        (rev 0)
+++ slim.logrotate	2019-01-12 12:17:41 UTC (rev 343713)
@@ -0,0 +1,9 @@
+/var/log/slim.log {
+    compress
+    rotate 1
+    size 1024k
+    notifempty
+    missingok
+    copytruncate
+    noolddir
+}

Deleted: slim.pam
===================================================================
--- slim.pam	2019-01-12 12:17:30 UTC (rev 343712)
+++ slim.pam	2019-01-12 12:17:41 UTC (rev 343713)
@@ -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

Copied: slim/repos/extra-x86_64/slim.pam (from rev 343712, slim/trunk/slim.pam)
===================================================================
--- slim.pam	                        (rev 0)
+++ slim.pam	2019-01-12 12:17:41 UTC (rev 343713)
@@ -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

Copied: slim/repos/extra-x86_64/slimlock.pam (from rev 343712, slim/trunk/slimlock.pam)
===================================================================
--- slimlock.pam	                        (rev 0)
+++ slimlock.pam	2019-01-12 12:17:41 UTC (rev 343713)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+
+auth        include     system-local-login


More information about the arch-commits mailing list