Move system profiles to Calculate Overlay

master
Трацевский Александр 15 years ago
parent 09a2e1f50f
commit ed94a5421f

@ -1,5 +1,8 @@
CHANGE LOG
1.2.3
* Использование Calculate Overlay для профилей сборки системы
1.2.13
* Изменен патч для alsasound, в нем удалено увеличение громкости для микрофонов.

@ -1,4 +0,0 @@
#-title-#
app-emulation/wine #-unmask-#
=media-sound/amarok-2.2.0 #-unmask-#

@ -1,11 +0,0 @@
#-title-#
sys-apps/openrc #-unmask-#
sys-apps/baselayout #-unmask-#
sys-apps/sysvinit #-unmask-#
=sys-apps/util-linux-2.16.1 #-unmask-#
sys-fs/aufs2 #-unmask-#
~sys-fs/udev-146 #-unmask-#
=sys-kernel/gentoo-sources-2.6.31-r4 #-unmask-#
x11-drivers/nvidia-drivers #-unmask-#

@ -1,9 +0,0 @@
#-title-#
#?calculate!=CLS&calculate!=CLSG#
app-office/openoffice #-unmask-#
dev-db/pgadmin3 #-unmask-#
media-gfx/gimp #-unmask-#
media-libs/libgphoto2 #-unmask-#
net-print/gutenprint #-unmask-#
#calculate#

@ -1,7 +0,0 @@
#-title-#
<app-cdr/k3b-1.68.0_alpha3
<dev-util/kdesvn-1.2.1
<kde-base/kdelibs-4.0
<media-gfx/digikam-0.10.0
<media-plugins/kipi-plugins-0.4.0

@ -2,26 +2,3 @@
#-themes-#
<net-print/foomatic-db-3.0.20080507
<net-print/foomatic-db-engine-3.0.20080507
<net-print/foomatic-db-ppds-3.0.20080507
<net-wireless/madwifi-ng-0.9.4.4030.20090529
<net-wireless/madwifi-ng-tools-0.9.4.4030.20090529
#?calculate!=CLS&calculate!=CLSG#
<net-fs/samba-3.4.3
<net-nds/openldap-2.4.0
=net-print/foomatic-db-3.0.20060720
#calculate#
#?calculate!=CLS&calculate!=CLSG&calculate!=CDS#
<app-crypt/qca-2.0.0
<dev-db/mysql-5.0.76
#calculate#
#?calculate=CDS#
<dev-db/postgresql-base-9.5
<virtual/postgresql-base-9.5
<virtual/postgresql-server-9.5
#calculate#

@ -1,10 +0,0 @@
#-title-#
dev-lang/php apache2 xml -fdftk session -berkdb dba mysql
dev-util/subversion apache2
media-video/mplayer 3dnow cpudetection encode mmxext sse2 ssse3 v4l v4l2 x264 xvid
net-dns/bind sdb-ldap
net-im/calculate-ejabberd mod_muc
net-mail/dovecot pop3d
net-proxy/squid icap-client
net-ftp/proftpd -ipv6 -acl

@ -1,14 +0,0 @@
#-title-#
app-office/openoffice gtk java -kde
dev-python/PyQt4 sql
dev-libs/soprano java
dev-util/cmake -qt4
kde-base/dolphin thumbnail
kde-base/gwenview kipi
kde-base/konqueror thumbnail
kde-base/kopete statistics history webpresence
kde-base/krdc vnc
media-gfx/imagemagick openexr
www-client/mozilla-firefox java xulrunner
net-libs/xulrunner java

@ -1,7 +0,0 @@
#-title-#
app-text/djvu -nsplugin
mail-client/claws-mail imap
media-video/mplayer gmplayer
sys-apps/calculate-client xfce
x11-themes/tango-icon-theme -png

@ -1,4 +0,0 @@
#-title-#
media-gfx/splashutils fbcondecor
sys-fs/aufs2 inotify kernel-patch

