Patch by Robert Scheck <robert@fedoraproject.org> for icedtea-web >= 1.8.8 which completely removes the Java applet support, because
upstream's build-time options fail to do so. Without this patch there are build failures related either to sun.applet.AppletImageRef
or the API documentation.
--- icedtea-web-1.8.8/acinclude.m4 2021-10-27 22:13:18.000000000 +0200
+++ icedtea-web-1.8.8/acinclude.m4.remove-applet 2023-04-23 01:01:50.114347243 +0200
@@ -1052,6 +1052,7 @@
else
it_cv_applet_hole=no;
fi
+it_cv_applet_hole=yes;
])
rm -f $CLASS *.class
cd ..
--- icedtea-web-1.8.8/configure.ac 2021-10-27 22:13:18.000000000 +0200
+++ icedtea-web-1.8.8/configure.ac.remove-applet 2023-04-23 01:01:50.114347243 +0200
@@ -186,7 +186,6 @@
fi
IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil], [some.pkg], [$JAVA_NAMING])
IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_HTTP_HANDLER, [sun.net.www.protocol.http.Handler], [some.pkg], [$JAVA_BASE])
-IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP])
IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY
IT_CHECK_GLIB_VERSION
--- icedtea-web-1.8.8/Makefile.am 2021-10-27 22:13:18.000000000 +0200
+++ icedtea-web-1.8.8/Makefile.am.remove-applet 2023-04-23 01:03:08.971853519 +0200
@@ -238,8 +238,7 @@
net.sourceforge.jnlp.controlpanel net.sourceforge.jnlp.event \
net.sourceforge.jnlp.runtime net.sourceforge.jnlp.security \
net.sourceforge.jnlp.security.viewer net.sourceforge.jnlp.services \
- net.sourceforge.jnlp.tools net.sourceforge.jnlp.util \
- sun.applet
+ net.sourceforge.jnlp.tools net.sourceforge.jnlp.util
if ENABLE_PLUGINJAR
export ICEDTEAPLUGIN_TARGET = stamps/liveconnect-dist.stamp
@@ -899,7 +898,7 @@
LANG_BACKUP=$$LANG ; \
echo "<html><head><title>$(PLUGIN_VERSION)</title></head>" > "$$HTML_DOCS_INDEX" ; \
echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \
- for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \
+ for LANG_ID in en_US.UTF-8 ; do \
ID=`echo "$$LANG_ID" | head -c 2` ; \
ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \
export LANG=$$LANG_ID; \
@@ -956,11 +955,11 @@
(cd $(NETX_DIR) ; \
mkdir -p lib ; \
$(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \
- $(TOP_BUILD_DIR)/netx.manifest javax/jnlp net sun; \
+ $(TOP_BUILD_DIR)/netx.manifest javax/jnlp net; \
cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
- $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net sun)
+ $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net)
mkdir -p stamps
touch $@
--- icedtea-web-1.8.8/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java 2021-10-27 22:13:18.000000000 +0200
+++ icedtea-web-1.8.8/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java.remove-applet 2023-04-23 01:03:08.970853513 +0200
@@ -502,8 +502,7 @@
ItwebSettingsTextsProvider itws = new ItwebSettingsTextsProvider(encoding, new HtmlFormatter(allowContext, allowLogo, includeXmlHeader), titles, expand);
PolicyEditorTextsProvider pe = new PolicyEditorTextsProvider(encoding, new HtmlFormatter(allowContext, allowLogo, includeXmlHeader), titles, expand);
IcedTeaWebTextsProvider itw = new IcedTeaWebTextsProvider(encoding, new HtmlFormatter(allowContext, allowLogo, includeXmlHeader), titles, expand);
- ItwebPluginTextProvider pl = new ItwebPluginTextProvider(encoding, new HtmlFormatter(allowContext, allowLogo, includeXmlHeader), titles, expand);
- TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw, pl};
+ TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw};
for (TextsProvider provider : providers) {
provider.setAuthorFilePath(authorFileFromUserInput);
provider.writeToDir(dir);
@@ -520,8 +519,7 @@
ItwebSettingsTextsProvider itws = new ItwebSettingsTextsProvider(encoding, new ManFormatter(), titles, expand);
PolicyEditorTextsProvider pe = new PolicyEditorTextsProvider(encoding, new ManFormatter(), titles, expand);
IcedTeaWebTextsProvider itw = new IcedTeaWebTextsProvider(encoding, new ManFormatter(), titles, expand);
- ItwebPluginTextProvider pl = new ItwebPluginTextProvider(encoding, new ManFormatter(), titles, expand);
- TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw, pl};
+ TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw};
for (TextsProvider provider : providers) {
provider.setAuthorFilePath(authorFileFromUserInput);
provider.writeToDir(dir);
@@ -538,8 +536,7 @@
ItwebSettingsTextsProvider itws = new ItwebSettingsTextsProvider(encoding, new PlainTextFormatter(indent, lineWidth), titles, expand);
PolicyEditorTextsProvider pe = new PolicyEditorTextsProvider(encoding, new PlainTextFormatter(indent, lineWidth), titles, expand);
IcedTeaWebTextsProvider itw = new IcedTeaWebTextsProvider(encoding, new PlainTextFormatter(indent, lineWidth), titles, expand);
- ItwebPluginTextProvider pl = new ItwebPluginTextProvider(encoding, new PlainTextFormatter(indent, lineWidth), titles, expand);
- TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw, pl};
+ TextsProvider[] providers = new TextsProvider[]{javaws, itws, pe, itw};
for(TextsProvider provider : providers){
provider.setAuthorFilePath(authorFileFromUserInput);
provider.writeToDir(dir);