Changeset 28909b72


Ignore:
Timestamp:
08/31/2021 08:39:20 PM (3 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.0, ken/refactor-virt, lazarus, qt5new, trunk, upgradedb
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:
4 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rb2054970 r28909b72  
    130130      true;                                                       \
    131131      bash obfuscate.sh $$filename;                               \
    132       sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
     132      sed -i -e "1,20s@text/html@application/xhtml+xml@g" $$filename; \
    133133   done;
    134134
     
    145145        $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
    146146        $(Q)bash obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
    147         $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
     147        $(Q)sed -i -e "1,20s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
    148148
    149149tmpdir: $(RENDERTMP)
  • xsoft/graphweb/firefox-legacy.xml

    rb2054970 r28909b72  
    503503mkdir -pv /usr/share/pixmaps &amp;&amp;
    504504
    505 cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
     505MIMETYPE="text/xml;text/mml;text/html;"                                    &amp;&amp;
     506MIMETYPE="$MIMETYPE;application/xhtml+xml;application/vnd.mozilla.xul+xml" &amp;&amp;
     507MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https;          &amp;&amp;
     508
     509cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; EOF &amp;&amp;
    506510<literal>[Desktop Entry]
    507511Encoding=UTF-8
     
    514518Icon=firefox
    515519Categories=GNOME;GTK;Network;WebBrowser;
    516 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
     520MimeType=$MIMETYPE
    517521StartupNotify=true</literal>
    518522EOF
     523
     524unset MIMETYPE &amp;&amp;
    519525
    520526ln -sfv /usr/lib/firefox/browser/chrome/icons/default/default128.png \
  • xsoft/graphweb/firefox.xml

    rb2054970 r28909b72  
    513513
    514514<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
    515 mkdir -pv /usr/share/pixmaps &amp;&amp;
    516 
    517 cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
     515mkdir -pv /usr/share/pixmaps      &amp;&amp;
     516
     517MIMETYPE="text/xml;text/mml;text/html;"                                    &amp;&amp;
     518MIMETYPE="$MIMETYPE;application/xhtml+xml;application/vnd.mozilla.xul+xml" &amp;&amp;
     519MIMETYPE="$MIMETYPE;x-scheme-handler/http;x-scheme-handler/https;          &amp;&amp;
     520
     521cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; EOF &amp;&amp;
    518522<literal>[Desktop Entry]
    519523Encoding=UTF-8
     
    526530Icon=firefox
    527531Categories=GNOME;GTK;Network;WebBrowser;
    528 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
     532MimeType=$MIMETYPE
    529533StartupNotify=true</literal>
    530534EOF
     535
     536unset MIMETYPE &amp;&amp;
    531537
    532538ln -sfv /usr/lib/firefox/browser/chrome/icons/default/default128.png \
  • xsoft/other/thunderbird.xml

    rb2054970 r28909b72  
    360360<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps} &amp;&amp;
    361361
    362 MIMETYPE="text/html;text/xml;application/xhtml+xml;application/xml"
    363 MIMETYPE="$MIMETYPE;application/rss+xml;x-scheme-handler/mailto;"
    364 
    365 cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; EOF &amp;&amp;
     362cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
    366363<literal>[Desktop Entry]
    367364Name=Thunderbird Mail
     
    373370Icon=thunderbird
    374371Categories=Network;Email;
    375 MimeType=$MIMETYPE
     372MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;x-scheme-handler/mailto;
    376373StartupNotify=true</literal>
    377374EOF
    378 
    379 unset MIMETYPE
    380375
    381376ln -sfv /usr/lib/thunderbird/chrome/icons/default/default256.png \
Note: See TracChangeset for help on using the changeset viewer.