summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-misc/shared-mime-info/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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, 69 insertions, 0 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
new file mode 100644
index 000000000000..601e8aff5caa
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-1.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 000000000000..5c0bb0357b29
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-1.4-iso-2.patch
@@ -0,0 +1,29 @@
+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
+