Changeset 28909b72

Timestamp:

08/31/2021 08:39:20 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

70d859c8

Parents:

b2054970

Message:

Fix up MimeType entries in .desktop instructions
We aso had a sed in the Makefile that changes text/html.
I changed that to only look at the top 20 lines of each page.

Files:

• Makefile (modified) (2 diffs)
• xsoft/graphweb/firefox-legacy.xml (modified) (2 diffs)
• xsoft/graphweb/firefox.xml (modified) (2 diffs)
• xsoft/other/thunderbird.xml (modified) (2 diffs)

Makefile

@@ -130 +130 @@
       true;                                                       \
       bash obfuscate.sh $$filename;                               \
-      sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
+      sed -i -e "1,20s@text/html@application/xhtml+xml@g" $$filename; \
    done;
 
@@ -145 +145 @@
         $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
         $(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-        $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+        $(Q)sed -i -e "1,20s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
 tmpdir: $(RENDERTMP)

xsoft/graphweb/firefox-legacy.xml

@@ -503 +503 @@
 mkdir -pv /usr/share/pixmaps &&
 
-cat > /usr/share/applications/firefox.desktop << "EOF" &&
+MIMETYPE="text/xml;text/mml;text/html;"                                    &&
+MIMETYPE="$MIMETYPE;application/xhtml+xml;application/vnd.mozilla.xul+xml" &&
+MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https;          &&
+
+cat > /usr/share/applications/firefox.desktop << EOF &&
 <literal>[Desktop Entry]
 Encoding=UTF-8
@@ -514 +518 @@
 Icon=firefox
 Categories=GNOME;GTK;Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+MimeType=$MIMETYPE
 StartupNotify=true</literal>
 EOF
+
+unset MIMETYPE &amp;&amp;
 
 ln -sfv /usr/lib/firefox/browser/chrome/icons/default/default128.png \

xsoft/graphweb/firefox.xml

@@ -513 +513 @@
 
 <screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-mkdir -pv /usr/share/pixmaps &amp;&amp;
-
-cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
+mkdir -pv /usr/share/pixmaps      &amp;&amp;
+
+MIMETYPE="text/xml;text/mml;text/html;"                                    &amp;&amp;
+MIMETYPE="$MIMETYPE;application/xhtml+xml;application/vnd.mozilla.xul+xml" &amp;&amp;
+MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https;          &amp;&amp;
+
+cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; EOF &amp;&amp;
 <literal>[Desktop Entry]
 Encoding=UTF-8
@@ -526 +530 @@
 Icon=firefox
 Categories=GNOME;GTK;Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+MimeType=$MIMETYPE
 StartupNotify=true</literal>
 EOF
+
+unset MIMETYPE &amp;&amp;
 
 ln -sfv /usr/lib/firefox/browser/chrome/icons/default/default128.png \

xsoft/other/thunderbird.xml

@@ -360 +360 @@
 <screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps} &amp;&amp;
 
-MIMETYPE="text/html;text/xml;application/xhtml+xml;application/xml"
-MIMETYPE="$MIMETYPE;application/rss+xml;x-scheme-handler/mailto;"
-
-cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; EOF &amp;&amp;
+cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
 <literal>[Desktop Entry]
 Name=Thunderbird Mail
@@ -373 +370 @@
 Icon=thunderbird
 Categories=Network;Email;
-MimeType=$MIMETYPE
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
 StartupNotify=true</literal>
 EOF
-
-unset MIMETYPE
 
 ln -sfv /usr/lib/thunderbird/chrome/icons/default/default256.png \