[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/

[Pacho Ramos]

commit:     87fa953c4fdc56801a1c314496be82f98a647071
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 10:54:37 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 10:54:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87fa953c

gnome-base/gnome-session: Handle text/markdown mimetype too.

Package-Manager: portage-2.3.2

 gnome-base/gnome-session/files/defaults.list-r3 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnome-base/gnome-session/files/defaults.list-r3 b/gnome-base/gnome-session/files/defaults.list-r3
index 6c62e32..5dfa6be 100644
--- a/gnome-base/gnome-session/files/defaults.list-r3
+++ b/gnome-base/gnome-session/files/defaults.list-r3
@@ -107,6 +107,7 @@ 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;

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/

[Matt Turner]

commit:     41bca9780b5257ed5f827768be9e4da0db2b31f8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun  1 17:28:35 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 19:01:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41bca978

gnome-base/gnome-session: remove unused patch

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...e-session-3.38.0-exit-conflict-systemd247.patch | 56 ----------------------
 1 file changed, 56 deletions(-)

diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch
deleted file mode 100644
index a4a99640f37..00000000000
--- a/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9de6e40f12e8878f524f8d429d85724c156a0517 Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Thu, 3 Dec 2020 13:45:36 +0100
-Subject: [PATCH] data: Fix indirect conflict with exit.target via app.slice
-
-systemd v247 now puts services into app.slice by default. But app.slice
-will have a conflict with exit.target, which in turn means that we still
-get a conflict with exit.target indirectly.
-
-Fix it by adding the appropriate Slice=-.slice into
-gnome-session-restart-dbus.service. Also update the note in
-gnome-session-shutdown.service to point out the requirements.
-
-Closes: #74
----
- data/gnome-session-restart-dbus.service.in | 5 +++--
- data/gnome-session-shutdown.target         | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/data/gnome-session-restart-dbus.service.in b/data/gnome-session-restart-dbus.service.in
-index e90f6bc8..6389c321 100644
---- a/data/gnome-session-restart-dbus.service.in
-+++ b/data/gnome-session-restart-dbus.service.in
-@@ -1,10 +1,11 @@
- [Unit]
- Description=Restart DBus after GNOME Session shutdown
- 
--# Allow exit.target to start even if this unit is started with replace-irreversibly
--# Also put it into a slice that doesn't have such implicit dependencies
-+# Allow exit.target to start even if this unit is started with replace-irreversibly.
-+# For this to work, we also need to be in the root slice.
- DefaultDependencies=no
- 
- [Service]
- Type=notify
- ExecStart=@libexecdir@/gnome-session-ctl --restart-dbus
-+Slice=-.slice
-diff --git a/data/gnome-session-shutdown.target b/data/gnome-session-shutdown.target
-index 607dc6e7..2c3d1963 100644
---- a/data/gnome-session-shutdown.target
-+++ b/data/gnome-session-shutdown.target
-@@ -1,8 +1,9 @@
- [Unit]
- Description=Shutdown running GNOME Session
- 
--# Allow exit.target to start even if this unit is started with replace-irreversibly
--# The same is needed for all (weak) dependencies
-+# Allow exit.target to start even if this unit is started with replace-irreversibly.
-+# All (weak) dependencies need to do the same. Services also need to ensure they
-+# are in the root slice by setting Slice=-.slice.
- DefaultDependencies=no
- 
- Conflicts=graphical-session.target graphical-session-pre.target
--- 
-GitLab
-

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/files/

[Mart Raudsepp]

commit:     07ef955be66bf7b11da98a2e451b6358eec82dd3
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 22:15:41 2023 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 22:17:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ef955b

gnome-base/gnome-session: drop old OpenOffice MIME type association entries

Primarily to make QA checks happy as we got a
'files/defaults.list-r6' exceeds 20.0 KiB in size; 20.0 KiB total
from the updated list with added entries.

No revbump as previous was 35 minutes ago and the changes to installed file
don't change anything when OpenOffice isn't installed, which no-one should
have, as these are legacy entries that should have been removed long ago
in the first place.

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/gnome-session/files/defaults.list-r6 | 140 ++++++++++++------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/gnome-base/gnome-session/files/defaults.list-r6 b/gnome-base/gnome-session/files/defaults.list-r6
index ea090d43163c..a724700e69cc 100644
--- a/gnome-base/gnome-session/files/defaults.list-r6
+++ b/gnome-base/gnome-session/files/defaults.list-r6
@@ -1,9 +1,9 @@
 [Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/rtf=abiword.desktop;libreoffice-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/richtext=abiword.desktop;libreoffice-writer.desktop;
+text/rtf=abiword.desktop;libreoffice-writer.desktop;
 text/x-abiword=abiword.desktop;
 text/x-xml-abiword=abiword.desktop;
 x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
@@ -133,36 +133,36 @@ 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/csv=gnumeric.desktop;libreoffice-calc.desktop;
+application/excel=gnumeric.desktop;libreoffice-calc.desktop;
+application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;
+application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;
+application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;
+application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-123=gnumeric.desktop;libreoffice-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-dbase=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-excel=gnumeric.desktop;libreoffice-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-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-msexcel=gnumeric.desktop;libreoffice-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-quattropro=gnumeric.desktop;libreoffice-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;
+text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;
+text/csv=gnumeric.desktop;libreoffice-calc.desktop;
+text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;
+text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;
+text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;
+text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;
 zz-application/zz-winassoc-xls=gnumeric.desktop;
 x-content/software=nautilus-autorun-software.desktop;
 x-content/unix-software=nautilus-autorun-software.desktop;
@@ -170,53 +170,53 @@ x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
 x-directory/normal=org.gnome.Nautilus.desktop;
 inode/directory=org.gnome.Nautilus.desktop;
 application/x-gnome-saved-search=org.gnome.Nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;
+application/vnd.sun.xml.calc=libreoffice-calc.desktop;
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;
+application/vnd.stardivision.calc=libreoffice-calc.desktop;
+application/vnd.stardivision.chart=libreoffice-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;
+application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;
+application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;
+application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;
+application/vnd.sun.xml.draw=libreoffice-draw.desktop;
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;
+application/vnd.stardivision.draw=libreoffice-draw.desktop;
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;
+application/vnd.sun.xml.impress=libreoffice-impress.desktop;
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;
+application/vnd.stardivision.impress=libreoffice-impress.desktop;
+application/mspowerpoint=libreoffice-impress.desktop;
+application/vnd.ms-powerpoint=libreoffice-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;
+application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;
+application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;
+application/vnd.sun.xml.math=libreoffice-math.desktop;
+application/vnd.stardivision.math=libreoffice-math.desktop;
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;
+application/vnd.sun.xml.writer=libreoffice-writer.desktop;
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;
+application/vnd.stardivision.writer=libreoffice-writer.desktop;
+application/msword=libreoffice-writer.desktop;
+application/vnd.ms-word=libreoffice-writer.desktop;
+application/x-doc=libreoffice-writer.desktop;
+application/vnd.wordperfect=libreoffice-writer.desktop;
+application/wordperfect=libreoffice-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;
+application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;
+application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;
 x-content/audio-player=rhythmbox.desktop;
 x-content/audio-cdda=org.gnome.SoundJuicer.desktop;
 application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;