tools-uclibc/desktop: several improvements

1) Fix circular dependency wrt avahi and directfb
  2) Add CFLAGS=-fcheck-stack to global build
  3) Address breakage under check-stack for ffmpeg, bug #471756
  4) Clean up desktop

tools-uclibc/desktop/config

@@ -130,7 +130,8 @@ CONFIG_RCU_FANOUT_LEAF=16
 CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_NOCB_CPU is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
@@ -6824,10 +6825,6 @@ CONFIG_KEYS=y
 # CONFIG_SECURITY is not set
 CONFIG_SECURITYFS=y
 # CONFIG_INTEL_TXT is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m

tools-uclibc/desktop/gentoo/.config/Thunar/accels.scm

@@ -1,75 +1,3 @@
 ; Thunar GtkAccelMap rc-file         -*- scheme -*-
 ; this file is an automated accelerator map dump
 ;
-; (gtk_accel_path "<Actions>/ThunarLauncher/sendto-desktop" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/create-folder" "<Primary><Shift>n")
-; (gtk_accel_path "<Actions>/ThunarShortcutsPane/sendto-shortcuts" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-menu" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/paste-into-folder" "<Primary>v")
-; (gtk_accel_path "<Actions>/ThunarWindow/open-home" "<Alt>Home")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-menu" "")
-; (gtk_accel_path "<Actions>/ThunarLauncher/open" "<Primary>o")
-; (gtk_accel_path "<Actions>/ThunarWindow/go-menu" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/open-file-system" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/zoom-out" "<Primary>minus")
-; (gtk_accel_path "<Actions>/ThunarStandardView/paste" "<Primary>v")
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-menu" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/help-menu" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/file-menu" "")
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-other-in-menu" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/detach-tab" "")
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-in-new-tab" "<Primary><Shift>p")
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-name" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-menubar" "<Primary>m")
-; (gtk_accel_path "<Actions>/ThunarStandardView/back" "<Alt>Left")
-; (gtk_accel_path "<Actions>/ThunarWindow/close-tab" "<Primary>w")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-as-compact-list" "<Primary>3")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-tree" "<Primary>e")
-; (gtk_accel_path "<Actions>/ThunarStandardView/restore" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/open-network" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/new-tab" "<Primary>t")
-; (gtk_accel_path "<Actions>/ThunarWindow/preferences" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/rename" "F2")
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-size" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/sendto-menu" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/edit-menu" "")
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-with-other" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-toolbar" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/invert-selection" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/make-link" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-as-icons" "<Primary>1")
-; (gtk_accel_path "<Actions>/ThunarWindow/new-window" "<Primary>n")
-; (gtk_accel_path "<Actions>/ThunarStandardView/forward" "<Alt>Right")
-; (gtk_accel_path "<Actions>/ThunarStandardView/move-to-trash" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/select-by-pattern" "<Primary>s")
-; (gtk_accel_path "<Actions>/ThunarWindow/about" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/contents" "F1")
-; (gtk_accel_path "<Actions>/ThunarWindow/open-desktop" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/close-all-windows" "<Primary><Shift>w")
-; (gtk_accel_path "<Actions>/ThunarWindow/zoom-in" "<Primary>plus")
-; (gtk_accel_path "<Actions>/ThunarStandardView/duplicate" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/open-parent" "<Alt>Up")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-shortcuts" "<Primary>b")
-; (gtk_accel_path "<Actions>/ThunarWindow/reload" "<Primary>r")
-; (gtk_accel_path "<Actions>/ThunarWindow/open-templates" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/copy" "<Primary>c")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-pathbar" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/open-trash" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-descending" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/properties" "<Alt>Return")
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-type" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/delete" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-ascending" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/empty-trash" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-menu" "")
-; (gtk_accel_path "<Actions>/ThunarLauncher/open-in-new-window" "<Primary><Shift>o")
-; (gtk_accel_path "<Actions>/ThunarStandardView/arrange-items-menu" "")
-; (gtk_accel_path "<Actions>/ThunarStandardView/cut" "<Primary>x")
-; (gtk_accel_path "<Actions>/ThunarWindow/close-window" "<Primary>q")
-; (gtk_accel_path "<Actions>/ThunarStandardView/select-all-files" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/open-location" "<Primary>l")
-; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-mtime" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/zoom-reset" "<Primary>0")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-statusbar" "")
-; (gtk_accel_path "<Actions>/ThunarWindow/show-hidden" "<Primary>h")
-; (gtk_accel_path "<Actions>/ThunarWindow/view-as-detailed-list" "<Primary>2")

tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-12/13698963011.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Name=Audio Mixer
+Comment=Adjust volume levels
+Icon=multimedia-volume-control
+Exec=xfce4-mixer
+Type=Application
+StartupNotify=true
+Terminal=false
+Categories=X-XFCE;Audio;Mixer;AudioVideo;
+X-XFCE-Source=file:///usr/share/applications/xfce4-mixer.desktop

tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/136796191211.desktop

@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Movie Player
-Comment=Play movies and songs
-Exec=totem %U
-Icon=totem
-Terminal=false
-Type=Application
-Categories=GTK;GNOME;AudioVideo;Player;Video;
-X-GNOME-DocPath=totem/totem.xml
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=totem
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.32.0
-X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
-X-GNOME-Bugzilla-ExtraInfoScript=/usr/libexec/totem/totem-bugreport.py
-StartupNotify=true
-MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-scheme-handler/pnm;x-scheme-handler/mms;x-scheme-handler/net;x-scheme-handler/rtp;x-scheme-handler/rtsp;x-scheme-handler/mmsh;x-scheme-handler/uvox;x-scheme-handler/icy;x-scheme-handler/icyx;
-X-XFCE-Source=file:///usr/share/applications/totem.desktop

tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/13699065271.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=Qt;KDE;AudioVideo;Player;Video;
+Comment=A great MPlayer front-end
+Exec=smplayer %U
+GenericName=Media Player
+Icon=smplayer
+MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
+Name=SMPlayer
+Type=Application
+X-KDE-StartupNotify=false
+X-XFCE-Source=file:///usr/share/applications/smplayer.desktop

tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml

@@ -2,4 +2,17 @@
 
 <channel name="xfce4-mixer" version="1.0">
   <property name="volume-step-size" type="uint" value="5"/>
+  <property name="active-card" type="string" value="HDAIntelAlsamixer"/>
+  <property name="sound-card" type="string" value="HDAIntelAlsamixer"/>
+  <property name="sound-cards" type="empty">
+    <property name="HDAIntelAlsamixer" type="array">
+      <value type="string" value="IEC958 Default PCM"/>
+      <value type="string" value="PCM"/>
+      <value type="string" value="Speaker"/>
+      <value type="string" value="Headphone"/>
+      <value type="string" value="Master"/>
+    </property>
+  </property>
+  <property name="window-height" type="int" value="468"/>
+  <property name="window-width" type="int" value="501"/>
 </channel>

tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

@@ -15,7 +15,7 @@
         <value type="int" value="3"/>
         <value type="int" value="15"/>
         <value type="int" value="4"/>
-        <value type="int" value="11"/>
+        <value type="int" value="12"/>
         <value type="int" value="5"/>
         <value type="int" value="6"/>
         <value type="int" value="2"/>
@@ -43,7 +43,21 @@
   </property>
   <property name="plugins" type="empty">
     <property name="plugin-1" type="string" value="applicationsmenu"/>
-    <property name="plugin-2" type="string" value="actions"/>
+    <property name="plugin-2" type="string" value="actions">
+      <property name="items" type="array">
+        <value type="string" value="+lock-screen"/>
+        <value type="string" value="-switch-user"/>
+        <value type="string" value="+separator"/>
+        <value type="string" value="-suspend"/>
+        <value type="string" value="-hibernate"/>
+        <value type="string" value="-separator"/>
+        <value type="string" value="+shutdown"/>
+        <value type="string" value="-restart"/>
+        <value type="string" value="+separator"/>
+        <value type="string" value="+logout"/>
+        <value type="string" value="-logout-dialog"/>
+      </property>
+    </property>
     <property name="plugin-3" type="string" value="tasklist"/>
     <property name="plugin-15" type="string" value="separator">
       <property name="expand" type="bool" value="true"/>
@@ -99,15 +113,14 @@
     </property>
     <property name="plugin-22" type="string" value="launcher">
       <property name="items" type="array">
-        <value type="string" value="136796191211.desktop"/>
+        <value type="string" value="13699065271.desktop"/>
       </property>
     </property>
-    <property name="plugin-11" type="string" value="mixer">
-      <property name="sound-card" type="string" value=""/>
-      <property name="track" type="string" value=""/>
-      <property name="command" type="string" value="xfce4-mixer"/>
-      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
-    </property>
     <property name="plugin-23" type="string" value="thunar-tpa"/>
+    <property name="plugin-12" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="13698963011.desktop"/>
+      </property>
+    </property>
   </property>
 </channel>

tools-uclibc/desktop/portage/env/ffmpeg.conf

@@ -0,0 +1 @@
+CFLAGS="-fno-stack-check"

tools-uclibc/desktop/portage/make.conf.1

@@ -1,10 +1,10 @@
-CFLAGS="-O2 -pipe"
+CFLAGS="-O2 -fstack-check -pipe"
 CXXFLAGS="${CFLAGS}"
 CHOST="x86_64-gentoo-linux-uclibc"
 MAKEOPTS="-j9"
 
 USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig"
-USE_GCC="gcj graphite objc objc++ objc-gc gtk X"
+USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X"
 USE="${USE_BASE} ${USE_GCC}"
 
 source "/var/lib/layman/make.conf"

tools-uclibc/desktop/portage/make.conf.2

@@ -1,10 +1,10 @@
-CFLAGS="-O2 -pipe"
+CFLAGS="-fstack-check -O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 CHOST="x86_64-gentoo-linux-uclibc"
 MAKEOPTS="-j9"
 
 USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig"
-USE_GCC="gcj graphite objc objc++ objc-gc gtk X"
+USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X"
 USE_ENC="gmp gnutls pkcs11 X509"
 USE_ACL="acl caps"
 USE_DBS="berkdb gdbm sqlite"
@@ -14,7 +14,7 @@ USE_UDEV="gudev hwdb keymap kmod"
 USE_VCS="git"
 USE_CHAR="fontforge icu idn"
 
-USE_SERVERS="avahi cups dbus sasl mbox zeroconf"
+USE_SERVERS="cups dbus sasl mbox zeroconf"
 USE_PAX="xtpax -ptpax"
 
 USE_AUDIO="openal"
@@ -24,10 +24,10 @@ USE_DISPLAY="cairo xinerama xscreensaver"
 USE_MULTI="3dnow 3dnowext a52 aac alsa amr ass avx cdio dirac dga dts dv dvb dvd encode ffmpeg flac g3dvl gsm jack jpeg2k lame libass libv4l mad mmxext mod modplug mp3 mpeg musepack ogg oss pulseaudio quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi"
 USE_MPLAYER="bidi bl bluray bs2b cddb cdparanoia cpudetection fbcon ftp ggi joystick ladspa libcaca libmpeg2 libnotify md5sum musicbrainz nas nut pnm portaudio postproc pvr quvi radio samba tga xanim zoran"
 
-USE_XFCE4="session thunar"
 USE_BROWSE="curl webkit -libproxy"
 USE_WORD="latex math openxml pdf spell thesaurus wmf wordperfect"
 USE_GAMES="artworkextra"
+USE_XFCE4="session thunar"
 
 USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-syntax watchdog"
 

tools-uclibc/desktop/portage/make.conf.3

@@ -1,10 +1,10 @@
-CFLAGS="-O2 -pipe"
+CFLAGS="-fstack-check -O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 CHOST="x86_64-gentoo-linux-uclibc"
 MAKEOPTS="-j9"
 
 USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig"
-USE_GCC="gcj graphite objc objc++ objc-gc gtk X"
+USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X"
 USE_ENC="gmp gnutls pkcs11 X509"
 USE_ACL="acl caps"
 USE_DBS="berkdb gdbm sqlite"
@@ -24,10 +24,10 @@ USE_DISPLAY="cairo xinerama xscreensaver"
 USE_MULTI="3dnow 3dnowext a52 aac alsa amr ass avx cdio dirac dga dts dv dvb dvd encode ffmpeg flac g3dvl gsm jack jpeg2k lame libass libv4l mad mmxext mod modplug mp3 mpeg musepack ogg oss pulseaudio quicktime rtmp schroedinger sdl sdlgfx speex taglib theora vcd vorbis vpx xv xvid xvmc v4l vaapi"
 USE_MPLAYER="bidi bl bluray bs2b cddb cdparanoia cpudetection fbcon ftp ggi joystick ladspa libcaca libmpeg2 libnotify md5sum musicbrainz nas nut pnm portaudio postproc pvr quvi radio samba tga xanim zoran"
 
-USE_XFCE4="session thunar"
 USE_BROWSE="curl webkit -libproxy"
 USE_WORD="latex math openxml pdf spell thesaurus wmf wordperfect"
 USE_GAMES="artworkextra"
+USE_XFCE4="session thunar"
 
 USE_MISC="bash-completion extras lpsol natspec unlock-notify utils uuid vim-syntax watchdog"
 

tools-uclibc/desktop/portage/package.accept_keywords/elfix

@@ -0,0 +1,2 @@
+=dev-python/pypax-0.8.3 ~amd64
+=sys-apps/elfix-0.8.3 ~amd64

tools-uclibc/desktop/portage/package.accept_keywords/xorg-cf-files

@@ -0,0 +1 @@
+=x11-misc/xorg-cf-files-1.0.4-r1 ~amd64

tools-uclibc/desktop/portage/package.env

@@ -2,3 +2,4 @@ sys-apps/coreutils coreutils.conf
 dev-vcs/git git.conf
 media-gfx/fontforge fontforge.conf
 media-libs/libquicktime libquicktime.conf
+media-video/ffmpeg ffmpeg.conf

tools-uclibc/desktop/run.sh

@@ -106,6 +106,7 @@ setup_usergroups() {
 
 	rm -rf "${ROOTFS}"/home/gentoo
 	cp -a gentoo "${ROOTFS}"/home/
+	mkdir "${ROOTFS}"/home/gentoo/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos}
 	chroot "${ROOTFS}"/ chown -R gentoo:gentoo /home/gentoo
 	sed -i 's/# \(%wheel.*NOPASSWD\)/\1/' "${ROOTFS}"/etc/sudoers
 }
@@ -137,7 +138,7 @@ unmount_dirs() {
 
 bundle_it() {
 	cd "${ROOTFS}"
-	tar jcvf ../"${ROOTFS}".tar.bz2 .
+	tar -j -c -f ../"${ROOTFS}".tar.bz2 .
 }
 
 main() {

tools-uclibc/desktop/world

@@ -42,6 +42,7 @@ net-misc/tor
 net-misc/vinagre
 net-p2p/transmission
 sys-apps/dbus
+sys-apps/elfix
 sys-apps/gradm
 sys-apps/less
 sys-apps/paxctl