task-pandora-xfce*: try to make it work

[openpandora.oe.git] / recipes / tasks / task-pandora-xfce.bb

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
old mode 100755 (executable)
new mode 100644 (file)
index fd337e7..f59cb1a
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -1,147 +1,13 @@
-DESCRIPTION = "Task file for the XFCE Pandora image"
+require task-pandora-xfce.inc
 
-# Don't forget to bump the PR if you change it.
+# bump PR in task-pandora-xfce.inc if you change this
 
-PR = "r3.1"
-
-inherit task
-
-ANGSTROM_EXTRA_INSTALL ?= ""
-
-APPS = " \
-  abiword \
-  cheese \
-  claws-mail \
-  epiphany epiphany-extensions \
-  swfdec swfdec-gnome swfdec-mozilla \
-  evince \
-  gcalctool \
-  gedit \
-  gimp \
-  gnome-games \
-  gnome-mplayer \
-  gnumeric \
-  gphoto2 \
-  gthumb \
-  pidgin \
-  synergy \
-  vnc \
-  x11vnc angstrom-x11vnc-xinit \
-  xmms \
-  xterm \
-"
-
-FONTS = " \
-  font-adobe-75dpi \
-  fontconfig fontconfig-utils font-util \
-  ttf-arphic-uming \
-  ttf-dejavu-common \
-  ttf-dejavu-sans \
-  ttf-dejavu-serif \
-  ttf-dejavu-sans-mono \
-  ttf-liberation-sans \
-  ttf-liberation-serif \
-  ttf-liberation-mono \
-  xorg-minimal-fonts \
-"  
-
-GSTREAMER = " \
-  gst-ffmpeg \
-  gst-omapfb \
-  gst-plugin-pulse \
-  gst-plugins-base-meta \
-  gst-plugins-good-meta \
-  gst-plugins-bad-meta \
-#  gst-plugins-ugly-meta \
-"
-
-PERL = " \
-  perl \
-#  task-perl-module-all \
-#  libnet-dbus-perl \
-  libxml-parser-perl \
-  libxml-twig-perl \
-"
-
-PULSEAUDIO = " \
-  pulseaudio-alsa-wrapper \
-  pulseaudio-esd-wrapper \
-  pulseaudio-module-gconf \
-  libasound-module-ctl-pulse \
-  libasound-module-pcm-pulse \
-"
-
-XSERVER_BASE = " \
-  ${XSERVER} \
-  dbus-x11 \
-  desktop-file-utils \
-  iso-codes \
-  mime-support \
-  notification-daemon inotify-tools \
-  xauth \
-#  xdg-utils \
-  xhost \
-  xinetd \
-  xinit \
-  xlsfonts \
-  xrdb \
-  xrefresh \
-  xset \
-  xvinfo \
-"
+# this is done this way to not break existing installations
 
 RDEPENDS_${PN} = " \
-  task-pandora-core \
-  ${ANGSTROM_EXTRA_INSTALL} \
-  ${APPS} \
-  ${FONTS} \
-  ${GSTREAMER} \
-  ${PERL} \
-  ${PULSEAUDIO} \
-  ${XSERVER_BASE} \
-       \
-       angstrom-x11-base-depends \
-       \
-#      pandora-auto-startx \
-#      pandora-first-run-wizard \
-       \
-       task-xfce46-base \
-       task-xfce46-extras \    
-       \
-#      gnome-packagekit \
-       \
-       rxvt-unicode \
-       xkbd \
-       xst \
-       xhost \
-       xrdb \
-       libgtkstylus \
-       suspend-desktop \
-       teleport \
-       xauth \
-       gdk-pixbuf-loader-png \
-       gdk-pixbuf-loader-xpm \
-       gdk-pixbuf-loader-jpeg \
-       pango-module-basic-x \
-       pango-module-basic-fc \
-       gpe-theme-clearlooks \
-       xcursor-transparent-theme \     
-       angstrom-zeroconf-audio \
-       angstrom-led-config \   
-       mime-support \
-       xterm xmms \
-       firefox \
-       hicolor-icon-theme gnome-icon-theme \
-       jaaa nmap iperf gnuplot \
-       abiword \
-       gnumeric \
-       gimp \
-       pidgin \
-       gnome-games \
-       stalonetray \
-       synergy \
-       x11vnc angstrom-x11vnc-xinit \
-       angstrom-gnome-icon-theme-enable \
-       networkmanager network-manager-applet \
-       gnome-bluetooth \
+  ${PANDORA_XFCE} \
+  pandora-firmware \
+  wl1251-modules \
+  pandora-scripts-wifi \
+  pandora-configtray-wifi \
 "