@ -1,32 +0,0 @@
#-title-#
app-antivirus/clamav gmp
app-crypt/pinentry gtk
app-emulation/wine xml
app-text/djvu -nsplugin
app-text/poppler-bindings gtk
dev-db/mysql embedded
media-fonts/terminus-font -X
media-libs/mlt melt xml
media-libs/svgalib no-helper
media-libs/xine-lib xcb
media-video/avidemux lame libsamplerate
media-video/dvdrip subtitles
media-video/mplayer amrnb cpudetection dga dts dvdnav md5sum mmxext radio sse2 ssse3 vdpau x264
media-video/realplayer -X
media-video/transcode mjpeg
media-video/vlc stream httpd
media-video/xine-ui -X
net-analyzer/nmap -gtk
www-client/mozilla-firefox iceweasel
net-print/foo2zjs -foomaticdb
net-print/hplip -X -qt3 -qt4 gtk ppds
net-wireless/wpa_supplicant -qt4
sys-apps/pciutils -zlib
sys-fs/mtools -X
www-client/links -X
x11-drivers/nvidia-drivers -gtk
x11-libs/cairo glitz svg
x11-libs/libX11 xcb
x11-libs/pixman -sse2
x11-misc/xscreensaver -opengl -jpeg

@ -1,5 +0,0 @@
#-title-#
dev-lang/lua deprecated
games-strategy/freeciv gtk

@ -1,15 +0,0 @@
#-title-#
#?calculate!=CLS&calculate!=CLSG#
virtual/aspell-dict app-dicts/aspell
virtual/bittorrent net-p2p/ktorrent
virtual/imapd net-mail/dovecot
virtual/jabber-server net-im/ejabberd
virtual/linux-sources sys-kernel/calculate-sources
virtual/logger app-admin/syslog-ng
virtual/ooo app-office/openoffice
#calculate#
#?system=server#
virtual/mta mail-mta/postfix
#system#

@ -1,5 +0,0 @@
#дополнительные флаги поддержки визуальных расширений
#?system=desktop#
#xscreensaver #support for the XScreenSaver extension
#system#

@ -1,18 +0,0 @@
#?system=desktop#
alsa #Adds support for media-libs/alsa-lib (Advanced Linux Sound Architecture)
-arts #Adds support for aRts: the KDE sound daemon
audiofile #Adds support for libaudiofile where applicable
id3tag #Enables ID3 tagging with id3tag library
flac #Adds support for the flac audio codec
mad #Adds support for mad (high-quality mp3 decoder library and cli frontend)
mp3 #Add support for reading mp3 files
mpeg #Adds libmpeg3 support to various packages
nas #Adds support for network audio sound
ogg #Adds support for the Ogg container format (commonly used by Vorbis, Theora and flac)
oggvorbis #Adds support for the OggVorbis audio encoding - DEPRECATED useflag
openal #Adds support for the Open Audio Library
portaudio #Adds support for the crossplatform portaudio audio API
vorbis #Adds support for the OggVorbis audio codec
mikmod #Adds libmikmod support to allow playing of SoundTracker-style music files
#system#

@ -1,9 +0,0 @@
#?system=desktop#
cdparanoia #Enables cdparanoia support
cdr #Adds support for CD writer hardware
dvd #Adds support for DVDs
dvdr #Adds support for DVD writer hardware (e.g. in xcdroast)
dvdread #Enables usage of Ogle's libdvdread for DVD playback
vcd #Video CD support
#system#

@ -1,3 +0,0 @@
chm #Enable support for Microsoft Compiled HTML Help files
djvu #support DjVu, a PDF-like document format esp. suited for scanned documents
ebook #Add E-Book suppport

@ -1,12 +0,0 @@
#?system=desktop#
clamav #Adds support for Clam AntiVirus software (usually with a plugin)
crypt #Add support for encryption -- using mcrypt or gpg where applicable
ssl #Adds support for Secure Socket Layer connections
#system#
#?system=server#
#hardened #activate default security enhancements for toolchain (gcc, glibc, binutils)
#kerberos #Adds kerberos support
#sasl #Adds support for the Simple Authentication and Security Layer
#system#

