Attachment 371739 Details for Bug 198714 – Patch

[patch] Patch

bug-198714-20190610165653.patch (text/plain), 4.06 KB, created by Adrian Perez on 2019-06-10 06:56:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2019-06-10 06:56:55 PDT

Size: 4.06 KB

patch

obsolete

>Subversion Revision: 246256
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 6f135b62e5e39d5602cb1546b3ed01df5b76eb13..70c2749850c981a61b9909f36cf72273c1f2b73c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-06-10  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [JHBuild] Bump shared-mime-info to version â¥ 1.6
>+        https://bugs.webkit.org/show_bug.cgi?id=198714
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [GTK][Flatpak] webkit-build fails due to missing libwpe in Flatpak environment
>diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
>index 6dfa4a7878a247c25de46383a4b0342a24f0a965..d496c91b838de1f6729de311a2a16a01860f2864 100644
>--- a/Tools/gtk/jhbuild.modules
>+++ b/Tools/gtk/jhbuild.modules
>@@ -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"
>diff --git a/Tools/gtk/patches/shared-mime-info-xht-glob.patch b/Tools/gtk/patches/shared-mime-info-xht-glob.patch
>deleted file mode 100644
>index 667ae4991aac029613c61c880a8ed9b9740d0e95..0000000000000000000000000000000000000000
>--- a/Tools/gtk/patches/shared-mime-info-xht-glob.patch
>+++ /dev/null
>@@ -1,21 +0,0 @@
>-From 6e5818deb54fdfa70f5798fc1df1d5c3eaba42df Mon Sep 17 00:00:00 2001
>-From: Bastien Nocera <hadess@hadess.net>
>-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
>-
>diff --git a/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch b/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch
>deleted file mode 100644
>index 4d0e81615e69b5d9b03f5d83b50c98dc4c8fabeb..0000000000000000000000000000000000000000
>--- a/Tools/gtk/patches/shared-mime-info-xhtml-magic.patch
>+++ /dev/null
>@@ -1,26 +0,0 @@
>-From 4961dc3e48d13c0c675ad7c135419b864813ca55 Mon Sep 17 00:00:00 2001
>-From: Bastien Nocera <hadess@hadess.net>
>-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="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml" offset="0:256"/>
>-+      <match type="string" value="&lt;HTML xmlns=&quot;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
>-

Actions: View | Formatted Diff | Diff

Attachments on bug 198714: 371739