From 3554abf93083c7ff013ad7d2b68925b67ffcdc8a Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 3 Oct 2011 18:28:37 +0200 Subject: [PATCH] [gnome-base/gnome-session] port from gnome overlay, add anti-fglrx patch (woot) --- gnome-base/gdm/Manifest | 2 +- gnome-base/gdm/gdm-3.2.0.ebuild | 2 +- gnome-base/gnome-session/Manifest | 7 + .../files/10-user-dirs-update-gnome | 10 + .../gnome-session/files/15-xdg-data-gnome | 9 + gnome-base/gnome-session/files/Gnome | 109 ++++++ gnome-base/gnome-session/files/defaults.list | 333 ++++++++++++++++++ ...sion-check-accelerated-disable-fglrx.patch | 26 ++ .../gnome-session/gnome-session-3.2.0.ebuild | 114 ++++++ 9 files changed, 610 insertions(+), 2 deletions(-) create mode 100644 gnome-base/gnome-session/Manifest create mode 100644 gnome-base/gnome-session/files/10-user-dirs-update-gnome create mode 100644 gnome-base/gnome-session/files/15-xdg-data-gnome create mode 100644 gnome-base/gnome-session/files/Gnome create mode 100644 gnome-base/gnome-session/files/defaults.list create mode 100644 gnome-base/gnome-session/files/gnome-session-check-accelerated-disable-fglrx.patch create mode 100644 gnome-base/gnome-session/gnome-session-3.2.0.ebuild diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 4f0a571bc..9f923863f 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -22,4 +22,4 @@ DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4 DIST gdm-3.0.4.tar.xz 1608480 RMD160 810496a18a98a505eb1a8a1987566d1b5b8d730d SHA1 15d73a0de180004626bda99f1b2386d86e21f7ea SHA256 7d2947fbc96c43cc94fd5915882655820c5453a1b1b11643b3c1be361f4288fd DIST gdm-3.2.0.tar.xz 1648892 RMD160 23beb73af25d947cfb99af1353bccac3230fe5cb SHA1 25cdf1e71a7d89d7994d5b1bf7ce4a6f48da536e SHA256 f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7 EBUILD gdm-3.0.4-r2.ebuild 7183 RMD160 8f24f81409cd3df43c434ffa7b863596145f3d52 SHA1 3803fcfceed6b6917155207bec59f0eba02699bf SHA256 e6c65e1d04736a019a75936d970718458041589a667f4a4ce92baea79c97e737 -EBUILD gdm-3.2.0.ebuild 8467 RMD160 98efafecf701d18e161123361f788b44803d1b9c SHA1 613bb54f702d8dce9beb527457fbb50dc97f66ca SHA256 f2eca58c90f454e1cf0ed111f7d151b5a974c154f85e397a84d5e01ced43a9a7 +EBUILD gdm-3.2.0.ebuild 8468 RMD160 04e95d97b7b8adce679c276611ee976b4793d4d6 SHA1 2b013a86ea9c6fb646f2124cab189b84d743493b SHA256 b4613888a417232bf5e7135b6adbd0d9ad0653b9d5c3eea4a56d1e29f519d6ae diff --git a/gnome-base/gdm/gdm-3.2.0.ebuild b/gnome-base/gdm/gdm-3.2.0.ebuild index 9de368268..97958b063 100644 --- a/gnome-base/gdm/gdm-3.2.0.ebuild +++ b/gnome-base/gdm/gdm-3.2.0.ebuild @@ -160,7 +160,7 @@ src_prepare() { # makes possible to circumvent this crap. GNOME devs are idiots # and this is another nice proof of it. epatch "${FILESDIR}/${PN}-3.2.0-lame-default-session-hardcoded-omg-wtf.patch" - epatch "${FILESDIR}/30_don_t_save_failsafe_session-2.patch" + #epatch "${FILESDIR}/30_don_t_save_failsafe_session-2.patch" # don't load accessibility support at runtime when USE=-accessibility if ! use accessibility; then diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest new file mode 100644 index 000000000..941342c2c --- /dev/null +++ b/gnome-base/gnome-session/Manifest @@ -0,0 +1,7 @@ +AUX 10-user-dirs-update-gnome 264 RMD160 92eba5fafd59d6cf051138acd247127b7afcc32b SHA1 8a75d6f0cc0a2ab05ee0542cf0ed921c761c9fca SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931 +AUX 15-xdg-data-gnome 227 RMD160 b42bf6342d18a00fe38b49264ef8a43c8ce87af9 SHA1 a365c288d94015e55c36bd25623b516ed27db352 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd +AUX Gnome 2391 RMD160 dee0875327352ae70f71b73257deb8ccc5bbc3ba SHA1 9d6f5c7c4f7aee36ea64b30c57b9cb9818664c42 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 +AUX defaults.list 14505 RMD160 1e15a5166728493f21987b530fafcae735a47a3c SHA1 927a883d98b7dbbed75f4480c284e0b0431ab000 SHA256 efe30d8f5be448661870fec6a5e49ae98ecfb73f06ee4ab0926990cb15223354 +AUX gnome-session-check-accelerated-disable-fglrx.patch 965 RMD160 adbf3f8980a818ef03b65740141f97bd45c3a86a SHA1 1dc2133d82193aee3cba8a9c1ace299c24d3ec2a SHA256 208587e9656c37018212f8d43be8bdb47d224e499120617ee7f763a53ea6decc +DIST gnome-session-3.2.0.tar.xz 701236 RMD160 b1b567b3643bfe3fa20144ec8ace24ffa0513ecf SHA1 1f0f0e9f006db11a0a718fee2841ae75a222512e SHA256 4b23d95b1ee622c7d1d600d3a88c8ded787d9a49567b0235208d2e600f131e3e +EBUILD gnome-session-3.2.0.ebuild 3209 RMD160 cf88363ae5ca15e1ffe57ae7cd30d22e3bc5550c SHA1 92092175db23199fb4a3a0f0d3c417ad04bec08e SHA256 d54254827fe0591042b6d0cd2eaa086c7a5553d3095ab90395233a271efd21a9 diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome b/gnome-base/gnome-session/files/10-user-dirs-update-gnome new file mode 100644 index 000000000..f909d44da --- /dev/null +++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome @@ -0,0 +1,10 @@ +#!/bin/sh + +# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc. +# That file is read by glib to get XDG_PICTURES_DIR, etc + +if [ "$DESKTOP_SESSION" = "gnome" ]; then + if type xdg-user-dirs-update &>/dev/null; then + xdg-user-dirs-update + fi +fi diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-base/gnome-session/files/15-xdg-data-gnome new file mode 100644 index 000000000..e62f3e1c6 --- /dev/null +++ b/gnome-base/gnome-session/files/15-xdg-data-gnome @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" = "gnome" ]; then + if [ -z "$XDG_DATA_DIRS" ]; then + export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ + else + export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS" + fi +fi diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome new file mode 100644 index 000000000..55d39b633 --- /dev/null +++ b/gnome-base/gnome-session/files/Gnome @@ -0,0 +1,109 @@ +#!/bin/sh +# +# This file has bitrotted badly. Someone needs to clean this up. +# + +if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then + export XDG_MENU_PREFIX=gnome- +fi + +for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done +# +# Distributors: +# You should modify the paths here to fit your distro +# If you need to do so, send me (jirka@5z.com) a patch +# and I'll try to make the script detect the distro stuff +# + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + +if [ -x "$HOME/.gnomerc" ]; then + command="$HOME/.gnomerc" +elif [ -x /etc/X11/gdm/gnomerc ]; then + command="/etc/X11/gdm/gnomerc" +else + # as fallback in case the config is screwed + command=`which gnome-session` +fi + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + +exec $command diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gnome-session/files/defaults.list new file mode 100644 index 000000000..572b54070 --- /dev/null +++ b/gnome-base/gnome-session/files/defaults.list @@ -0,0 +1,333 @@ +[Default Applications] +application/rtf=abiword.desktop +application/x-abiword=abiword.desktop +text/abiword=abiword.desktop +text/richtext=abiword.desktop +text/rtf=abiword.desktop +text/x-abiword=abiword.desktop +text/x-xml-abiword=abiword.desktop +x-content/blank-bd=brasero-nautilus.desktop +x-content/blank-dvd=brasero-nautilus.desktop +x-content/blank-cd=brasero-nautilus.desktop +x-content/blank-hddvd=brasero-nautilus.desktop +application/x-dia-diagram=dia.desktop +image/bmp=eog.desktop +image/gif=eog.desktop +image/jpeg=eog.desktop +image/jpg=eog.desktop +image/pjpeg=eog.desktop +image/png=eog.desktop +image/svg+xml=eog.desktop +image/svg+xml-compressed=eog.desktop +image/x-bmp=eog.desktop +image/x-gray=eog.desktop +image/x-icb=eog.desktop +image/x-ico=eog.desktop +image/x-pcx=eog.desktop +image/x-png=eog.desktop +image/x-portable-anymap=eog.desktop +image/x-portable-bitmap=eog.desktop +image/x-portable-graymap=eog.desktop +image/x-portable-pixmap=eog.desktop +image/x-xbitmap=eog.desktop +image/x-xpixmap=eog.desktop +image/vnd.wap.wbmp=eog.desktop +image/g3fax=gimp.desktop +image/x-compressed-xcf=gimp.desktop +image/x-fits=gimp.desktop +image/x-icon=gimp.desktop +image/x-psd=gimp.desktop +image/x-sgi=gimp.desktop +image/x-sun-raster=gimp.desktop +image/x-tga=gimp.desktop +image/x-xcf=gimp.desktop +image/x-xwindowdump=gimp.desktop +application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop +text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop +application/pdf=evince.desktop +application/x-bzpdf=evince.desktop +application/x-gzpdf=evince.desktop +application/postscript=evince.desktop +application/x-bzpostscript=evince.desktop +application/x-gzpostscript=evince.desktop +image/x-eps=evince.desktop +image/x-bzeps=evince.desktop +image/x-gzeps=evince.desktop +application/x-dvi=evince.desktop +application/x-bzdvi=evince.desktop +application/x-gzdvi=evince.desktop +image/vnd.djvu=evince.desktop +image/tiff=evince.desktop +application/x-cbr=evince.desktop +application/x-cbz=evince.desktop +application/x-cb7=evince.desktop +application/x-7z-compressed=file-roller.desktop +application/x-7z-compressed-tar=file-roller.desktop +application/x-ace=file-roller.desktop +application/x-alz=file-roller.desktop +application/x-ar=file-roller.desktop +application/x-arj=file-roller.desktop +application/x-bzip=file-roller.desktop +application/x-bzip-compressed-tar=file-roller.desktop +application/x-bzip1=file-roller.desktop +application/x-bzip1-compressed-tar=file-roller.desktop +application/x-cabinet=file-roller.desktop +application/x-cd-image=file-roller.desktop +application/x-compress=file-roller.desktop +application/x-compressed-tar=file-roller.desktop +application/x-cpio=file-roller.desktop +application/x-deb=file-roller.desktop +application/x-ear=file-roller.desktop +application/x-gtar=file-roller.desktop +application/x-gzip=file-roller.desktop +application/x-java-archive=file-roller.desktop +application/x-lha=file-roller.desktop +application/x-lhz=file-roller.desktop +application/x-lzip=file-roller.desktop +application/x-lzip-compressed-tar=file-roller.desktop +application/x-lzma=file-roller.desktop +application/x-lzma-compressed-tar=file-roller.desktop +application/x-lzop=file-roller.desktop +application/x-lzop-compressed-tar=file-roller.desktop +application/x-rar=file-roller.desktop +application/x-rar-compressed=file-roller.desktop +application/x-rpm=file-roller.desktop +application/x-rzip=file-roller.desktop +application/x-tar=file-roller.desktop +application/x-tarz=file-roller.desktop +application/x-stuffit=file-roller.desktop +application/x-war=file-roller.desktop +application/x-xz=file-roller.desktop +application/x-xz-compressed-tar=file-roller.desktop +application/x-zip=file-roller.desktop +application/x-zip-compressed=file-roller.desktop +application/x-zoo=file-roller.desktop +application/zip=file-roller.desktop +multipart/x-zip=file-roller.desktop +text/plain=gedit.desktop +text/css=gedit.desktop +text/javascript=gedit.desktop +text/mathml=gedit.desktop +text/x-csrc=gedit.desktop +text/x-chdr=gedit.desktop +text/x-dtd=gedit.desktop +text/x-java=gedit.desktop +text/x-javascript=gedit.desktop +text/x-patch=gedit.desktop +text/x-perl=gedit.destkop +text/x-php=gedit.destkop +text/x-python=gedit.destkop +text/x-sql=gedit.desktop +text/xml=gedit.desktop +application/javascript=gedit.destkop +application/x-cgi=gedit.desktop +application/x-javascript=gedit.desktop +application/x-perl=gedit.desktop +application/x-php=gedit.desktop +application/x-python=gedit.desktop +application/xml=gedit.desktop +application/xml-dtd=gedit.desktop +application/x-font-ttf=gnome-font-viewer.desktop +application/x-font-pcf=gnome-font-viewer.desktop +application/x-font-type1=gnome-font-viewer.desktop +application/x-font-otf=gnome-font-viewer.desktop +application/csv=gnumeric.desktop +application/excel=gnumeric.desktop +application/msexcel=gnumeric.desktop +application/tab-separated-values=gnumeric.desktop +application/vnd.lotus-1-2-3=gnumeric.desktop +application/vnd.ms-excel=gnumeric.desktop +application/x-123=gnumeric.desktop +application/x-applix-spreadsheet=gnumeric.desktop +application/x-dbase=gnumeric.desktop +application/x-dbf=gnumeric.desktop +application/x-dos_ms_excel=gnumeric.desktop +application/x-excel=gnumeric.desktop +application/x-gnumeric=gnumeric.desktop +application/x-mps=gnumeric.desktop +application/x-ms-excel=gnumeric.desktop +application/x-msexcel=gnumeric.desktop +application/x-oleo=gnumeric.desktop +application/x-planperfect=gnumeric.desktop +application/x-quattropro=gnumeric.desktop +application/x-sc=gnumeric.desktop +application/x-sylk=gnumeric.desktop +application/x-xbase=gnumeric.desktop +application/x-xls=gnumeric.desktop +application/xls=gnumeric.desktop +text/comma-separated-values=gnumeric.desktop +text/csv=gnumeric.desktop +text/spreadsheet=gnumeric.desktop +text/tab-separated-values=gnumeric.desktop +text/x-comma-separated-values=gnumeric.desktop +text/x-csv=gnumeric.desktop +zz-application/zz-winassoc-xls=gnumeric.desktop +x-content/software=nautilus-autorun-software.desktop +x-directory/gnome-default-handler=nautilus-folder-handler.desktop +x-directory/normal=nautilus-folder-handler.desktop +inode/directory=nautilus-folder-handler.desktop +application/x-gnome-saved-search=nautilus-folder-handler.desktop +application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop +application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop +application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop +application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop +application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop +application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop +application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop +application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop +x-content/audio-player=rhythmbox.desktop +x-content/audio-cdda=sound-juicer.desktop +application/x-shockwave-flash=swfdec-player.desktop +application/futuresplash=swfdec-player.desktop +application/mxf=totem.desktop +application/ogg=totem.desktop +application/ram=totem.desktop +application/sdp=totem.desktop +application/smil=totem.desktop +application/smil+xml=totem.desktop +application/vnd.ms-wpl=totem.desktop +application/vnd.rn-realmedia=totem.desktop +application/x-extension-m4a=totem.desktop +application/x-extension-mp4=totem.desktop +application/x-flac=totem.desktop +application/x-flash-video=totem.desktop +application/x-matroska=totem.desktop +application/x-netshow-channel=totem.desktop +application/x-ogg=totem.desktop +application/x-quicktime-media-link=totem.desktop +application/x-quicktimeplayer=totem.desktop +application/x-shorten=totem.desktop +application/x-smil=totem.desktop +application/xspf+xml=totem.desktop +audio/3gpp=totem.desktop +audio/ac3=totem.desktop +audio/AMR=totem.desktop +audio/AMR-WB=totem.desktop +audio/basic=totem.desktop +audio/midi=totem.desktop +audio/mp4=totem.desktop +audio/mpeg=totem.desktop +audio/mpegurl=totem.desktop +audio/ogg=totem.desktop +audio/prs.sid=totem.desktop +audio/vnd.rn-realaudio=totem.desktop +audio/x-ape=totem.desktop +audio/x-flac=totem.desktop +audio/x-gsm=totem.desktop +audio/x-it=totem.desktop +audio/x-m4a=totem.desktop +audio/x-matroska=totem.desktop +audio/x-mod=totem.desktop +audio/x-mp3=totem.desktop +audio/x-mpeg=totem.desktop +audio/x-mpegurl=totem.desktop +audio/x-ms-asf=totem.desktop +audio/x-ms-asx=totem.desktop +audio/x-ms-wax=totem.desktop +audio/x-ms-wma=totem.desktop +audio/x-musepack=totem.desktop +audio/x-pn-aiff=totem.desktop +audio/x-pn-au=totem.desktop +audio/x-pn-realaudio=totem.desktop +audio/x-pn-realaudio-plugin=totem.desktop +audio/x-pn-wav=totem.desktop +audio/x-pn-windows-acm=totem.desktop +audio/x-realaudio=totem.desktop +audio/x-real-audio=totem.desktop +audio/x-sbc=totem.desktop +audio/x-scpls=totem.desktop +audio/x-speex=totem.desktop +audio/x-tta=totem.desktop +audio/x-vorbis=totem.desktop +audio/x-vorbis+ogg=totem.desktop +audio/x-wav=totem.desktop +audio/x-wavpack=totem.desktop +audio/x-xm=totem.desktop +image/vnd.rn-realpix=totem.desktop +image/x-pict=totem.desktop +misc/ultravox=totem.desktop +text/google-video-pointer=totem.desktop +text/x-google-video-pointer=totem.desktop +video/3gpp=totem.desktop +video/dv=totem.desktop +video/fli=totem.desktop +video/flv=totem.desktop +video/mp2t=totem.desktop +video/mp4=totem.desktop +video/mp4v-es=totem.desktop +video/mpeg=totem.desktop +video/msvideo=totem.desktop +video/ogg=totem.desktop +video/quicktime=totem.desktop +video/vivo=totem.desktop +video/vnd.divx=totem.desktop +video/vnd.rn-realvideo=totem.desktop +video/vnd.vivo=totem.desktop +video/webm=totem.desktop +video/x-anim=totem.desktop +video/x-avi=totem.desktop +video/x-flc=totem.desktop +video/x-fli=totem.desktop +video/x-flic=totem.desktop +video/x-flv=totem.desktop +video/x-m4v=totem.desktop +video/x-matroska=totem.desktop +video/x-mpeg=totem.desktop +video/x-ms-asf=totem.desktop +video/x-ms-asx=totem.desktop +video/x-msvideo=totem.desktop +video/x-ms-wm=totem.desktop +video/x-ms-wmv=totem.desktop +video/x-ms-wmx=totem.desktop +video/x-ms-wvx=totem.desktop +video/x-nsv=totem.desktop +video/x-ogm+ogg=totem.desktop +video/x-theora+ogg=totem.desktop +video/x-totem-stream=totem.desktop +x-content/video-dvd=totem.desktop +x-content/video-vcd=totem.desktop +x-content/video-svcd=totem.desktop +x-scheme-handler/ghelp=yelp.desktop; +x-scheme-handler/help=yelp.desktop; +x-scheme-handler/http=firefox.desktop;epiphany.desktop +x-scheme-handler/https=firefox.desktop;epiphany.desktop +x-scheme-handler/mailto=evolution.desktop \ No newline at end of file diff --git a/gnome-base/gnome-session/files/gnome-session-check-accelerated-disable-fglrx.patch b/gnome-base/gnome-session/files/gnome-session-check-accelerated-disable-fglrx.patch new file mode 100644 index 000000000..e17c0b1c4 --- /dev/null +++ b/gnome-base/gnome-session/files/gnome-session-check-accelerated-disable-fglrx.patch @@ -0,0 +1,26 @@ +diff --git a/tools/gnome-session-check-accelerated-helper.c b/tools/gnome-session-check-accelerated-helper.c +index 3f83f76..b2f4f05 100644 +--- a/tools/gnome-session-check-accelerated-helper.c ++++ b/tools/gnome-session-check-accelerated-helper.c +@@ -107,6 +107,7 @@ _has_hardware_gl (Display *display) + XSetWindowAttributes cwa = { 0 }; + Window window = None; + const char *renderer; ++ const char *vendor; + int ret = 1; + + int attrlist[] = { +@@ -157,6 +158,13 @@ _has_hardware_gl (Display *display) + if (glGetError() != GL_NO_ERROR) + max_texture_size = -1; + ++ /* fglrx is currently garbage, this is Sabayon workaround ++ to avoid having fglrx and GNOME Shell enabled */ ++ vendor = (const char *) glGetString (GL_VENDOR); ++ if ((strcasestr(vendor, "ati") != NULL) || ++ (strcasestr(vendor, "amd") != NULL)) ++ goto out; ++ + ret = 0; + + out: diff --git a/gnome-base/gnome-session/gnome-session-3.2.0.ebuild b/gnome-base/gnome-session/gnome-session-3.2.0.ebuild new file mode 100644 index 000000000..a55ff48d4 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.2.0.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1.ebuild,v 1.4 2011/01/03 11:41:21 pacho Exp $ + +EAPI="4" +GCONF_DEBUG="yes" + +inherit gnome2 +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="Gnome session manager" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +if [[ ${PV} = 9999 ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +fi +IUSE="doc ipv6 elibc_FreeBSD" + +# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and +# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* +# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). +# gdk-pixbuf used in the inhibit dialog +COMMON_DEPEND=">=dev-libs/glib-2.28.0:2 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.90.7:3 + >=dev-libs/json-glib-0.10 + >=dev-libs/dbus-glib-0.76 + >=gnome-base/gconf-2:2 + >=sys-power/upower-0.9.0 + elibc_FreeBSD? ( dev-libs/libexecinfo ) + + virtual/opengl + x11-libs/libSM + x11-libs/libICE + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXrender + x11-libs/libXtst + x11-misc/xdg-user-dirs + x11-misc/xdg-user-dirs-gtk + x11-apps/xdpyinfo" +# Pure-runtime deps from the session files should *NOT* be added here +# Otherwise, things like gdm pull in gnome-shell +# gnome-themes-standard is needed for the failwhale dialog themeing +# sys-apps/dbus[X] is needed for session management +RDEPEND="${COMMON_DEPEND} + gnome-base/gnome-settings-daemon + >=gnome-base/gsettings-desktop-schemas-0.1.7 + >=x11-themes/gnome-themes-standard-2.91.92 + sys-apps/dbus[X]" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=sys-devel/gettext-0.10.40 + >=dev-util/pkgconfig-0.17 + >=dev-util/intltool-0.40.6 + !