X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Ftasks%2Ftask-pandora-xfce.bb;h=0bbb03e2c6ee42b172cb8238af1e526e2b75d2e1;hp=632b75be0e3653e2d26efd3099ea232d180ace8f;hb=88b0486ff8f09ce53d99ddd09981c29fe472d43c;hpb=34e0594aaa58c7104b8bbe0f1222f83796398f20

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index 632b75b..0bbb03e 100755
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -1,341 +1,18 @@
-DESCRIPTION = "Task file for the XFCE Pandora image"
+DESCRIPTION = "Task file for the XFCE Pandora image incl. Wifi"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r72"
+PR = "r73"
 
 inherit task
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
-APPS = " \
-  avahi-ui \
-#  abiword \
-  evince \
-#  claws-mail \
-  swfdec swfdec-gnome swfdec-mozilla \
-#  gnumeric \   
-  networkmanager network-manager-applet \ 
-  vnc x11vnc angstrom-x11vnc-xinit \
-  openvpn networkmanager-openvpn \
-  modemmanager \
-  xchat \
-  links-x11 \
-  enchant \
-  aspell \
-  xwininfo \
-  curl \
-  dosfstools \
-  netkit-ftp \
-#  xournal \
-#  arora \
-"
-
-BLUETOOTH_GUI = " \
-  gnome-bluetooth \
-"
-
-IM_CLIENT = " \
-#  pidgin \
-#  libpurple-protocol-msn \
-#  libpurple-protocol-yahoo \
-#  libpurple-protocol-icq \
-#  libpurple-protocol-aim \
-"
-
-DISPMAN = " \
-  slim \
-  slim-op-themes \
-"
-
-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 \
-"  
-
-# Any default games we want to ship.
-GAMES = " \
-#  scummvm \
-#  frozen-bubble \
-#  gnome-games \  
-#  numptyphysics \
-"
-
-GNOME_APPS = " \
-#  gnome-mplayer \
-  gcalctool \ 
-  gnome-keyring gnome-keyring-pam-plugin \
-  gksu \
-"
-
-GSTREAMER = " \
-#  gstreamer-ti \
-  gst-ffmpeg \
-  gst-omapfb \
-#  gst-plugin-pulse \
-  gst-plugin-xvimagesink \
-  gst-plugins-base-meta \
-#  gst-plugins-good-meta \
-#  gst-plugins-bad-meta \
-#  gst-plugins-ugly-meta \
-  gst-plugin-gles \
-"
-
-ICON_THEME = " \
-  hicolor-icon-theme \
-  elementary-icon-theme \
-  elementary-icon-theme-enable \
-"
-
-LAUNCHERS = " \
-#  netbook-launcher-efl \
-  pandora-libpnd-minimenu \
-#  pandora-pmenu \
-"
-
 PANDORA = " \
-  pandora-first-run-wizard hsetroot \
-  pandora-scripts \
+  pandora-task-xfce-nowifi \
   pandora-scripts-wifi \
-  pandora-wallpaper-official \
-  pandora-xfce-defaults \
-#  pandora-midori-defaults midori \
-  libgles2d \
-  pandora-misc \
-  pandora-pndstore \
-  pandora-configtray \
   pandora-configtray-wifi \
 "
