Title: [246262] trunk/Tools
- Revision
- 246262
- Author
- [email protected]
- Date
- 2019-06-10 07:42:26 -0700 (Mon, 10 Jun 2019)
Log Message
[JHBuild] Bump shared-mime-info to version ≥ 1.6
https://bugs.webkit.org/show_bug.cgi?id=198714
Reviewed by Carlos Garcia Campos.
* gtk/jhbuild.modules: Bump shared-mime-info version to 1.10.
* gtk/patches/shared-mime-info-xht-glob.patch: Removed.
* gtk/patches/shared-mime-info-xhtml-magic.patch: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (246261 => 246262)
--- trunk/Tools/ChangeLog 2019-06-10 14:39:18 UTC (rev 246261)
+++ trunk/Tools/ChangeLog 2019-06-10 14:42:26 UTC (rev 246262)
@@ -1,3 +1,14 @@
+2019-06-10 Adrian Perez de Castro <[email protected]>
+
+ [JHBuild] Bump shared-mime-info to version ≥ 1.6
+ https://bugs.webkit.org/show_bug.cgi?id=198714
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtk/jhbuild.modules: Bump shared-mime-info version to 1.10.
+ * gtk/patches/shared-mime-info-xht-glob.patch: Removed.
+ * gtk/patches/shared-mime-info-xhtml-magic.patch: Removed.
+
2019-06-10 Philippe Normand <[email protected]>
[WPE][Qt] Port to new wpe_fdo_egl_exported_image API
Modified: trunk/Tools/gtk/jhbuild.modules (246261 => 246262)
--- trunk/Tools/gtk/jhbuild.modules 2019-06-10 14:39:18 UTC (rev 246261)
+++ trunk/Tools/gtk/jhbuild.modules 2019-06-10 14:42:26 UTC (rev 246262)
@@ -419,12 +419,9 @@
<dep package="libxml2"/>
<dep package="glib"/>
</dependencies>
- <branch module="/~hadess/shared-mime-info-${version}.tar.xz" version="1.5"
+ <branch module="/~hadess/shared-mime-info-${version}.tar.xz" version="1.10"
repo="freedesktop.org"
- hash="sha256:d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180">
- <patch file="shared-mime-info-xht-glob.patch" strip="1"/>
- <patch file="shared-mime-info-xhtml-magic.patch" strip="1"/>
- </branch>
+ hash="sha256:c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf"/>
</autotools>
<autotools id="icu"
Deleted: trunk/Tools/gtk/patches/shared-mime-info-xht-glob.patch (246261 => 246262)
--- trunk/Tools/gtk/patches/shared-mime-info-xht-glob.patch 2019-06-10 14:39:18 UTC (rev 246261)
+++ trunk/Tools/gtk/patches/shared-mime-info-xht-glob.patch 2019-06-10 14:42:26 UTC (rev 246262)
@@ -1,21 +0,0 @@
-From 6e5818deb54fdfa70f5798fc1df1d5c3eaba42df Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[email protected]>
-Date: Thu, 7 Jan 2016 15:48:47 +0100
-Subject: Add *.xht as a glob for XHTML files
-
-
-diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index dc12655..48696d9 100644
---- a/freedesktop.org.xml.in
-+++ b/freedesktop.org.xml.in
-@@ -3669,6 +3669,7 @@ command to generate the output files.
- <sub-class-of type="application/xml"/>
- <generic-icon name="text-html"/>
- <glob pattern="*.xhtml"/>
-+ <glob pattern="*.xht"/>
- <root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
- </mime-type>
- <mime-type type="application/zip">
---
-cgit v0.10.2
-
Deleted: trunk/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch (246261 => 246262)
--- trunk/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch 2019-06-10 14:39:18 UTC (rev 246261)
+++ trunk/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch 2019-06-10 14:42:26 UTC (rev 246262)
@@ -1,26 +0,0 @@
-From 4961dc3e48d13c0c675ad7c135419b864813ca55 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <[email protected]>
-Date: Thu, 7 Jan 2016 15:49:16 +0100
-Subject: Add magic for XHTML files
-
-
-diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
-index 48696d9..9ea2f95 100644
---- a/freedesktop.org.xml.in
-+++ b/freedesktop.org.xml.in
-@@ -3670,6 +3670,12 @@ command to generate the output files.
- <generic-icon name="text-html"/>
- <glob pattern="*.xhtml"/>
- <glob pattern="*.xht"/>
-+ <magic priority="60">
-+ <match type="string" value="//W3C//DTD XHTML " offset="0:256"/>
-+ <match type="string" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" offset="0:256"/>
-+ <match type="string" value="<html xmlns="http://www.w3.org/1999/xhtml" offset="0:256"/>
-+ <match type="string" value="<HTML xmlns="http://www.w3.org/1999/xhtml" offset="0:256"/>
-+ </magic>
- <root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
- </mime-type>
- <mime-type type="application/zip">
---
-cgit v0.10.2
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
