From 5e839502c601d031988c0a7109007feef7cd0edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 3 Apr 2020 09:14:16 +0200 Subject: [PATCH 1/2] softmaker-office: fix desktop items Fix desktop items to pass validation: - Remove icon file extension. - Remove categories that are not defined by the specification. - Remove a duplicate MIME type in the PlanMaker desktop file --- .../office/softmaker/desktop_items.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix index 6975da06456..614c6574faa 100644 --- a/pkgs/applications/office/softmaker/desktop_items.nix +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -4,10 +4,10 @@ planmaker = makeDesktopItem { name = "${pname}-planmaker"; desktopName = "${suiteName} PlanMaker"; - icon = "${pname}-pml.png"; - categories = "Application;Office;SpreadSheet;"; + icon = "${pname}-pml"; + categories = "Office;"; exec = "${pname}-planmaker %F"; - mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; + mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; extraEntries = '' TryExec=${pname}-planmaker StartupWMClass=pm @@ -17,8 +17,8 @@ presentations = makeDesktopItem { name = "${pname}-presentations"; desktopName = "${suiteName} Presentations"; - icon = "${pname}-prl.png"; - categories = "Application;Office;Presentation;"; + icon = "${pname}-prl"; + categories = "Office;"; exec = "${pname}-presentations %F"; mimeType = "application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;"; extraEntries = '' @@ -30,8 +30,8 @@ textmaker = makeDesktopItem { name = "${pname}-textmaker"; desktopName = "${suiteName} TextMaker"; - icon = "${pname}-tml.png"; - categories = "Application;Office;WordProcessor;"; + icon = "${pname}-tml"; + categories = "Office;"; exec = "${pname}-textmaker %F"; mimeType = "application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;"; extraEntries = '' From cb5580e4c0519e0737f1d1fa92ea431c67728cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 3 Apr 2020 09:15:58 +0200 Subject: [PATCH 2/2] softmaker-office: 974 -> 976 This is a bugfix release: https://www.softmaker.com/en/servicepacks-office-changelog --- pkgs/applications/office/softmaker/softmaker_office.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index ed4903d6474..77634efebe8 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "softmaker-office"; - version = "974"; + version = "976"; edition = "2018"; suiteName = "SoftMaker Office"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - sha256 = "0z1g76lhja92s25x6y0h55wmqza2d3pjbshn5b9rn2784gjgj7hn"; + sha256 = "0j6zm0cbxrcgm7glk84hvvbp4z0ys6v8bkwwhl5r7dbphyi72fw8"; }; archive = "office${edition}.tar.lzma";