Rollback JDK-8370100 specific patch

alexeysemenyukoracle · alexeysemenyukoracle · commit 3216ddb8373e · 2025-10-21T02:39:33.000-04:00
diff --git a/test/jdk/tools/jpackage/share/IconTest.java b/test/jdk/tools/jpackage/share/IconTest.java
@@ -409,14 +409,6 @@ private static IconType getBundleIconType(JPackageCommand cmd,
             iconType = mainLauncherIconType;
         }
 
-        if (TKit.isLinux()) {
-            var noDefaultIcon = cmd.isImagePackageType() || !cmd.hasArgument("--linux-shortcut");
-
-            if (noDefaultIcon && iconType == IconType.DefaultIcon) {
-                iconType = IconType.NoIcon;
-            }
-        }
-
         return iconType;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -409,14 +409,6 @@ private static IconType getBundleIconType(JPackageCommand cmd,`
`409`	`409`	`iconType = mainLauncherIconType;`
`410`	`410`	`}`
`411`	`411`
`412`		`- if (TKit.isLinux()) {`
`413`		`- var noDefaultIcon = cmd.isImagePackageType() \|\| !cmd.hasArgument("--linux-shortcut");`
`414`		`-`
`415`		`- if (noDefaultIcon && iconType == IconType.DefaultIcon) {`
`416`		`- iconType = IconType.NoIcon;`
`417`		`- }`
`418`		`- }`
`419`		`-`
`420`	`412`	`return iconType;`
`421`	`413`	`}`
`422`	`414`