sysui/desktop/share/brand.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
New commits: commit e0ccbbf5011703fd8f5f36d8d8c93205644a1201 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 12 09:30:15 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 12 12:27:19 2021 +0200 uses of icon_filename are gone since commit e58a5f6db6d13d078f12c3496f46c227c6943c48 Author: Chris Mayo <[email protected]> Date: Wed Nov 11 19:27:52 2020 +0000 Remove obsolete GNOME 2 MIME types files Change-Id: I31e2c8351d8893f3f0336a19b8ef9b53b8ab8555 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123445 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl index b17a7374fd62..e02c4ef6d045 100644 --- a/sysui/desktop/share/brand.pl +++ b/sysui/desktop/share/brand.pl @@ -87,10 +87,6 @@ while ($arg = shift) { s/Icon=/Icon=$iconprefix/; } - # patch all occurrences of openoffice in icon_filename - # line with $prefix - s/icon_filename=/icon_filename=$iconprefix/; - # patch all occurrences of openoffice in EXEC line with # $productfilename if ( /Exec/ ) { commit 074644e2b5c0997f1b239eeb8c72712b7f01aeb4 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 12 09:52:53 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 12 12:27:05 2021 +0200 document-new shouldn't get prefixed to become libreoffice-document-new seen by rpminspect as .desktop "references icon libreoffice-document-new but no subpackages contain libreoffice-document-new" introduced by: commit f767d5e2b017c0d0cfd23ff3318cb30901847722 Date: Sun Sep 1 11:30:12 2019 +0200 Add icons to New Document desktop file actions in the [Desktop Action NewDocument] section Change-Id: I64ce5e2dbaca32083b2f76e960c33a815f8a3773 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123444 Tested-by: Jenkins Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl index 9d73e619c495..b17a7374fd62 100644 --- a/sysui/desktop/share/brand.pl +++ b/sysui/desktop/share/brand.pl @@ -81,9 +81,11 @@ while ($arg = shift) { # remove possible Windows line-ends chomp; - # patch all occurrences of openoffice in ICON line with - # $prefix - s/Icon=/Icon=$iconprefix/; + # patch all icons in ICON line with $prefix + if (! /Icon=document-new/ ) { # except for Icon=document-new which + # is a stock icon, not one of ours + s/Icon=/Icon=$iconprefix/; + } # patch all occurrences of openoffice in icon_filename # line with $prefix