@ -1,30 +0,0 @@
#?system=desktop#
3dnow #Adds support for 3dnow multimedia processor instructions
acpi #Adds support for Advanced Configuration and Power Interface
#apm #Adds APM (Advanced Power Management) support
#bluetooth #Enables Bluetooth Support
cairo #adds cairo support
dbus #Enable dbus support for anything that needs it (gpsd, gnomemeeting, etc)
dri #Enable direct rendering: used for accelerated 3D and some 2D, like DMA
hal #Enable Hardware Abstraction Layer (HAL) support
ieee1394 #Enable FireWire/iLink IEEE1394 support (dv, camera, ...)
mmx #Adds support for optimizations for Pentium MMX and Athlon class processors
mmxext #Enables mmx2 support
nvidia #Enable binary Nvidia driver support
opengl #Adds support for OpenGL
scanner #Adds support for scanner hardware (e.g. build the sane frontend in kdegraphics)
smp #Enable support for multiprocessors
sse #fast floating point optimization for PentiumIII+ class chips
sse2 #faster floating point optimization for SS[2E2 capable chips
sse3 #Enable SSE3 support
sse4.1 #Enable SSE4.1 support
sse4.2 #Enable SSE4.2 support
sse4a #Enable SSE4a support
sse5 #Enable SSE5 support
ssse3 #faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)
usb #Adds USB support to applications that have optional USB support (e.g. cups)
xcomposite #Enable support for the Xorg composite extension
#system#
#?calculate=CLD#
lirc #Adds support for lirc (Linux's Infra-Red Remote Control)
#calculate#

@ -1,8 +0,0 @@
#?system=desktop#
irc #Enable support for the IRC protocol
jabber #Enable jabber IM protocol support
jingle #Enables voice calls for jabber
oscar #Enable Oscar (AIM/ICQ) IM protocol support
yahoo #Enable Yahoo Messenger IM protocol support
#system#

@ -1,27 +0,0 @@
#?system=desktop#
X #Adds support for X11
exif #Adds support for reading EXIF headers from JPEG and TIFF images
fdftk #Add supports for Adobe's FDF toolkit
gd #Adds support for media-libs/gd (to generate graphics on the fly)
gif #Adds GIF image support
imagemagick #Enables support for Imagemagick (image converter)
jpeg #Adds JPEG image support
jpeg2k #Support for JPEG 2000, a wavelet-based image compression format
mng #Adds support for libmng (MNG images)
pdf #Adds general support for PDF, this replaces the pdflib and cpdflib flags
png #Adds support for libpng (PNG images)
svg #Adds support for SVG.
tiff #Adds support for the tiff image format
wmf #Adds support for the wmf vector image format
wxwindows #Adds support for wxWidgets/wxGTK GUI toolkit
xpm #Support for XPM graphics format
#system#
#?system=server#
exif #Adds support for reading EXIF headers from JPEG and TIFF images
gif #Adds GIF image support
jpeg #Adds JPEG image support
jpeg2k #Support for JPEG 2000, a wavelet-based image compression format
png #Adds support for libpng (PNG images)
tiff #Adds support for the tiff image format
#system#

@ -1,4 +0,0 @@
#?system=desktop#
-java #Adds support for Java
#system#

@ -1,10 +0,0 @@
truetype #Adds support for FreeType and/or FreeType2 fonts
nls #Adds Native Language Support (using gettext - GNU locale utilities)
slang #Adds support for the slang text display library (it's like ncurses, but different)
unicode #Adds support for Unicode
userlocales #build only the locales specified in /etc/locales.build
#?system=desktop#
spell #Adds dictionary support
#system#

@ -1,11 +0,0 @@
-mailwrapper #Adds mailwrapper support to allow multiple MTAs to be installed
#?system=desktop#
mbox #Adds support for mbox (/var/spool/mail) style mail spools
#system#
#?system=server#
imap #Adds support for IMAP (Internet Mail Application Protocol)
maildir #Adds support for maildir (~/.maildir) style mail spools
#system#

@ -1,18 +0,0 @@
#Сетевые протоколы
bittorrent #Enable embedded bittorrent transport plugin
ftp #Adds FTP (File Transfer Protocol) support
ipv6 #Adds support for IP version 6
nfs #Adds support for NFS file system
samba #Adds support for SAMBA
#?calculate=CLD?system=CLDX#
ldap #Adds LDAP support (Lightweight Directory Access Protocol)
rdesktop #support for the remote desktop protocol
#calculate#
#?calculate=CDS#
ldap #Adds LDAP support (Lightweight Directory Access Protocol)
radius #Adds support for RADIUS authentication
#calculate#

@ -1,4 +0,0 @@
#?system=desktop#
gphoto2 #Adds digital camera support
#system#

