diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config index 2bacd546..f9f79f63 100644 --- a/tools-uclibc/desktop/config +++ b/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 diff --git a/tools-uclibc/desktop/gentoo/.config/Thunar/accels.scm b/tools-uclibc/desktop/gentoo/.config/Thunar/accels.scm index edb95f23..4f9adb80 100644 --- a/tools-uclibc/desktop/gentoo/.config/Thunar/accels.scm +++ b/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 "/ThunarLauncher/sendto-desktop" "") -; (gtk_accel_path "/ThunarStandardView/create-folder" "n") -; (gtk_accel_path "/ThunarShortcutsPane/sendto-shortcuts" "") -; (gtk_accel_path "/ThunarWindow/view-side-pane-menu" "") -; (gtk_accel_path "/ThunarStandardView/paste-into-folder" "v") -; (gtk_accel_path "/ThunarWindow/open-home" "Home") -; (gtk_accel_path "/ThunarWindow/view-menu" "") -; (gtk_accel_path "/ThunarLauncher/open" "o") -; (gtk_accel_path "/ThunarWindow/go-menu" "") -; (gtk_accel_path "/ThunarWindow/open-file-system" "") -; (gtk_accel_path "/ThunarWindow/zoom-out" "minus") -; (gtk_accel_path "/ThunarStandardView/paste" "v") -; (gtk_accel_path "/ThunarLauncher/open-with-menu" "") -; (gtk_accel_path "/ThunarWindow/help-menu" "") -; (gtk_accel_path "/ThunarWindow/file-menu" "") -; (gtk_accel_path "/ThunarLauncher/open-with-other-in-menu" "") -; (gtk_accel_path "/ThunarWindow/detach-tab" "") -; (gtk_accel_path "/ThunarLauncher/open-in-new-tab" "p") -; (gtk_accel_path "/ThunarStandardView/sort-by-name" "") -; (gtk_accel_path "/ThunarWindow/view-menubar" "m") -; (gtk_accel_path "/ThunarStandardView/back" "Left") -; (gtk_accel_path "/ThunarWindow/close-tab" "w") -; (gtk_accel_path "/ThunarWindow/view-as-compact-list" "3") -; (gtk_accel_path "/ThunarWindow/view-side-pane-tree" "e") -; (gtk_accel_path "/ThunarStandardView/restore" "") -; (gtk_accel_path "/ThunarWindow/open-network" "") -; (gtk_accel_path "/ThunarWindow/new-tab" "t") -; (gtk_accel_path "/ThunarWindow/preferences" "") -; (gtk_accel_path "/ThunarStandardView/rename" "F2") -; (gtk_accel_path "/ThunarStandardView/sort-by-size" "") -; (gtk_accel_path "/ThunarWindow/sendto-menu" "") -; (gtk_accel_path "/ThunarWindow/edit-menu" "") -; (gtk_accel_path "/ThunarLauncher/open-with-other" "") -; (gtk_accel_path "/ThunarWindow/view-location-selector-toolbar" "") -; (gtk_accel_path "/ThunarStandardView/invert-selection" "") -; (gtk_accel_path "/ThunarStandardView/make-link" "") -; (gtk_accel_path "/ThunarWindow/view-as-icons" "1") -; (gtk_accel_path "/ThunarWindow/new-window" "n") -; (gtk_accel_path "/ThunarStandardView/forward" "Right") -; (gtk_accel_path "/ThunarStandardView/move-to-trash" "") -; (gtk_accel_path "/ThunarStandardView/select-by-pattern" "s") -; (gtk_accel_path "/ThunarWindow/about" "") -; (gtk_accel_path "/ThunarWindow/contents" "F1") -; (gtk_accel_path "/ThunarWindow/open-desktop" "") -; (gtk_accel_path "/ThunarWindow/close-all-windows" "w") -; (gtk_accel_path "/ThunarWindow/zoom-in" "plus") -; (gtk_accel_path "/ThunarStandardView/duplicate" "") -; (gtk_accel_path "/ThunarWindow/open-parent" "Up") -; (gtk_accel_path "/ThunarWindow/view-side-pane-shortcuts" "b") -; (gtk_accel_path "/ThunarWindow/reload" "r") -; (gtk_accel_path "/ThunarWindow/open-templates" "") -; (gtk_accel_path "/ThunarStandardView/copy" "c") -; (gtk_accel_path "/ThunarWindow/view-location-selector-pathbar" "") -; (gtk_accel_path "/ThunarWindow/open-trash" "") -; (gtk_accel_path "/ThunarStandardView/sort-descending" "") -; (gtk_accel_path "/ThunarStandardView/properties" "Return") -; (gtk_accel_path "/ThunarStandardView/sort-by-type" "") -; (gtk_accel_path "/ThunarStandardView/delete" "") -; (gtk_accel_path "/ThunarStandardView/sort-ascending" "") -; (gtk_accel_path "/ThunarWindow/empty-trash" "") -; (gtk_accel_path "/ThunarWindow/view-location-selector-menu" "") -; (gtk_accel_path "/ThunarLauncher/open-in-new-window" "o") -; (gtk_accel_path "/ThunarStandardView/arrange-items-menu" "") -; (gtk_accel_path "/ThunarStandardView/cut" "x") -; (gtk_accel_path "/ThunarWindow/close-window" "q") -; (gtk_accel_path "/ThunarStandardView/select-all-files" "") -; (gtk_accel_path "/ThunarWindow/open-location" "l") -; (gtk_accel_path "/ThunarStandardView/sort-by-mtime" "") -; (gtk_accel_path "/ThunarWindow/zoom-reset" "0") -; (gtk_accel_path "/ThunarWindow/view-statusbar" "") -; (gtk_accel_path "/ThunarWindow/show-hidden" "h") -; (gtk_accel_path "/ThunarWindow/view-as-detailed-list" "2") diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-12/13698963011.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-12/13698963011.desktop new file mode 100644 index 00000000..29e4c726 --- /dev/null +++ b/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 diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/136796191211.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/136796191211.desktop deleted file mode 100644 index b280b6d7..00000000 --- a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/136796191211.desktop +++ /dev/null @@ -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 diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/13699065271.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-22/13699065271.desktop new file mode 100644 index 00000000..926c37f7 --- /dev/null +++ b/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 diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml index 7d7ae9aa..60e5fd85 100644 --- a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml +++ b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml @@ -2,4 +2,17 @@ + + + + + + + + + + + + + diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index 2b51b109..57ea34e0 100644 --- a/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/tools-uclibc/desktop/gentoo/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -15,7 +15,7 @@ - + @@ -43,7 +43,21 @@ - + + + + + + + + + + + + + + + @@ -99,15 +113,14 @@ - + - - - - - - + + + + + diff --git a/tools-uclibc/desktop/portage/env/ffmpeg.conf b/tools-uclibc/desktop/portage/env/ffmpeg.conf new file mode 100644 index 00000000..0a288e8f --- /dev/null +++ b/tools-uclibc/desktop/portage/env/ffmpeg.conf @@ -0,0 +1 @@ +CFLAGS="-fno-stack-check" diff --git a/tools-uclibc/desktop/portage/make.conf.1 b/tools-uclibc/desktop/portage/make.conf.1 index ddc37ae6..597e28e4 100644 --- a/tools-uclibc/desktop/portage/make.conf.1 +++ b/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" diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2 index a5cf90f1..3f5879d1 100644 --- a/tools-uclibc/desktop/portage/make.conf.2 +++ b/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" diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3 index c7968871..cc980afb 100644 --- a/tools-uclibc/desktop/portage/make.conf.3 +++ b/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" diff --git a/tools-uclibc/desktop/portage/package.accept_keywords/elfix b/tools-uclibc/desktop/portage/package.accept_keywords/elfix new file mode 100644 index 00000000..b070d6a6 --- /dev/null +++ b/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 diff --git a/tools-uclibc/desktop/portage/package.accept_keywords/xorg-cf-files b/tools-uclibc/desktop/portage/package.accept_keywords/xorg-cf-files new file mode 100644 index 00000000..90e6d12b --- /dev/null +++ b/tools-uclibc/desktop/portage/package.accept_keywords/xorg-cf-files @@ -0,0 +1 @@ +=x11-misc/xorg-cf-files-1.0.4-r1 ~amd64 diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env index ea62511b..ccd169a9 100644 --- a/tools-uclibc/desktop/portage/package.env +++ b/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 diff --git a/tools-uclibc/desktop/build.sh b/tools-uclibc/desktop/run.sh old mode 100755 new mode 100644 similarity index 96% rename from tools-uclibc/desktop/build.sh rename to tools-uclibc/desktop/run.sh index abc2e80c..642a5d1e --- a/tools-uclibc/desktop/build.sh +++ b/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() { diff --git a/tools-uclibc/desktop/world b/tools-uclibc/desktop/world index c485f525..de1fcc41 100644 --- a/tools-uclibc/desktop/world +++ b/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