bug#23094: [PATCHv2] Re: bug#23094: icecat is missing a desktop file

[ludo@gnu.org (Ludovic Courtès)]

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> On Sat, 28 May 2016 17:22:41 +0200
> ludo@gnu.org (Ludovic Courtès) wrote:
>
>> I figured there’s already a desktop entry template in the source, and
>> it’s more complete (it includes translations), hence this patch:
>
> I tried your patch and I get:

Oops, my bad.

I tested the attached one.  It works as expected, but there remain
“%%ifdef” things in it (see attached file), and I’m guessing GNOME &
co. will barf upon them, though I don’t know how to test.

Thoughts?

Thanks,
Ludo’.


[-- Attachment #2: icecat.desktop --]
[-- Type: application/octet-stream, Size: 10783 bytes --]

[Desktop Entry]
Version=1.0
%%ifdef MOZ_OFFICIAL_BRANDING
Name=IceCat Web Browser
Name[ar]=متصفح الويب فَيَرفُكْس
Name[ast]=Restolador web IceCat
Name[bn]=ফায়ারফক্স ওয়েব ব্রাউজার
Name[ca]=Navegador web IceCat
Name[cs]=IceCat Webový prohlížeč
Name[da]=IceCat - internetbrowser
Name[el]=Περιηγητής IceCat
Name[es]=Navegador web IceCat
Name[et]=IceCati veebibrauser
Name[fa]=مرورگر اینترنتی IceCat
Name[fi]=IceCat-selain
Name[fr]=Navigateur Web IceCat
Name[gl]=Navegador web IceCat
Name[he]=דפדפן האינטרנט IceCat
Name[hr]=IceCat web preglednik
Name[hu]=IceCat webböngésző
Name[it]=IceCat Browser Web
Name[ja]=IceCat ウェブ・ブラウザ
Name[ko]=IceCat 웹 브라우저
Name[ku]=Geroka torê IceCat
Name[lt]=IceCat interneto naršyklė
Name[nb]=IceCat Nettleser
Name[nl]=IceCat webbrowser
Name[nn]=IceCat Nettlesar
Name[no]=IceCat Nettleser
Name[pl]=Przeglądarka WWW IceCat
Name[pt]=IceCat Navegador Web
Name[pt_BR]=Navegador Web IceCat
Name[ro]=IceCat – Navigator Internet
Name[ru]=Веб-браузер IceCat
Name[sk]=IceCat - internetový prehliadač
Name[sl]=IceCat spletni brskalnik
Name[sv]=IceCat webbläsare
Name[tr]=IceCat Web Tarayıcısı
Name[ug]=IceCat توركۆرگۈ
Name[uk]=Веб-браузер IceCat
Name[vi]=Trình duyệt web IceCat
Name[zh_CN]=IceCat 网络浏览器
Name[zh_TW]=IceCat 網路瀏覽器
%%else
Name=GNU IceCat Web Browser
Name[ast]=Restolador web GNU IceCat
Name[ca]=Navegador web GNU IceCat
Name[cs]=GNU IceCat Webový prohlížeč
Name[da]=GNU IceCat - internetbrowser
Name[el]=Περιηγητής GNU IceCat
Name[es]=Navegador web GNU IceCat
Name[et]=GNU IceCati veebibrauser
Name[fa]=مرورگر اینترنتی GNU IceCat
Name[fi]=GNU IceCat-selain
Name[fr]=Navigateur Web GNU IceCat
Name[gl]=Navegador web GNU IceCat
Name[he]=דפדפן האינטרנט GNU IceCat
Name[hr]=GNU IceCat web preglednik
Name[hu]=GNU IceCat webböngésző
Name[it]=GNU IceCat Browser Web
Name[ja]=GNU IceCat ウェブ・ブラウザ
Name[ko]=GNU IceCat 웹 브라우저
Name[ku]=Geroka torê GNU IceCat
Name[lt]=GNU IceCat interneto naršyklė
Name[nb]=GNU IceCat Nettleser
Name[nl]=GNU IceCat webbrowser
Name[nn]=GNU IceCat Nettlesar
Name[no]=GNU IceCat Nettleser
Name[pl]=Przeglądarka WWW GNU IceCat
Name[pt]=GNU IceCat Navegador Web
Name[pt_BR]=Navegador Web GNU IceCat
Name[ro]=GNU IceCat – Navigator Internet
Name[ru]=Веб-браузер GNU IceCat
Name[sk]=GNU IceCat - internetový prehliadač
Name[sl]=GNU IceCat spletni brskalnik
Name[sv]=GNU IceCat webbläsare
Name[tr]=GNU IceCat Web Tarayıcısı
Name[ug]=GNU IceCat توركۆرگۈ
Name[uk]=Веб-браузер GNU IceCat
Name[vi]=Trình duyệt web GNU IceCat
Name[zh_CN]=GNU IceCat 网络浏览器
Name[zh_TW]=GNU IceCat 網路瀏覽器
%%endif
Comment=Browse the World Wide Web
Comment[ar]=تصفح الشبكة العنكبوتية العالمية
Comment[ast]=Restola pela Rede
Comment[bn]=ইন্টারনেট ব্রাউজ করুন
Comment[ca]=Navegueu per la web
Comment[cs]=Prohlížení stránek World Wide Webu
Comment[da]=Surf på internettet
Comment[de]=Im Internet surfen
Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
Comment[es]=Navegue por la web
Comment[et]=Lehitse veebi
Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
Comment[fi]=Selaa Internetin WWW-sivuja
Comment[fr]=Naviguer sur le Web
Comment[gl]=Navegar pola rede
Comment[he]=גלישה ברחבי האינטרנט
Comment[hr]=Pretražite web
Comment[hu]=A világháló böngészése
Comment[it]=Esplora il web
Comment[ja]=ウェブを閲覧します
Comment[ko]=웹을 돌아 다닙니다
Comment[ku]=Li torê bigere
Comment[lt]=Naršykite internete
Comment[nb]=Surf på nettet
Comment[nl]=Verken het internet
Comment[nn]=Surf på nettet
Comment[no]=Surf på nettet
Comment[pl]=Przeglądanie stron WWW 
Comment[pt]=Navegue na Internet
Comment[pt_BR]=Navegue na Internet
Comment[ro]=Navigați pe Internet
Comment[ru]=Доступ в Интернет
Comment[sk]=Prehliadanie internetu
Comment[sl]=Brskajte po spletu
Comment[sv]=Surfa på webben
Comment[tr]=İnternet'te Gezinin
Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
Comment[uk]=Перегляд сторінок Інтернету
Comment[vi]=Để duyệt các trang web
Comment[zh_CN]=浏览互联网
Comment[zh_TW]=瀏覽網際網路
GenericName=Web Browser
GenericName[ar]=متصفح ويب
GenericName[ast]=Restolador Web
GenericName[bn]=ওয়েব ব্রাউজার
GenericName[ca]=Navegador web
GenericName[cs]=Webový prohlížeč
GenericName[da]=Webbrowser
GenericName[el]=Περιηγητής διαδικτύου
GenericName[es]=Navegador web
GenericName[et]=Veebibrauser
GenericName[fa]=مرورگر اینترنتی
GenericName[fi]=WWW-selain
GenericName[fr]=Navigateur Web
GenericName[gl]=Navegador Web
GenericName[he]=דפדפן אינטרנט
GenericName[hr]=Web preglednik
GenericName[hu]=Webböngésző
GenericName[it]=Browser web
GenericName[ja]=ウェブ・ブラウザ
GenericName[ko]=웹 브라우저
GenericName[ku]=Geroka torê
GenericName[lt]=Interneto naršyklė
GenericName[nb]=Nettleser
GenericName[nl]=Webbrowser
GenericName[nn]=Nettlesar
GenericName[no]=Nettleser
GenericName[pl]=Przeglądarka WWW
GenericName[pt]=Navegador Web
GenericName[pt_BR]=Navegador Web
GenericName[ro]=Navigator Internet
GenericName[ru]=Веб-браузер
GenericName[sk]=Internetový prehliadač
GenericName[sl]=Spletni brskalnik
GenericName[sv]=Webbläsare
GenericName[tr]=Web Tarayıcı
GenericName[ug]=توركۆرگۈ
GenericName[uk]=Веб-браузер
GenericName[vi]=Trình duyệt Web
GenericName[zh_CN]=网络浏览器
GenericName[zh_TW]=網路瀏覽器
Keywords=Internet;WWW;Browser;Web;Explorer
Keywords[ar]=انترنت;إنترنت;متصفح;ويب;وب
Keywords[ast]=Internet;WWW;Restolador;Web;Esplorador
Keywords[ca]=Internet;WWW;Navegador;Web;Explorador;Explorer
Keywords[cs]=Internet;WWW;Prohlížeč;Web;Explorer
Keywords[da]=Internet;Internettet;WWW;Browser;Browse;Web;Surf;Nettet
Keywords[de]=Internet;WWW;Browser;Web;Explorer;Webseite;Site;surfen;online;browsen
Keywords[el]=Internet;WWW;Browser;Web;Explorer;Διαδίκτυο;Περιηγητής;IceCat;Φιρεφοχ;Ιντερνετ
Keywords[es]=Explorador;Internet;WWW
Keywords[fi]=Internet;WWW;Browser;Web;Explorer;selain;Internet-selain;internetselain;verkkoselain;netti;surffaa
Keywords[fr]=Internet;WWW;Browser;Web;Explorer;Fureteur;Surfer;Navigateur
Keywords[he]=דפדפן;אינטרנט;רשת;אתרים;אתר;פיירפוקס;מוזילה;
Keywords[hr]=Internet;WWW;preglednik;Web
Keywords[hu]=Internet;WWW;Böngésző;Web;Háló;Net;Explorer
Keywords[it]=Internet;WWW;Browser;Web;Navigatore
Keywords[is]=Internet;WWW;Vafri;Vefur;Netvafri;Flakk
Keywords[ja]=Internet;WWW;Web;インターネット;ブラウザ;ウェブ;エクスプローラ
Keywords[nb]=Internett;WWW;Nettleser;Explorer;Web;Browser;Nettside
Keywords[nl]=Internet;WWW;Browser;Web;Explorer;Verkenner;Website;Surfen;Online 
Keywords[pt]=Internet;WWW;Browser;Web;Explorador;Navegador
Keywords[pt_BR]=Internet;WWW;Browser;Web;Explorador;Navegador
Keywords[ru]=Internet;WWW;Browser;Web;Explorer;интернет;браузер;веб;файрфокс;огнелис
Keywords[sk]=Internet;WWW;Prehliadač;Web;Explorer
Keywords[sl]=Internet;WWW;Browser;Web;Explorer;Brskalnik;Splet
Keywords[tr]=İnternet;WWW;Tarayıcı;Web;Gezgin;Web sitesi;Site;sörf;çevrimiçi;tara
Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;переглядач;оглядач;браузер;веб;файрфокс;вогнелис;перегляд
Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web
Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;IceCat;ff;互联网;网站;
Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐
Exec=/gnu/store/6mh9l6s13nx3vq3814l8xn7x3ck1jdl9-icecat-38.8.0-gnu1/bin/icecat %u
Terminal=false
X-MultipleArgs=false
Type=Application
Icon=icecat
Categories=GNOME;GTK;Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
StartupNotify=true
Actions=NewWindow;NewPrivateWindow;

[Desktop Action NewWindow]
Name=Open a New Window
Name[ar]=افتح نافذة جديدة
Name[ast]=Abrir una ventana nueva
Name[bn]=Abrir una ventana nueva
Name[ca]=Obre una finestra nova
Name[cs]=Otevřít nové okno
Name[da]=Åbn et nyt vindue
Name[de]=Ein neues Fenster öffnen
Name[el]=Άνοιγμα νέου παραθύρου
Name[es]=Abrir una ventana nueva
Name[fi]=Avaa uusi ikkuna
Name[fr]=Ouvrir une nouvelle fenêtre
Name[gl]=Abrir unha nova xanela
Name[he]=פתיחת חלון חדש
Name[hr]=Otvori novi prozor
Name[hu]=Új ablak nyitása
Name[it]=Apri una nuova finestra
Name[ja]=新しいウィンドウを開く
Name[ko]=새 창 열기
Name[ku]=Paceyeke nû veke
Name[lt]=Atverti naują langą
Name[nb]=Åpne et nytt vindu
Name[nl]=Nieuw venster openen
Name[pt]=Abrir nova janela
Name[pt_BR]=Abrir nova janela
Name[ro]=Deschide o fereastră nouă
Name[ru]=Новое окно
Name[sk]=Otvoriť nové okno
Name[sl]=Odpri novo okno
Name[sv]=Öppna ett nytt fönster
Name[tr]=Yeni pencere aç 
Name[ug]=يېڭى كۆزنەك ئېچىش
Name[uk]=Відкрити нове вікно
Name[vi]=Mở cửa sổ mới
Name[zh_CN]=新建窗口
Name[zh_TW]=開啟新視窗
Exec=/gnu/store/6mh9l6s13nx3vq3814l8xn7x3ck1jdl9-icecat-38.8.0-gnu1/bin/icecat -new-window
OnlyShowIn=Unity;

[Desktop Action NewPrivateWindow]
Name=Open a New Private Window
Name[ar]=افتح نافذة جديدة للتصفح الخاص
Name[ca]=Obre una finestra nova en mode d'incògnit
Name[de]=Ein neues privates Fenster öffnen
Name[es]=Abrir una ventana privada nueva
Name[fi]=Avaa uusi yksityinen ikkuna
Name[fr]=Ouvrir une nouvelle fenêtre de navigation privée
Name[he]=פתיחת חלון גלישה פרטית חדש
Name[hu]=Új privát ablak nyitása
Name[it]=Apri una nuova finestra anonima
Name[nb]=Åpne et nytt privat vindu
Name[ru]=Новое приватное окно
Name[sl]=Odpri novo okno zasebnega brskanja
Name[tr]=Yeni bir pencere aç
Name[uk]=Відкрити нове вікно у потайливому режимі
Name[zh_TW]=開啟新隱私瀏覽視窗
Exec=/gnu/store/6mh9l6s13nx3vq3814l8xn7x3ck1jdl9-icecat-38.8.0-gnu1/bin/icecat -private-window
OnlyShowIn=Unity;

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: Type: text/x-patch, Size: 1416 bytes --]

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 7e52534..264a754 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -509,7 +509,24 @@ standards.")
               (format #t "configure flags: ~s~%" flags)
               (zero? (apply system* bash
                             (string-append srcdir "/configure")
-                            flags))))))))
+                            flags)))))
+         (add-before 'configure 'install-desktop-entry
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Install the '.desktop' file.
+             (let* ((out (assoc-ref outputs "out"))
+                    (applications (string-append out "/share/applications")))
+               (mkdir-p applications)
+               (copy-file "debian/icecat.desktop.in"
+                          "debian/icecat.desktop")
+               (substitute* "debian/icecat.desktop"
+                 (("@MOZ_DISPLAY_NAME@")
+                  "GNU IceCat")
+                 (("^Exec=@MOZ_APP_NAME@")
+                  (string-append "Exec=" out "/bin/icecat"))
+                 (("@MOZ_APP_NAME@")
+                  "icecat"))
+               (install-file "debian/icecat.desktop" applications)
+               #t))))))
     (home-page "http://www.gnu.org/software/gnuzilla/")
     (synopsis "Entirely free browser derived from Mozilla Firefox")
     (description