Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=2edf0aa64bd604a38aa567842e58b81744494ae0

commit 2edf0aa64bd604a38aa567842e58b81744494ae0
Author: Elentir <elen...@frugalware.org>
Date:   Wed Jul 27 15:07:52 2011 +0200

gui: replace feh with xloadimage

diff --git a/Makefile b/Makefile
index da7c59e..74f221a 100644
--- a/Makefile
+++ b/Makefile
@@ -948,17 +948,11 @@ shared-mime-info:
$(UNPACK); \
cp -a usr/share/mime ../shared-mime-info/usr/share

-giblib:
+xloadimage:
$(CLEANUP)
-       mkdir -p giblib/usr/lib
+       mkdir -p xloadimage/usr/bin
$(UNPACK); \
-       cp -a usr/lib/*.so* ../giblib/usr/lib
-
-feh:
-       $(CLEANUP)
-       mkdir -p feh/usr/bin
-       $(UNPACK); \
-       cp -a usr/bin/feh ../feh/usr/bin/
+       cp -a usr/bin/xloadimage ../xloadimage/usr/bin/

libxml2:
$(CLEANUP)
@@ -1002,14 +996,6 @@ libsigc++2:
$(UNPACK); \
cp -a usr/lib/*.so* ../libsigc++2/usr/lib

-imlib2:
-       $(CLEANUP)
-       mkdir -p imlib2/usr/lib/imlib2/{loaders,filters}
-       $(UNPACK); \
-       cp -a usr/lib/libImlib2.so* ../imlib2/usr/lib; \
-       cp -a usr/lib/imlib2/loaders/*.so ../imlib2/usr/lib/imlib2/loaders/; \
-       cp -a usr/lib/imlib2/filters/*.so ../imlib2/usr/lib/imlib2/filters/
-
openbox-minimal:
$(CLEANUP)
mkdir -p openbox-minimal/usr/{bin,lib}
diff --git a/configure b/configure
index fbfb893..ab02962 100755
--- a/configure
+++ b/configure
@@ -45,8 +45,8 @@ if options.gui:
packages.extend(['coreutils', 'tzdata', 'libxau', 'libxcb', 'libxdmcp', 
'libx11', 'libfontenc', 'libxfont', 'libxext',
'libxrender', 'libxrandr', 'libxft', 'libxpm', 'libxkbfile', 'libice', 'libsm', 
'pixman', 'libpciaccess',
'setxkbmap', 'xkbcomp', 'xkeyboard-config', 'xorg-server-minimal', 
'xf86-input-evdev',
-                       'xf86-video-vesa', 'freetype2', 'fontconfig', 
'shared-mime-info', 'giblib', 'feh', 'libxml2', 'atk',
-                       'libpng', 'libjpeg', 'libstdc++', 'libgcc', 
'libsigc++2', 'imlib2', 'openbox-minimal', 'gdk-pixbuf2-minimal',
+                       'xf86-video-vesa', 'freetype2', 'fontconfig', 
'shared-mime-info', 'xloadimage', 'libxml2', 'atk',
+                       'libpng', 'libjpeg', 'libstdc++', 'libgcc', 
'libsigc++2', 'openbox-minimal', 'gdk-pixbuf2-minimal',
'cairo-minimal', 'pango-minimal', 'gtk+2-minimal', 'fwife-minimal', 'glibmm', 
'cairomm-minimal',
'pangomm-minimal', 'gtkmm-minimal', 'gparted-minimal', 'dejavu-ttf', 
'fwifecd-config', 'xf86-video-ati',
'xf86-video-geode', 'xf86-video-intel', 'xf86-video-nouveau', 
'xf86-video-openchrome', 'libdrm',
diff --git a/gui/startx.sh b/gui/startx.sh
index cdd91f8..3da661b 100644
--- a/gui/startx.sh
+++ b/gui/startx.sh
@@ -4,6 +4,6 @@ Xorg -nolisten tcp -modulepath /usr/lib/xorg/modules &
sleep 1
openbox --config-file /usr/share/openbox/obconfig.xml &
sleep 1
-feh --bg-scale /usr/share/themes/backgrounds/fw.jpg &
+xloadimage -onroot -quiet -fullscreen /usr/share/themes/backgrounds/fw.jpg &
export GTK_PATH="/usr/lib/gtk-2.0/"
fwife && killall Xorg & exec /bin/sh
\ No newline at end of file
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to