Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fedb5eb7775a928d290d2ddb50b9d5b68f9dde10
commit fedb5eb7775a928d290d2ddb50b9d5b68f9dde10 Author: Elentir <[email protected]> Date: Tue Dec 30 11:33:09 2008 +0100 metisse-0.4.1-1-i686 * new package diff --git a/source/x11-extra/metisse/FrugalBuild b/source/x11-extra/metisse/FrugalBuild new file mode 100644 index 0000000..ffc2266 --- /dev/null +++ b/source/x11-extra/metisse/FrugalBuild @@ -0,0 +1,42 @@ +# Compiling Time: 0.65 SBU +# Maintainer: - +# Contributor: Elentir <[email protected]> + +pkgname=metisse +pkgver=0.4.1 +pkgrel=1 +pkgdesc="Metisse is an X-based window system" +url="http://insitu.lri.fr/metisse/"; +source=("$url/download/metisse/$pkgname-$pkgver.tar.bz2" "startmetisse" "metisse.desktop" "metisse-gnome.desktop" "metisse-kde.desktop" "metisse-xfce.desktop" "metisse-compositor.conf" "xinitrc.metisse" "metisse-format-security.patch") +depends=('glibc' 'xorg-server' 'freetype2' 'gtk+2' 'libstroke' 'libxft' 'nucleo') +rodepends=('xdpyinfo') +conflicts=('fvwm' 'fvwm-devel') +groups=('x11-extra') +archs=('i686') +up2date="Flasttar $url/download/metisse/" +Fconfopts="--prefix=/usr --enable-glx-x86 --enable-freetype" +sha1sums=('acf97b125905d91988955560a9b14b06a530eed6' \ + '32345bab6ffb04e60b3b2991c19133e43817b0cd' \ + 'a16bb5d52b7df5d25e13b0c2353d98c158cfceba' \ + 'e0f54fdc174c38a93dde2a1b22e713ee65c89fc7' \ + '1e03e4383bd92d91c153c52c99b3f7489d914751' \ + '9a7ebd00c2125bf99ab47dadc0a290b5b5abe699' \ + '05cd339b4e6493b94863986ee9228fd0f0eb86cf' \ + '15046a7d35bedf61bc55a47e01475e6c201c6734' \ + '303c4c92bc4a648788518d10c6fd5970ce60e03e') + +build() +{ + Fbuild + Fmkdir /etc/X11/sessions/ + Fmkdir /usr/share/apps/kdm/sessions/ + Fexe startmetisse /usr/bin/ + Fexe xinitrc.metisse /etc/X11/xinit/xinitrc.metisse + Ffile metisse.desktop metisse-kde.desktop metisse-gnome.desktop metisse-xfce.desktop /usr/share/apps/kdm/sessions + Ffile metisse.desktop metisse-kde.desktop metisse-gnome.desktop metisse-xfce.desktop /etc/X11/sessions/ + #delete useless desktop files + Frm /etc/X11/dm/ + Ffile metisse-compositor.conf /etc/ +} + +# optimization OK diff --git a/source/x11-extra/metisse/metisse-compositor.conf b/source/x11-extra/metisse/metisse-compositor.conf new file mode 100644 index 0000000..bb72db0 --- /dev/null +++ b/source/x11-extra/metisse/metisse-compositor.conf @@ -0,0 +1,29 @@ +# General configuration + +# Set default display used by metisse compositor +XMDISPLAY=:1 +# Default depth +DEPTH=24 +# Uncomment if you want to disable resolution autodetection +#RESOL=1024x768 + +# Compositor options + +# Disables the use of OpenGL's stencil buffer to render shaped windows if set to 0 +# This may slow down the compositor but it might also solve problems with applications like xeyes, xine or xmms. +STENCILBUFFER=1 + +# Enables a software cursor if set to 1. +# This might solve some rendering problems and allows to create screenshots that show the cursor. +SOFTWARECURSOR=0 + +# Enables the use of OpenGL's mipmapping functions if set to 1. +# This will use more memory but might produce better renderings of transformed windows. +MIPMAP=0 + +# Enables non-power-of-two texture support if set to 1. +# This might improve performance and reduce memory usage but might also cause rendering problems on some graphics hardware. +TWOPOWTEX=0 + +# Disables window shadows if set to 0 +WINDOWSHADOW=1 \ No newline at end of file diff --git a/source/x11-extra/metisse/metisse-format-security.patch b/source/x11-extra/metisse/metisse-format-security.patch new file mode 100644 index 0000000..0c6405e --- /dev/null +++ b/source/x11-extra/metisse/metisse-format-security.patch @@ -0,0 +1,58 @@ +diff -p -up metisse-0.4.1/fvwm-insitu/fvwm/builtins.c.format-security metisse-0.4.1/fvwm-insitu/fvwm/builtins.c +--- metisse-0.4.1/fvwm-insitu/fvwm/builtins.c.format-security 2008-12-17 13:33:54.000000000 +0100 ++++ metisse-0.4.1/fvwm-insitu/fvwm/builtins.c 2008-12-17 13:34:50.000000000 +0100 +@@ -2850,7 +2850,7 @@ void CMD_Echo(F_CMD_ARGS) + action[len-1]='\0'; + } + } +- fvwm_msg(ECHO,"Echo",action); ++ fvwm_msg(ECHO,"Echo","%s",action); + + return; + } +diff -p -up metisse-0.4.1/fvwm-insitu/libs/FRenderInit.c.format-security metisse-0.4.1/fvwm-insitu/libs/FRenderInit.c +--- metisse-0.4.1/fvwm-insitu/libs/FRenderInit.c.format-security 2008-12-17 13:32:00.000000000 +0100 ++++ metisse-0.4.1/fvwm-insitu/libs/FRenderInit.c 2008-12-17 13:32:24.000000000 +0100 +@@ -129,7 +129,7 @@ Bool FRenderGetErrorText(int code, char + code <= FRenderErrorBase + + (sizeof(error_names) / sizeof(char *)) -1) + { +- sprintf(msg, error_names[code - FRenderErrorBase]); ++ sprintf(msg, "%s", error_names[code - FRenderErrorBase]); + return 1; + } + } +diff -p -up metisse-0.4.1/fvwm-insitu/modules/FvwmIconMan/functions.c.format-security metisse-0.4.1/fvwm-insitu/modules/FvwmIconMan/functions.c +--- metisse-0.4.1/fvwm-insitu/modules/FvwmIconMan/functions.c.format-security 2008-12-17 13:39:49.000000000 +0100 ++++ metisse-0.4.1/fvwm-insitu/modules/FvwmIconMan/functions.c 2008-12-17 13:43:59.000000000 +0100 +@@ -522,7 +522,7 @@ int builtin_ret(int numargs, BuiltinArg + + int builtin_print(int numargs, BuiltinArg *args) + { +- char *s, buf[256]; ++ char *s; + + ConsoleDebug(FUNCTIONS, "print: %s\n", args[0].value.string_value); + +@@ -533,8 +533,7 @@ int builtin_print(int numargs, BuiltinAr + } + else + { +- sprintf(buf, "%s\n", s); +- ConsoleMessage(buf); ++ ConsoleMessage("%s\n",s); + } + + return 0; +diff -p -up metisse-0.4.1/xserver/metisse/init.c.format-security metisse-0.4.1/xserver/metisse/init.c +--- metisse-0.4.1/xserver/metisse/init.c.format-security 2008-12-17 14:16:14.000000000 +0100 ++++ metisse-0.4.1/xserver/metisse/init.c 2008-12-17 14:17:05.000000000 +0100 +@@ -1124,7 +1124,7 @@ void rfbLog(char *format, ...) + + time(&clock); + strftime(buf, 255, "%F %T ", localtime(&clock)); +- fprintf(stderr, buf); ++ fprintf(stderr, "%s", buf); + + vfprintf(stderr, format, args); + fflush(stderr); diff --git a/source/x11-extra/metisse/metisse-gnome.desktop b/source/x11-extra/metisse/metisse-gnome.desktop new file mode 100644 index 0000000..02b3c89 --- /dev/null +++ b/source/x11-extra/metisse/metisse-gnome.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GNOME with Metisse +Comment=Metisse is not a 3d desktop +Exec=startmetisse gnome-session +Icon= +Type=Application \ No newline at end of file diff --git a/source/x11-extra/metisse/metisse-kde.desktop b/source/x11-extra/metisse/metisse-kde.desktop new file mode 100644 index 0000000..ed88e6c --- /dev/null +++ b/source/x11-extra/metisse/metisse-kde.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=KDE with Metisse +Comment=Metisse is not a 3d desktop +Exec=startmetisse startkde +Icon= +Type=Application \ No newline at end of file diff --git a/source/x11-extra/metisse/metisse-xfce.desktop b/source/x11-extra/metisse/metisse-xfce.desktop new file mode 100644 index 0000000..06a0c10 --- /dev/null +++ b/source/x11-extra/metisse/metisse-xfce.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=XFCE4 with Metisse +Comment=Metisse is not a 3d desktop +Exec=startmetisse startxfce4 +Icon= +Type=Application \ No newline at end of file diff --git a/source/x11-extra/metisse/metisse.desktop b/source/x11-extra/metisse/metisse.desktop new file mode 100644 index 0000000..154bc62 --- /dev/null +++ b/source/x11-extra/metisse/metisse.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Metisse +Comment=Metisse is not a 3d desktop +Exec=startmetisse +Icon= +Type=Application \ No newline at end of file diff --git a/source/x11-extra/metisse/startmetisse b/source/x11-extra/metisse/startmetisse new file mode 100644 index 0000000..ec7653b --- /dev/null +++ b/source/x11-extra/metisse/startmetisse @@ -0,0 +1,40 @@ +#! /bin/sh + +. /etc/metisse-compositor.conf + +OPTION="--" + +if [ "$STENCILBUFFER" = "0" ]; then +OPTION+=" -t" +fi + +if [ "$SOFTWARECURSOR" = "1" ]; then +OPTION+=" -C" +fi + +if [ "$MIPMAP" = "1" ]; then +OPTION+=" -p" +fi + +if [ "$TWOPOWTEX" = "1" ]; then +OPTION+=" -n" +fi + +if [ "$WINDOWSHADOW" = "0" ]; then +OPTION+=" -s" +fi + +#try to autodetect resolution +if [ "$RESOL" = "" ]; then +RESOL=$(xdpyinfo | grep dimensions | sed 's/.*:\(.*x.*\) p.*/\1/;s/ //g') +fi + +killall Xmetisse &> /dev/null +if [ "$1" = "" ]; then +Xmetisse -depth $DEPTH -geometry $RESOL -ac $XMDISPLAY >& .Xmetisse-log & +metisse-start-fvwm -wd $XMDISPLAY $OPTION -- --replace >& .compositor-log +else +Xmetisse -depth $DEPTH -geometry $RESOL -ac $XMDISPLAY >& .Xmetisse-log & +metisse-start-fvwm -wd $XMDISPLAY $OPTION -- --replace >& .compositor-log & DISPLAY="$XMDISPLAY" $1 +fi +killall Xmetisse &> /dev/null diff --git a/source/x11-extra/metisse/xinitrc.metisse b/source/x11-extra/metisse/xinitrc.metisse new file mode 100644 index 0000000..821c76d --- /dev/null +++ b/source/x11-extra/metisse/xinitrc.metisse @@ -0,0 +1,29 @@ +#!/bin/sh +# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/usr/lib/X11/xinit/.Xresources +sysmodmap=/usr/lib/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# start some nice programs + +startmetisse _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
