diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index e8409157275c..70940d6db122 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -1,127 +1,115 @@ PORTNAME= icedtea-web -PORTVERSION= 1.8.4 +PORTVERSION= 1.8.8 DISTVERSIONPREFIX= icedtea-web- -PORTREVISION= 23 CATEGORIES= java www -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= java@FreeBSD.org COMMENT= Free Java plug-in and Java Web Start for OpenJDK WWW= http://icedtea.classpath.org/wiki/IcedTea-Web LICENSE= GPLv2 BUILD_DEPENDS= zip:archivers/zip \ bash:shells/bash \ gsed:textproc/gsed \ ${HAMCREST_JAR}:java/hamcrest \ ${JUNIT_JAR}:java/junit RUN_DEPENDS= bash:shells/bash -MAKE_JOBS_UNSAFE=yes - GNU_CONFIGURE= yes +USES= autoreconf compiler:c++11-lang desktop-file-utils gmake \ + pkgconfig shebangfix xorg USE_JAVA= yes JAVA_VERSION= 8 JAVA_OS= native JAVA_VENDOR= openjdk -USE_PERL5= build USE_XORG= x11 -USES= autoreconf compiler:c++11-lang desktop-file-utils gmake perl5 \ - pkgconfig shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= AdoptOpenJDK GH_PROJECT= IcedTea-Web SHEBANG_FILES= jrunscript.in shell-launcher/launchers.sh.in CONFIGURE_ARGS= --with-hamcrest="${HAMCREST_JAR}" CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" CONFIGURE_ARGS+= --with-junit="${JUNIT_JAR}" CONFIGURE_ARGS+= --with-rhino="${RHINO_JAR}" CONFIGURE_ARGS+= --with-tagsoup="${TAGSOUP_JAR}" CONFIGURE_ARGS+= --with-itw-libs="DISTRIBUTION" CONFIGURE_ARGS+= --enable-shell-launchers .for opt in asm chrome chromium ecj epiphany firefox jacoco midori opera CONFIGURE_ARGS+= --without-${opt} .endfor CONFIGURE_ENV= BIN_BASH=${bash_CMD} CONFIGURE_ENV+= bashcompdir=${PREFIX}/etc/bash_completion.d CONFIGURE_SHELL= ${bash_CMD} TEST_TARGET= check # Upstream archive contains files with UTF-8 names EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar -OPTIONS_DEFINE= DOCS PLUGIN RHINO RUST TAGSOUP -OPTIONS_DEFAULT=PLUGIN RUST +OPTIONS_DEFINE= DOCS PLUGIN PLUGINJAR RHINO RUST TAGSOUP +OPTIONS_DEFAULT=PLUGINJAR RUST OPTIONS_SUB= yes PLUGIN_DESC= Enable the browser plug-in +PLUGINJAR_DESC= Enable plugin.jar for itweb-javaws -html RHINO_DESC= Add support for Proxy Auto Config files RUST_DESC= Build modern launchers written in Rust TAGSOUP_DESC= Enable cleaning up of malformed JNLP files DOCS_CONFIGURE_ENABLE= docs DOCS_PORTDOCS= netx RHINO_BUILD_DEPENDS= ${JAVASHAREDIR}/rhino/rhino.jar:lang/rhino RHINO_RUN_DEPENDS= ${RHINO_BUILD_DEPENDS} RHINO_VARS= RHINO_JAR="${JAVASHAREDIR}/rhino/rhino.jar" RHINO_VARS_OFF= RHINO_JAR=no RUST_BUILD_DEPENDS= rustc:lang/${RUST_DEFAULT} TAGSOUP_BUILD_DEPENDS= ${JAVALIBDIR}/tagsoup.jar:textproc/tagsoup TAGSOUP_RUN_DEPENDS= ${TAGSOUP_BUILD_DEPENDS} TAGSOUP_VARS= TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar" TAGSOUP_VARS_OFF= TAGSOUP_JAR=no -PLUGIN_CONFIGURE_ENABLE=native-plugin pluginjar +PLUGIN_CONFIGURE_ENABLE=native-plugin PLUGIN_CONFIGURE_ENV= MOZILLA_CFLAGS="-I${WRKDIR}/npapi-headers -DXP_UNIX" \ MOZILLA_LIBS=" " # needs to be set and non-empty! PLUGIN_DISTFILES= libxul-npapi-headers-45.9.0${EXTRACT_SUFX}:npapi PLUGIN_MASTER_SITES= LOCAL/tobik:npapi -PLUGIN_PORTDOCS= plugin PLUGIN_TEST_TARGET= plugin-tests PLUGIN_USE= GNOME=glib20 PLUGIN_USES= webplugin:native gnome PLUGIN_VARS= WEBPLUGIN_DIR=${PREFIX}/lib \ WEBPLUGIN_FILES=IcedTeaPlugin.so +PLUGIN_IMPLIES= PLUGINJAR + +PLUGINJAR_CONFIGURE_ENABLE= pluginjar +PLUGINJAR_PORTDOCS= plugin HAMCREST_JAR= ${JAVALIBDIR}/hamcrest.jar JUNIT_JAR= ${JAVALIBDIR}/junit.jar .include -.if ${JAVA_PORT_VERSION:M*6*} -pre-extract: - @${ECHO_MSG} - @${ECHO_MSG} "IMPORTANT: To build IcedTea-Web ${PORTVERSION}, you have to turn on 'ICEDTEA' option" - @${ECHO_MSG} "for ${JAVA_PORT} (default). Otherwise, it will neither build nor work." - @${ECHO_MSG} -. if !(defined(PACKAGE_BUILDING) || defined(BATCH)) - @sleep 5 -. endif -.endif - post-patch: ${REINPLACE_CMD} -e 's|^sed\([[:space:]]\)|gsed\1|' \ -e 's|\([[:space:]]\)sed\([[:space:]]\)|\1gsed\2|g' \ ${WRKSRC}/Makefile.am ${WRKSRC}/html-gen.sh ${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \ ${WRKSRC}/*.desktop.in post-install: ${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${DESKTOPDIR} .for lang in cs de en pl .for man in javaws policyeditor ${MV} ${STAGEDIR}${MANPREFIX}/man/${lang:Nen}/man1/${man}.1 \ ${STAGEDIR}${MANPREFIX}/man/${lang:Nen}/man1/itweb-${man}.1 .endfor .endfor @${ECHO_MSG} @${ECHO_MSG} "Run \"make test\" to execute regression test." @${ECHO_MSG} .include diff --git a/java/icedtea-web/distinfo b/java/icedtea-web/distinfo index bc9bc6e702fa..88e903ea646a 100644 --- a/java/icedtea-web/distinfo +++ b/java/icedtea-web/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1529752635 -SHA256 (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.4_GH0.tar.gz) = a0c12cd2d7793f05428a02e49159c7f3f70694f48e23787ffdb6588b0db7c862 -SIZE (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.4_GH0.tar.gz) = 2358591 +TIMESTAMP = 1639151286 +SHA256 (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.8_GH0.tar.gz) = f4203a605a3c9c50acdcc6eef4a366b9fdd36d95edcd76bcbfede01107cb5fe6 +SIZE (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.8_GH0.tar.gz) = 2365638 SHA256 (libxul-npapi-headers-45.9.0.tar.gz) = 625d86955aef95c7a0a4c192bb51a1e7833d30c2d53e390d07f97abd835744f8 SIZE (libxul-npapi-headers-45.9.0.tar.gz) = 15637 diff --git a/java/icedtea-web/files/patch-Makefile.am b/java/icedtea-web/files/patch-Makefile.am index eef8eea2ce83..198663d63e93 100644 --- a/java/icedtea-web/files/patch-Makefile.am +++ b/java/icedtea-web/files/patch-Makefile.am @@ -1,171 +1,171 @@ ---- Makefile.am.orig 2019-08-02 14:08:17.000000000 +0200 -+++ Makefile.am 2020-01-14 17:43:47.000000000 +0100 -@@ -331,9 +331,9 @@ +--- Makefile.am.orig 2021-05-17 09:24:37 UTC ++++ Makefile.am +@@ -336,9 +336,9 @@ export EXPORTED_PACK200=$(SYSTEM_JDK_DIR)/bin/pack200 #end of exported autoconf copies # binary names -javaws:= $(shell echo javaws | sed '@program_transform_name@') +javaws:= $(shell echo itweb-javaws | sed '@program_transform_name@') itweb_settings:= $(shell echo itweb-settings | sed '@program_transform_name@') -policyeditor:= $(shell echo policyeditor | sed '@program_transform_name@') +policyeditor:= $(shell echo itweb-policyeditor | sed '@program_transform_name@') if WINDOWS_OR_INCLUDE_BATS # convert Unix newlines (LF) to DOS format: -@@ -393,7 +393,7 @@ +@@ -398,7 +398,7 @@ if ENABLE_PLUGINJAR endif ${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR) ${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG) - ${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/ + ${INSTALL_DATA} $(TOP_SRC_DIR)/${ICON} $(ICONS_DEST_DIR)/itweb-javaws.png mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR) cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION) if ENABLE_NATIVE_LAUNCHERS -@@ -402,9 +402,9 @@ +@@ -407,9 +407,9 @@ if ENABLE_NATIVE_LAUNCHERS ${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir) endif if ENABLE_SHELL_LAUNCHERS - ${INSTALL_PROGRAM} launcher.build/$(javaws).sh $(DESTDIR)$(bindir) - ${INSTALL_PROGRAM} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir) - ${INSTALL_PROGRAM} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir) + ${INSTALL_SCRIPT} launcher.build/$(javaws).sh $(DESTDIR)$(bindir) + ${INSTALL_SCRIPT} launcher.build/$(itweb_settings).sh $(DESTDIR)$(bindir) + ${INSTALL_SCRIPT} launcher.build/$(policyeditor).sh $(DESTDIR)$(bindir) if WINDOWS_OR_INCLUDE_BATS ${INSTALL_PROGRAM} launcher.build/$(javaws).bat $(DESTDIR)$(bindir) ${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir) -@@ -426,13 +426,15 @@ +@@ -431,13 +431,15 @@ if ENABLE_DOCS (cd ${TOP_BUILD_DIR}/docs/netx; \ for files in $$(find . -type f); \ do \ - ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \ + mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \ + ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \ done) if ENABLE_PLUGINJAR (cd ${TOP_BUILD_DIR}/docs/plugin; \ for files in $$(find . -type f); \ do \ - ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \ + mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \ + ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \ done) endif endif -@@ -544,7 +546,7 @@ +@@ -571,7 +573,7 @@ remove-empty-linux-only-dirs: # all generated manpages must be removed one by one # shell (only shell!) launchers must go away uninstall-linux-only: - KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 javaws.1 policyeditor.1" ; \ + KNOWN_MANS="icedtea-web.1 icedtea-web-plugin.1 itweb-settings.1 itweb-javaws.1 itweb-policyeditor.1" ; \ KNOWN_DIRS="man1 de/man1 pl/man1 cs/man1" ; \ for file in $$KNOWN_MANS ; do \ for dir in $$KNOWN_DIRS ; do \ -@@ -868,7 +870,7 @@ +@@ -901,7 +903,7 @@ stamps/generate-docs.stamp: stamps/netx.stamp echo "

