* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/, gnome-base/gnome-session/files/
@ 2019-03-02 9:25 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2019-03-02 9:25 UTC (permalink / raw
To: gentoo-commits
commit: ca48a3124cabb263143c84930d9c43358c83a567
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 09:23:41 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 09:24:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca48a312
gnome-base/gnome-session: bump to 3.28.1, update MIME defaults
Meson port. Supports consolekit together with systemd (so it could
support booting up without systemd still having fallback to CK then),
but also no session tracking at all. Express this in the ebuild for
the time being, even though using null backend is probably bad. Will
revisit once elogind support is added, but meanwhile this allows to
have the package at least installed on non-systemd systems without
relying on deprecated CK.
Many X11 deps are gone with the meson port, and some since long ago
with autotools, but not updated earlier.
Also clean up some pure RDEPEND vs COMMON_DEPEND stuff (dbus-glib
was wrongly in DEPEND only, xdg-user-dirs* was wrongly in COMMON_DEPEND).
Update gnome-mimeapps.list with newer desktop files and fix some
messup with brasero stuff, and zzz-gimp.desktop.
Bug: https://bugs.gentoo.org/679220
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gnome-session/Manifest | 1 +
gnome-base/gnome-session/files/defaults.list-r4 | 335 +++++++++++++++++++++
.../gnome-session/gnome-session-3.28.1.ebuild | 114 +++++++
gnome-base/gnome-session/metadata.xml | 3 +
4 files changed, 453 insertions(+)
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index d01e504c898..6d0cda94e65 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,3 +1,4 @@
DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc
DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27
DIST gnome-session-3.26.1.tar.xz 782676 BLAKE2B 68ffae002910f827dca372402b8e014298b12fc892d6e6c477ff8ba0f793c98cd28f4a974c5665ac8bf7d61f485e4c662ba2f96cb3fd9bdec4a6218e86a797db SHA512 a4c2e82306ae044c56b857c8f7347dc5d5235231e702d2ac38c8c433e21efc75ca3911ee029af01754685f64000a0e6f5d17408192208b19d7dc367079ee7b0a
+DIST gnome-session-3.28.1.tar.xz 480196 BLAKE2B 37bd2138c0610f5cbaa77d558a02f025e2df3105d1b07a3e41f06078215c06c01d47fd6803cb72ee05ccc98765b46221fc618e2b7c3e091398c4420d5be8a015 SHA512 ceeacb3cb4729d4b0a646220097a49359d1eb85ec20cd5d5a44c273b661d41ee83caaf6598def06c4e89b5f785f9317b1171b5550bf8f5634bc882a21e5e685b
diff --git a/gnome-base/gnome-session/files/defaults.list-r4 b/gnome-base/gnome-session/files/defaults.list-r4
new file mode 100644
index 00000000000..0f70884acb3
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r4
@@ -0,0 +1,335 @@
+[Default Applications]
+application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-abiword=abiword.desktop;
+text/abiword=abiword.desktop;
+text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/x-abiword=abiword.desktop;
+text/x-xml-abiword=abiword.desktop;
+x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-hddvd=brasero.desktop;org.gnome.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;zzz-gimp.desktop;
+image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
+image/x-fits=gimp.desktop;zzz-gimp.desktop;
+image/x-icon=gimp.desktop;zzz-gimp.desktop;
+image/x-psd=gimp.desktop;zzz-gimp.desktop;
+image/x-sgi=gimp.desktop;zzz-gimp.desktop;
+image/x-sun-raster=gimp.desktop;zzz-gimp.desktop;
+image/x-tga=gimp.desktop;zzz-gimp.desktop;
+image/x-xcf=gimp.desktop;zzz-gimp.desktop;
+image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop;
+application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+text/html=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+application/pdf=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop;
+application/postscript=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop;
+image/x-eps=org.gnome.Evince.desktop;evince.desktop;
+image/x-bzeps=org.gnome.Evince.desktop;evince.desktop;
+image/x-gzeps=org.gnome.Evince.desktop;evince.desktop;
+application/x-dvi=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop;
+image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop;
+image/tiff=org.gnome.Evince.desktop;evince.desktop;
+application/x-cbr=org.gnome.Evince.desktop;evince.desktop;
+application/x-cbz=org.gnome.Evince.desktop;evince.desktop;
+application/x-cb7=org.gnome.Evince.desktop;evince.desktop;
+application/x-7z-compressed=org.gnome.FileRoller.desktop;
+application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-ace=org.gnome.FileRoller.desktop;
+application/x-alz=org.gnome.FileRoller.desktop;
+application/x-ar=org.gnome.FileRoller.desktop;
+application/x-arj=org.gnome.FileRoller.desktop;
+application/x-bzip=org.gnome.FileRoller.desktop;
+application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-bzip1=org.gnome.FileRoller.desktop;
+application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cabinet=org.gnome.FileRoller.desktop;
+application/x-cd-image=org.gnome.FileRoller.desktop;
+application/x-compress=org.gnome.FileRoller.desktop;
+application/x-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cpio=org.gnome.FileRoller.desktop;
+application/x-deb=org.gnome.FileRoller.desktop;
+application/x-ear=org.gnome.FileRoller.desktop;
+application/x-gtar=org.gnome.FileRoller.desktop;
+application/x-gzip=org.gnome.FileRoller.desktop;
+application/x-java-archive=org.gnome.FileRoller.desktop;
+application/x-lha=org.gnome.FileRoller.desktop;
+application/x-lhz=org.gnome.FileRoller.desktop;
+application/x-lzip=org.gnome.FileRoller.desktop;
+application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzma=org.gnome.FileRoller.desktop;
+application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzop=org.gnome.FileRoller.desktop;
+application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-rar=org.gnome.FileRoller.desktop;
+application/x-rar-compressed=org.gnome.FileRoller.desktop;
+application/x-rpm=org.gnome.FileRoller.desktop;
+application/x-rzip=org.gnome.FileRoller.desktop;
+application/x-tar=org.gnome.FileRoller.desktop;
+application/x-tarz=org.gnome.FileRoller.desktop;
+application/x-stuffit=org.gnome.FileRoller.desktop;
+application/x-war=org.gnome.FileRoller.desktop;
+application/x-xz=org.gnome.FileRoller.desktop;
+application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-zip=org.gnome.FileRoller.desktop;
+application/x-zip-compressed=org.gnome.FileRoller.desktop;
+application/x-zoo=org.gnome.FileRoller.desktop;
+application/zip=org.gnome.FileRoller.desktop;
+multipart/x-zip=org.gnome.FileRoller.desktop;
+text/plain=org.gnome.gedit.desktop;
+text/css=org.gnome.gedit.desktop;
+text/javascript=org.gnome.gedit.desktop;
+text/markdown=org.gnome.gedit.desktop;
+text/mathml=org.gnome.gedit.desktop;
+text/x-csrc=org.gnome.gedit.desktop;
+text/x-chdr=org.gnome.gedit.desktop;
+text/x-dtd=org.gnome.gedit.desktop;
+text/x-java=org.gnome.gedit.desktop;
+text/x-javascript=org.gnome.gedit.desktop;
+text/x-patch=org.gnome.gedit.desktop;
+text/x-perl=org.gnome.gedit.destkop
+text/x-php=org.gnome.gedit.destkop
+text/x-python=org.gnome.gedit.destkop
+text/x-sql=org.gnome.gedit.desktop;
+text/xml=org.gnome.gedit.desktop;
+application/javascript=org.gnome.gedit.destkop
+application/x-cgi=org.gnome.gedit.desktop;
+application/x-javascript=org.gnome.gedit.desktop;
+application/x-perl=org.gnome.gedit.desktop;
+application/x-php=org.gnome.gedit.desktop;
+application/x-python=org.gnome.gedit.desktop;
+application/xml=org.gnome.gedit.desktop;
+application/xml-dtd=org.gnome.gedit.desktop;
+application/x-font-ttf=org.gnome.font-viewer.desktop;
+application/x-font-pcf=org.gnome.font-viewer.desktop;
+application/x-font-type1=org.gnome.font-viewer.desktop;
+application/x-font-otf=org.gnome.font-viewer.desktop;
+application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-applix-spreadsheet=gnumeric.desktop;
+application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-gnumeric=gnumeric.desktop;
+application/x-mps=gnumeric.desktop;
+application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-oleo=gnumeric.desktop;
+application/x-planperfect=gnumeric.desktop;
+application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.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;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+zz-application/zz-winassoc-xls=gnumeric.desktop;
+x-content/software=nautilus-autorun-software.desktop;
+x-content/unix-software=nautilus-autorun-software.desktop;
+x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
+x-directory/normal=org.gnome.Nautilus.desktop;
+inode/directory=org.gnome.Nautilus.desktop;
+application/x-gnome-saved-search=org.gnome.Nautilus.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;firefox.desktop;chromium-browser-chromium.desktop;
+application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
+application/mxf=org.gnome.Totem.desktop;
+application/ogg=org.gnome.Totem.desktop;
+application/ram=org.gnome.Totem.desktop;
+application/sdp=org.gnome.Totem.desktop;
+application/smil=org.gnome.Totem.desktop;
+application/smil+xml=org.gnome.Totem.desktop;
+application/vnd.ms-wpl=org.gnome.Totem.desktop;
+application/vnd.rn-realmedia=org.gnome.Totem.desktop;
+application/x-extension-m4a=org.gnome.Totem.desktop;
+application/x-extension-mp4=org.gnome.Totem.desktop;
+application/x-flac=org.gnome.Totem.desktop;
+application/x-flash-video=org.gnome.Totem.desktop;
+application/x-matroska=org.gnome.Totem.desktop;
+application/x-netshow-channel=org.gnome.Totem.desktop;
+application/x-ogg=org.gnome.Totem.desktop;
+application/x-quicktime-media-link=org.gnome.Totem.desktop;
+application/x-quicktimeplayer=org.gnome.Totem.desktop;
+application/x-shorten=org.gnome.Totem.desktop;
+application/x-smil=org.gnome.Totem.desktop;
+application/xspf+xml=org.gnome.Totem.desktop;
+audio/3gpp=org.gnome.Totem.desktop;
+audio/ac3=org.gnome.Totem.desktop;
+audio/AMR=org.gnome.Totem.desktop;
+audio/AMR-WB=org.gnome.Totem.desktop;
+audio/basic=org.gnome.Totem.desktop;
+audio/midi=org.gnome.Totem.desktop;
+audio/mp4=org.gnome.Totem.desktop;
+audio/mpeg=org.gnome.Totem.desktop;
+audio/mpegurl=org.gnome.Totem.desktop;
+audio/ogg=org.gnome.Totem.desktop;
+audio/prs.sid=org.gnome.Totem.desktop;
+audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
+audio/x-ape=org.gnome.Totem.desktop;
+audio/x-flac=org.gnome.Totem.desktop;
+audio/x-gsm=org.gnome.Totem.desktop;
+audio/x-it=org.gnome.Totem.desktop;
+audio/x-m4a=org.gnome.Totem.desktop;
+audio/x-matroska=org.gnome.Totem.desktop;
+audio/x-mod=org.gnome.Totem.desktop;
+audio/x-mp3=org.gnome.Totem.desktop;
+audio/x-mpeg=org.gnome.Totem.desktop;
+audio/x-mpegurl=org.gnome.Totem.desktop;
+audio/x-ms-asf=org.gnome.Totem.desktop;
+audio/x-ms-asx=org.gnome.Totem.desktop;
+audio/x-ms-wax=org.gnome.Totem.desktop;
+audio/x-ms-wma=org.gnome.Totem.desktop;
+audio/x-musepack=org.gnome.Totem.desktop;
+audio/x-pn-aiff=org.gnome.Totem.desktop;
+audio/x-pn-au=org.gnome.Totem.desktop;
+audio/x-pn-realaudio=org.gnome.Totem.desktop;
+audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
+audio/x-pn-wav=org.gnome.Totem.desktop;
+audio/x-pn-windows-acm=org.gnome.Totem.desktop;
+audio/x-realaudio=org.gnome.Totem.desktop;
+audio/x-real-audio=org.gnome.Totem.desktop;
+audio/x-sbc=org.gnome.Totem.desktop;
+audio/x-scpls=org.gnome.Totem.desktop;
+audio/x-speex=org.gnome.Totem.desktop;
+audio/x-tta=org.gnome.Totem.desktop;
+audio/x-vorbis=org.gnome.Totem.desktop;
+audio/x-vorbis+ogg=org.gnome.Totem.desktop;
+audio/x-wav=org.gnome.Totem.desktop;
+audio/x-wavpack=org.gnome.Totem.desktop;
+audio/x-xm=org.gnome.Totem.desktop;
+image/vnd.rn-realpix=org.gnome.Totem.desktop;
+image/x-pict=org.gnome.Totem.desktop;
+misc/ultravox=org.gnome.Totem.desktop;
+text/google-video-pointer=org.gnome.Totem.desktop;
+text/x-google-video-pointer=org.gnome.Totem.desktop;
+video/3gpp=org.gnome.Totem.desktop;
+video/dv=org.gnome.Totem.desktop;
+video/fli=org.gnome.Totem.desktop;
+video/flv=org.gnome.Totem.desktop;
+video/mp2t=org.gnome.Totem.desktop;
+video/mp4=org.gnome.Totem.desktop;
+video/mp4v-es=org.gnome.Totem.desktop;
+video/mpeg=org.gnome.Totem.desktop;
+video/msvideo=org.gnome.Totem.desktop;
+video/ogg=org.gnome.Totem.desktop;
+video/quicktime=org.gnome.Totem.desktop;
+video/vivo=org.gnome.Totem.desktop;
+video/vnd.divx=org.gnome.Totem.desktop;
+video/vnd.rn-realvideo=org.gnome.Totem.desktop;
+video/vnd.vivo=org.gnome.Totem.desktop;
+video/webm=org.gnome.Totem.desktop;
+video/x-anim=org.gnome.Totem.desktop;
+video/x-avi=org.gnome.Totem.desktop;
+video/x-flc=org.gnome.Totem.desktop;
+video/x-fli=org.gnome.Totem.desktop;
+video/x-flic=org.gnome.Totem.desktop;
+video/x-flv=org.gnome.Totem.desktop;
+video/x-m4v=org.gnome.Totem.desktop;
+video/x-matroska=org.gnome.Totem.desktop;
+video/x-mpeg=org.gnome.Totem.desktop;
+video/x-ms-asf=org.gnome.Totem.desktop;
+video/x-ms-asx=org.gnome.Totem.desktop;
+video/x-msvideo=org.gnome.Totem.desktop;
+video/x-ms-wm=org.gnome.Totem.desktop;
+video/x-ms-wmv=org.gnome.Totem.desktop;
+video/x-ms-wmx=org.gnome.Totem.desktop;
+video/x-ms-wvx=org.gnome.Totem.desktop;
+video/x-nsv=org.gnome.Totem.desktop;
+video/x-ogm+ogg=org.gnome.Totem.desktop;
+video/x-theora+ogg=org.gnome.Totem.desktop;
+video/x-totem-stream=org.gnome.Totem.desktop;
+x-content/video-dvd=org.gnome.Totem.desktop;
+x-content/video-vcd=org.gnome.Totem.desktop;
+x-content/video-svcd=org.gnome.Totem.desktop;
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.28.1.ebuild b/gnome-base/gnome-session/gnome-session-3.28.1.ebuild
new file mode 100644
index 00000000000..dd524fae1e3
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.28.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="consolekit doc systemd"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.46.0:2
+ >=x11-libs/gtk+-3.18.0:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=gnome-base/gnome-desktop-3.18:3=
+ >=dev-libs/json-glib-0.10
+ media-libs/mesa[egl,gles2]
+ media-libs/libepoxy
+ x11-libs/libXcomposite
+
+ systemd? ( >=sys-apps/systemd-183:0= )
+ consolekit? ( >=dev-libs/dbus-glib-0.76 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell.
+# gnome-settings-daemon is assumed to be >=3.27.90, but this is about
+# removed components, so no need to strictly require it (older just
+# won't have those daemons loaded by gnome-session).
+# 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).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-base/gnome-settings-daemon-3.23.2
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ sys-apps/dbus[X]
+ consolekit? ( sys-auth/consolekit )
+
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=sys-devel/gettext-0.19.8
+ x11-libs/xtrans
+ virtual/pkgconfig
+ doc? ( app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2 )
+"
+
+src_prepare() {
+ xdg_src_prepare
+ # Install USE=doc in $PF if enabled
+ sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddeprecation_flags=false
+ -Dsession_selector=true # gnome-custom-session
+ $(meson_use systemd)
+ $(meson_use systemd systemd_journal)
+ $(meson_use consolekit)
+ $(meson_use doc docbook)
+ -Dman=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ dodir /etc/X11/Sessions
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ insinto /usr/share/applications
+ newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list
+
+ dodir /etc/X11/xinit/xinitrc.d/
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+ # This should be done here as discussed in bug #270852
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+ # Set XCURSOR_THEME from current dconf setting instead of installing
+ # default cursor symlink globally and affecting other DEs (bug #543488)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+ ewarn "If you use a custom .xinitrc for your X session,"
+ ewarn "make sure that the commands in the xinitrc.d scripts are run."
+ fi
+
+ if ! use systemd && ! use consolekit; then
+ ewarn "You are building without systemd and/or consolekit support."
+ ewarn "gnome-session won't be able to correctly track and manage your session."
+ fi
+}
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
index 39980802b1d..506e4f9e5c5 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -5,4 +5,7 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+<use>
+ <flag name="consolekit">Support <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/, gnome-base/gnome-session/files/
@ 2019-03-19 9:54 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2019-03-19 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 1884b78144b57878b7e7497e6f7c62d5b4562b6a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 09:53:29 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 09:53:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1884b781
gnome-base/gnome-session: add elogind support
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../files/3.30.1-elogind-support.patch | 67 ++++++++++++++++++++++
....30.1.ebuild => gnome-session-3.30.1-r1.ebuild} | 15 ++++-
gnome-base/gnome-session/metadata.xml | 1 +
3 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/gnome-base/gnome-session/files/3.30.1-elogind-support.patch b/gnome-base/gnome-session/files/3.30.1-elogind-support.patch
new file mode 100644
index 00000000000..4f1c5dab9dd
--- /dev/null
+++ b/gnome-base/gnome-session/files/3.30.1-elogind-support.patch
@@ -0,0 +1,67 @@
+From 92072c73ab74ebe0654ac5bd4f9fd2182181ee9d Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 19 Mar 2019 11:00:21 +0200
+Subject: [PATCH] meson: Support elogind
+
+---
+ meson.build | 12 +++++++++---
+ meson_options.txt | 1 +
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index afc97457..7c32e3b9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -121,8 +121,10 @@ session_tracking = 'null backend'
+
+ enable_systemd = get_option('systemd')
+ enable_systemd_journal = get_option('systemd_journal')
++enable_elogind = get_option('elogind')
+ enable_consolekit = get_option('consolekit')
+-if enable_systemd or enable_consolekit
++assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once')
++if enable_systemd or enable_elogind or enable_consolekit
+ session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version)
+
+ # Check for systemd
+@@ -145,6 +147,10 @@ if enable_systemd or enable_consolekit
+ endif
+
+ session_tracking = 'systemd'
++ elif enable_elogind
++ libelogind_dep = dependency('libelogind', version: '>= 239.4')
++ session_bin_deps += libelogind_dep
++ session_tracking = 'elogind'
+ endif
+
+ # Check for ConsoleKit
+@@ -154,14 +160,14 @@ if enable_systemd or enable_consolekit
+
+ session_bin_deps += dbus_glib_dep
+
+- if enable_systemd
++ if enable_systemd or enable_elogind
+ session_tracking += ' (with fallback to ConsoleKit)'
+ else
+ session_tracking = 'ConsoleKit'
+ endif
+ endif
+ endif
+-config_h.set('HAVE_SYSTEMD', enable_systemd)
++config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
+ config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal)
+ config_h.set('HAVE_CONSOLEKIT', enable_consolekit)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 05174fec..cd85eae8 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,4 +1,5 @@
+ option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
++option('elogind', type: 'boolean', value: true, description: 'Use elogind')
+ option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog')
+ option('systemd', type: 'boolean', value: true, description: 'Use systemd')
+ option('systemd_journal', type: 'boolean', value:'true', description: 'Send log to systemd-journal')
+--
+2.17.0
+
diff --git a/gnome-base/gnome-session/gnome-session-3.30.1.ebuild b/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild
similarity index 87%
rename from gnome-base/gnome-session/gnome-session-3.30.1.ebuild
rename to gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild
index 8674fec66da..f62cbf2858f 100644
--- a/gnome-base/gnome-session/gnome-session-3.30.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild
@@ -10,7 +10,10 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="consolekit doc systemd"
+IUSE="consolekit doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
+REQUIRED_USE="?? ( elogind systemd )"
COMMON_DEPEND="
>=dev-libs/glib-2.46.0:2
@@ -25,6 +28,7 @@ COMMON_DEPEND="
x11-libs/libXcomposite
systemd? ( >=sys-apps/systemd-183:0= )
+ elogind? ( >=sys-auth/elogind-239.4 )
consolekit? ( >=dev-libs/dbus-glib-0.76 )
"
@@ -57,6 +61,10 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2 )
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-elogind-support.patch
+)
+
src_prepare() {
xdg_src_prepare
# Install USE=doc in $PF if enabled
@@ -66,6 +74,7 @@ src_prepare() {
src_configure() {
local emesonargs=(
-Ddeprecation_flags=false
+ $(meson_use elogind)
-Dsession_selector=true # gnome-custom-session
$(meson_use systemd)
$(meson_use systemd systemd_journal)
@@ -108,8 +117,8 @@ pkg_postinst() {
ewarn "make sure that the commands in the xinitrc.d scripts are run."
fi
- if ! use systemd && ! use consolekit; then
- ewarn "You are building without systemd and/or consolekit support."
+ if ! use systemd && ! use elogind && ! use consolekit; then
+ ewarn "You are building without systemd, elogind and/or consolekit support."
ewarn "gnome-session won't be able to correctly track and manage your session."
fi
}
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
index 506e4f9e5c5..0a5d0e69d17 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<use>
<flag name="consolekit">Support <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+ <flag name="elogind">Support <pkg>sys-auth/elogind</pkg> for session tracking</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/, gnome-base/gnome-session/files/
@ 2019-05-18 20:46 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2019-05-18 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 74ac5248f2693a0432fa8a406fc21de12ec16a02
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 20:22:30 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 20:44:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ac5248
gnome-base/gnome-session: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gnome-session/Manifest | 2 -
.../gnome-session/files/3.22.3-xorg-default.patch | 58 ----
gnome-base/gnome-session/files/defaults.list-r3 | 335 ---------------------
.../gnome-session/gnome-session-3.24.2-r1.ebuild | 138 ---------
4 files changed, 533 deletions(-)
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 0e0b9578f86..8c69163bac2 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,3 +1 @@
-DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc
-DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27
DIST gnome-session-3.30.1.tar.xz 485996 BLAKE2B 6882aa9f6004dc6da5070a484d92450bd1e8f61885492edf11260d9834fcae700f113a8ddeb1d905171432400ad9e94fba99ed6eaa49f08efd2d0ec2dffd9c5a SHA512 b6bc98da0245cdefa7e462b1f4e2c9198ee0da1f15a426d377331f79aec2f637bef27b093780c77f7ffbe7eb62c6829acdbd9f9e25cac5a4f6ed0da6ab96359a
diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch
deleted file mode 100644
index 02eea39715c..00000000000
--- a/gnome-base/gnome-session/files/3.22.3-xorg-default.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a709a07bff91a7b2dd4e4a412090850a73937999 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 7 Mar 2016 13:36:32 -0500
-Subject: [PATCH 2/3] data: switch back to Xorg by default
-
-Consensus seems to be that switching to wayland for user sessions
-by default is a bit premature.
-
-This commit moves it back to Xorg by default.
-
-We'll save wayland by default for 3.22
-
-https://bugzilla.gnome.org/show_bug.cgi?id=763266
----
- data/Makefile.am | 4 ++--
- data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
- rename data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} (85%)
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index ae08730..d0a7310 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -9,7 +9,7 @@ hwcompatdir = $(pkgdatadir)
- hwcompat_DATA = hardware-compatibility
-
- xsessiondir = $(datadir)/xsessions
--xsession_in_files = gnome.desktop.in gnome-xorg.desktop.in
-+xsession_in_files = gnome.desktop.in
-
- if BUILD_SESSION_SELECTOR
- xsession_in_files += gnome-custom-session.desktop.in
-@@ -18,7 +18,7 @@ endif
- xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
-
- wayland_sessiondir = $(datadir)/wayland-sessions
--wayland_session_in_files = gnome.desktop.in
-+wayland_session_in_files = gnome-wayland.desktop.in
- wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
-
- sessiondir = $(datadir)/gnome-session/sessions
-diff --git a/data/gnome-xorg.desktop.in b/data/gnome-wayland.desktop.in
-similarity index 85%
-rename from data/gnome-xorg.desktop.in
-rename to data/gnome-wayland.desktop.in
-index d00b3dc..852be87 100644
---- a/data/gnome-xorg.desktop.in
-+++ b/data/gnome-wayland.desktop.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--_Name=GNOME on Xorg
-+_Name=GNOME on Wayland
- _Comment=This session logs you into GNOME
- Exec=gnome-session
- TryExec=gnome-session
---
-2.10.1
-
diff --git a/gnome-base/gnome-session/files/defaults.list-r3 b/gnome-base/gnome-session/files/defaults.list-r3
deleted file mode 100644
index 5dfa6be6af1..00000000000
--- a/gnome-base/gnome-session/files/defaults.list-r3
+++ /dev/null
@@ -1,335 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-abiword=abiword.desktop;
-text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/x-abiword=abiword.desktop;
-text/x-xml-abiword=abiword.desktop;
-x-content/blank-bd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-dvd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-cd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-hddvd=brasero-org.gnome.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;chromium-browser-chromium.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.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=org.gnome.FileRoller.desktop;
-application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-ace=org.gnome.FileRoller.desktop;
-application/x-alz=org.gnome.FileRoller.desktop;
-application/x-ar=org.gnome.FileRoller.desktop;
-application/x-arj=org.gnome.FileRoller.desktop;
-application/x-bzip=org.gnome.FileRoller.desktop;
-application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-bzip1=org.gnome.FileRoller.desktop;
-application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cabinet=org.gnome.FileRoller.desktop;
-application/x-cd-image=org.gnome.FileRoller.desktop;
-application/x-compress=org.gnome.FileRoller.desktop;
-application/x-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cpio=org.gnome.FileRoller.desktop;
-application/x-deb=org.gnome.FileRoller.desktop;
-application/x-ear=org.gnome.FileRoller.desktop;
-application/x-gtar=org.gnome.FileRoller.desktop;
-application/x-gzip=org.gnome.FileRoller.desktop;
-application/x-java-archive=org.gnome.FileRoller.desktop;
-application/x-lha=org.gnome.FileRoller.desktop;
-application/x-lhz=org.gnome.FileRoller.desktop;
-application/x-lzip=org.gnome.FileRoller.desktop;
-application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzma=org.gnome.FileRoller.desktop;
-application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzop=org.gnome.FileRoller.desktop;
-application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-rar=org.gnome.FileRoller.desktop;
-application/x-rar-compressed=org.gnome.FileRoller.desktop;
-application/x-rpm=org.gnome.FileRoller.desktop;
-application/x-rzip=org.gnome.FileRoller.desktop;
-application/x-tar=org.gnome.FileRoller.desktop;
-application/x-tarz=org.gnome.FileRoller.desktop;
-application/x-stuffit=org.gnome.FileRoller.desktop;
-application/x-war=org.gnome.FileRoller.desktop;
-application/x-xz=org.gnome.FileRoller.desktop;
-application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-zip=org.gnome.FileRoller.desktop;
-application/x-zip-compressed=org.gnome.FileRoller.desktop;
-application/x-zoo=org.gnome.FileRoller.desktop;
-application/zip=org.gnome.FileRoller.desktop;
-multipart/x-zip=org.gnome.FileRoller.desktop;
-text/plain=org.gnome.gedit.desktop;
-text/css=org.gnome.gedit.desktop;
-text/javascript=org.gnome.gedit.desktop;
-text/markdown=org.gnome.gedit.desktop;
-text/mathml=org.gnome.gedit.desktop;
-text/x-csrc=org.gnome.gedit.desktop;
-text/x-chdr=org.gnome.gedit.desktop;
-text/x-dtd=org.gnome.gedit.desktop;
-text/x-java=org.gnome.gedit.desktop;
-text/x-javascript=org.gnome.gedit.desktop;
-text/x-patch=org.gnome.gedit.desktop;
-text/x-perl=gedit.destkop
-text/x-php=gedit.destkop
-text/x-python=gedit.destkop
-text/x-sql=org.gnome.gedit.desktop;
-text/xml=org.gnome.gedit.desktop;
-application/javascript=gedit.destkop
-application/x-cgi=org.gnome.gedit.desktop;
-application/x-javascript=org.gnome.gedit.desktop;
-application/x-perl=org.gnome.gedit.desktop;
-application/x-php=org.gnome.gedit.desktop;
-application/x-python=org.gnome.gedit.desktop;
-application/xml=org.gnome.gedit.desktop;
-application/xml-dtd=org.gnome.gedit.desktop;
-application/x-font-ttf=org.gnome.font-viewer.desktop;
-application/x-font-pcf=org.gnome.font-viewer.desktop;
-application/x-font-type1=org.gnome.font-viewer.desktop;
-application/x-font-otf=org.gnome.font-viewer.desktop;
-application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-gnumeric=gnumeric.desktop;
-application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-oleo=gnumeric.desktop;
-application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.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;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-zz-application/zz-winassoc-xls=gnumeric.desktop;
-x-content/software=nautilus-autorun-software.desktop;
-x-content/unix-software=nautilus-autorun-software.desktop;
-x-directory/gnome-default-handler=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-x-directory/normal=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-inode/directory=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-application/x-gnome-saved-search=nautilus-folder-handler.desktop;org.gnome.Nautilus.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;firefox.desktop;chromium-browser-chromium.desktop;
-application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/mxf=org.gnome.Totem.desktop;
-application/ogg=org.gnome.Totem.desktop;
-application/ram=org.gnome.Totem.desktop;
-application/sdp=org.gnome.Totem.desktop;
-application/smil=org.gnome.Totem.desktop;
-application/smil+xml=org.gnome.Totem.desktop;
-application/vnd.ms-wpl=org.gnome.Totem.desktop;
-application/vnd.rn-realmedia=org.gnome.Totem.desktop;
-application/x-extension-m4a=org.gnome.Totem.desktop;
-application/x-extension-mp4=org.gnome.Totem.desktop;
-application/x-flac=org.gnome.Totem.desktop;
-application/x-flash-video=org.gnome.Totem.desktop;
-application/x-matroska=org.gnome.Totem.desktop;
-application/x-netshow-channel=org.gnome.Totem.desktop;
-application/x-ogg=org.gnome.Totem.desktop;
-application/x-quicktime-media-link=org.gnome.Totem.desktop;
-application/x-quicktimeplayer=org.gnome.Totem.desktop;
-application/x-shorten=org.gnome.Totem.desktop;
-application/x-smil=org.gnome.Totem.desktop;
-application/xspf+xml=org.gnome.Totem.desktop;
-audio/3gpp=org.gnome.Totem.desktop;
-audio/ac3=org.gnome.Totem.desktop;
-audio/AMR=org.gnome.Totem.desktop;
-audio/AMR-WB=org.gnome.Totem.desktop;
-audio/basic=org.gnome.Totem.desktop;
-audio/midi=org.gnome.Totem.desktop;
-audio/mp4=org.gnome.Totem.desktop;
-audio/mpeg=org.gnome.Totem.desktop;
-audio/mpegurl=org.gnome.Totem.desktop;
-audio/ogg=org.gnome.Totem.desktop;
-audio/prs.sid=org.gnome.Totem.desktop;
-audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
-audio/x-ape=org.gnome.Totem.desktop;
-audio/x-flac=org.gnome.Totem.desktop;
-audio/x-gsm=org.gnome.Totem.desktop;
-audio/x-it=org.gnome.Totem.desktop;
-audio/x-m4a=org.gnome.Totem.desktop;
-audio/x-matroska=org.gnome.Totem.desktop;
-audio/x-mod=org.gnome.Totem.desktop;
-audio/x-mp3=org.gnome.Totem.desktop;
-audio/x-mpeg=org.gnome.Totem.desktop;
-audio/x-mpegurl=org.gnome.Totem.desktop;
-audio/x-ms-asf=org.gnome.Totem.desktop;
-audio/x-ms-asx=org.gnome.Totem.desktop;
-audio/x-ms-wax=org.gnome.Totem.desktop;
-audio/x-ms-wma=org.gnome.Totem.desktop;
-audio/x-musepack=org.gnome.Totem.desktop;
-audio/x-pn-aiff=org.gnome.Totem.desktop;
-audio/x-pn-au=org.gnome.Totem.desktop;
-audio/x-pn-realaudio=org.gnome.Totem.desktop;
-audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
-audio/x-pn-wav=org.gnome.Totem.desktop;
-audio/x-pn-windows-acm=org.gnome.Totem.desktop;
-audio/x-realaudio=org.gnome.Totem.desktop;
-audio/x-real-audio=org.gnome.Totem.desktop;
-audio/x-sbc=org.gnome.Totem.desktop;
-audio/x-scpls=org.gnome.Totem.desktop;
-audio/x-speex=org.gnome.Totem.desktop;
-audio/x-tta=org.gnome.Totem.desktop;
-audio/x-vorbis=org.gnome.Totem.desktop;
-audio/x-vorbis+ogg=org.gnome.Totem.desktop;
-audio/x-wav=org.gnome.Totem.desktop;
-audio/x-wavpack=org.gnome.Totem.desktop;
-audio/x-xm=org.gnome.Totem.desktop;
-image/vnd.rn-realpix=org.gnome.Totem.desktop;
-image/x-pict=org.gnome.Totem.desktop;
-misc/ultravox=org.gnome.Totem.desktop;
-text/google-video-pointer=org.gnome.Totem.desktop;
-text/x-google-video-pointer=org.gnome.Totem.desktop;
-video/3gpp=org.gnome.Totem.desktop;
-video/dv=org.gnome.Totem.desktop;
-video/fli=org.gnome.Totem.desktop;
-video/flv=org.gnome.Totem.desktop;
-video/mp2t=org.gnome.Totem.desktop;
-video/mp4=org.gnome.Totem.desktop;
-video/mp4v-es=org.gnome.Totem.desktop;
-video/mpeg=org.gnome.Totem.desktop;
-video/msvideo=org.gnome.Totem.desktop;
-video/ogg=org.gnome.Totem.desktop;
-video/quicktime=org.gnome.Totem.desktop;
-video/vivo=org.gnome.Totem.desktop;
-video/vnd.divx=org.gnome.Totem.desktop;
-video/vnd.rn-realvideo=org.gnome.Totem.desktop;
-video/vnd.vivo=org.gnome.Totem.desktop;
-video/webm=org.gnome.Totem.desktop;
-video/x-anim=org.gnome.Totem.desktop;
-video/x-avi=org.gnome.Totem.desktop;
-video/x-flc=org.gnome.Totem.desktop;
-video/x-fli=org.gnome.Totem.desktop;
-video/x-flic=org.gnome.Totem.desktop;
-video/x-flv=org.gnome.Totem.desktop;
-video/x-m4v=org.gnome.Totem.desktop;
-video/x-matroska=org.gnome.Totem.desktop;
-video/x-mpeg=org.gnome.Totem.desktop;
-video/x-ms-asf=org.gnome.Totem.desktop;
-video/x-ms-asx=org.gnome.Totem.desktop;
-video/x-msvideo=org.gnome.Totem.desktop;
-video/x-ms-wm=org.gnome.Totem.desktop;
-video/x-ms-wmv=org.gnome.Totem.desktop;
-video/x-ms-wmx=org.gnome.Totem.desktop;
-video/x-ms-wvx=org.gnome.Totem.desktop;
-video/x-nsv=org.gnome.Totem.desktop;
-video/x-ogm+ogg=org.gnome.Totem.desktop;
-video/x-theora+ogg=org.gnome.Totem.desktop;
-video/x-totem-stream=org.gnome.Totem.desktop;
-x-content/video-dvd=org.gnome.Totem.desktop;
-x-content/video-vcd=org.gnome.Totem.desktop;
-x-content/video-svcd=org.gnome.Totem.desktop;
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/mailto=evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild
deleted file mode 100644
index 905dab2736d..00000000000
--- a/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~leio/distfiles/${P}-xorg-default-translations.patch.xz"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD ipv6 systemd"
-
-# 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.46.0:2[dbus]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.18.0:3
- >=dev-libs/json-glib-0.10
- >=gnome-base/gnome-desktop-3.18:3=
- elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-
- media-libs/mesa[egl,gles2]
-
- media-libs/libepoxy
- 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
-
- systemd? ( >=sys-apps/systemd-183:0= )
-"
-# 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-3.23.2
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- x11-themes/adwaita-icon-theme
- sys-apps/dbus[X]
- !systemd? (
- sys-auth/consolekit
- >=dev-libs/dbus-glib-0.76
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- >=sys-devel/gettext-0.10.40
- virtual/pkgconfig
- !<gnome-base/gdm-2.20.4
- doc? (
- app-text/xmlto
- dev-libs/libxslt )
- gnome-base/gnome-common
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-PATCHES=(
- # Restore Xorg as the default GNOME session instead of Wayland for the 3.24 release, bug 641988
- "${FILESDIR}/3.22.3-xorg-default.patch" # remove ewarn about this below when removing for 3.26; also eautoreconf if possible
- "${WORKDIR}/${P}-xorg-default-translations.patch"
-)
-
-src_configure() {
- # 1. Avoid automagic on old upower releases
- # 2. xsltproc is always checked due to man configure
- # switch, even if USE=-doc
- # 3. Disable old gconf support as other distributions did long time
- # ago
- gnome2_src_configure \
- --disable-deprecation-flags \
- --disable-gconf \
- --enable-session-selector \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6) \
- $(use_enable systemd) \
- $(use_enable !systemd consolekit) \
- UPOWER_CFLAGS="" \
- UPOWER_LIBS=""
- # gnome-session-selector pre-generated man page is missing
- #$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- insinto /usr/share/applications
- newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
- dodir /etc/X11/xinit/xinitrc.d/
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
- # Set XCURSOR_THEME from current dconf setting instead of installing
- # default cursor symlink globally and affecting other DEs (bug #543488)
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of"
- ewarn "Wayland for GNOME 3.24 stable version, even if USE=wayland is set on applicable"
- ewarn "packages. You can still choose the 'GNOME on Wayland' session explicitly, if"
- ewarn "desired. GNOME 3.26 will default to Wayland again as upstream GNOME does, if"
- ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will remain a choice."
- ewarn "Default enabling USE=wayland via gnome profiles is planned with 3.26 as well."
-
- if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/, gnome-base/gnome-session/files/
@ 2021-03-28 8:53 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2021-03-28 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 86c66f18359d1521517820a84325a6e8fec93b85
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 08:52:55 2021 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 08:52:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c66f18
gnome-base/gnome-session: Fix conflict with systemd v247
Upstream patch from 'master' to fix indirect conflict with exit.target via
app.slice
Closes: https://bugs.gentoo.org/758752
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
...e-session-3.38.0-exit-conflict-systemd247.patch | 56 ++++++++++
.../gnome-session/gnome-session-3.38.0-r1.ebuild | 123 +++++++++++++++++++++
2 files changed, 179 insertions(+)
diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch
new file mode 100644
index 00000000000..a4a99640f37
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch
@@ -0,0 +1,56 @@
+From 9de6e40f12e8878f524f8d429d85724c156a0517 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Thu, 3 Dec 2020 13:45:36 +0100
+Subject: [PATCH] data: Fix indirect conflict with exit.target via app.slice
+
+systemd v247 now puts services into app.slice by default. But app.slice
+will have a conflict with exit.target, which in turn means that we still
+get a conflict with exit.target indirectly.
+
+Fix it by adding the appropriate Slice=-.slice into
+gnome-session-restart-dbus.service. Also update the note in
+gnome-session-shutdown.service to point out the requirements.
+
+Closes: #74
+---
+ data/gnome-session-restart-dbus.service.in | 5 +++--
+ data/gnome-session-shutdown.target | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/data/gnome-session-restart-dbus.service.in b/data/gnome-session-restart-dbus.service.in
+index e90f6bc8..6389c321 100644
+--- a/data/gnome-session-restart-dbus.service.in
++++ b/data/gnome-session-restart-dbus.service.in
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=Restart DBus after GNOME Session shutdown
+
+-# Allow exit.target to start even if this unit is started with replace-irreversibly
+-# Also put it into a slice that doesn't have such implicit dependencies
++# Allow exit.target to start even if this unit is started with replace-irreversibly.
++# For this to work, we also need to be in the root slice.
+ DefaultDependencies=no
+
+ [Service]
+ Type=notify
+ ExecStart=@libexecdir@/gnome-session-ctl --restart-dbus
++Slice=-.slice
+diff --git a/data/gnome-session-shutdown.target b/data/gnome-session-shutdown.target
+index 607dc6e7..2c3d1963 100644
+--- a/data/gnome-session-shutdown.target
++++ b/data/gnome-session-shutdown.target
+@@ -1,8 +1,9 @@
+ [Unit]
+ Description=Shutdown running GNOME Session
+
+-# Allow exit.target to start even if this unit is started with replace-irreversibly
+-# The same is needed for all (weak) dependencies
++# Allow exit.target to start even if this unit is started with replace-irreversibly.
++# All (weak) dependencies need to do the same. Services also need to ensure they
++# are in the root slice by setting Slice=-.slice.
+ DefaultDependencies=no
+
+ Conflicts=graphical-session.target graphical-session-pre.target
+--
+GitLab
+
diff --git a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
new file mode 100644
index 00000000000..88737c316d3
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+ >=dev-libs/glib-2.46.0:2
+ >=x11-libs/gtk+-3.22.0:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=gnome-base/gnome-desktop-3.34.2:3=
+ >=dev-libs/json-glib-0.10
+ media-libs/mesa[egl,gles2,X(+)]
+ media-libs/libepoxy
+ x11-libs/libXcomposite
+
+ systemd? ( >=sys-apps/systemd-242:0= )
+ elogind? ( >=sys-auth/elogind-239.4 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# 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).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${DEPEND}
+ >=gnome-base/gnome-settings-daemon-3.35.91
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ sys-apps/dbus[X]
+
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+"
+BDEPEND="
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=sys-devel/gettext-0.19.8
+ x11-libs/xtrans
+ virtual/pkgconfig
+ doc? ( app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-Support-elogind.patch
+ # Fix indirect conflict with exit.target via app.slice (from 'master')
+ "${FILESDIR}"/${PN}-3.38.0-exit-conflict-systemd247.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ # Install USE=doc in $PF if enabled
+ sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddeprecation_flags=false
+ $(meson_use elogind)
+ -Dsession_selector=true # gnome-custom-session
+ $(meson_use systemd)
+ -Dsystemd_session=$(usex systemd default disable)
+ $(meson_use systemd systemd_journal)
+ $(meson_use doc docbook)
+ -Dconsolekit=false
+ -Dman=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+ # This should be done here as discussed in bug #270852
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+ # Set XCURSOR_THEME from current dconf setting instead of installing
+ # default cursor symlink globally and affecting other DEs (bug #543488)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+ ewarn "If you use a custom .xinitrc for your X session,"
+ ewarn "make sure that the commands in the xinitrc.d scripts are run."
+ fi
+
+ if ! use systemd && ! use elogind; then
+ ewarn "You are building without systemd or elogind support."
+ ewarn "gnome-session won't be able to correctly track and manage your session."
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/, gnome-base/gnome-session/files/
@ 2023-12-26 21:43 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2023-12-26 21:43 UTC (permalink / raw
To: gentoo-commits
commit: cec9b7626f22389266fa1f333d1f254b90816119
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 21:35:00 2023 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 21:43:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec9b762
gnome-base/gnome-session: update default MIME type associations
Quick simple update for now:
* Prefer gnome-text-editor over gedit
* Prefer loupe over eog (once we have it packaged)
* Fix typo in gedit association for application/javascript
A bigger review and rework is in order, but this will take some time.
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gnome-session/files/defaults.list-r6 | 336 +++++++++++++++++++++
.../gnome-session/gnome-session-45.0-r1.ebuild | 128 ++++++++
2 files changed, 464 insertions(+)
diff --git a/gnome-base/gnome-session/files/defaults.list-r6 b/gnome-base/gnome-session/files/defaults.list-r6
new file mode 100644
index 000000000000..ea090d43163c
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r6
@@ -0,0 +1,336 @@
+[Default Applications]
+application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-abiword=abiword.desktop;
+text/abiword=abiword.desktop;
+text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/x-abiword=abiword.desktop;
+text/x-xml-abiword=abiword.desktop;
+x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
+x-content/blank-hddvd=brasero.desktop;org.gnome.Nautilus.desktop;
+application/x-dia-diagram=dia.desktop;
+image/bmp=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/gif=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/jpeg=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/jpg=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/pjpeg=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/png=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/svg+xml=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/svg+xml-compressed=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-bmp=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-gray=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-icb=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-ico=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-pcx=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-png=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-portable-anymap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-portable-bitmap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-portable-graymap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-portable-pixmap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-xbitmap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-xpixmap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/vnd.wap.wbmp=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/g3fax=gimp.desktop;zzz-gimp.desktop;
+image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
+image/x-fits=gimp.desktop;zzz-gimp.desktop;
+image/x-icon=gimp.desktop;zzz-gimp.desktop;
+image/x-psd=gimp.desktop;zzz-gimp.desktop;
+image/x-sgi=gimp.desktop;zzz-gimp.desktop;
+image/x-sun-raster=gimp.desktop;zzz-gimp.desktop;
+image/x-tga=gimp.desktop;zzz-gimp.desktop;
+image/x-xcf=gimp.desktop;zzz-gimp.desktop;
+image/x-xwindowdump=gimp.desktop;zzz-gimp.desktop;
+application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+text/html=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+application/pdf=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzpdf=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzpdf=org.gnome.Evince.desktop;evince.desktop;
+application/postscript=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzpostscript=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzpostscript=org.gnome.Evince.desktop;evince.desktop;
+image/x-eps=org.gnome.Evince.desktop;evince.desktop;
+image/x-bzeps=org.gnome.Evince.desktop;evince.desktop;
+image/x-gzeps=org.gnome.Evince.desktop;evince.desktop;
+application/x-dvi=org.gnome.Evince.desktop;evince.desktop;
+application/x-bzdvi=org.gnome.Evince.desktop;evince.desktop;
+application/x-gzdvi=org.gnome.Evince.desktop;evince.desktop;
+image/vnd.djvu=org.gnome.Evince.desktop;evince.desktop;
+image/tiff=org.gnome.Evince.desktop;evince.desktop;
+application/x-cbr=org.gnome.Evince.desktop;evince.desktop;
+application/x-cbz=org.gnome.Evince.desktop;evince.desktop;
+application/x-cb7=org.gnome.Evince.desktop;evince.desktop;
+application/x-7z-compressed=org.gnome.FileRoller.desktop;
+application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-ace=org.gnome.FileRoller.desktop;
+application/x-alz=org.gnome.FileRoller.desktop;
+application/x-ar=org.gnome.FileRoller.desktop;
+application/x-arj=org.gnome.FileRoller.desktop;
+application/x-bzip=org.gnome.FileRoller.desktop;
+application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-bzip1=org.gnome.FileRoller.desktop;
+application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cabinet=org.gnome.FileRoller.desktop;
+application/x-cd-image=org.gnome.FileRoller.desktop;
+application/x-compress=org.gnome.FileRoller.desktop;
+application/x-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cpio=org.gnome.FileRoller.desktop;
+application/x-deb=org.gnome.FileRoller.desktop;
+application/x-ear=org.gnome.FileRoller.desktop;
+application/x-gtar=org.gnome.FileRoller.desktop;
+application/x-gzip=org.gnome.FileRoller.desktop;
+application/x-java-archive=org.gnome.FileRoller.desktop;
+application/x-lha=org.gnome.FileRoller.desktop;
+application/x-lhz=org.gnome.FileRoller.desktop;
+application/x-lzip=org.gnome.FileRoller.desktop;
+application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzma=org.gnome.FileRoller.desktop;
+application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzop=org.gnome.FileRoller.desktop;
+application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-rar=org.gnome.FileRoller.desktop;
+application/x-rar-compressed=org.gnome.FileRoller.desktop;
+application/x-rpm=org.gnome.FileRoller.desktop;
+application/x-rzip=org.gnome.FileRoller.desktop;
+application/x-tar=org.gnome.FileRoller.desktop;
+application/x-tarz=org.gnome.FileRoller.desktop;
+application/x-source-rpm=org.gnome.FileRoller.desktop;
+application/x-stuffit=org.gnome.FileRoller.desktop;
+application/x-war=org.gnome.FileRoller.desktop;
+application/x-xz=org.gnome.FileRoller.desktop;
+application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-zip=org.gnome.FileRoller.desktop;
+application/x-zip-compressed=org.gnome.FileRoller.desktop;
+application/x-zoo=org.gnome.FileRoller.desktop;
+application/zip=org.gnome.FileRoller.desktop;
+multipart/x-zip=org.gnome.FileRoller.desktop;
+text/plain=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/css=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/javascript=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/markdown=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/mathml=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-csrc=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-chdr=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-dtd=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-java=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-javascript=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-patch=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-perl=org.gnome.gedit.destkop
+text/x-php=org.gnome.gedit.destkop
+text/x-python=org.gnome.gedit.destkop
+text/x-sql=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/xml=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/javascript=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop
+application/x-cgi=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-javascript=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-perl=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-php=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-python=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/xml=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/xml-dtd=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-font-ttf=org.gnome.font-viewer.desktop;
+application/x-font-pcf=org.gnome.font-viewer.desktop;
+application/x-font-type1=org.gnome.font-viewer.desktop;
+application/x-font-otf=org.gnome.font-viewer.desktop;
+application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-applix-spreadsheet=gnumeric.desktop;
+application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-gnumeric=gnumeric.desktop;
+application/x-mps=gnumeric.desktop;
+application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-oleo=gnumeric.desktop;
+application/x-planperfect=gnumeric.desktop;
+application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.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;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+zz-application/zz-winassoc-xls=gnumeric.desktop;
+x-content/software=nautilus-autorun-software.desktop;
+x-content/unix-software=nautilus-autorun-software.desktop;
+x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
+x-directory/normal=org.gnome.Nautilus.desktop;
+inode/directory=org.gnome.Nautilus.desktop;
+application/x-gnome-saved-search=org.gnome.Nautilus.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=org.gnome.SoundJuicer.desktop;
+application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
+application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
+application/mxf=org.gnome.Totem.desktop;
+application/ogg=org.gnome.Totem.desktop;
+application/ram=org.gnome.Totem.desktop;
+application/sdp=org.gnome.Totem.desktop;
+application/smil=org.gnome.Totem.desktop;
+application/smil+xml=org.gnome.Totem.desktop;
+application/vnd.ms-wpl=org.gnome.Totem.desktop;
+application/vnd.rn-realmedia=org.gnome.Totem.desktop;
+application/x-extension-m4a=org.gnome.Totem.desktop;
+application/x-extension-mp4=org.gnome.Totem.desktop;
+application/x-flac=org.gnome.Totem.desktop;
+application/x-flash-video=org.gnome.Totem.desktop;
+application/x-matroska=org.gnome.Totem.desktop;
+application/x-netshow-channel=org.gnome.Totem.desktop;
+application/x-ogg=org.gnome.Totem.desktop;
+application/x-quicktime-media-link=org.gnome.Totem.desktop;
+application/x-quicktimeplayer=org.gnome.Totem.desktop;
+application/x-shorten=org.gnome.Totem.desktop;
+application/x-smil=org.gnome.Totem.desktop;
+application/xspf+xml=org.gnome.Totem.desktop;
+audio/3gpp=org.gnome.Totem.desktop;
+audio/ac3=org.gnome.Totem.desktop;
+audio/AMR=org.gnome.Totem.desktop;
+audio/AMR-WB=org.gnome.Totem.desktop;
+audio/basic=org.gnome.Totem.desktop;
+audio/midi=org.gnome.Totem.desktop;
+audio/mp4=org.gnome.Totem.desktop;
+audio/mpeg=org.gnome.Totem.desktop;
+audio/mpegurl=org.gnome.Totem.desktop;
+audio/ogg=org.gnome.Totem.desktop;
+audio/prs.sid=org.gnome.Totem.desktop;
+audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
+audio/x-ape=org.gnome.Totem.desktop;
+audio/x-flac=org.gnome.Totem.desktop;
+audio/x-gsm=org.gnome.Totem.desktop;
+audio/x-it=org.gnome.Totem.desktop;
+audio/x-m4a=org.gnome.Totem.desktop;
+audio/x-matroska=org.gnome.Totem.desktop;
+audio/x-mod=org.gnome.Totem.desktop;
+audio/x-mp3=org.gnome.Totem.desktop;
+audio/x-mpeg=org.gnome.Totem.desktop;
+audio/x-mpegurl=org.gnome.Totem.desktop;
+audio/x-ms-asf=org.gnome.Totem.desktop;
+audio/x-ms-asx=org.gnome.Totem.desktop;
+audio/x-ms-wax=org.gnome.Totem.desktop;
+audio/x-ms-wma=org.gnome.Totem.desktop;
+audio/x-musepack=org.gnome.Totem.desktop;
+audio/x-pn-aiff=org.gnome.Totem.desktop;
+audio/x-pn-au=org.gnome.Totem.desktop;
+audio/x-pn-realaudio=org.gnome.Totem.desktop;
+audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
+audio/x-pn-wav=org.gnome.Totem.desktop;
+audio/x-pn-windows-acm=org.gnome.Totem.desktop;
+audio/x-realaudio=org.gnome.Totem.desktop;
+audio/x-real-audio=org.gnome.Totem.desktop;
+audio/x-sbc=org.gnome.Totem.desktop;
+audio/x-scpls=org.gnome.Totem.desktop;
+audio/x-speex=org.gnome.Totem.desktop;
+audio/x-tta=org.gnome.Totem.desktop;
+audio/x-vorbis=org.gnome.Totem.desktop;
+audio/x-vorbis+ogg=org.gnome.Totem.desktop;
+audio/x-wav=org.gnome.Totem.desktop;
+audio/x-wavpack=org.gnome.Totem.desktop;
+audio/x-xm=org.gnome.Totem.desktop;
+image/vnd.rn-realpix=org.gnome.Totem.desktop;
+image/x-pict=org.gnome.Totem.desktop;
+misc/ultravox=org.gnome.Totem.desktop;
+text/google-video-pointer=org.gnome.Totem.desktop;
+text/x-google-video-pointer=org.gnome.Totem.desktop;
+video/3gpp=org.gnome.Totem.desktop;
+video/dv=org.gnome.Totem.desktop;
+video/fli=org.gnome.Totem.desktop;
+video/flv=org.gnome.Totem.desktop;
+video/mp2t=org.gnome.Totem.desktop;
+video/mp4=org.gnome.Totem.desktop;
+video/mp4v-es=org.gnome.Totem.desktop;
+video/mpeg=org.gnome.Totem.desktop;
+video/msvideo=org.gnome.Totem.desktop;
+video/ogg=org.gnome.Totem.desktop;
+video/quicktime=org.gnome.Totem.desktop;
+video/vivo=org.gnome.Totem.desktop;
+video/vnd.divx=org.gnome.Totem.desktop;
+video/vnd.rn-realvideo=org.gnome.Totem.desktop;
+video/vnd.vivo=org.gnome.Totem.desktop;
+video/webm=org.gnome.Totem.desktop;
+video/x-anim=org.gnome.Totem.desktop;
+video/x-avi=org.gnome.Totem.desktop;
+video/x-flc=org.gnome.Totem.desktop;
+video/x-fli=org.gnome.Totem.desktop;
+video/x-flic=org.gnome.Totem.desktop;
+video/x-flv=org.gnome.Totem.desktop;
+video/x-m4v=org.gnome.Totem.desktop;
+video/x-matroska=org.gnome.Totem.desktop;
+video/x-mpeg=org.gnome.Totem.desktop;
+video/x-ms-asf=org.gnome.Totem.desktop;
+video/x-ms-asx=org.gnome.Totem.desktop;
+video/x-msvideo=org.gnome.Totem.desktop;
+video/x-ms-wm=org.gnome.Totem.desktop;
+video/x-ms-wmv=org.gnome.Totem.desktop;
+video/x-ms-wmx=org.gnome.Totem.desktop;
+video/x-ms-wvx=org.gnome.Totem.desktop;
+video/x-nsv=org.gnome.Totem.desktop;
+video/x-ogm+ogg=org.gnome.Totem.desktop;
+video/x-theora+ogg=org.gnome.Totem.desktop;
+video/x-totem-stream=org.gnome.Totem.desktop;
+x-content/video-dvd=org.gnome.Totem.desktop;
+x-content/video-vcd=org.gnome.Totem.desktop;
+x-content/video-svcd=org.gnome.Totem.desktop;
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;org.gnome.Epiphany.desktop;epiphany.desktop;
+x-scheme-handler/mailto=org.gnome.Evolution.desktop;evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-45.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-45.0-r1.ebuild
new file mode 100644
index 000000000000..c2c22fd25d7a
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-45.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.46.0:2
+ >=x11-libs/gtk+-3.22.0:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=gnome-base/gnome-desktop-3.34.2:3=
+ >=dev-libs/json-glib-0.10
+ media-libs/libglvnd[X]
+ media-libs/libepoxy
+ x11-libs/libXcomposite
+
+ systemd? ( >=sys-apps/systemd-242:0= )
+ elogind? ( >=sys-auth/elogind-239.4 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# 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).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-base/gnome-settings-daemon-3.35.91
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ sys-apps/dbus[X]
+
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+"
+DEPEND="${COMMON_DEPEND}
+ x11-libs/xtrans
+"
+BDEPEND="
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ doc? (
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
+)
+
+src_prepare() {
+ default
+ xdg_environment_reset
+
+ # Install USE=doc in ${PF} if enabled
+ sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddeprecation_flags=false
+ $(meson_use elogind)
+ -Dsession_selector=true # gnome-custom-session
+ $(meson_use systemd)
+ -Dsystemd_session=$(usex systemd default disable)
+ $(meson_use systemd systemd_journal)
+ $(meson_use doc docbook)
+ -Dsystemduserunitdir="$(systemd_get_userunitdir)"
+ -Dconsolekit=false
+ -Dman=true
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ newmenu "${FILESDIR}/defaults.list-r6" gnome-mimeapps.list
+
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+ # This should be done here as discussed in bug #270852
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+ # Set XCURSOR_THEME from current dconf setting instead of installing
+ # default cursor symlink globally and affecting other DEs (bug #543488)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+ ewarn "If you use a custom .xinitrc for your X session,"
+ ewarn "make sure that the commands in the xinitrc.d scripts are run."
+ fi
+
+ if ! use systemd && ! use elogind; then
+ ewarn "You are building without systemd or elogind support."
+ ewarn "gnome-session won't be able to correctly track and manage your session."
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/, gnome-base/gnome-session/files/
@ 2024-08-01 8:34 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2024-08-01 8:34 UTC (permalink / raw
To: gentoo-commits
commit: 47aae21c1beeef930aa7e2125d93e52bf237d2b9
Author: Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Thu Jan 11 12:13:44 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 1 08:34:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47aae21c
gnome-base/gnome-session: Bump to 46.0
Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34748
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
gnome-base/gnome-session/Manifest | 1 +
.../gnome-session-46.0-meson-Support-elogind.patch | 18 ++++
gnome-base/gnome-session/gnome-session-46.0.ebuild | 119 +++++++++++++++++++++
3 files changed, 138 insertions(+)
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index a21e381f049d..6614af35e8df 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1 +1,2 @@
DIST gnome-session-45.0.tar.xz 485992 BLAKE2B 473f0b3d94ffa8c1e2bf45884d053c753e5d5ad791b7cd9f889ce7952a273c4631c9867f038edaa6fe8e6ce16b9659c479755ce8028076016a658ad23291eeb7 SHA512 3eb3b4b9fcab2ec35bb61bac6257b254f142167250bbc1eb71d46aed350372f8942601c9d5ca5856e8686b53b70321f914cb55f1639daecfe6c61d84cb6d8aba
+DIST gnome-session-46.0.tar.xz 484368 BLAKE2B 9519530abd84957df9b936706647f1b60ed660efa095602ad67e5f84a5047653ed711a73eaa272424c06c8080a46c86aebf9e3fa5bda8c9b09f291b2ca6bda20 SHA512 2187b8ae4ac4ec728283c5dc03edba6472864a704f6c6cd7a3e962515a3925d3a8438f7f89855dd082d2c013868da81e16da280c70b0e07537c8e431301b4bd8
diff --git a/gnome-base/gnome-session/files/gnome-session-46.0-meson-Support-elogind.patch b/gnome-base/gnome-session/files/gnome-session-46.0-meson-Support-elogind.patch
new file mode 100644
index 000000000000..ac96d521b8f4
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-46.0-meson-Support-elogind.patch
@@ -0,0 +1,18 @@
+--- a/meson.build 2024-07-29 16:43:01.812864903 +0200
++++ b/meson.build 2024-07-29 16:54:16.654741387 +0200
+@@ -113,8 +113,13 @@
+ pkgconfig_define: ['prefix', session_prefix])
+ endif
+
+-libsystemd_dep = dependency('libsystemd', version: '>= 209', required: true)
+-session_bin_deps += libsystemd_dep
++libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
++if libsystemd_dep.found()
++ session_bin_deps += libsystemd_dep
++else
++ elogind_dep = dependency('libelogind', version: '>=209', required: true)
++ session_bin_deps += elogind_dep
++endif
+
+ configure_file(
+ output: 'config.h',
diff --git a/gnome-base/gnome-session/gnome-session-46.0.ebuild b/gnome-base/gnome-session/gnome-session-46.0.ebuild
new file mode 100644
index 000000000000..d178a939e800
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-46.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc elogind systemd"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.46.0:2
+ >=x11-libs/gtk+-3.22.0:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ >=gnome-base/gnome-desktop-3.34.2:3=
+ >=dev-libs/json-glib-0.10
+ media-libs/libglvnd[X]
+ media-libs/libepoxy
+ x11-libs/libXcomposite
+ systemd? ( >=sys-apps/systemd-242:0= )
+ elogind? ( >=sys-auth/elogind-239.4 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# 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).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-base/gnome-settings-daemon-3.35.91
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ sys-apps/dbus[elogind=,systemd=,X]
+
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+"
+DEPEND="${COMMON_DEPEND}
+ x11-libs/xtrans
+"
+BDEPEND="
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ doc? (
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-Support-elogind.patch
+)
+
+src_prepare() {
+ default
+ xdg_environment_reset
+
+ # Install USE=doc in ${PF} if enabled
+ sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddeprecation_flags=false
+ -Dsession_selector=true # gnome-custom-session
+ $(meson_use doc docbook)
+ -Dman=true
+ )
+ use systemd && local emesonargs+=( -Dsystemduserunitdir="$(systemd_get_userunitdir)" )
+ # Set a dummy systemduserunitdir to avoid dependency on systemd
+ use elogind && local emesonargs+=( -Dsystemduserunitdir="${T}" )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ newmenu "${FILESDIR}/defaults.list-r6" gnome-mimeapps.list
+
+ exeinto /etc/X11/xinit/xinitrc.d/
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+ # This should be done here as discussed in bug #270852
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+ # Set XCURSOR_THEME from current dconf setting instead of installing
+ # default cursor symlink globally and affecting other DEs (bug #543488)
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+ ewarn "If you use a custom .xinitrc for your X session,"
+ ewarn "make sure that the commands in the xinitrc.d scripts are run."
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-01 8:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-26 21:43 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/, gnome-base/gnome-session/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2024-08-01 8:34 Pacho Ramos
2021-03-28 8:53 Pacho Ramos
2019-05-18 20:46 Mart Raudsepp
2019-03-19 9:54 Mart Raudsepp
2019-03-02 9:25 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox