diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /gnome-base/gnome-session |
reinit the tree, so we can have metadata
Diffstat (limited to 'gnome-base/gnome-session')
-rw-r--r-- | gnome-base/gnome-session/Manifest | 15 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 | 10 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/15-xdg-data-gnome-r1 | 9 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch | 43 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch | 619 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/3.22.3-xorg-default.patch | 58 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/90-xcursor-theme-gnome | 11 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/Gnome | 109 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/defaults.list-r3 | 335 | ||||
-rw-r--r-- | gnome-base/gnome-session/gnome-session-3.22.3.ebuild | 137 | ||||
-rw-r--r-- | gnome-base/gnome-session/gnome-session-3.24.1.ebuild | 121 | ||||
-rw-r--r-- | gnome-base/gnome-session/metadata.xml | 8 |
12 files changed, 1475 insertions, 0 deletions
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest new file mode 100644 index 000000000000..642286c2c59b --- /dev/null +++ b/gnome-base/gnome-session/Manifest @@ -0,0 +1,15 @@ +AUX 10-user-dirs-update-gnome-r1 299 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a WHIRLPOOL 0dca330c2bedd4cfb056d162550680f4fcf89b94598ace9e02d0289d9e6a4414aa184b2444ce768e8f757ee9ce492fa9288616c25ca8885dbe92dffec28fd9f6 +AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc WHIRLPOOL dbf53f428300ec213eb7397f88cdb54a7c4c4f6bf9d45a07e84894db83e95906cb45a217d437db1e875c000c77c5658b97b6f21050c8d89d20b0750a102aac2e +AUX 3.22.3-wayland-login-shell.patch 1253 SHA256 c45a23e9b1673e79df07f586f9f4e4a276f2b399b62c2610d38577f20dc95e46 SHA512 3abcdf697b3d1160b37031232e223759e24aff23b97dd1b8e4f1347071bf1575832ac00eae0414d2b9839636b85aaceb028bfbc2e488e38ff5fd17d3497a1b6e WHIRLPOOL 7edfbe43ed9499dc5da71509620ff6991f69f93dcb112d5002f4b760ea19b7f9ee7dc197fcf95b55fc013b599c2cecc615ed4dbe3f8cae416adedea4ea879764 +AUX 3.22.3-xorg-default-translations.patch 15908 SHA256 83362800086601b9f60024c1f455f0123f05475862de2ca7b88d5c76c75ae5d2 SHA512 e71b0dc296b4fd43b6bdc2251d8f1d9eb9d5f5e369100e66427254038de7e2e8e6cc8fed3173a618cf1a2677dc4346c1061a99926f3d8e2f40e2789d4f32f7a3 WHIRLPOOL 7b85589c2e4c6cd2e74bc5f3e75c8c6149b23c8ce29c4e0db1190c180be004ac7a52b8bd1af26f3d526eff7ba9e80eda1174ee5bde8f2344e3bb83395eaeddfd +AUX 3.22.3-xorg-default.patch 1929 SHA256 7142210207012fa8669a84fc78ab1b5a1db9f7e0d632291fd49b3118ef5f89bc SHA512 025ba94a21a3c42b816083e6d99c85ece695487af1153990c1fec63bbb215284efb95a2c8d505afe36b0e4575b0796ca57fe83ae715a8593c8db886b7eacfca1 WHIRLPOOL 864a8403069bf9c55c3d79fc780ad90cec4c4637ba8dc0b91b0680f011563e567b6287054b53fd9bb2b5f52c750c97f70dd70fe0a238963eb80fac34172586d4 +AUX 90-xcursor-theme-gnome 384 SHA256 e54babb8c0d0ad33eaa0f80985c802b0656fad9d1d60df2f1aa979f38356d8e0 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b WHIRLPOOL 68bc6c55d6a10cd14539eae6cc34f746c2bc485f96112317213f89c579a9ae7b259c0969155e2c8b30e88d62e19196bcdec559bb2cf3a3816034957c1fa5997e +AUX Gnome 2391 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 WHIRLPOOL 7c3d492309bd3916b24ab48e0fc31a7924ce1ce6661f27770e6b8cc3c902fd06c1f22f6950d46dcac97b8d82a9f95f0b5cc12235dd0e78bc34b4cb2a5f0a7da0 +AUX defaults.list-r3 18178 SHA256 85c225ec5fe9c4e0d337ce003441cc419f54259a46122128cfd958a7bfd2b45b SHA512 1c8cd1a07f0aaacaef2adf7d009a90996b177b348dd6780fc9692728424d8803e517ae4d357fa2324e447b8d082836b60565497b505d54e0559704757b6ecbf3 WHIRLPOOL f07aa9c1390a217b53a49038b0a631da347b5e937f8c7ea1c56d83af4a5c5e1b32d0cb30d75d881b2af0e8e5711bc7907f916976a3c816a5909f2087a8341b38 +DIST gnome-session-3.22.3.tar.xz 777420 SHA256 cc486fc84d892fa744a382b5ea8b9b40fc5045bc0d5feccfb02e80137eab77e5 SHA512 2350ddc485f9e47df9d9351e413b847336506a694e34daa672111784f64d6d24d3e5e6fc25ad03dd13b318b139809ba2312a542801993db586937650b1422ccd WHIRLPOOL 35e78d60b16ee9027d2c664f2a222a48083736e032e1be41fd015403fb8e9dcf4b2560299b1c9c9e81bde95cb9ed86da41ed0cc44a816f71e83a1a4e1a704fb9 +DIST gnome-session-3.24.1.tar.xz 780632 SHA256 3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee SHA512 507f9f1cddab37f1b66c72291e1885397f7e8b6bfb7c365f6f1ff827649a71380706fe0e3a8c6e74c3c159349a0eea0aabe3d5c7bbae5b29aeb2d49ae715affb WHIRLPOOL e82c8526c90e965c956b3153621722bfa5216a6f00bbeec7fccb2479bfed33f6b1e9e0f1748d293762bda86d87155e35ebfcb0f45b5ede5174decf00fe8d85ee +EBUILD gnome-session-3.22.3.ebuild 4440 SHA256 deb86f0e04c21aedea971e97293d45af22a7ea43f174aea788157ff832aa9114 SHA512 cd0afcddfce169e155010f7354feb91d4538fd8b38b22be46a23a81a92a6aa3d98729347e753313580afe28c5503449702921729878d5595bb9bb27d58d8b000 WHIRLPOOL 24bdaf532ab16617728211f5f74ed530ea98886114aee75f73e2b3540fbb97ab26a1946debbea37c93b87d170e3da5f1e3ae942d2f720f2c2d45dbc30ef1a7d8 +EBUILD gnome-session-3.24.1.ebuild 3555 SHA256 762d78adb1fbffaeb382e7cace9dec46de0199212b3f7b98bbe7cd31e86ff433 SHA512 aac4a9df9ad8d5237015c2c86246fa8453679586becf5da829e9572e0f21f6e83e90029b0bff72c5e9965f4a2af11128aa50c046f9b9e15c91c76be87b33b6ab WHIRLPOOL ce0b7539c86599f6875b0433de117911a12cd5c4acb32fd509f5dbfc909916573e24c0d24208efe062b3b8110198273190b45367faece2c228bbb35d7277c25c +MISC ChangeLog 5985 SHA256 adb5a74fc9fbf91bd56111b79bfaf581b76689128bf7cfe6983d1b7fee65a8f1 SHA512 e71f599b28e6cd96ca2666c3bfb1ae1b716fe18e59c8362f075513e78553dd15032caf1616699401c123102a09974bf24cb3736735b635f2602114dfde6e145a WHIRLPOOL 644388f0cdfa90e2edc4bbe736d84f5b2ad5e990479593ecf28e6c8a865f059508e8a2eb4596f32cf62e8e3c00f03651c2be9fcd62c224fd4c6b74b324a76041 +MISC ChangeLog-2015 54021 SHA256 599c9482627fb5bf448d2085cf5088e419c1dc4c999056b1c8b6155369e848d7 SHA512 d40b1e9c97426c4c4eaf88fa93da8ecec8da5a8a895933d94cf8cc1a815f70c5acef1ab130e3129a24b3c3866e0fd67ef0591c6b634c19303cc033aecaa27d16 WHIRLPOOL 78963eeb87ae58b21a2faf53478197a9959abf60de7993021f54e22ab1e01cbda12be55d5ceb6b706acbfbfe429df4eea72166a097a8d3cfc131171c0b74f218 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 new file mode 100644 index 000000000000..61fd08c51141 --- /dev/null +++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 @@ -0,0 +1,10 @@ +#!/bin/sh + +# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc. +# That file is read by glib to get XDG_PICTURES_DIR, etc + +if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then + if type xdg-user-dirs-update &>/dev/null; then + xdg-user-dirs-update + fi +fi diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 new file mode 100644 index 000000000000..5eaa6985d9dc --- /dev/null +++ b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then + if [ -z "$XDG_DATA_DIRS" ]; then + export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ + else + export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS" + fi +fi diff --git a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch new file mode 100644 index 000000000000..f82825f4822e --- /dev/null +++ b/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch @@ -0,0 +1,43 @@ +From 97229b322d30cf531e7b7cc7757f83ed80e831bc Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Thu, 5 Jan 2017 10:02:58 -0500 +Subject: [PATCH 1/3] gnome-session: make sure wayland sessions get a login + shell + +Users expect their shell profiles to get sourced at startup, which +doesn't happen with wayland sessions. + +This commit brings back that feature, by making the gnome-session +wrapper script run a login shell. + +https://bugzilla.gnome.org/show_bug.cgi?id=736660 +--- + gnome-session/gnome-session.in | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in +index 530299d..04ea741 100644 +--- a/gnome-session/gnome-session.in ++++ b/gnome-session/gnome-session.in +@@ -1,5 +1,18 @@ + #!/bin/sh + ++if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && ++ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && ++ [ -n "$SHELL" ] && ++ grep -q "$SHELL" /etc/shells && ++ ! (echo "$SHELL" | grep -q "false") && ++ ! (echo "$SHELL" | grep -q "nologin"); then ++ if [ "$1" != '-l' ]; then ++ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" ++ else ++ shift ++ fi ++fi ++ + SETTING=$(gsettings get org.gnome.system.locale region) + REGION=${SETTING#\'} + REGION=${REGION%\'} +-- +2.10.1 + diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch new file mode 100644 index 000000000000..8c259de9d157 --- /dev/null +++ b/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch @@ -0,0 +1,619 @@ +From abc07aa67043d0013dfcf812101208296bbfa4ac Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sat, 18 Mar 2017 11:42:40 +0200 +Subject: [PATCH 3/3] po: Forward port "GNOME on Wayland" translations + +--- + po/POTFILES.in | 2 +- + po/bg.po | 4 ++++ + po/cs.po | 4 ++++ + po/da.po | 4 ++++ + po/de.po | 4 ++++ + po/el.po | 4 ++++ + po/es.po | 4 ++++ + po/eu.po | 4 ++++ + po/fa.po | 4 ++++ + po/fi.po | 4 ++++ + po/fr.po | 4 ++++ + po/fur.po | 4 ++++ + po/gd.po | 4 ++++ + po/gl.po | 4 ++++ + po/gu.po | 4 ++++ + po/he.po | 4 ++++ + po/hr.po | 4 ++++ + po/hu.po | 4 ++++ + po/id.po | 4 ++++ + po/is.po | 4 ++++ + po/it.po | 4 ++++ + po/kk.po | 4 ++++ + po/ko.po | 4 ++++ + po/lt.po | 4 ++++ + po/lv.po | 4 ++++ + po/nb.po | 4 ++++ + po/pl.po | 4 ++++ + po/pt.po | 4 ++++ + po/pt_BR.po | 4 ++++ + po/ru.po | 4 ++++ + po/sk.po | 4 ++++ + po/sr.po | 4 ++++ + po/sr@latin.po | 4 ++++ + po/sv.po | 4 ++++ + po/tr.po | 4 ++++ + po/uk.po | 4 ++++ + po/vi.po | 4 ++++ + po/zh_CN.po | 4 ++++ + 38 files changed, 149 insertions(+), 1 deletion(-) + +diff --git a/po/POTFILES.in b/po/POTFILES.in +index cc1170a..0feb5cf 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -2,9 +2,9 @@ + # Please keep this file sorted alphabetically. + data/gnome-custom-session.desktop.in + data/gnome.desktop.in +-data/gnome-xorg.desktop.in + data/gnome-dummy.session.desktop.in.in + data/gnome.session.desktop.in.in ++data/gnome-wayland.desktop.in + [type: gettext/glade]data/session-selector.ui + gnome-session/gsm-fail-whale-dialog.c + gnome-session/gsm-manager.c +diff --git a/po/bg.po b/po/bg.po +index 7d243fc..7bb73b6 100644 +--- a/po/bg.po ++++ b/po/bg.po +@@ -50,6 +50,10 @@ msgstr "GNOME с Xorg" + msgid "GNOME dummy" + msgstr "GNOME — фиктивна" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME с Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Друга сесия" +diff --git a/po/cs.po b/po/cs.po +index a9acc59..4efd144 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -54,6 +54,10 @@ msgstr "GNOME na Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME na Waylandu" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Vlastní sezení" +diff --git a/po/da.po b/po/da.po +index de709ac..62a49c3 100644 +--- a/po/da.po ++++ b/po/da.po +@@ -65,6 +65,10 @@ msgstr "GNOME på Xorg" + msgid "GNOME dummy" + msgstr "GNOME-attrap" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME på Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Tilpasset session" +diff --git a/po/de.po b/po/de.po +index 051c9ee..a283114 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -61,6 +61,10 @@ msgstr "GNOME unter Xorg" + msgid "GNOME dummy" + msgstr "GNOME Platzhalter" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME unter Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Benutzerdefinierte Sitzung" +diff --git a/po/el.po b/po/el.po +index 99f92ba..9f1d419 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -72,6 +72,10 @@ msgstr "GNOME σε Xorg" + msgid "GNOME dummy" + msgstr "Εικονικό GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME σε Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Προσαρμοσμένη συνεδρία" +diff --git a/po/es.po b/po/es.po +index 79e3a6d..a9b73b2 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -56,6 +56,10 @@ msgstr "GNOME en Xorg" + msgid "GNOME dummy" + msgstr "GNOME «dummy»" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME en Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sesión personalizada" +diff --git a/po/eu.po b/po/eu.po +index da3969d..6b57df1 100644 +--- a/po/eu.po ++++ b/po/eu.po +@@ -48,6 +48,10 @@ msgstr "GNOME Xorg gainean" + msgid "GNOME dummy" + msgstr "Probako GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME Wayland gainean" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Saio pertsonalizatua" +diff --git a/po/fa.po b/po/fa.po +index 1737204..8b1b6e5 100644 +--- a/po/fa.po ++++ b/po/fa.po +@@ -50,6 +50,10 @@ msgstr "گنوم بر روی Xorg" + msgid "GNOME dummy" + msgstr "گنوم ساختگی" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "گنوم بر روی Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "نشست سفارشی" +diff --git a/po/fi.po b/po/fi.po +index a3cd0ca..8b5025c 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -51,6 +51,10 @@ msgstr "Gnome Xorgia käyttäen" + msgid "GNOME dummy" + msgstr "Gnome-malli-istunto (dummy)" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Gnome Waylandia käyttäen" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Omavalintainen istunto" +diff --git a/po/fr.po b/po/fr.po +index e209804..5fe647a 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -54,6 +54,10 @@ msgstr "GNOME sur Xorg" + msgid "GNOME dummy" + msgstr "GNOME factice" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME sur Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Session personnalisée" +diff --git a/po/fur.po b/po/fur.po +index 8245a6f..1dc5f85 100644 +--- a/po/fur.po ++++ b/po/fur.po +@@ -42,6 +42,10 @@ msgstr "GNOME su Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME su Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Session personalizade" +diff --git a/po/gd.po b/po/gd.po +index beb1618..ebb67bc 100644 +--- a/po/gd.po ++++ b/po/gd.po +@@ -48,6 +48,10 @@ msgstr "GNOME air Xorg" + msgid "GNOME dummy" + msgstr "Caochag GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME air Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Seisean gnàthaichte" +diff --git a/po/gl.po b/po/gl.po +index 02b9879..2d9c944 100644 +--- a/po/gl.po ++++ b/po/gl.po +@@ -51,6 +51,10 @@ msgstr "GNOME en Xorg" + msgid "GNOME dummy" + msgstr "GNOME de proba" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME en Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sesión personalizada" +diff --git a/po/gu.po b/po/gu.po +index c83ed6b..fa92f6a 100644 +--- a/po/gu.po ++++ b/po/gu.po +@@ -44,6 +44,10 @@ msgstr "Xorg પર GNOME" + msgid "GNOME dummy" + msgstr "GNOME ડમી" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Wayland પર GNOME" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "વૈવિધ્ય સત્ર" +diff --git a/po/he.po b/po/he.po +index 22045b6..c197658 100644 +--- a/po/he.po ++++ b/po/he.po +@@ -45,6 +45,10 @@ msgstr "GNOME על גבי Xorg" + msgid "GNOME dummy" + msgstr "מדומה של GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME על גבי Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "הפעלה מותאמת אישית" +diff --git a/po/hr.po b/po/hr.po +index db64d1a..46ba1af 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -41,6 +41,10 @@ msgstr "GNOME na Xorgu" + msgid "GNOME dummy" + msgstr "GNOME lažno" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME na Waylandu" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Prilagođena sesija" +diff --git a/po/hu.po b/po/hu.po +index 403b0a1..f207056 100644 +--- a/po/hu.po ++++ b/po/hu.po +@@ -49,6 +49,10 @@ msgstr "GNOME Xorgon" + msgid "GNOME dummy" + msgstr "GNOME példa" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME Wayland-en" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Egyéni környezet" +diff --git a/po/id.po b/po/id.po +index 04848d8..3519b35 100644 +--- a/po/id.po ++++ b/po/id.po +@@ -46,6 +46,10 @@ msgstr "GNOME pada Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME pada Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sesi Gubahan" +diff --git a/po/is.po b/po/is.po +index 5cfbfa2..a95c1e7 100644 +--- a/po/is.po ++++ b/po/is.po +@@ -44,6 +44,10 @@ msgstr "GNOME á Xorg" + msgid "GNOME dummy" + msgstr "GNOME sýnishorn" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME á Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sérsniðin seta" +diff --git a/po/it.po b/po/it.po +index 3a95eff..6119ff2 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -46,6 +46,10 @@ msgstr "GNOME su Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME su Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sessione personalizzata" +diff --git a/po/kk.po b/po/kk.po +index 7168f0d..8fede72 100644 +--- a/po/kk.po ++++ b/po/kk.po +@@ -43,6 +43,10 @@ msgstr "Xorg негізіндегі GNOME" + msgid "GNOME dummy" + msgstr "GNOME жалған сессиясы" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Wayland негізіндегі GNOME" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Таңдауыңызша сесия" +diff --git a/po/ko.po b/po/ko.po +index 8c90323..359a65d 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -49,6 +49,10 @@ msgstr "그놈 (Xorg)" + msgid "GNOME dummy" + msgstr "그놈 더미" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "그놈, 웨일랜드" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "사용자 지정 세션" +diff --git a/po/lt.po b/po/lt.po +index 9a4bfb9..221c293 100644 +--- a/po/lt.po ++++ b/po/lt.po +@@ -49,6 +49,10 @@ msgstr "GNOME Xorg aplinkoje" + msgid "GNOME dummy" + msgstr "GNOME netikra" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME Wayland aplinkoje" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Pasirinktinis seansas" +diff --git a/po/lv.po b/po/lv.po +index 14e4180..688efe2 100644 +--- a/po/lv.po ++++ b/po/lv.po +@@ -52,6 +52,10 @@ msgstr "GNOME ar Xorg" + msgid "GNOME dummy" + msgstr "GNOME makets" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME ar Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Pielāgota sesija" +diff --git a/po/nb.po b/po/nb.po +index afad648..471fb14 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -41,6 +41,10 @@ msgstr "GNOME på Xorg" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME på Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Egendefinert økt" +diff --git a/po/pl.po b/po/pl.po +index 92b0cfe..1b92056 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -48,6 +48,10 @@ msgstr "GNOME (Xorg)" + msgid "GNOME dummy" + msgstr "Pusta sesja GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME (Wayland)" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Niestandardowa sesja" +diff --git a/po/pt.po b/po/pt.po +index fc4bb99..573908d 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -50,6 +50,10 @@ msgstr "GNOME em Xorg" + msgid "GNOME dummy" + msgstr "GNOME de teste" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME no Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sessão personalizada" +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 6a2a88a..7d6a66a 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -59,6 +59,10 @@ msgstr "GNOME sobre Xorg" + msgid "GNOME dummy" + msgstr "GNOME experimental" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME sobre Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Sessão personalizada" +diff --git a/po/ru.po b/po/ru.po +index 4378126..52eda37 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -52,6 +52,10 @@ msgstr "GNOME на Xorg" + msgid "GNOME dummy" + msgstr "Фиктивный сеанс GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME на Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Другой сеанс" +diff --git a/po/sk.po b/po/sk.po +index 0f75b10..49fbf5d 100644 +--- a/po/sk.po ++++ b/po/sk.po +@@ -53,6 +53,10 @@ msgstr "GNOME cez Xorg" + msgid "GNOME dummy" + msgstr "Fingované GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME cez Wayland" ++ + # GtkWindow title + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" +diff --git a/po/sr.po b/po/sr.po +index 7ec002a..2a71f45 100644 +--- a/po/sr.po ++++ b/po/sr.po +@@ -48,6 +48,10 @@ msgstr "Гном на Икс серверу" + msgid "GNOME dummy" + msgstr "Гномов лажњак" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Гном на Вејланду" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Прилагођена сесија" +diff --git a/po/sr@latin.po b/po/sr@latin.po +index 677444e..b148d70 100644 +--- a/po/sr@latin.po ++++ b/po/sr@latin.po +@@ -48,6 +48,10 @@ msgstr "Gnom na Iks serveru" + msgid "GNOME dummy" + msgstr "Gnomov lažnjak" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Gnom na Vejlandu" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Prilagođena sesija" +diff --git a/po/sv.po b/po/sv.po +index 2894eec..3072075 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -50,6 +50,10 @@ msgstr "GNOME med Xorg" + msgid "GNOME dummy" + msgstr "GNOME-attrapp" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME med Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Anpassad session" +diff --git a/po/tr.po b/po/tr.po +index 3ede169..87bba43 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -54,6 +54,10 @@ msgstr "Xorg üzerinde GNOME" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "Wayland üzerinde GNOME" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Özel Oturum" +diff --git a/po/uk.po b/po/uk.po +index de980dc..c98fd8d 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -46,6 +46,10 @@ msgstr "GNOME через Xorg" + msgid "GNOME dummy" + msgstr "Несправжній GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME через Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Власний сеанс" +diff --git a/po/vi.po b/po/vi.po +index 1cdee0a..cf249e3 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -46,6 +46,10 @@ msgstr "GNOME trên Xorg" + msgid "GNOME dummy" + msgstr "Giả lập GNOME" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "GNOME trên Wayland" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "Phiên làm việc tự chọn" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 6f07716..8d36444 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -55,6 +55,10 @@ msgstr "运行于 Xorg 的 GNOME" + msgid "GNOME dummy" + msgstr "GNOME dummy" + ++#: ../data/gnome-wayland.desktop.in.h:1 ++msgid "GNOME on Wayland" ++msgstr "基于 Wayland 的 GNOME" ++ + #: ../data/session-selector.ui.h:1 + msgid "Custom Session" + msgstr "自定义会话" +-- +2.10.1 + 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 new file mode 100644 index 000000000000..02eea39715cc --- /dev/null +++ b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch @@ -0,0 +1,58 @@ +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/90-xcursor-theme-gnome b/gnome-base/gnome-session/files/90-xcursor-theme-gnome new file mode 100644 index 000000000000..13bc453c7854 --- /dev/null +++ b/gnome-base/gnome-session/files/90-xcursor-theme-gnome @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then + XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2> /dev/null + if [ x"$XCURSOR_THEME" = "x" ]; then + export XCURSOR_THEME="Adwaita" + else + # 'dconf read' wraps string output in single quotes + eval export "XCURSOR_THEME=$XCURSOR_THEME" + fi +fi diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome new file mode 100644 index 000000000000..55d39b633257 --- /dev/null +++ b/gnome-base/gnome-session/files/Gnome @@ -0,0 +1,109 @@ +#!/bin/sh +# +# This file has bitrotted badly. Someone needs to clean this up. +# + +if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then + export XDG_MENU_PREFIX=gnome- +fi + +for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done +# +# Distributors: +# You should modify the paths here to fit your distro +# If you need to do so, send me (jirka@5z.com) a patch +# and I'll try to make the script detect the distro stuff +# + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + +if [ -x "$HOME/.gnomerc" ]; then + command="$HOME/.gnomerc" +elif [ -x /etc/X11/gdm/gnomerc ]; then + command="/etc/X11/gdm/gnomerc" +else + # as fallback in case the config is screwed + command=`which gnome-session` +fi + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + +exec $command diff --git a/gnome-base/gnome-session/files/defaults.list-r3 b/gnome-base/gnome-session/files/defaults.list-r3 new file mode 100644 index 000000000000..5dfa6be6af16 --- /dev/null +++ b/gnome-base/gnome-session/files/defaults.list-r3 @@ -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-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.22.3.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild new file mode 100644 index 000000000000..4e89bd630b17 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2017 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" + +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 ) + + 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 + >=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=( + # Make gnome wayland session launch inside a login shell for /etc/env.d and other stuff to work, bug 604110 + "${FILESDIR}/${PV}-wayland-login-shell.patch" + # Restore Xorg as the default GNOME session instead of Wayland for the 3.22 release, bug 611146 + "${FILESDIR}/${PV}-xorg-default.patch" # remove ewarn about this below when removing for 3.24 + "${FILESDIR}/${PV}-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.22 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.24 will default to Wayland again as upstream GNOME does, if" + ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will be a choice." + + 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 +} diff --git a/gnome-base/gnome-session/gnome-session-3.24.1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild new file mode 100644 index 000000000000..9eaa8c16f0e8 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-3.24.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Gnome session manager" +HOMEPAGE="https://git.gnome.org/browse/gnome-session" + +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 ) + + 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-common needed for eautoreconf +# gnome-base/gdm does not provide gnome.desktop anymore + +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 + + 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 +} diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-base/gnome-session/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> |