-
-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 \
-"
-
-PYTHON_LIBS = " \
-  python-shell \
-  python-pygtk \
-  python-pycairo \
-  gnome-vfs-plugin-http \
-  gnome-vfs-plugin-ftp \
-"
-
-QT_SUPPORT = " \
- libqt3support4 \ 
- libqtassistantclient4 \ 
- libqtclucene4 \ 
- libqtcore4 \ 
- libqtdbus4 \ 
- libqtdesigner4 \ 
- libqtdesignercomponents4 \ 
- libqtgui4 \ 
- libqthelp4 \ 
- libqtnetwork4 \  
- libqtscript4 \ 
- libqtscripttools4 \ 
- libqtsql4 \ 
- libqtsvg4 \ 
- libqttest4 \ 
- libqtwebkit4 \ 
- libqtxml4 \  
- qt4-tools \ 
- qt4-assistant \ 
- qt4-common \ 
- qt4-dbus \ 
- qt4-designer \ 
- qt4-fonts \ 
- qt4-linguist \ 
- qt4-mkspecs \ 
- qt4-pixeltool \ 
- qt4-qt3to4 \
- qt4-plugin-imageformat-jpeg \
- qt4-plugin-imageformat-gif \
-"
-
-
-TOTEM = " \
-#  totem \
-#  totem-browser-plugin \
-#  totem-plugin-bemused \
-#  totem-plugin-gromit \
-#  totem-plugin-media-player-keys \
-#  totem-plugin-ontop \
-#  totem-plugin-properties \
-#  totem-plugin-screensaver \
-#  totem-plugin-skipto \
-#  totem-plugin-thumbnail \
-"
-
-TOUCHSCREEN = " \
-#  gtk-touchscreen-mode-enable \
-  libgtkstylus \
-#  xinput-calibrator \
-"
-
-XFCE46_BASE = " \
-  xfce4-dev-tools \
-  xfwm4 \
-  xfwm4-theme-default \
-  xfce-utils \  
-  xfce4-session \     
-  xfconf \
-  xfdesktop \
-  xfce4-panel \
-  xfce4-power-manager \
-  \
-  gtk-xfce-engine \
-  \
-  xfce4-panel-plugin-actions \
-  xfce4-panel-plugin-clock \
-  xfce4-panel-plugin-iconbox \
-  xfce4-panel-plugin-launcher \
-  xfce4-panel-plugin-pager \
-  xfce4-panel-plugin-separator \
-  xfce4-panel-plugin-showdesktop \
-  xfce4-panel-plugin-systray \
-  xfce4-panel-plugin-tasklist \
-  xfce4-panel-plugin-windowlist \   
-  xfce4-settings \
-  xfce-terminal \
-  thunar \
-"
-
-XFCE46_EXTRAS = " \
-  xfce4-notifyd \
-  xfce4-mixer \
-  xfce4-appfinder \
-  xfce4-battery-plugin \
-  xfprint \    
-  orage \
-  squeeze \
-  ristretto \
-  mousepad \ 
-  gigolo \
-  xdotool \
-"
-
-XFCE_THEMES = " \
-  xfwm4-theme-daloa \
-  xfwm4-theme-moheli \
-  xfwm4-theme-kokodi \
-  xfwm4-theme-sassandra \
-  xfwm4-themes \
-"
-
-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 \
-  devilspie \
-  encodings \
-  xterm \
-  xmodmap \
-"
-
-ADD_LIBS = " \
-  libbonobo \
-  libetpan \
-  libfribidi \
-  libgsf \
-  libidn \
-  libxslt \
-  wv \
-  libsamplerate0 \
-  glibc-gconv-cp1252 \
-  glibc-gconv-ibm850 \
-  glibc-gconv-iso8859-15 \
-  glibc-gconv-cp1250 \
-  glibc-gconv-koi8-r \
-  glibc-gconv-unicode \
-  glibc-gconv-utf-16 \
-  gvfsd-sftp \
-  sshfs-fuse \
-  directfb \
-  rtl8712-module \
-  rtl8192u-module \
-" 
-
-DSP = " \
-  ti-dsplink-module \
-  ti-cmem-module \
-  ti-lpm-module \
-  ti-sdma-module \
-  ti-codecs-omap3530-server \
-"
-
 RDEPENDS_${PN} = " \
   task-pandora-core \
-  angstrom-x11-base-depends \
-  ${ANGSTROM_EXTRA_INSTALL} \
-  ${APPS} \
-  ${BLUETOOTH_GUI} \
-  ${IM_CLIENT} \
-  ${DISPMAN} \
-  ${FONTS} \
-  ${GAMES} \  
-  ${GNOME_APPS} \
-  ${GSTREAMER} \
-  ${ICON_THEME} \
-  ${LAUNCHERS} \
-  ${PANDORA} \
-  ${PERL} \
-  ${PULSEAUDIO} \
-  ${PYTHON_LIBS} \
-  ${QT_SUPPORT} \
-  ${TOTEM} \
-  ${TOUCHSCREEN} \
-  ${XSERVER_BASE} \
-  ${XFCE46_BASE} \
-  ${XFCE46_EXTRAS} \
-  ${XFCE_THEMES} \
-  ${ADD_LIBS} \
-  ${DSP} \
-  \
-  rxvt-unicode \
-#  xst \
-#  suspend-desktop \
-#  teleport \
-  gdk-pixbuf-loader-png \
-  gdk-pixbuf-loader-xpm \
-  gdk-pixbuf-loader-jpeg \
-  pango-module-basic-x \
-  pango-module-basic-fc \
-  xcursor-transparent-theme \	
-  xterm \
-  jaaa nmap iperf \
-  xf86-video-udlfb \
-#  gnuplot \
 "