@ -1,3 +0,0 @@
cups #Add support for CUPS (Common Unix Printing System)
foomaticdb #Adds support for the foomatic printing driver database

@ -1,5 +0,0 @@
#?calculate=CLD#
mysql #Adds mySQL Database support
#postgres #Adds support for the postgresql database
#calculate#

@ -1,8 +0,0 @@
logrotate #Install support files for logrotate
nptl #Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)
nptlonly #Disables building the linuxthreads fallback in glibc ebuilds that support building both linuxthreads and nptl
#?system=desktop#
nsplugin #Builds plugins for Netscape compatible browsers
#system#

@ -1,38 +0,0 @@
#?system=desktop#
a52 #Enables support for decoding ATSC A/52 streams used in DVD
aac #Enables support for MPEG-4 AAC Audio
aalib #Adds support for media-libs/aalib (ASCII-Graphics Library)
avi #Adds avifile (Library for avi) support
cddb #Access cddb servers to retrieve and submit information about compact disks
dv #Enables support for a codec used by many camcorders
encode #Adds support for encoding of audio or video files
fbcon #Adds framebuffer support for the console, via the kernel
ffmpeg #Enable ffmpeg support
flash #Adds support for creating flash files using Ming
ggi #Adds support for media-libs/libggi (non-X video api/drivers)
libcaca #Add support for colored ASCII-art graphics
lzo #Enables support for lzo compression
matroska #Adds support for the matroska container format
mplayer #Enable mplayer support
musepack #Enable support for the musepack audio codec
real #Installs the real video codecs
sdl #Adds support for Simple Direct Layer (media library)
speex #Adds support for the speex audio codec
srt #Support for SRT subtitle format
svga #Adds support for SVGAlib (graphics library)
tga #Enables Targa video output
quicktime #Adds support for OpenQuickTime
theora #Adds support for the Theora Video Compression Codec
v4l #Enables video4linux support
v4l2 #Enable video4linux2 support
vidix #Support for vidix video output
win32codecs #use win32codecs package for dll avi decoding support (wmv and what not)
xanim #Enables support for xanim based codecs
x264 #Enable h264 encoding using x264
xine #Add support for the XINE movie libraries
xinerama #Add support for the xinerama X11 extension, which allows you to stretch your display across multiple monitors
xv #Adds in optional support for the Xvideo extension (an X API for video playback)
xvid #Adds support for xvid.org's open-source mpeg-4 codec
xvmc #Support for XVideo Motion Compensation (accelerated mpeg playback)
#system#

@ -1,34 +0,0 @@
#?system=desktop#
gtk #Adds support for x11-libs/gtk+ (The GIMP Toolkit)
#system#
#?calculate=CLD#
-eds #Enables support for Evolution-Data-Server(eds)
-gnome #Adds GNOME support
kde #Adds support for kde-base/kde (K Desktop Enviroment)
qt4 #Adds support for the Qt GUI/Application Toolkit version 4.x
qt3support #Enable the Qt3Support libraries for Qt4
-qt3 #Adds support for the Qt GUI/Application Toolkit version 3.x
#calculate#
#?calculate=CLDX#
-eds #Enables support for Evolution-Data-Server(eds)
-gnome #Adds GNOME support
-kde #Adds support for kde-base/kde (K Desktop Enviroment)
#calculate#
#?calculate=CLSG#
gnome #Adds GNOME support
-kde #Adds support for kde-base/kde (K Desktop Enviroment)
#calculate#
#?system=server#
-gnome
-gtk
-kde
-qt3
-qt4
-qt3support
-X
#system#

@ -1,12 +0,0 @@
#?system=desktop#
#-apache #Chooses Apache1 support when a package optionally supports Apache1
#apache2 #Chooses Apache2 support when a package supports both Apache1 and Apache2
libwww #Adds libwww support (General purpose WEB API)
vhosts #Adds support for installing web-based applications into a virtual-hosting environment
#javascript #enable javascript support
#system#
#?calculate=CLD#
webkit #enable WebKit support
#calculate#

@ -1,4 +0,0 @@
#?system=desktop#
bluetooth #Enables Bluetooth Support
#system#

