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=c25925853f63fbfcc6862b85ecdddbe1c3a6f6fd;hp=890dd9341b28bda10306b0c2c90ccfa8a36cbc60;hb=c65e756b71976767f4276c66135e9295b60e794f;hpb=3f51538f54e35a12c28e2372fe140b2fc6870290

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index 890dd93..c259258 100755
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -2,33 +2,47 @@ DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r3.1"
+PR = "r58"
 
 inherit task
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 
 APPS = " \
-  abiword \
-  cheese \
-  claws-mail \
-  epiphany epiphany-extensions \
-  swfdec swfdec-gnome swfdec-mozilla \
+  avahi-ui \
+#  abiword \
   evince \
-  gcalctool \
-  gedit \
-  gimp \
-  gnome-games \
-  gnome-mplayer \
-  gnumeric \
-  gphoto2 \
-  gthumb \
-  pidgin \
-  synergy \
-  vnc \
-  x11vnc angstrom-x11vnc-xinit \
-  xmms \
-  xterm \
+#  claws-mail \
+  swfdec swfdec-gnome swfdec-mozilla \
+#  gnumeric \   
+  networkmanager network-manager-applet \ 
+  vnc x11vnc angstrom-x11vnc-xinit \
+  xchat \
+  links-x11 \
+  enchant \
+  aspell \
+  xwininfo \
+  curl \
+  dosfstools \
+#  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 = " \
@@ -45,30 +59,181 @@ FONTS = " \
   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-pulse \
+  gst-plugin-xvimagesink \
   gst-plugins-base-meta \
-  gst-plugins-good-meta \
-  gst-plugins-bad-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-wallpaper-official \
+  pandora-xfce-defaults \
+#  pandora-midori-defaults midori \
+  libgles2d \
+  pandora-misc \
+  pandora-pndstore \
 "
 
 PERL = " \
   perl \
-#  task-perl-module-all \
-#  libnet-dbus-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 \
+#  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 = " \
@@ -79,7 +244,7 @@ XSERVER_BASE = " \
   mime-support \
   notification-daemon inotify-tools \
   xauth \
-#  xdg-utils \
+  xdg-utils \
   xhost \
   xinetd \
   xinit \
@@ -88,60 +253,65 @@ XSERVER_BASE = " \
   xrefresh \
   xset \
   xvinfo \
+  devilspie \
+  encodings \
+  xterm \
+  xmodmap \
 "
 
-RDEPENDS_${PN} = "\
+ADD_LIBS = " \
+  libbonobo \
+  libetpan \
+  libfribidi \
+  libgsf \
+  libidn \
+  libxslt \
+  wv \
+  libsamplerate0 \
+  glibc-gconv-cp1252 \
+  glibc-gconv-ibm850 \
+  glibc-gconv-iso8859-15 \
+  
+" 
+
+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} \
-	\
-	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 \
+  ${XFCE46_BASE} \
+  ${XFCE46_EXTRAS} \
+  ${XFCE_THEMES} \
+  ${ADD_LIBS} \
+  \
+  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 \
+#  gnuplot \
 "