commit: d936e1fdcb80c0984f2c1703f8c4f5199ab54f06 Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> AuthorDate: Sun Apr 19 00:31:02 2020 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Sun Apr 19 13:11:08 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d936e1fd
Fixed upstream in Gnome, commit fa8de58b. Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> gnome-base/gnome-session/Manifest | 1 - .../files/10-user-dirs-update-gnome-r1 | 10 - .../gnome-session/files/15-xdg-data-gnome-r1 | 9 - .../files/3.22.3-wayland-login-shell.patch | 43 -- .../files/3.22.3-xorg-default-translations.patch | 619 --------------------- .../gnome-session/files/3.22.3-xorg-default.patch | 58 -- .../gnome-session/files/90-xcursor-theme-gnome | 11 - gnome-base/gnome-session/files/Gnome | 109 ---- gnome-base/gnome-session/files/defaults.list-r3 | 335 ----------- .../files/patch-gnome-session_main_c.patch | 15 - .../gnome-session/gnome-session-3.22.3.ebuild | 135 ----- gnome-base/gnome-session/metadata.xml | 8 - 12 files changed, 1353 deletions(-) diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest deleted file mode 100644 index 0197661..0000000 --- a/gnome-base/gnome-session/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-session-3.22.3.tar.xz 777420 SHA256 cc486fc84d892fa744a382b5ea8b9b40fc5045bc0d5feccfb02e80137eab77e5 SHA512 2350ddc485f9e47df9d9351e413b847336506a694e34daa672111784f64d6d24d3e5e6fc25ad03dd13b318b139809ba2312a542801993db586937650b1422ccd WHIRLPOOL 35e78d60b16ee9027d2c664f2a222a48083736e032e1be41fd015403fb8e9dcf4b2560299b1c9c9e81bde95cb9ed86da41ed0cc44a816f71e83a1a4e1a704fb9 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 deleted file mode 100644 index 61fd08c..0000000 --- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 deleted file mode 100644 index 5eaa698..0000000 --- a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 deleted file mode 100644 index f82825f..0000000 --- a/gnome-base/gnome-session/files/3.22.3-wayland-login-shell.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 97229b322d30cf531e7b7cc7757f83ed80e831bc Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstr...@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 deleted file mode 100644 index 8c259de..0000000 --- a/gnome-base/gnome-session/files/3.22.3-xorg-default-translations.patch +++ /dev/null @@ -1,619 +0,0 @@ -From abc07aa67043d0013dfcf812101208296bbfa4ac Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <l...@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/s...@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/s...@latin.po b/po/s...@latin.po -index 677444e..b148d70 100644 ---- a/po/s...@latin.po -+++ b/po/s...@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 deleted file mode 100644 index 02eea39..0000000 --- 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 <rstr...@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 deleted file mode 100644 index 13bc453..0000000 --- a/gnome-base/gnome-session/files/90-xcursor-theme-gnome +++ /dev/null @@ -1,11 +0,0 @@ -#!/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 deleted file mode 100644 index 55d39b6..0000000 --- a/gnome-base/gnome-session/files/Gnome +++ /dev/null @@ -1,109 +0,0 @@ -#!/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 (ji...@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 deleted file mode 100644 index 5dfa6be..0000000 --- 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/files/patch-gnome-session_main_c.patch b/gnome-base/gnome-session/files/patch-gnome-session_main_c.patch deleted file mode 100644 index 0cef909..0000000 --- a/gnome-base/gnome-session/files/patch-gnome-session_main_c.patch +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-gnome-session_main_c,v 1.13 2015/04/03 12:43:19 ajacoutot Exp $ - -XXX no rpmatch(3) on OpenBSD - ---- a/gnome-session/main.c.orig Fri Apr 3 14:18:31 2015 -+++ b/gnome-session/main.c Fri Apr 3 14:19:42 2015 -@@ -260,7 +260,7 @@ main (int argc, char **argv) - - debug_string = g_getenv ("GNOME_SESSION_DEBUG"); - if (debug_string != NULL) { -- debug = rpmatch (debug_string) == TRUE || atoi (debug_string) == 1; -+ debug = atoi (debug_string) == 1; - } - - error = NULL; diff --git a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild b/gnome-base/gnome-session/gnome-session-3.22.3.ebuild deleted file mode 100644 index 306dd10..0000000 --- a/gnome-base/gnome-session/gnome-session-3.22.3.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# 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="amd64 ~arm ~arm64 ~ppc x86" -IUSE="doc 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= - 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" - "${FILESDIR}/patch-gnome-session_main_c.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/metadata.xml b/gnome-base/gnome-session/metadata.xml deleted file mode 100644 index 3998080..0000000 --- a/gnome-base/gnome-session/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>gn...@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata>
