sysui/desktop/share/brand.pl |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d90c78640042001944a7b0799e4ef33e123c9bd5
Author:     Caolán McNamara <[email protected]>
AuthorDate: Tue Oct 12 09:52:53 2021 +0100
Commit:     Adolfo Jayme Barrientos <[email protected]>
CommitDate: Mon Oct 18 02:31:15 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]>
    (cherry picked from commit 074644e2b5c0997f1b239eeb8c72712b7f01aeb4)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123634
    Reviewed-by: Adolfo Jayme Barrientos <[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

Reply via email to