summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2017-02-18 16:38:45 +0100
committerDavid Seifert <soap@gentoo.org>2017-02-18 23:07:48 +0100
commit2980f569ee984a48b8692f998aeb68c890645809 (patch)
tree36535a05c4bdac7e36b47ac1862f9c0bf7b0fcea /x11-misc/shared-mime-info/files
parentx11-plugins/pidgin-libnotify: remove unused patch (diff)
downloadgentoo-2980f569ee984a48b8692f998aeb68c890645809.tar.gz
gentoo-2980f569ee984a48b8692f998aeb68c890645809.tar.bz2
gentoo-2980f569ee984a48b8692f998aeb68c890645809.zip
x11-misc/shared-mime-info: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/4016
Diffstat (limited to 'x11-misc/shared-mime-info/files')
-rw-r--r--x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch40
-rw-r--r--x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch29
2 files changed, 0 insertions, 69 deletions
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch
deleted file mode 100644
index 601e8aff5caa..000000000000
--- a/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0e93784410db711eef67fa2a56b0ec4bc4b5e08d Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sun, 15 Feb 2015 18:43:49 +0100
-Subject: [PATCH] Add a note about ISO image magic
-
-And the fact that we cannot implement it here.
----
- HACKING | 3 +++
- freedesktop.org.xml.in | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/HACKING b/HACKING
-index 260025b..370fb68 100644
---- a/HACKING
-+++ b/HACKING
-@@ -10,6 +10,9 @@ A few ground rules for people interested in adding new mime-types.
- * Mime-types/file formats proprietary to one application should only
- be added to a private .xml file and be bundled with the application
- itself
-+* Magic offset must be as small as possible. For example, the worst case
-+ scenario for ISO images is 32k inside the file. This is too big for a sniff
-+ buffer, especially on remote locations. Avoid those.
- * No commits should be done that break the test suite, or the test suite
- test in question should be amended, and reason for the changes clearly
- documented in the commit message
-diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index 7321d40..093c260 100644
---- a/freedesktop.org.xml.in
-+++ b/freedesktop.org.xml.in
-@@ -1514,6 +1514,7 @@ command to generate the output files.
- <_comment>raw CD image</_comment>
- <sub-class-of type="application/x-raw-disk-image"/>
- <alias type="application/x-iso9660-image"/>
-+ <!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
- <glob pattern="*.iso"/>
- <glob pattern="*.iso9660"/>
- </mime-type>
---
-2.4.1
-
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch
deleted file mode 100644
index 5c0bb0357b29..000000000000
--- a/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 824cff3da0f17812715795f0e64a47f7331a338b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 18 Feb 2015 10:37:36 +0100
-Subject: [PATCH] Bump priority for ISO images glob matching
-
-To work-around file managers that cannot use magic to differentiate
-mime-types.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=80877
----
- freedesktop.org.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index 64f34b9..59e399c 100644
---- a/freedesktop.org.xml.in
-+++ b/freedesktop.org.xml.in
-@@ -1515,7 +1515,7 @@ command to generate the output files.
- <sub-class-of type="application/x-raw-disk-image"/>
- <alias type="application/x-iso9660-image"/>
- <!-- No magic, see https://bugs.freedesktop.org/show_bug.cgi?id=10049 -->
-- <glob pattern="*.iso"/>
-+ <glob pattern="*.iso" weight="80"/>
- <glob pattern="*.iso9660"/>
- </mime-type>
- <mime-type type="application/x-cdrdao-toc">
---
-2.4.1
-