$(PLUGIN_VERSION) docs:

" >> "$$HTML_DOCS_INDEX" ; \ for LANG_ID in en_US.UTF-8 cs_CZ.UTF-8 pl_PL.UTF-8 de_DE.UTF-8 ; do \ ID=`echo "$$LANG_ID" | head -c 2` ; \ - ENCOD=`echo "$$LANG_ID" | tail -c 6 -` ; \ + ENCOD=`echo "$$LANG_ID" | tail -c 6` ; \ export LANG=$$LANG_ID; \ mkdir "$$HTML_DOCS_TARGET_DIR/$$ID" ; \ echo "
  • $$LANG_ID
    • " >> "$$HTML_DOCS_INDEX" ; \ -@@ -910,7 +912,8 @@ +@@ -943,7 +945,8 @@ stamps/netx.stamp: netx-source-files.txt stamps/netx-h (cd $(NETX_RESOURCE_DIR); \ for files in $$(find . -type f); \ do \ - ${INSTALL_DATA} -D $${files} \ + mkdir -p `dirname $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}`; \ + ${INSTALL_DATA} $${files} \ $(NETX_DIR)/net/sourceforge/jnlp/resources/$${files}; \ done) cp $(CPA) $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \ -@@ -940,9 +943,9 @@ +@@ -973,9 +976,9 @@ clean-netx: rm -f $(NETX_RESOURCE_DIR)/{NEWS,AUTHORS,COPYING,ChangeLog}.html clean-desktop-files: - rm -f javaws.desktop + rm -f itweb-javaws.desktop rm -f itweb-settings.desktop - rm -f policyeditor.desktop + rm -f itweb-policyeditor.desktop # launcher run args: -@@ -1123,7 +1126,7 @@ +@@ -1156,7 +1159,7 @@ endif fi javaws.desktop: javaws.desktop.in - sed "s#PATH_TO_JAVAWS#$(bindir)/$(JAVAWS)#" < $(srcdir)/javaws.desktop.in > javaws.desktop + sed "s#PATH_TO_JAVAWS#$(bindir)/$(JAVAWS)#" < $(srcdir)/javaws.desktop.in > itweb-javaws.desktop itweb-settings.desktop: $(srcdir)/itweb-settings.desktop.in sed "s#PATH_TO_ITWEB_SETTINGS#$(bindir)/$(ITWEB_SETTINGS)#" \ -@@ -1131,7 +1134,7 @@ +@@ -1164,7 +1167,7 @@ itweb-settings.desktop: $(srcdir)/itweb-settings.deskt policyeditor.desktop: $(srcdir)/policyeditor.desktop.in sed "s#PATH_TO_POLICYEDITOR#$(bindir)/$(POLICYEDITOR)#" \ - < $(srcdir)/policyeditor.desktop.in > policyeditor.desktop + < $(srcdir)/policyeditor.desktop.in > itweb-policyeditor.desktop # documentation -@@ -1271,7 +1274,7 @@ +@@ -1304,7 +1307,7 @@ stamps/netx-dist-tests-prepare-reproducers.stamp: stam notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \ $(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar\$(CLASSPATH_SEPARATOR)$(TOP_BUILD_DIR)/liveconnect -d "$(REPRODUCERS_BUILD_DIR)/$$dir/" $$srcFiles ; \ if [ -n "$$notSrcFiles" ] ; then \ - cp -R --parents $$notSrcFiles "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \ + tar -c -f - "$$notSrcFiles" | tar -x -f - -C "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \ fi ; \ cd "$(REPRODUCERS_BUILD_DIR)/$$dir/" ; \ if [ -f $(META_MANIFEST) ]; \ -@@ -1339,7 +1342,7 @@ +@@ -1372,7 +1375,7 @@ stamps/change-dots-to-paths.stamp: stamps/netx-dist-te path="`dirname $$slashed_dir`" ; \ file="`basename $$slashed_dir`.jar" ; \ echo "copying $$dir.jar to $$path as $$file" ; \ - mkdir --parents $$path ; \ + mkdir -p $$path ; \ cp $$dir".jar" "$$path"/"$$file" ; \ fi ; \ done ; \ -@@ -1485,7 +1488,7 @@ +@@ -1518,7 +1521,7 @@ $(REPRODUCERS_CLASS_NAMES): whiteListed=$(RUN_WHITELIST_FILTER); \ cd $(TEST_EXTENSIONS_TESTS_DIR) ; \ class_names= ; \ - for test in `find -type f` ; do \ + for test in `find . -type f` ; do \ class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \ class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \ INCLUDE="NO" ; \ -@@ -1674,7 +1677,7 @@ +@@ -1707,7 +1710,7 @@ $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME): $(UNIT_CLASS_NAMES): cd $(NETX_UNIT_TEST_DIR) ; \ class_names= ; \ - for test in `find -type f` ; do \ + for test in `find . -type f` ; do \ class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \ class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \ class_names="$$class_names $$class_name" ; \ -@@ -1685,10 +1688,7 @@ +@@ -1718,10 +1721,7 @@ stamps/run-netx-unit-tests.stamp: stamps/netx-unit-tes $(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) $(UNIT_CLASS_NAMES) filename=" " ; \ cd $(NETX_UNIT_TEST_SRCDIR) ; \ - for file in `find . -type f \! -iname "*.java"`; do\ - filename=`echo $$file `; \ - cp --parents $$filename $(NETX_UNIT_TEST_DIR) ; \ - done ; \ + tar -c -f - `find . -type f \! -iname "*.java"` | tar -x -f - -C $(NETX_UNIT_TEST_DIR) ; \ cd $(NETX_UNIT_TEST_DIR) ; \ class_names=`cat $(UNIT_CLASS_NAMES)` ; \ CLASSPATH="$(call joinsegments, $(NETX_DIR)/lib/classes.jar $(TOP_BUILD_DIR)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(MSLINKS_JAR) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR))" ; \ -@@ -2012,9 +2012,7 @@ +@@ -2045,9 +2045,7 @@ stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) stamps/ $(PLUGIN_TEST_SRCS) ; $(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \ plugin/tests/LiveConnect/*.class ; - cp -pPR $(SRC_DIR_LINK) $(TOP_SRC_DIR)/plugin/tests/LiveConnect/*.{js,html} \ - plugin/tests/LiveConnect ; - echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; + @echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ; mkdir -p stamps touch stamps/plugin-tests.stamp endif diff --git a/java/icedtea-web/files/patch-completion_javaws.bash.in b/java/icedtea-web/files/patch-completion_javaws.bash.in index 18d04499dcbb..c8496d4a25dc 100644 --- a/java/icedtea-web/files/patch-completion_javaws.bash.in +++ b/java/icedtea-web/files/patch-completion_javaws.bash.in @@ -1,8 +1,8 @@ ---- completion/javaws.bash.in.orig 2020-06-04 13:08:14.000000000 +0200 -+++ completion/javaws.bash.in 2020-07-31 20:16:56.895261000 +0200 -@@ -28,4 +28,4 @@ +--- completion/javaws.bash.in.orig 2021-05-17 09:24:37 UTC ++++ completion/javaws.bash.in +@@ -28,4 +28,4 @@ _javaws() return 0 fi } -complete -F _javaws javaws +complete -F _javaws itweb-javaws diff --git a/java/icedtea-web/files/patch-completion_policyeditor.bash.in b/java/icedtea-web/files/patch-completion_policyeditor.bash.in index 99014843ed42..4741a8480ad4 100644 --- a/java/icedtea-web/files/patch-completion_policyeditor.bash.in +++ b/java/icedtea-web/files/patch-completion_policyeditor.bash.in @@ -1,8 +1,8 @@ ---- completion/policyeditor.bash.in.orig 2020-06-04 13:08:14.000000000 +0200 -+++ completion/policyeditor.bash.in 2020-07-31 20:02:45.694743000 +0200 -@@ -10,4 +10,4 @@ +--- completion/policyeditor.bash.in.orig 2021-05-17 09:24:37 UTC ++++ completion/policyeditor.bash.in +@@ -10,4 +10,4 @@ _policyeditor() COMPREPLY=($(compgen -W "${opts}" -- ${cur})) return 0 } -complete -F _policyeditor policyeditor +complete -F _policyeditor itweb-policyeditor diff --git a/java/icedtea-web/files/patch-configure.ac b/java/icedtea-web/files/patch-configure.ac deleted file mode 100644 index fdb19287ceec..000000000000 --- a/java/icedtea-web/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2019-08-02 14:08:17.000000000 +0200 -+++ configure.ac 2020-01-14 16:32:04.000000000 +0100 -@@ -71,7 +71,7 @@ - build_linux=no - build_windows=no - case "${host_os}" in -- linux*) -+ freebsd*) - build_linux=yes - ;; - cygwin*) diff --git a/java/icedtea-web/files/patch-html-gen.sh b/java/icedtea-web/files/patch-html-gen.sh index 01c7329fbbba..8db03d8150d0 100644 --- a/java/icedtea-web/files/patch-html-gen.sh +++ b/java/icedtea-web/files/patch-html-gen.sh @@ -1,20 +1,20 @@ ---- html-gen.sh.orig 2016-02-03 13:47:43 UTC +--- html-gen.sh.orig 2021-05-17 09:24:37 UTC +++ html-gen.sh @@ -74,7 +74,7 @@ else unset REPO_URL fi -start_time="$(date +%s.%N)" +start_time="$(date +%s)" if [ ! -e html-gen ]; then echo "No html-gen directory, exiting. See Makefile.am for usage" -@@ -168,7 +168,7 @@ done +@@ -170,7 +170,7 @@ done sed -i -r 's|(\*\ .*):|\1:|' ChangeLog.html # Underline changed files in ChangeLog, eg "* Makefile.am:" -end_time="$(date +%s.%N)" +end_time="$(date +%s)" print_debug "HTML generation complete" print_debug "Total elapsed time: $(echo "$end_time - $start_time" | bc )" diff --git a/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java b/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java index a712407510d6..09d85eb19fdf 100644 --- a/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java +++ b/java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java @@ -1,26 +1,26 @@ ---- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2019-05-21 12:20:44.000000000 +0200 -+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java 2019-06-19 14:33:09.000000000 +0200 -@@ -86,7 +86,7 @@ +--- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig 2021-05-17 09:24:37 UTC ++++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java +@@ -86,7 +86,7 @@ import net.sourceforge.jnlp.security.dialogresults.Acc public class XDesktopEntry implements GenericDesktopEntry { - public static final String JAVA_ICON_NAME = "javaws"; + public static final String JAVA_ICON_NAME = "itweb-javaws"; private JNLPFile file = null; private int iconSize = -1; -@@ -219,12 +219,12 @@ +@@ -219,12 +219,12 @@ public class XDesktopEntry implements GenericDesktopEn if (exec != null) { return exec; } - String pathResult = findOnPath(new String[]{"javaws", System.getProperty("icedtea-web.bin.name")}); + String pathResult = findOnPath(new String[]{"itweb-javaws", System.getProperty("icedtea-web.bin.name")}); if (pathResult != null) { return pathResult; } - return "javaws"; + return "itweb-javaws"; } diff --git a/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc b/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc index c0ee8a2cdc39..698262d8e838 100644 --- a/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc +++ b/java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc @@ -1,14 +1,14 @@ ---- plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2019-08-02 14:08:17.000000000 +0200 -+++ plugin/icedteanp/IcedTeaNPPlugin.cc 2020-03-22 00:41:29.958009000 +0100 -@@ -1627,9 +1627,9 @@ +--- plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2021-05-17 09:24:37 UTC ++++ plugin/icedteanp/IcedTeaNPPlugin.cc +@@ -1627,9 +1627,9 @@ plugin_start_appletviewer (ITNPPluginData* data) command_line.push_back("-classpath"); command_line.push_back(get_plugin_jfx_jar()); command_line.push_back("--patch-module"); - command_line.push_back("java.desktop="PLUGIN_JAR":"NETX_JAR); + command_line.push_back("java.desktop=" PLUGIN_JAR":" NETX_JAR); command_line.push_back("--patch-module"); - command_line.push_back("jdk.jsobject="JSOBJECT_JAR); + command_line.push_back("jdk.jsobject=" JSOBJECT_JAR); command_line.push_back("--add-reads"); command_line.push_back("java.base=ALL-UNNAMED,java.desktop"); command_line.push_back("--add-reads"); diff --git a/java/icedtea-web/files/patch-rust-launcher_Cargo.toml b/java/icedtea-web/files/patch-rust-launcher_Cargo.toml index 510f97e3503d..b3f2ddbea801 100644 --- a/java/icedtea-web/files/patch-rust-launcher_Cargo.toml +++ b/java/icedtea-web/files/patch-rust-launcher_Cargo.toml @@ -1,10 +1,10 @@ ---- rust-launcher/Cargo.toml.orig 2020-06-04 13:08:14.000000000 +0200 -+++ rust-launcher/Cargo.toml 2020-06-15 09:34:55.000000000 +0200 +--- rust-launcher/Cargo.toml.orig 2021-05-17 09:24:37 UTC ++++ rust-launcher/Cargo.toml @@ -2,7 +2,3 @@ name = "launcher" version = "1.8.0" authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] - -[dependencies] -[target.'cfg(windows)'.dependencies] -dunce = "0.1.1" diff --git a/java/icedtea-web/pkg-plist b/java/icedtea-web/pkg-plist index d54b05276b79..b8bbd2979ad1 100644 --- a/java/icedtea-web/pkg-plist +++ b/java/icedtea-web/pkg-plist @@ -1,39 +1,39 @@ bin/itw-modularjdk.args %%RUST%%bin/itweb-javaws bin/itweb-javaws.sh %%RUST%%bin/itweb-policyeditor bin/itweb-policyeditor.sh %%RUST%%bin/itweb-settings bin/itweb-settings.sh %%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so etc/bash_completion.d/itweb-settings.bash etc/bash_completion.d/javaws.bash etc/bash_completion.d/policyeditor.bash man/cs/man1/icedtea-web-plugin.1.gz man/cs/man1/icedtea-web.1.gz man/cs/man1/itweb-javaws.1.gz man/cs/man1/itweb-policyeditor.1.gz man/cs/man1/itweb-settings.1.gz man/de/man1/icedtea-web-plugin.1.gz man/de/man1/icedtea-web.1.gz man/de/man1/itweb-javaws.1.gz man/de/man1/itweb-policyeditor.1.gz man/de/man1/itweb-settings.1.gz man/man1/icedtea-web-plugin.1.gz man/man1/icedtea-web.1.gz man/man1/itweb-javaws.1.gz man/man1/itweb-policyeditor.1.gz man/man1/itweb-settings.1.gz man/pl/man1/icedtea-web-plugin.1.gz man/pl/man1/icedtea-web.1.gz man/pl/man1/itweb-javaws.1.gz man/pl/man1/itweb-policyeditor.1.gz man/pl/man1/itweb-settings.1.gz share/applications/itweb-javaws.desktop share/applications/itweb-policyeditor.desktop share/applications/itweb-settings.desktop %%DATADIR%%/javaws.jar %%DATADIR%%/javaws_splash.png -%%PLUGIN%%%%DATADIR%%/jsobject.jar -%%PLUGIN%%%%DATADIR%%/plugin.jar +%%PLUGINJAR%%%%DATADIR%%/jsobject.jar +%%PLUGINJAR%%%%DATADIR%%/plugin.jar share/pixmaps/itweb-javaws.png