diff --git a/tools-uclibc/desktop/gentoo/.config/midori/config b/tools-uclibc/desktop/gentoo/.config/midori/config deleted file mode 100644 index 30bd0dd9..00000000 --- a/tools-uclibc/desktop/gentoo/.config/midori/config +++ /dev/null @@ -1,7 +0,0 @@ -[settings] -default-encoding=ISO-8859-1 -enable-site-specific-quirks=true -last-window-state=MIDORI_WINDOW_MAXIMIZED -location-entry-search=https://duckduckgo.com/?q=%s -enable-html5-database=true -user-agent=Mozilla/5.0 (Macintosh; U; Intel Mac OS X; c) AppleWebKit/535+ (KHTML, like Gecko) Version/5.0 Safari/535.22+ Midori/0.4 diff --git a/tools-uclibc/desktop/gentoo/.config/midori/session.xbel b/tools-uclibc/desktop/gentoo/.config/midori/session.xbel deleted file mode 100644 index 08427a17..00000000 --- a/tools-uclibc/desktop/gentoo/.config/midori/session.xbel +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - -‪Google - - - - - diff --git a/tools-uclibc/desktop/gentoo/.config/midori/speeddial b/tools-uclibc/desktop/gentoo/.config/midori/speeddial deleted file mode 100644 index 1a6505b5..00000000 --- a/tools-uclibc/desktop/gentoo/.config/midori/speeddial +++ /dev/null @@ -1,3 +0,0 @@ -[settings] -columns=3 -rows=3 diff --git a/tools-uclibc/desktop/gentoo/.config/smplayer/smplayer.ini b/tools-uclibc/desktop/gentoo/.config/smplayer/smplayer.ini index 4d223a32..84d3613f 100644 --- a/tools-uclibc/desktop/gentoo/.config/smplayer/smplayer.ini +++ b/tools-uclibc/desktop/gentoo/.config/smplayer/smplayer.ini @@ -283,8 +283,8 @@ show_language_toolbar=F6 [%General] config_version=4 mplayer_bin=mplayer2 -driver\vo="xv," -driver\audio_output= +driver\vo=xv +driver\audio_output=alsa use_screenshot=true screenshot_folder=/home/gentoo/Pictures/smplayer_screenshots dont_remember_media_settings=false diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/helpers.rc b/tools-uclibc/desktop/gentoo/.config/xfce4/helpers.rc index 823dc688..43dd5dcc 100644 --- a/tools-uclibc/desktop/gentoo/.config/xfce4/helpers.rc +++ b/tools-uclibc/desktop/gentoo/.config/xfce4/helpers.rc @@ -1,4 +1,4 @@ TerminalEmulator=gnome-terminal -WebBrowser=midori +WebBrowser=epiphany MailReader=sylpheed-claws diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13728034731.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13728034731.desktop deleted file mode 100644 index 4178d8e6..00000000 --- a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13728034731.desktop +++ /dev/null @@ -1,33 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Midori -GenericName=Web Browser -Comment=Browse the Web -X-GNOME-Keywords=Internet;WWW;Explorer -X-AppInstall-Keywords=Internet;WWW;Explorer -Categories=GTK;Network;WebBrowser; -MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;image/svg+xml; -Exec=midori %U -Icon=midori -Terminal=false -StartupNotify=true -X-Osso-Type=application/x-executable -X-Osso-Service=midori -X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private -X-XFCE-Source=file:///usr/share/applications/midori.desktop - -[TabNew Shortcut Group] -Name=New _Tab -Exec=midori -e TabNew -TargetEnvironment=Unity - -[WindowNew Shortcut Group] -Name=New _Window -Exec=midori -e WindowNew -TargetEnvironment=Unity - -[Private Shortcut Group] -Name=New P_rivate Browsing Window -Exec=midori --private -TargetEnvironment=Unity diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13732417901.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13732417901.desktop new file mode 100644 index 00000000..86f96795 --- /dev/null +++ b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-18/13732417901.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Name=Epiphany +GenericName=Web Browser +X-GNOME-FullName=Epiphany Web Browser +Comment=Browse the web +Exec=epiphany %U +StartupNotify=true +Terminal=false +Type=Application +Icon=gnome-web-browser +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=epiphany +X-GNOME-Bugzilla-Component=BugBuddyBugs +X-GNOME-Bugzilla-Version=2.30.6 +Categories=Network;GNOME;GTK;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https; +X-XFCE-Source=file:///usr/share/applications/epiphany.desktop diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-20/13679618069.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-20/13679618069.desktop deleted file mode 100644 index 6090b653..00000000 --- a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-20/13679618069.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=GQview -GenericName=Image Viewer -Comment=View and manage images -Exec=gqview -r %F -Icon=gqview -Type=Application -Terminal=false -Categories=Graphics;Viewer; -MimeType=application/x-navi-animation;image/bmp;image/x-bmp;image/x-MS-bmp;image/gif;image/x-icon;image/jpeg;image/png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-cmu-raster;image/x-sun-raster;image/x-tga;image/tiff;image/vnd.wap.wbmp;image/x-xbitmap;image/x-xpixmap;image/svg;image/svg+xml;image/x-png;image/xpm;image/x-ico;image/x-pcx; -X-XFCE-Source=file:///usr/share/applications/gqview.desktop diff --git a/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-20/13732436141.desktop b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-20/13732436141.desktop new file mode 100644 index 00000000..1a1431a4 --- /dev/null +++ b/tools-uclibc/desktop/gentoo/.config/xfce4/panel/launcher-20/13732436141.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Name=Image Viewer +Comment=Browse and rotate images +TryExec=eog +Exec=eog %U +Icon=eog +StartupNotify=true +Terminal=false +Type=Application +Categories=GNOME;GTK;Graphics;RasterGraphics;Viewer; +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=EOG +X-GNOME-Bugzilla-Component=general +X-GNOME-Bugzilla-Version=2.32.1 +X-GNOME-DocPath=eog/eog.xml +MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/svg+xml;image/svg+xml-compressed;image/vnd.wap.wbmp; +X-XFCE-Source=file:///usr/share/applications/eog.desktop 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 c6814b7f..6e0cb9d1 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 @@ -98,12 +98,12 @@ - + - + diff --git a/tools-uclibc/desktop/portage/env/fontforge.conf b/tools-uclibc/desktop/portage/env/fontforge.conf index 51d9d826..be0ccc49 100644 --- a/tools-uclibc/desktop/portage/env/fontforge.conf +++ b/tools-uclibc/desktop/portage/env/fontforge.conf @@ -1 +1 @@ -LDFLAGS="-lintl" +CFLAGS="-lintl" diff --git a/tools-uclibc/desktop/portage/env/libquicktime.conf b/tools-uclibc/desktop/portage/env/libquicktime.conf index 51d9d826..be0ccc49 100644 --- a/tools-uclibc/desktop/portage/env/libquicktime.conf +++ b/tools-uclibc/desktop/portage/env/libquicktime.conf @@ -1 +1 @@ -LDFLAGS="-lintl" +CFLAGS="-lintl" diff --git a/tools-uclibc/desktop/portage/env/pinentry.conf b/tools-uclibc/desktop/portage/env/pinentry.conf new file mode 100644 index 00000000..518a258e --- /dev/null +++ b/tools-uclibc/desktop/portage/env/pinentry.conf @@ -0,0 +1 @@ +CFLAGS="-liconv" diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2 index 074ce5da..cec78657 100644 --- a/tools-uclibc/desktop/portage/make.conf.2 +++ b/tools-uclibc/desktop/portage/make.conf.2 @@ -4,7 +4,7 @@ CHOST="x86_64-gentoo-linux-uclibc" MAKEOPTS="-j9" USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig" -USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X" +USE_GCC="graphite objc objc++ objc-gc gtk gtk3 qt4 X" USE_ENC="gmp gnutls pkcs11 X509" USE_ACL="acl caps" USE_DBS="berkdb gdbm sqlite" diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3 index 18bfaa92..6e33b19b 100644 --- a/tools-uclibc/desktop/portage/make.conf.3 +++ b/tools-uclibc/desktop/portage/make.conf.3 @@ -4,7 +4,7 @@ CHOST="x86_64-gentoo-linux-uclibc" MAKEOPTS="-j9" USE_BASE="bindist mmx mmxext smp sse sse2 ssse3 static-libs -savedconfig" -USE_GCC="graphite objc objc++ objc-gc gtk gtk3 X" +USE_GCC="graphite objc objc++ objc-gc gtk gtk3 qt4 X" USE_ENC="gmp gnutls pkcs11 X509" USE_ACL="acl caps" USE_DBS="berkdb gdbm sqlite" diff --git a/tools-uclibc/desktop/portage/package.env b/tools-uclibc/desktop/portage/package.env index ccd169a9..3da8496d 100644 --- a/tools-uclibc/desktop/portage/package.env +++ b/tools-uclibc/desktop/portage/package.env @@ -1,5 +1,6 @@ -sys-apps/coreutils coreutils.conf +app-crypt/pinentry pinentry.conf dev-vcs/git git.conf media-gfx/fontforge fontforge.conf media-libs/libquicktime libquicktime.conf media-video/ffmpeg ffmpeg.conf +sys-apps/coreutils coreutils.conf diff --git a/tools-uclibc/desktop/portage/package.mask/syslog-ng b/tools-uclibc/desktop/portage/package.mask/syslog-ng new file mode 100644 index 00000000..65a11429 --- /dev/null +++ b/tools-uclibc/desktop/portage/package.mask/syslog-ng @@ -0,0 +1 @@ +>app-admin/syslog-ng-3.2.5 diff --git a/tools-uclibc/desktop/resolv.conf b/tools-uclibc/desktop/resolv.conf index d55a5304..18782ebc 100644 --- a/tools-uclibc/desktop/resolv.conf +++ b/tools-uclibc/desktop/resolv.conf @@ -1,4 +1,4 @@ # Add your own name server here. # This is only for the build. It # will be removed in the final image. -nameserver 192.168.3.1 +nameserver 67.151.215.230 diff --git a/tools-uclibc/desktop/run.sh b/tools-uclibc/desktop/run.sh index 38ec408f..8bf937bf 100755 --- a/tools-uclibc/desktop/run.sh +++ b/tools-uclibc/desktop/run.sh @@ -105,9 +105,16 @@ setup_usergroups() { chroot "${ROOTFS}"/ /tmp/passwd.sh rm -f "${ROOTFS}"/tmp/passwd.sh + rm -rf "${ROOTFS}"/etc/skel + cp -a gentoo "${ROOTFS}"/etc/skel + mkdir "${ROOTFS}"/etc/skel/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh} + chmod 700 "${ROOTFS}"/etc/skel/.ssh + rm -rf "${ROOTFS}"/home/gentoo - cp -a gentoo "${ROOTFS}"/home/ - mkdir "${ROOTFS}"/home/gentoo/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos} + cp -a gentoo "${ROOTFS}"/home/gentoo + mkdir "${ROOTFS}"/home/gentoo/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh} + chmod 700 "${ROOTFS}"/home/gentoo/.ssh + chroot "${ROOTFS}"/ chown -R gentoo:gentoo /home/gentoo sed -i 's/# \(%wheel.*NOPASSWD\)/\1/' "${ROOTFS}"/etc/sudoers } diff --git a/tools-uclibc/desktop/world b/tools-uclibc/desktop/world index ffd86fd7..c842297e 100644 --- a/tools-uclibc/desktop/world +++ b/tools-uclibc/desktop/world @@ -26,7 +26,6 @@ mail-client/mailx mail-mta/postfix media-gfx/eog media-gfx/gimp -media-gfx/gqview media-sound/alsa-utils media-video/smplayer media-video/totem @@ -41,6 +40,7 @@ net-misc/rdate net-misc/tor net-misc/vinagre net-p2p/transmission +net-wireless/wpa_supplicant sys-apps/dbus sys-apps/elfix sys-apps/gradm @@ -64,10 +64,8 @@ sys-process/lsof virtual/libiconv virtual/libintl virtual/package-manager -www-client/midori +www-client/epiphany x11-base/xorg-server -x11-drivers/xf86-video-nouveau -x11-drivers/xf86-video-vesa x11-libs/gksu x11-misc/slim x11-terms/gnome-terminal