@ -22,7 +22,7 @@ use Time::Local;
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#------------------------------------------------------------------------------
my %data; #объявим хэш переменных
$data{"calcver"} = "1.2.14";
$data{"calcver"} = "1.3.0";
#Определим путь к программе
if(!getpath()){exit;};
@ -2734,54 +2734,6 @@ sub checksystem{
$data{emergerun1} = "/usr/bin/emerge";
} }
#----------------------------------------------------------------------
# Определим переменные настройки make.conf
# $data{use}, $data{uselist}
#----------------------------------------------------------------------
if($data{builder}){
#сформируем USE-флаги
#получим список USE файлов
my %usefiles = ();
#основные USE-флаги
my $path = "$data{dir}/install/builder/use";
opendir(DIR, $path);
foreach(readdir DIR){
if($_ eq "." || $_ eq ".."){next;}
$usefiles{"$path/$_"}++;
}
closedir DIR;
#дополнительные USE-флаги
my $path = "/usr/calculate/share/builder/use";
opendir(DIR, $path);
foreach(readdir DIR){
if($_ eq "." || $_ eq ".."){next;}
$usefiles{"$path/$_"}++;
}
closedir DIR;
#сформироем строки USE-флага
foreach(sort keys %usefiles){
$data{file}{name} = $_;
my $use = '';
my $usefile = $data{file}{name}; $usefile=~s/.+\/([^\/]+)$/$1/;
#соберем по группам USE-флаги
open (F, "$data{file}{name}");
my @f = <F>;
close (F);
foreach(convert(lines => [@f], nocomment => yes)){
chomp;
$use.=" $_";
}
#сформируем массив USE флагов, разбитый построчно
if($use){
$data{use} .= " $use\n";
if($data{uselist}){$data{uselist}.=", "}
$data{uselist} .= "$usefile";
}
}
chop $data{use};
$data{use} = "\n$data{use}";
}
#----------------------------------------------------------------------
# Определим ссылки на исходники программ
# $data{gentoo_mirrors}

@ -1,19 +0,0 @@
--- kdelibs-4.3.1.orig/kdecore/services/kfoldermimetype.cpp
+++ kdelibs-4.3.1/kdecore/services/kfoldermimetype.cpp
@@ -77,11 +77,11 @@ QString KFolderMimeTypePrivate::iconName( const KUrl& _url ) const
// There are also other directories with 0 size, such as /proc, that may
// be mounted, but those are unlikely to contain .directory (and checking
// this would require KMountPoint from kio).
- KDE_struct_stat buff;
- if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0
- && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) {
- return KMimeTypePrivate::iconName( _url );
- }
+ //KDE_struct_stat buff;
+ //if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0
+ // && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) {
+ // return KMimeTypePrivate::iconName( _url );
+ //}
KUrl u( _url );
u.addPath( ".directory" );

