* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/
@ 2015-09-21 17:00 Ian Stakenvicius
0 siblings, 0 replies; 4+ messages in thread
From: Ian Stakenvicius @ 2015-09-21 17:00 UTC (permalink / raw
To: gentoo-commits
commit: 55fa9dd65d9b67ce91db08adce9810357917c3dc
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 17:34:55 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 16:59:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55fa9dd6
x11-misc/slim: add live ebuild
Package-Manager: portage-2.2.20.1
x11-misc/slim/files/slim-9999-config.diff | 70 +++++++++++++++++
x11-misc/slim/slim-9999.ebuild | 125 ++++++++++++++++++++++++++++++
2 files changed, 195 insertions(+)
diff --git a/x11-misc/slim/files/slim-9999-config.diff b/x11-misc/slim/files/slim-9999-config.diff
new file mode 100644
index 0000000..81f0fee
--- /dev/null
+++ b/x11-misc/slim/files/slim-9999-config.diff
@@ -0,0 +1,70 @@
+diff --git a/slim.conf b/slim.conf
+index 2c72255..7af4adb 100644
+--- a/slim.conf
++++ b/slim.conf
+@@ -2,7 +2,7 @@
+ # Note: -xauth $authfile is automatically appended
+ default_path /bin:/usr/bin:/usr/local/bin
+ default_xserver /usr/bin/X
+-#xserver_arguments -dpi 75
++xserver_arguments -nolisten tcp -br -deferglyphs 16 vt07
+
+ # Commands for halt, login, etc.
+ halt_cmd /sbin/shutdown -h now
+@@ -18,7 +18,7 @@ authfile /var/run/slim.auth
+
+
+ # Activate numlock when slim starts. Valid values: on|off
+-# numlock on
++numlock on
+
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+@@ -33,19 +33,20 @@ authfile /var/run/slim.auth
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd exec /bin/sh - ~/.xinitrc %session
+-login_cmd exec /bin/bash -login ~/.xinitrc %session
++# login_cmd exec /bin/bash -login ~/.xinitrc %session
++login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session
+
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+ # sessreg. You can use the %user variable
+ #
+-# sessionstart_cmd some command
+-# sessionstop_cmd some command
++sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user
++sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user
+
+ # Start in daemon mode. Valid values: yes | no
+ # Note that this can be overriden by the command line
+ # options "-d" and "-nodaemon"
+-# daemon yes
++daemon yes
+
+ # Available sessions:
+ # The current chosen session name replaces %session in the login_cmd
+@@ -63,7 +64,10 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session
+ sessiondir /usr/share/xsessions
+
+ # Executed when pressing F11 (requires imagemagick for 'import')
+-screenshot_cmd import -window root /slim.png
++# Alternative: media-gfx/scrot. See Gentoo bug 252241 for more info.
++screenshot_cmd import -window root /tmp/slim.png
++#screenshot_cmd scrot /tmp/slim.png
++
+
+ # welcome message. Available variables: %host, %domain
+ welcome_msg Welcome to %host
+@@ -92,8 +96,8 @@ reboot_msg The system is rebooting...
+ # randomly choose from
+ current_theme default
+
+-# Lock file
+-lockfile /var/run/slim.lock
++# Lock file, /etc/init.d/xdm expects slim.pid
++lockfile /run/slim.pid
+
+ # Log file
+ logfile /var/log/slim.log
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
new file mode 100644
index 0000000..86ea64f
--- /dev/null
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+inherit cmake-utils pam eutils systemd versionator
+
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://github.com/axs-gentoo/slim-git.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://sourceforge.net/projects/slim.berlios/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="branding pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+RDEPEND="x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXft
+ x11-libs/libXrandr
+ media-libs/libpng:0=
+ virtual/jpeg:=
+ x11-apps/sessreg
+ consolekit? ( sys-auth/consolekit
+ sys-apps/dbus )
+ pam? ( virtual/pam
+ !x11-misc/slimlock )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ x11-proto/xproto"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+src_prepare() {
+ # Our Gentoo-specific config changes
+ epatch "${FILESDIR}"/${P}-config.diff
+
+ if use elibc_FreeBSD; then
+ sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
+ || die
+ fi
+
+ if use branding; then
+ sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf \
+ || die
+ fi
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use pam USE_PAM)
+ $(cmake-utils_use consolekit USE_CONSOLEKIT)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use pam ; then
+ pamd_mimic system-local-login slim auth account session
+ pamd_mimic system-local-login slimlock auth
+ fi
+
+ systemd_dounit build_files/slim.service
+
+ insinto /usr/share/slim
+ newins "${FILESDIR}/Xsession-r3" Xsession
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/slim.logrotate" slim
+
+ dodoc xinitrc.sample README THEMES
+}
+
+pkg_postinst() {
+ # note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog
+ elog "The configuration file is located at /etc/slim.conf."
+ elog
+ elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
+ elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
+ fi
+ if ! version_is_at_least "1.3.6" "${REPLACING_VERSIONS:-1.0}" ; then
+ elog
+ elog "By default, ${PN} is set up to provide X session selection based on the"
+ elog ".desktop entries in /usr/share/xsessions/ that are installed by each"
+ elog "DE, including ~/.xsession support via the 'Xsession' session. Sessions"
+ elog "are selected at login by pressing [F1]. As per the Xorg guide, each"
+ elog "user's default session can be specified by adding the name from"
+ elog "/etc/X11/Sessions to ~/.xsession."
+ elog
+ elog "The XSESSION environment variable is still supported as a default"
+ elog "if no session has been specified by the user."
+ elog
+ elog "If you want to use .xinitrc in the user's home directory for session"
+ elog "management instead, see README and xinitrc.sample in"
+ elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
+ elog "accordingly."
+ elog
+ if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.4}" ; then
+ ewarn "Please note that slim supports consolekit directly. Please do not use any "
+ ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
+ ewarn "and enable USE=\"consolekit\" instead."
+ ewarn
+ fi
+ fi
+ if ! use pam; then
+ elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
+ elog "the console when restarting your window manager. If this is not desired, then"
+ elog "please remerge ${PN} with USE=\"pam\""
+ elog
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/
@ 2023-05-29 6:14 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2023-05-29 6:14 UTC (permalink / raw
To: gentoo-commits
commit: 6c6f4d7ae3a6eb8e0fcf2606ff87329291f17bb9
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 06:11:26 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 29 06:11:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6f4d7a
x11-misc/slim: drop 1.3.6-r5, 1.3.9
Bug: https://bugs.gentoo.org/906312
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-misc/slim/Manifest | 2 -
x11-misc/slim/files/slim-1.3.5-arm.patch | 11 --
.../files/slim-1.3.5-disable-ck-for-systemd.patch | 122 -------------------
.../files/slim-1.3.6-add-missing-libgen_h.patch | 11 --
x11-misc/slim/files/slim-1.3.6-config.diff | 77 ------------
x11-misc/slim/files/slim-1.3.6-drop-zlib.patch | 10 --
.../slim-1.3.6-envcpy-bad-pointer-arithmetic.patch | 15 ---
.../files/slim-1.3.6-fix-slimlock-nopam-v2.patch | 26 ----
x11-misc/slim/files/slim-1.3.6-freetype.patch | 12 --
x11-misc/slim/files/slim-1.3.6-gcc11.patch | 12 --
x11-misc/slim/files/slim-1.3.6-honour-cflags.patch | 14 ---
.../files/slim-1.3.6-libslim-cmake-fixes.patch | 33 -----
.../slim/files/slim-1.3.6-session-chooser.patch | 115 ------------------
.../slim-1.3.6-strip-systemd-unit-install.patch | 13 --
.../slim/files/slim-1.3.6-systemd-session.patch | 29 -----
x11-misc/slim/files/slim-1.3.9-config.diff | 49 --------
.../slim/files/slim-1.3.9-greeter-session.diff | 12 --
x11-misc/slim/slim-1.3.6-r5.ebuild | 133 ---------------------
x11-misc/slim/slim-1.3.9.ebuild | 98 ---------------
19 files changed, 794 deletions(-)
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 6290a51df48d..0236f4cb80fe 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,3 +1 @@
-DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
-DIST slim-1.3.9.tar.gz 239609 BLAKE2B 41eec388b0d63bc720cb51f93707f69c4765800f4e69654fe5ebdcb280eb25775c7ed951163943b6f58884b0a9fb628e049d68a2faa7516b1f884adb080953c6 SHA512 607366a402479381858f8193db9b4da0a40eda15f4868cad9e7313b4a084390cf3cee80958f58a56d3e4383cf2fa9069960d1b20861068f921bd9ba89da7aec1
DIST slim-1.4.0.tar.gz 530318 BLAKE2B 507f22d09a3449b870bb5fd5a5f0ab1002ceee5372c82f702582809a5fc442088c17d79fedff6712e198cee672696388479604a194e5729c7bc12139770c833d SHA512 2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f
diff --git a/x11-misc/slim/files/slim-1.3.5-arm.patch b/x11-misc/slim/files/slim-1.3.5-arm.patch
deleted file mode 100644
index 9438ce4a1caf..000000000000
--- a/x11-misc/slim/files/slim-1.3.5-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Ck.cpp 2012-06-26 04:20:14.000000000 -0400
-+++ b/Ck.cpp 2012-10-05 13:25:29.000000000 -0400
-@@ -91,7 +91,7 @@
-
- vt = *((long *)return_value);
-
-- std::snprintf(device, 32, "/dev/tty%ld", vt);
-+ std::sprintf(device, "/dev/tty%ld", vt);
-
- if(return_value)
- XFree(return_value);
diff --git a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch b/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
deleted file mode 100644
index f7e361767615..000000000000
--- a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -Naur slim-1.3.5/app.cpp slim-1.3.5.new/app.cpp
---- slim-1.3.5/app.cpp 2012-12-31 08:03:42.000000000 -0500
-+++ slim-1.3.5.new/app.cpp 2013-08-22 14:16:37.994854259 -0400
-@@ -138,11 +138,14 @@
- daemonmode = false;
- force_nodaemon = false;
- firstlogin = true;
-+#ifdef USE_CONSOLEKIT
-+ consolekit_support_enabled = true;
-+#endif
- Dpy = NULL;
-
- /* Parse command line
- Note: we force a option for nodaemon switch to handle "-nodaemon" */
-- while((tmp = getopt(argc, argv, "vhp:n:d?")) != EOF) {
-+ while((tmp = getopt(argc, argv, "vhsp:n:d?")) != EOF) {
- switch (tmp) {
- case 'p': /* Test theme */
- testtheme = optarg;
-@@ -163,6 +166,11 @@
- std::cout << APPNAME << " version " << VERSION << endl;
- exit(OK_EXIT);
- break;
-+#ifdef USE_CONSOLEKIT
-+ case 's': /* Disable consolekit support */
-+ consolekit_support_enabled = false;
-+ break;
-+#endif
- case '?': /* Illegal */
- logStream << endl;
- case 'h': /* Help */
-@@ -171,6 +179,9 @@
- << " -d: daemon mode" << endl
- << " -nodaemon: no-daemon mode" << endl
- << " -v: show version" << endl
-+#ifdef USE_CONSOLEKIT
-+ << " -s: start for systemd, disable consolekit support" << endl
-+#endif
- << " -p /path/to/theme/dir: preview theme" << endl;
- exit(OK_EXIT);
- break;
-@@ -559,6 +570,7 @@
- #endif
-
- #ifdef USE_CONSOLEKIT
-+ if (consolekit_support_enabled) {
- /* Setup the ConsoleKit session */
- try {
- ck.open_session(DisplayName, pw->pw_uid);
-@@ -567,6 +579,7 @@
- logStream << APPNAME << ": " << e << endl;
- exit(ERR_EXIT);
- }
-+ }
- #endif
-
- /* Create new process */
-@@ -578,6 +591,7 @@
- char** child_env = pam.getenvlist();
-
- # ifdef USE_CONSOLEKIT
-+ if (consolekit_support_enabled) {
- char** old_env = child_env;
-
- /* Grow the copy of the environment for the session cookie */
-@@ -590,6 +604,7 @@
- memcpy(child_env, old_env, sizeof(char*)*n+1);
- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
- child_env[n] = NULL;
-+ }
- # endif /* USE_CONSOLEKIT */
- #else
-
-@@ -611,6 +626,7 @@
- child_env[n++]=StrConcat("MAIL=", maildir.c_str());
- child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
- # ifdef USE_CONSOLEKIT
-+ if (consolekit_support_enabled)
- child_env[n++]=StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
- # endif /* USE_CONSOLEKIT */
- child_env[n++]=0;
-@@ -656,12 +672,14 @@
- }
-
- #ifdef USE_CONSOLEKIT
-+ if (consolekit_support_enabled) {
- try {
- ck.close_session();
- }
- catch(Ck::Exception &e) {
- logStream << APPNAME << ": " << e << endl;
- };
-+ }
- #endif
-
- #ifdef USE_PAM
-diff -Naur slim-1.3.5/app.h slim-1.3.5.new/app.h
---- slim-1.3.5/app.h 2012-12-31 08:03:42.000000000 -0500
-+++ slim-1.3.5.new/app.h 2013-08-22 14:12:45.536850016 -0400
-@@ -108,6 +108,10 @@
- char *testtheme;
- bool testing;
-
-+#ifdef USE_CONSOLEKIT
-+ bool consolekit_support_enabled;
-+#endif
-+
- std::string themeName;
- std::string mcookie;
-
-diff -Naur slim-1.3.5/slim.service slim-1.3.5.new/slim.service
---- slim-1.3.5/slim.service 2012-12-31 08:03:42.000000000 -0500
-+++ slim-1.3.5.new/slim.service 2013-08-22 14:15:39.186853186 -0400
-@@ -3,7 +3,7 @@
- After=systemd-user-sessions.service
-
- [Service]
--ExecStart=/usr/bin/slim -nodaemon
-+ExecStart=/usr/bin/slim -nodaemon -s
-
- [Install]
- Alias=display-manager.service
diff --git a/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch b/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch
deleted file mode 100644
index f137d94e8367..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur slim-1.3.6.orig/panel.cpp slim-1.3.6/panel.cpp
---- slim-1.3.6.orig/panel.cpp 2014-06-18 11:04:57.958630814 -0400
-+++ slim-1.3.6/panel.cpp 2014-06-18 11:05:10.675631393 -0400
-@@ -11,6 +11,7 @@
-
- #include <sstream>
- #include <poll.h>
-+#include <libgen.h>
- #include <X11/extensions/Xrandr.h>
- #include "panel.h"
-
diff --git a/x11-misc/slim/files/slim-1.3.6-config.diff b/x11-misc/slim/files/slim-1.3.6-config.diff
deleted file mode 100644
index 561e6a99273c..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-config.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/slim.conf.orig 2010-08-25 11:52:23.000000000 -0400
-+++ b/slim.conf 2010-08-25 11:58:58.000000000 -0400
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path /bin:/usr/bin:/usr/local/bin
- default_xserver /usr/bin/X
--#xserver_arguments -dpi 75
-+xserver_arguments -nolisten tcp -br -deferglyphs 16 vt07
-
- # Commands for halt, login, etc.
- halt_cmd /sbin/shutdown -h now
-@@ -18,7 +18,7 @@
-
-
- # Activate numlock when slim starts. Valid values: on|off
--# numlock on
-+numlock on
-
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,7 +33,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd exec /bin/sh - ~/.xinitrc %session
--login_cmd exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd exec /bin/bash -login ~/.xinitrc %session
-+login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session
-
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -41,20 +42,30 @@
- #
- # sessionstart_cmd some command
- # sessionstop_cmd some command
-+sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user
-
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon yes
-+daemon yes
-
--# Available sessions (first one is the default).
--# The current chosen session name is replaced in the login_cmd
-+# Available sessions:
-+# The current chosen session name replaces %session in the login_cmd
- # above, so your login command can handle different sessions.
-+# If no session is chosen (via F1), %session will be an empty string.
- # see the xinitrc.sample file shipped with slim sources
--sessions xfce4,icewm-session,wmaker,blackbox
-+#sessions xfce4,icewm-session,wmaker,blackbox
-+# Alternatively, read available sessions from a directory of scripts:
-+#sessiondir /etc/X11/Sessions
-+# Or, read available sessions from the xsessions desktop files --
-+# note that this may provide a full path to the session executable!
-+sessiondir /usr/share/xsessions
-
--# Executed when pressing F11 (requires imagemagick)
-+# Executed when pressing F11 (requires media-gfx/imagemagick for import)
-+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
- screenshot_cmd import -window root /slim.png
-+#screenshot_cmd scrot /root/slim.png
-
- # welcome message. Available variables: %host, %domain
- welcome_msg Welcome to %host
-@@ -83,8 +91,8 @@
- # randomly choose from
- current_theme default
-
--# Lock file
--lockfile /var/run/slim.lock
-+# Lock file, /etc/init.d/xdm expects slim.pid
-+lockfile /run/slim.pid
-
- # Log file
- logfile /var/log/slim.log
diff --git a/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch b/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch
deleted file mode 100644
index cf2106a8a8eb..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt 2014-02-28 10:38:48.655262163 -0500
-+++ b/CMakeLists.txt 2014-02-28 10:47:01.671271162 -0500
-@@ -96,7 +96,6 @@
- find_package(Freetype REQUIRED)
- find_package(JPEG REQUIRED)
- find_package(PNG REQUIRED)
--find_package(ZLIB REQUIRED)
-
- # Fontconfig
- set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH})
diff --git a/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch b/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
deleted file mode 100644
index b3787dd58459..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/app.cpp 2015-09-14 12:00:00.460481656 -0400
-+++ b/app.cpp 2015-09-14 14:41:10.970536588 -0400
-@@ -606,9 +606,9 @@
-
- n++;
-
-- child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-- memcpy(child_env, old_env, sizeof(char*)*n+1);
-- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
-+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
-+ memcpy(child_env, old_env, sizeof(char*)*n);
-+ child_env[n-1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
- child_env[n] = NULL;
- }
- # endif /* USE_CONSOLEKIT */
diff --git a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
deleted file mode 100644
index d5fc4db4838d..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/CMakeLists.txt 2013-10-27 21:24:21.193802669 -0400
-+++ b/CMakeLists.txt 2013-10-27 21:26:54.127806951 -0400
-@@ -220,7 +220,6 @@
- ####### install
- # slim
- install(TARGETS slim RUNTIME DESTINATION bin)
--install(TARGETS slimlock RUNTIME DESTINATION bin)
-
- if (BUILD_SHARED_LIBS)
- set_target_properties(libslim PROPERTIES
-@@ -235,8 +234,14 @@
-
- # man file
- install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
--install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
- # configure
- install(FILES slim.conf DESTINATION ${SYSCONFDIR})
-+
-+#slimlock
-+if(BUILD_SLIMLOCK)
-+install(TARGETS slimlock RUNTIME DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
-+install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
-+endif(BUILD_SLIMLOCK)
-+
- # themes directory
- subdirs(themes)
diff --git a/x11-misc/slim/files/slim-1.3.6-freetype.patch b/x11-misc/slim/files/slim-1.3.6-freetype.patch
deleted file mode 100644
index fe2aa60ad1b6..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-freetype.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
---- a/CMakeLists.txt.orig 2014-11-11 20:38:40.706121207 +0100
-+++ b/CMakeLists.txt 2014-11-11 20:39:34.206120264 +0100
-@@ -165,7 +165,7 @@ include_directories(
- ${X11_Xft_INCLUDE_PATH}
- ${X11_Xrender_INCLUDE_PATH}
- ${X11_Xrandr_INCLUDE_PATH}
-- ${FREETYPE_INCLUDE_DIR_freetype2}
-+ ${FREETYPE_INCLUDE_DIRS}
- ${X11_Xmu_INCLUDE_PATH}
- ${ZLIB_INCLUDE_DIR}
- ${JPEG_INCLUDE_DIR}
diff --git a/x11-misc/slim/files/slim-1.3.6-gcc11.patch b/x11-misc/slim/files/slim-1.3.6-gcc11.patch
deleted file mode 100644
index a6b07c637780..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/786498
---- a/panel.cpp
-+++ b/panel.cpp
-@@ -48,7 +48,7 @@
- gcm = GCGraphicsExposures;
- gcv.graphics_exposures = False;
- WinGC = XCreateGC(Dpy, Win, gcm, &gcv);
-- if (WinGC < 0) {
-+ if (WinGC == 0) {
- cerr << APPNAME
- << ": failed to create pixmap\n.";
- exit(ERR_EXIT);
diff --git a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
deleted file mode 100644
index 2a43be75fb02..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt 2013-10-01 18:38:05.000000000 -0400
-+++ b/CMakeLists.txt.new 2013-10-15 11:33:18.975741094 -0400
-@@ -42,11 +42,6 @@
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
-
--# Flags
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2")
--set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")
--
- # source
- set(slim_srcs
- main.cpp
diff --git a/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch b/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch
deleted file mode 100644
index 11e39dc97628..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/CMakeLists.txt 2013-10-15 11:35:16.688739802 -0400
-+++ b/CMakeLists.txt 2013-10-15 11:53:46.185727620 -0400
-@@ -115,6 +115,7 @@
- message("\tPAM Found")
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
- target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
-+ target_link_libraries(libslim ${PAM_LIBRARY})
- target_link_libraries(slimlock ${PAM_LIBRARY})
- include_directories(${PAM_INCLUDE_DIR})
- else(PAM_FOUND)
-@@ -173,7 +174,10 @@
- )
-
- target_link_libraries(libslim
-- ${JPEG_LIBRARIES}
-+ ${RT_LIB}
-+ ${X11_Xft_LIB}
-+ ${X11_Xrandr_LIB}
-+ ${JPEG_LIBRARIES}
- ${PNG_LIBRARIES}
- )
-
-@@ -228,8 +228,8 @@
- SOVERSION ${SLIM_VERSION})
-
- install(TARGETS libslim
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SIFFUX}
- )
- endif (BUILD_SHARED_LIBS)
-
diff --git a/x11-misc/slim/files/slim-1.3.6-session-chooser.patch b/x11-misc/slim/files/slim-1.3.6-session-chooser.patch
deleted file mode 100644
index b43c9a307605..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-session-chooser.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- a/cfg.cpp 2013-10-01 18:38:05.000000000 -0400
-+++ b/cfg.cpp 2013-10-24 12:12:20.584103253 -0400
-@@ -274,14 +274,14 @@
- while (true) {
- string::const_iterator begin = s;
- while (*s != c && s != str.end()) { ++s; }
-- tmp = string(begin, s);
-- if (useEmpty || tmp.size() > 0)
-+ tmp = string(begin, s);
-+ if (useEmpty || tmp.size() > 0)
- v.push_back(tmp);
- if (s == str.end()) {
- break;
- }
- if (++s == str.end()) {
-- if (useEmpty)
-+ if (useEmpty)
- v.push_back("");
- break;
- }
-@@ -289,6 +289,7 @@
- }
-
- void Cfg::fillSessionList(){
-+ string strSessionList = getOption("sessions");
- string strSessionDir = getOption("sessiondir");
-
- sessions.clear();
-@@ -307,29 +308,29 @@
- struct stat oFileStat;
-
- if (stat(strFile.c_str(), &oFileStat) == 0) {
-- if (S_ISREG(oFileStat.st_mode) &&
-- access(strFile.c_str(), R_OK) == 0){
-- ifstream desktop_file( strFile.c_str() );
-- if (desktop_file){
-- string line, session_name = "", session_exec = "";
-- while (getline( desktop_file, line )) {
-- if (line.substr(0, 5) == "Name=") {
-- session_name = line.substr(5);
-- if (!session_exec.empty())
-- break;
-- } else
-- if (line.substr(0, 5) == "Exec=") {
-- session_exec = line.substr(5);
-- if (!session_name.empty())
-- break;
-- }
-- }
-- desktop_file.close();
-- pair<string,string> session(session_name,session_exec);
-- sessions.push_back(session);
-- cout << session_exec << " - " << session_name << endl;
-- }
--
-+ if (S_ISREG(oFileStat.st_mode) &&
-+ access(strFile.c_str(), R_OK) == 0){
-+ ifstream desktop_file( strFile.c_str() );
-+ if (desktop_file){
-+ string line, session_name = "", session_exec = "";
-+ while (getline( desktop_file, line )) {
-+ if (line.substr(0, 5) == "Name=") {
-+ session_name = line.substr(5);
-+ if (!session_exec.empty()) break;
-+ } else if (line.substr(0, 5) == "Exec=") {
-+ session_exec = line.substr(5);
-+ if (!session_name.empty()) break;
-+ }
-+ }
-+ desktop_file.close();
-+ if (!session_name.empty() && !session_exec.empty()) {
-+ pair<string,string> session(session_name,session_exec);
-+ sessions.push_back(session);
-+ } else if (access(strFile.c_str(), X_OK) == 0) {
-+ pair<string,string> session(string(pDirent->d_name),strFile);
-+ sessions.push_back(session);
-+ }
-+ }
- }
- }
- }
-@@ -338,8 +339,18 @@
- }
-
- if (sessions.empty()){
-- pair<string,string> session("","");
-- sessions.push_back(session);
-+ if (strSessionList.empty()) {
-+ pair<string,string> session("","");
-+ sessions.push_back(session);
-+ } else {
-+ // iterate through the split of the session list
-+ vector<string> sessit;
-+ split(sessit,strSessionList,',',false);
-+ for (vector<string>::iterator it = sessit.begin(); it != sessit.end(); ++it) {
-+ pair<string,string> session(*it,*it);
-+ sessions.push_back(session);
-+ }
-+ }
- }
- }
-
---- a/app.cpp 2013-10-24 12:16:59.870111072 -0400
-+++ b/app.cpp 2013-10-24 12:29:59.899132910 -0400
-@@ -377,10 +377,6 @@
- LoginPanel->SetName(cfg->getOption("default_user") );
- }
-
-- if (firstloop) {
-- LoginPanel->SwitchSession();
-- }
--
- if (!AuthenticateUser(focuspass && firstloop)){
- panelclosed = 0;
- firstloop = false;
diff --git a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
deleted file mode 100644
index 9ffa19ce0537..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt 2013-10-15 12:02:13.463722050 -0400
-+++ b/CMakeLists.txt 2013-10-17 09:41:41.602917345 -0400
-@@ -238,10 +238,6 @@
- install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
- # configure
- install(FILES slim.conf DESTINATION ${SYSCONFDIR})
--# systemd service file
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-- install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system)
--endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- # themes directory
- subdirs(themes)
-
diff --git a/x11-misc/slim/files/slim-1.3.6-systemd-session.patch b/x11-misc/slim/files/slim-1.3.6-systemd-session.patch
deleted file mode 100644
index 0639aeb5f185..000000000000
--- a/x11-misc/slim/files/slim-1.3.6-systemd-session.patch
+++ /dev/null
@@ -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 -s
-+Restart=on-failure
-
- [Install]
- Alias=display-manager.service
-Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes
diff --git a/x11-misc/slim/files/slim-1.3.9-config.diff b/x11-misc/slim/files/slim-1.3.9-config.diff
deleted file mode 100644
index da7e69f2eccd..000000000000
--- a/x11-misc/slim/files/slim-1.3.9-config.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Customize the configuration file to suit Gentoo practice
-===================================================================
---- a/slim.conf
-+++ b/slim.conf
-@@ -21,7 +21,7 @@
-
- # Activate numlock when slim starts. Valid values: on|off
- # Default is to not change it
--# numlock on
-+numlock on
-
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -36,7 +36,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd exec /bin/sh - ~/.xinitrc %session
--login_cmd exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd exec /bin/bash -login ~/.xinitrc %session
-+login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session
-
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -66,12 +67,12 @@
- # %session is the Exec= value -- note that this may provide a full
- # path to the session executable!
--#sessiondir /usr/share/xsessions
-+sessiondir /usr/share/xsessions
-
-
--# Executed when pressing F11 (requires imagemagick)
-+# Executed when pressing F11 (requires media-gfx/imagemagick for import)
- screenshot_cmd import -window root /slim.png
--# Alternative using scrot.
-+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
- #screenshot_cmd scrot /root/slim.png
-
- # welcome message. Available variables: %host, %domain
- welcome_msg Welcome to %host
-@@ -111,8 +111,8 @@
- # randomly choose from
- current_theme default
-
--# Lock file
-+# Lock file, /etc/init.d/xdm expects slim.pid
- lockfile /run/slim.pid
-
- # Log file
- logfile /var/log/slim.log
diff --git a/x11-misc/slim/files/slim-1.3.9-greeter-session.diff b/x11-misc/slim/files/slim-1.3.9-greeter-session.diff
deleted file mode 100644
index c9e5e256850a..000000000000
--- a/x11-misc/slim/files/slim-1.3.9-greeter-session.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix bug #727544 by telling elogind that we're a greeter
-===================================================================
---- a/app.cpp
-+++ b/app.cpp
-@@ -290,6 +290,7 @@
- pam.start("slim");
- pam.set_item(PAM::Authenticator::TTY, DisplayName);
- pam.set_item(PAM::Authenticator::Requestor, "root");
-+ pam.setenv("XDG_SESSION_CLASS", "greeter");
- }
- catch(PAM::Exception& e){
- logStream << APPNAME << ": " << e << endl;
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
deleted file mode 100644
index 7cad37d07bb7..000000000000
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake pam systemd
-
-DESCRIPTION="Simple Login Manager"
-HOMEPAGE="https://sourceforge.net/projects/slim.berlios/"
-SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv sparc x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="branding pam"
-
-RDEPEND="x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXft
- x11-libs/libXrandr
- media-libs/libpng:0=
- virtual/jpeg:=
- x11-apps/sessreg
- pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-PATCHES=(
- # Our Gentoo-specific config changes
- "${FILESDIR}"/${P}-config.diff
- "${FILESDIR}"/${PN}-1.3.5-arm.patch
- "${FILESDIR}"/${P}-honour-cflags.patch
- "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
- "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
- "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
- "${FILESDIR}"/${P}-systemd-session.patch
- "${FILESDIR}"/${P}-session-chooser.patch
- "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
- "${FILESDIR}"/${P}-drop-zlib.patch
- "${FILESDIR}"/${P}-freetype.patch
- "${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
- "${FILESDIR}"/${PN}-1.3.6-add-missing-libgen_h.patch
- "${FILESDIR}"/${PN}-1.3.6-gcc11.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if use branding; then
- sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_PAM=$(usex pam)
- -DUSE_CONSOLEKIT=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use pam ; then
- pamd_mimic system-local-login slim auth account session
- pamd_mimic system-local-login slimlock auth
- fi
-
- systemd_dounit slim.service
-
- insinto /usr/share/slim
- newins "${FILESDIR}/Xsession-r3" Xsession
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/slim.logrotate" slim
-
- dodoc xinitrc.sample ChangeLog README TODO THEMES
-}
-
-pkg_postinst() {
- # massage ${REPLACING_VERSIONS} to come up with whether or not it's a new install
- # or if it's older than 1.3.2-r7
- # Note - there should only ever be zero or one version as this package isn't slotted,
- # so the logic doesn't worry about what happens if there's two, due to the case where
- # a previous emerge attempt failed in the middle of qmerge.
- local rv=none
- for rv in ${REPLACING_VERSIONS} ; do
- if ver_test "1.3.2-r7" -le "${rv}" ; then
- rv=newer
- break;
- fi
-
- if ver_test "1.0" -le "${rv}" ; then
- rv=older
- break;
- fi
- done
-
- if [[ ${rv} == none ]]; then
- elog
- elog "The configuration file is located at /etc/slim.conf."
- elog
- elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
- elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
- fi
- if [[ ${rv} != newer ]]; then
- elog
- elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
- elog "support, as well as selection between sessions available in"
- elog "/etc/X11/Sessions/ at login by pressing [F1]."
- elog
- elog "The XSESSION environment variable is still supported as a default"
- elog "if no session has been specified by the user."
- elog
- elog "If you want to use .xinitrc in the user's home directory for session"
- elog "management instead, see README and xinitrc.sample in"
- elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
- elog "accordingly."
- elog
- fi
-
- if ! use pam; then
- elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
- elog "the console when restarting your window manager. If this is not desired, then"
- elog "please remerge ${PN} with USE=\"pam\""
- elog
- fi
-}
diff --git a/x11-misc/slim/slim-1.3.9.ebuild b/x11-misc/slim/slim-1.3.9.ebuild
deleted file mode 100644
index e4a798f76287..000000000000
--- a/x11-misc/slim/slim-1.3.9.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake pam readme.gentoo-r1 systemd
-
-DESCRIPTION="Simple Login Manager resurrected"
-HOMEPAGE="https://slim-fork.sourceforge.io/"
-SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="branding pam"
-
-RDEPEND="media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- x11-apps/sessreg
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXrandr
- pam? (
- sys-libs/pam
- x11-libs/libXext
- )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-PATCHES=(
- # Our Gentoo-specific config changes
- "${FILESDIR}"/${P}-config.diff
- "${FILESDIR}"/${P}-greeter-session.diff
-)
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The configuration file is located at /etc/slim.conf.
-
-If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\"
-in /etc/conf.d/display-manager and run
-
- # rc-update add display-manager default.
-
-See also https://wiki.gentoo.org/wiki/SLiM
-"
-
-src_prepare() {
- cmake_src_prepare
-
- if use branding; then
- sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_PAM=$(usex pam)
- -DUSE_CONSOLEKIT=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use pam ; then
- pamd_mimic system-local-login slim auth account session
- pamd_mimic system-local-login slimlock auth
- fi
-
- systemd_dounit slim.service
-
- insinto /usr/share/slim
- newins "${FILESDIR}/Xsession-r3" Xsession
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/slim.logrotate" slim
-
- dodoc xinitrc.sample ChangeLog README TODO THEMES
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if ! use pam; then
- elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
- elog "the console when restarting your window manager. If this is not desired, then"
- elog "please remerge ${PN} with USE=\"pam\""
- elog
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/
@ 2023-03-14 19:30 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2023-03-14 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 33127b6d177f2d123c333c239a4ca13bfafd8124
Author: Robert Pearce <gentoo <AT> flitspace <DOT> org <DOT> uk>
AuthorDate: Tue Feb 21 08:01:47 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 19:28:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33127b6d
x11-misc/slim: Added ebuilds for the resurrected upstream project
Fixed issues from pkgcheck
List myself as a proxy maintainer
Correct several issues pointed out in review by ceamac and added a -9999 ebuild
in light of discussion
Closes: https://bugs.gentoo.org/832562
Closes: https://bugs.gentoo.org/727544
Closes: https://bugs.gentoo.org/832303
Closes: https://bugs.gentoo.org/580458
Closes: https://bugs.gentoo.org/803476
Closes: https://bugs.gentoo.org/732430
Closes: https://bugs.gentoo.org/756181
Signed-off-by: Robert Pearce <gentoo <AT> flitspace.org.uk>
Closes: https://github.com/gentoo/gentoo/pull/29838
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
x11-misc/slim/Manifest | 2 +
x11-misc/slim/files/slim-1.3.9-config.diff | 49 ++++++++++
.../slim/files/slim-1.3.9-greeter-session.diff | 12 +++
x11-misc/slim/files/slim-1.4.0-config.diff | 48 ++++++++++
x11-misc/slim/metadata.xml | 11 ++-
x11-misc/slim/slim-1.3.9.ebuild | 98 +++++++++++++++++++
x11-misc/slim/slim-1.4.0.ebuild | 104 +++++++++++++++++++++
x11-misc/slim/slim-9999.ebuild | 104 +++++++++++++++++++++
8 files changed, 426 insertions(+), 2 deletions(-)
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index d0638d550cf4..6290a51df48d 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1 +1,3 @@
DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
+DIST slim-1.3.9.tar.gz 239609 BLAKE2B 41eec388b0d63bc720cb51f93707f69c4765800f4e69654fe5ebdcb280eb25775c7ed951163943b6f58884b0a9fb628e049d68a2faa7516b1f884adb080953c6 SHA512 607366a402479381858f8193db9b4da0a40eda15f4868cad9e7313b4a084390cf3cee80958f58a56d3e4383cf2fa9069960d1b20861068f921bd9ba89da7aec1
+DIST slim-1.4.0.tar.gz 530318 BLAKE2B 507f22d09a3449b870bb5fd5a5f0ab1002ceee5372c82f702582809a5fc442088c17d79fedff6712e198cee672696388479604a194e5729c7bc12139770c833d SHA512 2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f
diff --git a/x11-misc/slim/files/slim-1.3.9-config.diff b/x11-misc/slim/files/slim-1.3.9-config.diff
new file mode 100644
index 000000000000..da7e69f2eccd
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.9-config.diff
@@ -0,0 +1,49 @@
+Customize the configuration file to suit Gentoo practice
+===================================================================
+--- a/slim.conf
++++ b/slim.conf
+@@ -21,7 +21,7 @@
+
+ # Activate numlock when slim starts. Valid values: on|off
+ # Default is to not change it
+-# numlock on
++numlock on
+
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+@@ -36,7 +36,8 @@
+ # to adjust the command according to your preferred shell,
+ # i.e. for freebsd use:
+ # login_cmd exec /bin/sh - ~/.xinitrc %session
+-login_cmd exec /bin/bash -login ~/.xinitrc %session
++# login_cmd exec /bin/bash -login ~/.xinitrc %session
++login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session
+
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -66,12 +67,12 @@
+ # %session is the Exec= value -- note that this may provide a full
+ # path to the session executable!
+-#sessiondir /usr/share/xsessions
++sessiondir /usr/share/xsessions
+
+
+-# Executed when pressing F11 (requires imagemagick)
++# Executed when pressing F11 (requires media-gfx/imagemagick for import)
+ screenshot_cmd import -window root /slim.png
+-# Alternative using scrot.
++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
+ #screenshot_cmd scrot /root/slim.png
+
+ # welcome message. Available variables: %host, %domain
+ welcome_msg Welcome to %host
+@@ -111,8 +111,8 @@
+ # randomly choose from
+ current_theme default
+
+-# Lock file
++# Lock file, /etc/init.d/xdm expects slim.pid
+ lockfile /run/slim.pid
+
+ # Log file
+ logfile /var/log/slim.log
diff --git a/x11-misc/slim/files/slim-1.3.9-greeter-session.diff b/x11-misc/slim/files/slim-1.3.9-greeter-session.diff
new file mode 100644
index 000000000000..c9e5e256850a
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.9-greeter-session.diff
@@ -0,0 +1,12 @@
+Fix bug #727544 by telling elogind that we're a greeter
+===================================================================
+--- a/app.cpp
++++ b/app.cpp
+@@ -290,6 +290,7 @@
+ pam.start("slim");
+ pam.set_item(PAM::Authenticator::TTY, DisplayName);
+ pam.set_item(PAM::Authenticator::Requestor, "root");
++ pam.setenv("XDG_SESSION_CLASS", "greeter");
+ }
+ catch(PAM::Exception& e){
+ logStream << APPNAME << ": " << e << endl;
diff --git a/x11-misc/slim/files/slim-1.4.0-config.diff b/x11-misc/slim/files/slim-1.4.0-config.diff
new file mode 100644
index 000000000000..1a92a66a6f43
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.4.0-config.diff
@@ -0,0 +1,48 @@
+Index: slim-fork-code/slim.conf
+Customize the configuration file to suit Gentoo practice
+===================================================================
+--- a/slim.conf (revision 54)
++++ b/slim.conf (working copy)
+@@ -21,7 +21,7 @@
+
+ # Activate numlock when slim starts. Valid values: on|off
+ # Default is to not change it
+-#numlock on
++numlock on
+
+ # Hide the mouse cursor (note: does not work with some WMs).
+ # Valid values: true|false
+@@ -35,7 +35,8 @@
+ # NOTE: if your system does not have bash you need to adjust the command
+ # according to your preferred shell, e.g. for freebsd use:
+ # login_cmd exec /bin/sh - ~/.xinitrc %session
+-login_cmd exec /bin/bash -login ~/.xinitrc %session
++#login_cmd exec /bin/bash -login ~/.xinitrc %session
++login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session
+
+ # Commands executed when starting and exiting a session.
+ # They can be used for registering a X11 session with
+@@ -65,11 +66,12 @@
+ # %session is the Exec= value -- note that this may provide a full
+ # path to the session executable!
+ #sessiondir /usr/share/xsessions
++sessiondir /etc/X11/Sessions
+
+
+-# Executed when pressing F11 (requires imagemagick)
++# Executed when pressing F11 (requires media-gfx/imagemagick for import)
+ screenshot_cmd import -window root /slim.png
+-# Alternative using scrot.
++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
+ #screenshot_cmd scrot /root/slim.png
+
+ # Delay after failed authentication before allowing another attempt
+@@ -102,7 +104,7 @@
+ # randomly choose from
+ current_theme default
+
+-# Lock file
++# Lock file, /etc/init.d/xdm expects slim.pid
+ lockfile /run/slim.pid
+
+ # Log file - full path for a file, or just stderr (or /dev/stderr) to send
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index d371e5ad92eb..1505068a165e 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>bugs.gentoo@flitspace.org.uk</email>
+ <name>Robert Pearce</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
- <remote-id type="sourceforge">slim.berlios</remote-id>
+ <remote-id type="sourceforge">slim-fork</remote-id>
</upstream>
</pkgmetadata>
diff --git a/x11-misc/slim/slim-1.3.9.ebuild b/x11-misc/slim/slim-1.3.9.ebuild
new file mode 100644
index 000000000000..e4a798f76287
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.9.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake pam readme.gentoo-r1 systemd
+
+DESCRIPTION="Simple Login Manager resurrected"
+HOMEPAGE="https://slim-fork.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="branding pam"
+
+RDEPEND="media-libs/libjpeg-turbo:=
+ media-libs/libpng:0=
+ x11-apps/sessreg
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXrandr
+ pam? (
+ sys-libs/pam
+ x11-libs/libXext
+ )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+PATCHES=(
+ # Our Gentoo-specific config changes
+ "${FILESDIR}"/${P}-config.diff
+ "${FILESDIR}"/${P}-greeter-session.diff
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+The configuration file is located at /etc/slim.conf.
+
+If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\"
+in /etc/conf.d/display-manager and run
+
+ # rc-update add display-manager default.
+
+See also https://wiki.gentoo.org/wiki/SLiM
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use branding; then
+ sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PAM=$(usex pam)
+ -DUSE_CONSOLEKIT=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use pam ; then
+ pamd_mimic system-local-login slim auth account session
+ pamd_mimic system-local-login slimlock auth
+ fi
+
+ systemd_dounit slim.service
+
+ insinto /usr/share/slim
+ newins "${FILESDIR}/Xsession-r3" Xsession
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/slim.logrotate" slim
+
+ dodoc xinitrc.sample ChangeLog README TODO THEMES
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if ! use pam; then
+ elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
+ elog "the console when restarting your window manager. If this is not desired, then"
+ elog "please remerge ${PN} with USE=\"pam\""
+ elog
+ fi
+}
diff --git a/x11-misc/slim/slim-1.4.0.ebuild b/x11-misc/slim/slim-1.4.0.ebuild
new file mode 100644
index 000000000000..a48f2bde4254
--- /dev/null
+++ b/x11-misc/slim/slim-1.4.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake pam readme.gentoo-r1 systemd
+
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="https://svn.code.sf.net/p/slim-fork/code/trunk"
+ inherit subversion
+else
+ SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Simple Login Manager resurrected"
+HOMEPAGE="https://slim-fork.sourceforge.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="branding pam"
+
+RDEPEND="media-libs/libjpeg-turbo:=
+ media-libs/libpng:0=
+ x11-apps/sessreg
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXrandr
+ pam? (
+ sys-libs/pam
+ x11-libs/libXext
+ )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+PATCHES=(
+ # Our Gentoo-specific config changes
+ "${FILESDIR}"/${PN}-1.4.0-config.diff
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+The configuration file is located at /etc/slim.conf.
+
+If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\"
+in /etc/conf.d/display-manager and run
+
+ # rc-update add display-manager default.
+
+See also https://wiki.gentoo.org/wiki/SLiM
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use branding; then
+ sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PAM=$(usex pam)
+ -DUSE_CONSOLEKIT=OFF
+ -DBUILD_SLIMLOCK=$(usex pam)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use pam ; then
+ pamd_mimic system-local-login slim auth account session
+ pamd_mimic system-local-login slimlock auth
+ fi
+
+ systemd_dounit slim.service
+
+ insinto /usr/share/slim
+ newins "${FILESDIR}/Xsession-r3" Xsession
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/slim.logrotate" slim
+
+ dodoc xinitrc.sample ChangeLog README TODO THEMES
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if ! use pam; then
+ elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
+ elog "the console when restarting your window manager. If this is not desired, then"
+ elog "please remerge ${PN} with USE=\"pam\""
+ elog
+ fi
+}
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
new file mode 100644
index 000000000000..a48f2bde4254
--- /dev/null
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake pam readme.gentoo-r1 systemd
+
+if [[ ${PV} == "9999" ]] ; then
+ ESVN_REPO_URI="https://svn.code.sf.net/p/slim-fork/code/trunk"
+ inherit subversion
+else
+ SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Simple Login Manager resurrected"
+HOMEPAGE="https://slim-fork.sourceforge.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="branding pam"
+
+RDEPEND="media-libs/libjpeg-turbo:=
+ media-libs/libpng:0=
+ x11-apps/sessreg
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXrandr
+ pam? (
+ sys-libs/pam
+ x11-libs/libXext
+ )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+PATCHES=(
+ # Our Gentoo-specific config changes
+ "${FILESDIR}"/${PN}-1.4.0-config.diff
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+The configuration file is located at /etc/slim.conf.
+
+If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\"
+in /etc/conf.d/display-manager and run
+
+ # rc-update add display-manager default.
+
+See also https://wiki.gentoo.org/wiki/SLiM
+"
+
+src_prepare() {
+ cmake_src_prepare
+
+ if use branding; then
+ sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PAM=$(usex pam)
+ -DUSE_CONSOLEKIT=OFF
+ -DBUILD_SLIMLOCK=$(usex pam)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use pam ; then
+ pamd_mimic system-local-login slim auth account session
+ pamd_mimic system-local-login slimlock auth
+ fi
+
+ systemd_dounit slim.service
+
+ insinto /usr/share/slim
+ newins "${FILESDIR}/Xsession-r3" Xsession
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/slim.logrotate" slim
+
+ dodoc xinitrc.sample ChangeLog README TODO THEMES
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if ! use pam; then
+ elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
+ elog "the console when restarting your window manager. If this is not desired, then"
+ elog "please remerge ${PN} with USE=\"pam\""
+ elog
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/
@ 2015-09-14 19:40 Ian Stakenvicius
0 siblings, 0 replies; 4+ messages in thread
From: Ian Stakenvicius @ 2015-09-14 19:40 UTC (permalink / raw
To: gentoo-commits
commit: e44233b3de61851f504ee94f8b2c526d6ec200af
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 19:30:37 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 19:39:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44233b3
x11-misc/slim: fix pointer arithmetic error
While addressing bug 560088 related to consolekit-1.0, it was found that
some pointer arithmetic being used in a malloc and memcpy was wrong and was causing
a malloc corruption error. This patch addresses the out-of-bounds indexing.
Package-Manager: portage-2.2.20.1
.../slim-1.3.6-envcpy-bad-pointer-arithmetic.patch | 15 +++++++++++++
.../{slim-1.3.6-r4.ebuild => slim-1.3.6-r5.ebuild} | 25 +++++++++++-----------
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch b/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
new file mode 100644
index 0000000..b3787dd
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
@@ -0,0 +1,15 @@
+--- a/app.cpp 2015-09-14 12:00:00.460481656 -0400
++++ b/app.cpp 2015-09-14 14:41:10.970536588 -0400
+@@ -606,9 +606,9 @@
+
+ n++;
+
+- child_env = static_cast<char**>(malloc(sizeof(char*)*n));
+- memcpy(child_env, old_env, sizeof(char*)*n+1);
+- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
++ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
++ memcpy(child_env, old_env, sizeof(char*)*n);
++ child_env[n-1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ child_env[n] = NULL;
+ }
+ # endif /* USE_CONSOLEKIT */
diff --git a/x11-misc/slim/slim-1.3.6-r4.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
similarity index 84%
rename from x11-misc/slim/slim-1.3.6-r4.ebuild
rename to x11-misc/slim/slim-1.3.6-r5.ebuild
index 728b2f4..2fdeebe 100644
--- a/x11-misc/slim/slim-1.3.6-r4.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,17 +36,18 @@ PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
src_prepare() {
# Our Gentoo-specific config changes
- epatch "${FILESDIR}"/${P}-config.diff
- epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
- epatch "${FILESDIR}"/${P}-honour-cflags.patch
- epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
- epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
- epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
- epatch "${FILESDIR}"/${P}-systemd-session.patch
- epatch "${FILESDIR}"/${P}-session-chooser.patch
- epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
- epatch "${FILESDIR}"/${P}-drop-zlib.patch
- epatch "${FILESDIR}"/${P}-freetype.patch
+ epatch "${FILESDIR}"/${P}-config.diff \
+ "${FILESDIR}"/${PN}-1.3.5-arm.patch \
+ "${FILESDIR}"/${P}-honour-cflags.patch \
+ "${FILESDIR}"/${P}-libslim-cmake-fixes.patch \
+ "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch \
+ "${FILESDIR}"/${P}-strip-systemd-unit-install.patch \
+ "${FILESDIR}"/${P}-systemd-session.patch \
+ "${FILESDIR}"/${P}-session-chooser.patch \
+ "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch \
+ "${FILESDIR}"/${P}-drop-zlib.patch \
+ "${FILESDIR}"/${P}-freetype.patch \
+ "${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
if use elibc_FreeBSD; then
sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-29 6:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21 17:00 [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/files/, x11-misc/slim/ Ian Stakenvicius
-- strict thread matches above, loose matches on Subject: below --
2023-05-29 6:14 Joonas Niilola
2023-03-14 19:30 Viorel Munteanu
2015-09-14 19:40 Ian Stakenvicius
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox