From 6a988463ea6b4d8682af675f9d98f5dab559d07a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 09:41:44 +0000 Subject: import shared-mime-info-1.8-5.el7 --- diff --git a/SOURCES/0001-Add-font-top-level-type.patch b/SOURCES/0001-Add-font-top-level-type.patch new file mode 100644 index 0000000..f6b354d --- /dev/null +++ b/SOURCES/0001-Add-font-top-level-type.patch @@ -0,0 +1,80 @@ +From 7e5d5796c410bb4640399d2284592f3ad27b119e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 8 Feb 2017 13:06:22 +0200 +Subject: [PATCH 1/6] Add "font" top level type + +https://www.iana.org/assignments/media-types/media-types.xhtml#font +https://tools.ietf.org/html/draft-ietf-justfont-toplevel +--- + update-mime-database.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/update-mime-database.c b/update-mime-database.c +index 5af14d7..881f6a9 100644 +--- a/update-mime-database.c ++++ b/update-mime-database.c +@@ -34,60 +34,61 @@ + + #define MIME_ERROR g_quark_from_static_string("mime-error-quark") + + #define NOGLOBS "__NOGLOBS__" + #define NOMAGIC "__NOMAGIC__" + + #ifndef PATH_SEPARATOR + # ifdef _WIN32 + # define PATH_SEPARATOR ";" + # else + # define PATH_SEPARATOR ":" + # endif + #endif + + /* This is the list of directories to scan when finding old type files to + * delete. It is also used to warn about invalid MIME types. + */ + const char *media_types[] = { + "text", + "application", + "image", + "audio", + "inode", + "video", + "message", + "model", + "multipart", + "x-content", + "x-epoc", + "x-scheme-handler", ++ "font", + }; + + /* Represents a MIME type */ + typedef struct _Type Type; + + /* A parsed element */ + typedef struct _Magic Magic; + + /* A parsed element */ + typedef struct _Match Match; + + /* A parsed element */ + typedef struct _TreeMagic TreeMagic; + + /* A parsed element */ + typedef struct _TreeMatch TreeMatch; + + /* A parsed element */ + typedef struct _Glob Glob; + + struct _Type { + char *media; + char *subtype; + + /* Contains xmlNodes for elements that are being copied to the output. + * That is, , and nodes, and anything + * with an unknown namespace. + */ + xmlDoc *output; + }; +-- +2.21.0 + diff --git a/SOURCES/0002-font-ttf-Use-IANA-registered-type.patch b/SOURCES/0002-font-ttf-Use-IANA-registered-type.patch new file mode 100644 index 0000000..5eea16f --- /dev/null +++ b/SOURCES/0002-font-ttf-Use-IANA-registered-type.patch @@ -0,0 +1,130 @@ +From e6d2f2633d468b0a4bb5688fceb9ce08387b1429 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 8 Feb 2017 13:08:34 +0200 +Subject: [PATCH 2/6] font/ttf: Use IANA registered type + +https://www.iana.org/assignments/media-types/font/ttf +--- + freedesktop.org.xml.in | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in +index e2ff392..452714a 100644 +--- a/freedesktop.org.xml.in ++++ b/freedesktop.org.xml.in +@@ -2029,111 +2029,112 @@ command to generate the output files. + + + + + + <_comment>Linux PSF console font + + + + + + + + <_comment>Linux PSF console font (gzip-compressed) + + + + + + <_comment>PCF font + + + + + + + + + + <_comment>OpenType font +- ++ + + + + + + + + <_comment>Speedo font + + + + + + + + <_comment>SunOS News font + + + + + + + + + <_comment>TeX font + + + + + + + + + <_comment>TeX font metrics + + + + + + +- ++ + <_comment>TrueType font + + + + + + + + ++ + + + <_comment>TrueType XML font + + + + + + + + + <_comment>V font + + + + + + + <_comment>Adobe FrameMaker document + + + + + + + + + + + + diff --git a/SOURCES/0003-font-otf-Use-IANA-registered-type.patch b/SOURCES/0003-font-otf-Use-IANA-registered-type.patch new file mode 100644 index 0000000..a529a5f --- /dev/null +++ b/SOURCES/0003-font-otf-Use-IANA-registered-type.patch @@ -0,0 +1,88 @@ +From eba157babfaf5bff143bf7843ca67fc344377d62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 8 Feb 2017 13:09:34 +0200 +Subject: [PATCH 3/6] font/otf: Use IANA registered type + +https://www.iana.org/assignments/media-types/font/otf +--- + freedesktop.org.xml.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in +index 452714a..8d2568b 100644 +--- a/freedesktop.org.xml.in ++++ b/freedesktop.org.xml.in +@@ -2027,68 +2027,69 @@ command to generate the output files. + <_comment>LIBGRX font + + + + + + + <_comment>Linux PSF console font + + + + + + + + <_comment>Linux PSF console font (gzip-compressed) + + + + + + <_comment>PCF font + + + + + + + + +- ++ + <_comment>OpenType font + + + + + + ++ + + + <_comment>Speedo font + + + + + + + + <_comment>SunOS News font + + + + + + + + + <_comment>TeX font + + + + + + + + + <_comment>TeX font metrics + +-- +2.21.0 + diff --git a/SOURCES/0004-font-woff-Use-new-IANA-registered-type.patch b/SOURCES/0004-font-woff-Use-new-IANA-registered-type.patch new file mode 100644 index 0000000..a8637a7 --- /dev/null +++ b/SOURCES/0004-font-woff-Use-new-IANA-registered-type.patch @@ -0,0 +1,87 @@ +From a96dabb669a7a9b48807eb534223de8ad2e80474 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 8 Feb 2017 13:14:33 +0200 +Subject: [PATCH 4/6] font/woff: Use new IANA registered type + +https://www.iana.org/assignments/media-types/font/woff +--- + freedesktop.org.xml.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in +index 8d2568b..e5629f0 100644 +--- a/freedesktop.org.xml.in ++++ b/freedesktop.org.xml.in +@@ -1941,69 +1941,70 @@ command to generate the output files. + + + + + + + + + + + + + + + + + + + + + <_comment>FLTK Fluid file + FLTK + Fast Light Toolkit + + + + + + + +- ++ + <_comment>WOFF font + WOFF + Web Open Font Format + + + + + ++ + + + <_comment>Postscript type-1 font + + + + + + + + + + + + + + + + <_comment>Adobe font metrics + + + + + <_comment>BDF font + + + + + + + diff --git a/SOURCES/0005-font-collection-New-type-associate-.ttc-with-it.patch b/SOURCES/0005-font-collection-New-type-associate-.ttc-with-it.patch new file mode 100644 index 0000000..567ef43 --- /dev/null +++ b/SOURCES/0005-font-collection-New-type-associate-.ttc-with-it.patch @@ -0,0 +1,86 @@ +From 95d0e4aa11f0b544a0911c75bdd3b15eded8fe67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 8 Feb 2017 13:18:43 +0200 +Subject: [PATCH 5/6] font/collection: New type, associate *.ttc with it + +https://www.iana.org/assignments/media-types/font/collection +--- + freedesktop.org.xml.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in +index e5629f0..e810d2f 100644 +--- a/freedesktop.org.xml.in ++++ b/freedesktop.org.xml.in +@@ -2081,63 +2081,67 @@ command to generate the output files. + + + + + + <_comment>TeX font + + + + + + + + + <_comment>TeX font metrics + + + + + + + + <_comment>TrueType font + + + + + + + +- + + ++ ++ <_comment>Font collection ++ ++ ++ + + <_comment>TrueType XML font + + + + + + + + + <_comment>V font + + + + + + + <_comment>Adobe FrameMaker document + + + + + + + + + + + + +-- +2.21.0 + diff --git a/SOURCES/0006-font-woff2-New-type.patch b/SOURCES/0006-font-woff2-New-type.patch new file mode 100644 index 0000000..df66759 --- /dev/null +++ b/SOURCES/0006-font-woff2-New-type.patch @@ -0,0 +1,88 @@ +From 94c863d34f6be9be014c7f230b98a51b6ca91bf9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Wed, 8 Feb 2017 13:21:15 +0200 +Subject: [PATCH 6/6] font/woff2: New type + +https://www.iana.org/assignments/media-types/font/woff2 +--- + freedesktop.org.xml.in | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in +index e810d2f..15652ac 100644 +--- a/freedesktop.org.xml.in ++++ b/freedesktop.org.xml.in +@@ -1952,60 +1952,70 @@ command to generate the output files. + + + + + + + + + + <_comment>FLTK Fluid file + FLTK + Fast Light Toolkit + + + + + + + + + <_comment>WOFF font + WOFF + Web Open Font Format + + + + + + + ++ ++ <_comment>WOFF2 font ++ WOFF2 ++ Web Open Font Format 2.0 ++ ++ ++ ++ ++ ++ + + <_comment>Postscript type-1 font + + + + + + + + + + + + + + + + <_comment>Adobe font metrics + + + + + <_comment>BDF font + + + + + + + +-- +2.21.0 + diff --git a/SPECS/shared-mime-info.spec b/SPECS/shared-mime-info.spec index 42ce426..6bd8c4e 100644 --- a/SPECS/shared-mime-info.spec +++ b/SPECS/shared-mime-info.spec @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 1.8 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Base URL: http://freedesktop.org/Software/shared-mime-info @@ -18,7 +18,15 @@ Source3: file-roller-defaults.list Source4: eog-defaults.list # Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354 -Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch +Patch0001: 0001-Remove-sub-classing-from-OO.o-mime-types.patch + +# from upstream +Patch1001: 0001-Add-font-top-level-type.patch +Patch1002: 0002-font-ttf-Use-IANA-registered-type.patch +Patch1003: 0003-font-otf-Use-IANA-registered-type.patch +Patch1004: 0004-font-woff-Use-new-IANA-registered-type.patch +Patch1005: 0005-font-collection-New-type-associate-.ttc-with-it.patch +Patch1006: 0006-font-woff2-New-type.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel @@ -42,7 +50,7 @@ a file. This is generally done by examining the file's name or contents, and looking up the correct MIME type in a database. %prep -%autosetup +%autosetup -p1 %build %configure --disable-silent-rules --disable-update-mimedb @@ -96,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/* %{_mandir}/man*/* %changelog +* Tue Aug 13 2019 Ray Strode - 1.8-5 +- support new toplevel font types + Resolves: #1678448 + * Wed Sep 20 2017 Bastien Nocera - 1.8-4 + shared-mime-info-1.8-4 - Fix CSV files being associated with LibreOffice Math instead