@ -1,12 +0,0 @@
diff -uNr kdebase-workspace-4.2.0.old/kdm/kfrontend/kgapp.cpp kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp
--- kdebase-workspace-4.2.0.old/kdm/kfrontend/kgapp.cpp 2008-09-18 00:54:59.000000000 +0400
+++ kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp 2009-02-12 15:50:05.000000000 +0300
@@ -377,6 +377,8 @@
setCursor( dpy, app.desktop()->winId(), XC_left_ptr );
int rslt = ex_exit;
+ app.setStyle( _GUIStyle );
+ app.setFont( *_normalFont );
for (;;) {
int cmd = gRecvInt();

@ -1,101 +0,0 @@
diff --git a/configure b/configure
index f6e9e78..4138ba9 100755
--- a/configure
+++ b/configure
@@ -474,9 +474,9 @@ else
then
if test $Fnroff = "missing"
then
- nroff="nroff -Tascii -c -mandoc"
+ nroff="/usr/bin/man2nroff -Tascii -c -mandoc"
else
- nroff="$Fnroff -mandoc"
+ nroff="/usr/bin/man2nroff -mandoc -Tlatin1"
fi
troff="troff -mandoc"
echo "Warning: could not find groff"
@@ -485,7 +485,7 @@ else
then
nroff="$Fgroff -Tlatin1 -mandoc"
else
- nroff="$Fnroff -mandoc"
+ nroff="/usr/bin/man2nroff -mandoc -Tlatin1"
fi
troff="$Fgroff -Tps -mandoc"
jnroff="$Fgroff -Tnippon -mandocj"
@@ -1248,6 +1248,7 @@ man=$bindir/man
apropos=$bindir/apropos
whatis=$bindir/whatis
man2dvi=$bindir/man2dvi
+man2nroff=$bindir/man2nroff
makewhatis=$sbindir/makewhatis
man_config_dir=$confdir
man_config_file=$confdir/$conffilename
@@ -1351,6 +1352,7 @@ s,@man@,$man,
s,@apropos@,$apropos,
s,@whatis@,$whatis,
s,@man2dvi@,$man2dvi,
+s,@man2nroff@,$man2nroff,
s,@makewhatis@,$makewhatis,
s,@man_config_dir@,$man_config_dir,
s,@man_config_file@,$man_config_file,
diff --git a/src/Makefile.in b/src/Makefile.in
index 9e95cab..0db1ad4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -105,6 +105,7 @@ install: all apropos whatis makewhatis
$(INSTALL) -c -m 755 apropos $(DESTDIR)$(PREFIX)@apropos@
$(INSTALL) -c -m 755 whatis $(DESTDIR)$(PREFIX)@whatis@
$(INSTALL) -c -m 755 man2dvi $(DESTDIR)$(PREFIX)@man2dvi@
+ $(INSTALL) -c -m 755 man2nroff $(DESTDIR)$(PREFIX)@man2nroff@
mkdir -p $(DESTDIR)$(PREFIX)@sbindir@
$(INSTALL) -c -m 754 makewhatis $(DESTDIR)$(PREFIX)@makewhatis@
mkdir -p $(DESTDIR)$(PREFIX)@man_config_dir@
diff --git a/src/man2nroff b/src/man2nroff
new file mode 100755
index 0000000..11b871a
--- /dev/null
+++ b/src/man2nroff
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+#-*- coding: utf-8 -*-
+#------------------------------------------------------------------------------
+# manrc
+# Copyright ©2009 Mir Calculate Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
+import sys
+import subprocess
+import os
+
+buf = sys.stdin.read()
+
+# проверяем локаль и есть ли символы выше ascii
+if os.environ.get("LANG") == "ru_RU.UTF-8" and \
+ len([ i for i in buf if ord(i)>127 ]) > 0:
+ # конвертируем текст вначале через enconv, а в конце через iconv
+ convert_string = '/usr/bin/enconv -L ru -x KOI8-R |' \
+ '/usr/bin/nroff %s | iconv -f koi8-r' % " ".join(sys.argv[1:])
+else:
+ convert_string = '/usr/bin/nroff -mandoc -Tlatin1 -c'
+
+pipe = subprocess.Popen(convert_string,
+ stdin=subprocess.PIPE,
+ stdout=sys.stdout,
+ stderr=subprocess.PIPE,
+ close_fds=True,shell=True)
+pipe.stdin.write(buf)
+pipe.stdin.close()

@ -1,6 +0,0 @@
# Changing BRANDING for openrc
post_pkg_setup() {
export BRANDING="Calculate Linux"
}

@ -1,61 +0,0 @@
diff --git a/Makefile b/Makefile
index 2d36f45..61c69fb 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ slim: $(OBJECTS)
install: slim install-theme
install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
+ install -D -m 755 slimd $(DESTDIR)$(PREFIX)/bin/slimd
install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
diff --git a/slimd b/slimd
new file mode 100644
index 0000000..d283a68
--- /dev/null
+++ b/slimd
@@ -0,0 +1,43 @@
+#!/bin/bash
+#------------------------------------------------------------------------------
+# slimd
+# Copyright ©2009 Mir Calculate Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
+stopslim() {
+ # force kill X
+ killall X &>/dev/null
+ # and kill slim, because slim may be hanged
+ killall -9 slim &>/dev/null
+ # removing slim lock file
+ rm -f /var/run/slim.lock
+ exit
+}
+
+workloop() {
+ trap stopslim TERM
+ # waiting TERM signal for killing X and slim
+ while true
+ do
+ sleep 10
+ done
+}
+
+rm -f /var/run/slim.lock
+killall -9 slim &>/dev/null
+/usr/bin/slim
+workloop &
+
Loading…
Cancel
Save