diff options
Diffstat (limited to 'x11-misc/slim')
| -rw-r--r-- | x11-misc/slim/ChangeLog | 4 | ||||
| -rw-r--r-- | x11-misc/slim/Manifest | 19 | ||||
| -rw-r--r-- | x11-misc/slim/files/digest-slim-1.2.5-r1 | 3 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-fix-warnings.patch | 107 | ||||
| -rw-r--r-- | x11-misc/slim/slim-1.2.5-r1.ebuild | 60 |
5 files changed, 189 insertions, 4 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index 337a400b3..1a10fbc64 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 Aug 2006; Jakub Moc <jakub@gentoo.org> +slim-1.2.5-r1.ebuild, + +files/slim-fix-warnings.patch: + Fix compile warnings (thanks to KIMURA Masaru), some cosmetics + 10 Aug 2006; Josu López Fernández <zamorate@zamorate.net> ChangeLog: Added ~ppc keyword diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest index ad1384f72..e23176763 100644 --- a/x11-misc/slim/Manifest +++ b/x11-misc/slim/Manifest @@ -2,15 +2,23 @@ AUX slim-cflags.patch 1323 RMD160 994a329f1c3b2b79ab09fa9eca6f741ee2c9e253 SHA1 MD5 73c0aef8cda4201853c02ee4c49dd4f0 files/slim-cflags.patch 1323 RMD160 994a329f1c3b2b79ab09fa9eca6f741ee2c9e253 files/slim-cflags.patch 1323 SHA256 937852de4141ccf54834bf2bf9f13584a0466a647f21fbf43b67989c51f03f27 files/slim-cflags.patch 1323 +AUX slim-fix-warnings.patch 2994 RMD160 763f59508a0b4c6be07cc5e291a3d103b3574ee5 SHA1 b9b305e872a1c7bf826b2e6b153af6aef8fcfe6d SHA256 bfb99d385a2d3d10e1ffbbd1e7ae7fa5f0165928e50fe46e50c81d2b021633af +MD5 cf915944119605b4e235149b9b746f3d files/slim-fix-warnings.patch 2994 +RMD160 763f59508a0b4c6be07cc5e291a3d103b3574ee5 files/slim-fix-warnings.patch 2994 +SHA256 bfb99d385a2d3d10e1ffbbd1e7ae7fa5f0165928e50fe46e50c81d2b021633af files/slim-fix-warnings.patch 2994 DIST slim-1.2.5.tar.gz 216437 RMD160 796dc2cf2f903a5d1d7e8aa92106bd9af7990d69 SHA1 f08ef603b362e3441b83d1f89445cc7ea73e7ebb SHA256 eee5c172a3397a2edc279d6a7a46c0075e05c022c4cb4417a14e3714626c9261 +EBUILD slim-1.2.5-r1.ebuild 1790 RMD160 3b35708810e8b970d9e47e1368682bb48be19a9b SHA1 f74b9f2e3b56cc7a5582ed78178db18a90511acb SHA256 5d6f393c1011f436097fe576cad7e04d202c1f47872e289d79960cc3c2b95ece +MD5 faa81e31460f1e525786e8b8c77b6cdd slim-1.2.5-r1.ebuild 1790 +RMD160 3b35708810e8b970d9e47e1368682bb48be19a9b slim-1.2.5-r1.ebuild 1790 +SHA256 5d6f393c1011f436097fe576cad7e04d202c1f47872e289d79960cc3c2b95ece slim-1.2.5-r1.ebuild 1790 EBUILD slim-1.2.5.ebuild 1804 RMD160 c3dbdf1872b9e16f7f4dbb6d1ce8a405295df2e2 SHA1 6603d2d7d2135aff882b7214aa520ca64e51b95d SHA256 41e4f0d6a9aae690f4fc2391fd1bdf8c565d659eef02c2aa4c5628137ccd8d2b MD5 d9f04b5afb20c2b1c5a117d109ab0a2f slim-1.2.5.ebuild 1804 RMD160 c3dbdf1872b9e16f7f4dbb6d1ce8a405295df2e2 slim-1.2.5.ebuild 1804 SHA256 41e4f0d6a9aae690f4fc2391fd1bdf8c565d659eef02c2aa4c5628137ccd8d2b slim-1.2.5.ebuild 1804 -MISC ChangeLog 422 RMD160 fa366b896491fa5402ff98f0fb38b2c7c46dd0e5 SHA1 6a1a485a2d34674653666a7b02f524f7238ebb06 SHA256 ff05ea58ad94df17de07d3b6a39115dc4d7c57918c2fee50551c478cd2e4fa60 -MD5 e2389d6ae5dd36c283bd07d8683ffc5a ChangeLog 422 -RMD160 fa366b896491fa5402ff98f0fb38b2c7c46dd0e5 ChangeLog 422 -SHA256 ff05ea58ad94df17de07d3b6a39115dc4d7c57918c2fee50551c478cd2e4fa60 ChangeLog 422 +MISC ChangeLog 589 RMD160 a07e75d234e5ca646f6f507b4ca8354ba227dfdc SHA1 40e1fa56dece7ec6b8842ce10522f1677c5e56fb SHA256 787fab09a9118ee82c9e91070c8d9e748a2d2ebf387aa6b4628576affeedda47 +MD5 cc7c62aaca1e2bfb825534ba2218f95f ChangeLog 589 +RMD160 a07e75d234e5ca646f6f507b4ca8354ba227dfdc ChangeLog 589 +SHA256 787fab09a9118ee82c9e91070c8d9e748a2d2ebf387aa6b4628576affeedda47 ChangeLog 589 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 @@ -18,3 +26,6 @@ SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata MD5 e087ddd8c788afb3d12d7de0306d96d0 files/digest-slim-1.2.5 232 RMD160 16e6b4762e059ecea287807933d8fd48551390b6 files/digest-slim-1.2.5 232 SHA256 94cbe9129d5e576e8e1e3a54e40356e70cae9d798a01a203f626b8c801d06c0e files/digest-slim-1.2.5 232 +MD5 e087ddd8c788afb3d12d7de0306d96d0 files/digest-slim-1.2.5-r1 232 +RMD160 16e6b4762e059ecea287807933d8fd48551390b6 files/digest-slim-1.2.5-r1 232 +SHA256 94cbe9129d5e576e8e1e3a54e40356e70cae9d798a01a203f626b8c801d06c0e files/digest-slim-1.2.5-r1 232 diff --git a/x11-misc/slim/files/digest-slim-1.2.5-r1 b/x11-misc/slim/files/digest-slim-1.2.5-r1 new file mode 100644 index 000000000..6689f6993 --- /dev/null +++ b/x11-misc/slim/files/digest-slim-1.2.5-r1 @@ -0,0 +1,3 @@ +MD5 faa644d874abba2f02bdce7d90539f57 slim-1.2.5.tar.gz 216437 +RMD160 796dc2cf2f903a5d1d7e8aa92106bd9af7990d69 slim-1.2.5.tar.gz 216437 +SHA256 eee5c172a3397a2edc279d6a7a46c0075e05c022c4cb4417a14e3714626c9261 slim-1.2.5.tar.gz 216437 diff --git a/x11-misc/slim/files/slim-fix-warnings.patch b/x11-misc/slim/files/slim-fix-warnings.patch new file mode 100644 index 000000000..388966cfa --- /dev/null +++ b/x11-misc/slim/files/slim-fix-warnings.patch @@ -0,0 +1,107 @@ +--- slim-1.2.5/cfg.cpp.orig 2006-08-18 14:18:12.000000000 +0900 ++++ slim-1.2.5/cfg.cpp 2006-08-18 14:20:34.000000000 +0900 +@@ -154,7 +154,7 @@ + } + int pos = 0; + string line = s; +- string::size_type len = line.length(); ++ int len = line.length(); + while ( pos < len && isspace( line[pos] ) ) { + ++pos; + } +@@ -240,7 +240,7 @@ + if (sessions.size() <= 1) + return current; + +- for (int i=0; i<sessions.size()-1; i++) { ++ for (int i=0; i<(int)sessions.size()-1; i++) { + if (current == sessions[i]) { + return sessions[i+1]; + } +--- slim-1.2.5/image.cpp.orig 2006-08-18 13:39:03.000000000 +0900 ++++ slim-1.2.5/image.cpp 2006-08-18 13:39:29.000000000 +0900 +@@ -391,7 +391,7 @@ + void Image::Center(const int w, const int h, const char *hex) { + + unsigned long packed_rgb; +- sscanf(hex, "%x", &packed_rgb); ++ sscanf(hex, "%lx", &packed_rgb); + + unsigned long r = packed_rgb>>16; + unsigned long g = packed_rgb>>8 & 0xff; +@@ -471,7 +471,7 @@ + void Image::Plain(const int w, const int h, const char *hex) { + + unsigned long packed_rgb; +- sscanf(hex, "%x", &packed_rgb); ++ sscanf(hex, "%lx", &packed_rgb); + + unsigned long r = packed_rgb>>16; + unsigned long g = packed_rgb>>8 & 0xff; +--- slim-1.2.5/panel.cpp.orig 2006-08-18 13:49:18.000000000 +0900 ++++ slim-1.2.5/panel.cpp 2006-08-18 13:55:55.000000000 +0900 +@@ -239,7 +239,7 @@ + + void Panel::Cursor(int visible) { + char* text; +- int xx, yy, x2,y2, cheight; ++ int xx, yy, y2, cheight; + char* txth = "Wj"; // used to get cursor height + + switch(In->GetField()) { +@@ -254,6 +254,12 @@ + xx = input_name_x; + yy = input_name_y; + break; ++ ++ default: /* Origin & NULL string as default values. */ ++ text = (char *)NULL; ++ xx = (int)0; ++ yy = (int)0; ++ break; + } + + +@@ -347,7 +353,7 @@ + del = In->Key(buffer, keysym, singleInputMode); + Action = In->GetAction(); + +- XGlyphInfo extents, delextents; ++ XGlyphInfo extents; + XftDraw *draw = XftDrawCreate(Dpy, Win, + DefaultVisual(Dpy, Scr), DefaultColormap(Dpy, Scr)); + +@@ -397,6 +403,12 @@ + xx = input_name_x; + yy = input_name_y; + break; ++ ++ default: /* Origin & NULL string as default values. */ ++ text = (char *)NULL; ++ xx = (int)0; ++ yy = (int)0; ++ break; + } + + char* txth = "Wj"; // get proper maximum height ? +@@ -431,7 +443,6 @@ + // Draw welcome and "enter username" message + void Panel::ShowText(){ + string cfgX, cfgY; +- int n=-1; + XGlyphInfo extents; + + bool singleInputMode = +--- slim-1.2.5/switchuser.cpp.orig 2006-08-18 14:06:31.000000000 +0900 ++++ slim-1.2.5/switchuser.cpp 2006-08-18 14:15:10.000000000 +0900 +@@ -14,9 +14,6 @@ + using namespace std; + + SwitchUser::SwitchUser(struct passwd *pw, Cfg *c, const string& display) +- : Pw(pw), +- cfg(c), +- displayName(display) + { + } + + diff --git a/x11-misc/slim/slim-1.2.5-r1.ebuild b/x11-misc/slim/slim-1.2.5-r1.ebuild new file mode 100644 index 000000000..ea5029db5 --- /dev/null +++ b/x11-misc/slim/slim-1.2.5-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils toolchain-funcs + +DESCRIPTION="SLiM - Simple Login Manager" +HOMEPAGE="http://slim.berlios.de/" +SRC_URI="http://download.berlios.de/${PN}/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND="|| ( ( x11-proto/xproto + x11-libs/libXmu + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXft ) + <virtual/x11-7 + ) + media-libs/libpng + media-libs/jpeg" +RDEPEND="${DEPEND} + media-fonts/corefonts" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-fix-warnings.patch + + sed -i -e "s:^CXX=.*:CXX=$(tc-getCXX):" \ + -e "s:^CC=.*:CC=$(tc-getCC):" \ + -e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ + -e "s:/usr/X11R6:/usr:" \ + Makefile || die 'sed failed in Makefile' + + # Remove all X11R6 references from slim.conf + # Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop + # Set the default logfile to /dev/null to avoid cluttering up the harddisk + #as slim puts a lot of garbage in it's logfile + sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \ + -e 's/# daemon/daemon/' \ + -e 's#/var/log/slim.log#/dev/null#g' \ + slim.conf || die "sed slim.conf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc xinitrc.sample README TODO THEMES +} + +pkg_postinst() { + elog "The configuration file is located at /etc/slim.conf." + elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " + elog "in /etc/rc.conf and run \"rc-update add xdm default\" " + elog + elog "${PN} uses .xinitrc in the user's home directory and /etc/slim.conf" + elog "for session management. For further information, see README and" + elog "xinitrc.sample in /usr/share/doc/${PF}" +} |