Attachment 215350 Details for Bug 244976 – Here is a new patch for release 1.8.4

[patch] Here is a new patch for release 1.8.4

java_icedtea-web.diff (text/plain), 26.88 KB, created by Lars Herschke on 2020-06-08 10:55:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Herschke

Created: 2020-06-08 10:55:57 UTC

Size: 26.88 KB

patch

obsolete

>Index: java/icedtea-web/Makefile
>===================================================================
>--- java/icedtea-web/Makefile	(Revision 528914)
>+++ java/icedtea-web/Makefile	(Arbeitskopie)
>@@ -1,12 +1,11 @@
> # $FreeBSD$
> 
> PORTNAME=	icedtea-web
>-PORTVERSION=	1.6.2
>-PORTREVISION=	5
>+PORTVERSION=	1.8.4
> CATEGORIES=	java www
>-MASTER_SITES=	http://icedtea.wildebeest.org/download/source/ \
>-		http://icedtea.classpath.org/download/source/
>+MASTER_SITES=	https://github.com/AdoptOpenJDK/IcedTea-Web/archive/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>+WRKSRC=		${WRKDIR}/IcedTea-Web-icedtea-web-1.8.4
> 
> MAINTAINER=	java@FreeBSD.org
> COMMENT=	Free Java plug-in and Java Web Start for OpenJDK
>@@ -15,10 +14,10 @@
> 
> BUILD_DEPENDS=	zip:archivers/zip \
> 		bash:shells/bash \
>-		gsed:textproc/gsed
>+		gsed:textproc/gsed \
>+		${HAMCREST_JAR}:java/hamcrest \
>+		${JUNIT_JAR}:java/junit
> RUN_DEPENDS=	bash:shells/bash
>-TEST_DEPENDS=	${HAMCREST_JAR}:java/hamcrest \
>-		${JUNIT_JAR}:java/junit
> 
> GNU_CONFIGURE=	yes
> USE_JAVA=	yes
>@@ -26,8 +25,8 @@
> JAVA_VENDOR=	openjdk
> USE_PERL5=	build
> USE_XORG=	x11
>-USES=		desktop-file-utils gmake perl5 pkgconfig shebangfix xorg
>-SHEBANG_FILES=	jrunscript.in launcher/launchers.in
>+USES=		autoreconf desktop-file-utils gmake perl5 pkgconfig shebangfix xorg
>+SHEBANG_FILES=	jrunscript.in shell-launcher/launchers.sh.in
> 
> CONFIGURE_ARGS=		--with-hamcrest="${HAMCREST_JAR}"
> CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"
>@@ -35,6 +34,8 @@
> CONFIGURE_ARGS+=	--with-junit="${JUNIT_JAR}"
> CONFIGURE_ARGS+=	--with-rhino="${RHINO_JAR}"
> CONFIGURE_ARGS+=	--with-tagsoup="${TAGSOUP_JAR}"
>+CONFIGURE_ARGS+=	--with-itw-libs="BUNDLED"
>+CONFIGURE_ARGS+=	--enable-shell-launchers
> .for opt in asm chrome chromium ecj epiphany firefox jacoco midori opera
> CONFIGURE_ARGS+=	--without-${opt}
> .endfor
>@@ -64,7 +65,7 @@
> TAGSOUP_VARS=		TAGSOUP_JAR="${JAVALIBDIR}/tagsoup.jar"
> TAGSOUP_VARS_OFF=	TAGSOUP_JAR=no
> 
>-PLUGIN_CONFIGURE_ENABLE=plugin
>+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
>@@ -95,7 +96,7 @@
> post-patch:
> 	${REINPLACE_CMD} -e 's|^sed$[[:space:]]$|gsed\1|' \
> 	    -e 's|$[[:space:]]$sed$[[:space:]]$|\1gsed\2|g' \
>-	    ${WRKSRC}/Makefile.in ${WRKSRC}/html-gen.sh
>+	    ${WRKSRC}/Makefile.am ${WRKSRC}/html-gen.sh
> 	${REINPLACE_CMD} -e 's|^Icon=javaws|Icon=itweb-javaws|' \
> 	    ${WRKSRC}/*.desktop.in
> 
>Index: java/icedtea-web/distinfo
>===================================================================
>--- java/icedtea-web/distinfo	(Revision 528914)
>+++ java/icedtea-web/distinfo	(Arbeitskopie)
>@@ -1,5 +1,5 @@
> TIMESTAMP = 1529752635
>-SHA256 (icedtea-web-1.6.2.tar.gz) = ce67034096d6b960e2b6cfb5c41a7bd6b30eb2ec7f13bf3ecdb477ff6ce69300
>-SIZE (icedtea-web-1.6.2.tar.gz) = 1824557
>+SHA256 (icedtea-web-1.8.4.tar.gz) = a0c12cd2d7793f05428a02e49159c7f3f70694f48e23787ffdb6588b0db7c862
>+SIZE (icedtea-web-1.8.4.tar.gz) = 2358591
> SHA256 (libxul-npapi-headers-45.9.0.tar.gz) = 625d86955aef95c7a0a4c192bb51a1e7833d30c2d53e390d07f97abd835744f8
> SIZE (libxul-npapi-headers-45.9.0.tar.gz) = 15637
>Index: java/icedtea-web/files/patch-Makefile.am
>===================================================================
>--- java/icedtea-web/files/patch-Makefile.am	(nicht existent)
>+++ java/icedtea-web/files/patch-Makefile.am	(Arbeitskopie)
>@@ -0,0 +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 @@
>+ #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 @@
>+ 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 @@
>+ 	${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 @@
>+ 	(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 @@
>+ # 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 @@
>+ 	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 \
>+ 	  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 "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>"  >> "$$HTML_DOCS_INDEX" ; \
>+@@ -910,7 +912,8 @@
>+ 	(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 @@
>+ 	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 @@
>+ 	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 @@
>+ 
>+ 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 @@
>+ 	      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 @@
>+ 	      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 @@
>+ 	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 @@
>+ $(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 @@
>+  $(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 @@
>+ 	 $(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
>
>Property changes on: java/icedtea-web/files/patch-Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/icedtea-web/files/patch-Makefile.in
>===================================================================
>--- java/icedtea-web/files/patch-Makefile.in	(Revision 528914)
>+++ java/icedtea-web/files/patch-Makefile.in	(nicht existent)
>@@ -1,160 +0,0 @@
>---- Makefile.in.orig	2016-02-03 13:49:10 UTC
>-+++ Makefile.in
>-@@ -338,9 +338,9 @@ ECHO_WHITELIST = if [ -f $(REPRODUCERS_C
>- #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@')
>- 
>- # the launcher needs to know $(bindir) and $(datadir) which can be different at
>- # make-time from configure-time
>-@@ -900,10 +900,10 @@ install-exec-local:
>- @ENABLE_PLUGIN_TRUE@	${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
>- 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
>- 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
>--	${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/
>--	${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
>--	${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
>--	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
>-+	${INSTALL_DATA} $(abs_top_srcdir)/javaws.png $(ICONS_DEST_DIR)/itweb-javaws.png
>-+	${INSTALL_SCRIPT} launcher.build/$(javaws) $(DESTDIR)$(bindir)
>-+	${INSTALL_SCRIPT} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
>-+	${INSTALL_SCRIPT} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
>- 
>- # all generated manpages are installed in swarm
>- install-data-local:
>-@@ -913,12 +913,14 @@ install-data-local:
>- @ENABLE_DOCS_TRUE@	(cd ${abs_top_builddir}/docs/netx; \
>- @ENABLE_DOCS_TRUE@	 for files in $$(find . -type f); \
>- @ENABLE_DOCS_TRUE@	 do \
>--@ENABLE_DOCS_TRUE@	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
>-+@ENABLE_DOCS_TRUE@	   mkdir -p `dirname $(DESTDIR)$(htmldir)/netx/$${files}`; \
>-+@ENABLE_DOCS_TRUE@	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
>- @ENABLE_DOCS_TRUE@	 done)
>- @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	(cd ${abs_top_builddir}/docs/plugin; \
>- @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	 for files in $$(find . -type f); \
>- @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	 do \
>--@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	   ${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
>-+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	   mkdir -p `dirname $(DESTDIR)$(htmldir)/plugin/$${files}`; \
>-+@ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	   ${INSTALL_DATA} $${files} $(DESTDIR)$(htmldir)/plugin/$${files}; \
>- @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	 done)
>- 
>- # all generated manpages must be removed one by one
>-@@ -928,7 +930,7 @@ uninstall-local:
>- 	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
>- 	rm -r $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
>- 	rm -r $(ICONS_DEST_DIR)/javaws.png
>--	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 \
>-@@ -1161,7 +1163,7 @@ stamps/generate-docs.stamp: stamps/netx.
>- 	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 \
>- 	  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 "<li><a href='$$ID/icedtea-web.html'>$$LANG_ID</a></li>"  >> "$$HTML_DOCS_INDEX" ; \
>-@@ -1203,7 +1205,8 @@ stamps/netx.stamp: netx-source-files.txt
>- 	(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 -a $(NETX_SRCDIR)/net/sourceforge/jnlp/runtime/pac-funcs.js \
>-@@ -1233,7 +1236,7 @@ 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
>- 
>- launcher.build/$(javaws): launcher/launchers.in
>-@@ -1266,7 +1269,7 @@ clean-launchers:
>- 	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)#" \
>-@@ -1274,7 +1277,7 @@ itweb-settings.desktop: $(srcdir)/itweb-
>- 
>- 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
>- 
>-@@ -1400,7 +1403,7 @@ stamps/netx-dist-tests-prepare-reproduce
>- 	      notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
>- 	      $(SYSTEM_JDK_DIR)/bin/javac -cp $(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/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) ]; \
>-@@ -1465,7 +1468,7 @@ stamps/change-dots-to-paths.stamp: stamp
>- 	      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 ; \
>-@@ -1598,7 +1601,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" ; \
>-@@ -1783,7 +1786,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" ; \
>-@@ -1794,10 +1797,7 @@ stamps/run-netx-unit-tests.stamp: stamps
>-  $(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 $(abs_top_builddir)/liveconnect/lib/classes.jar $(JUNIT_RUNTIME) $(JUNIT_RUNNER_JAR) $(TEST_EXTENSIONS_DIR) . $(TEST_EXTENSIONS_SRCDIR) $(TAGSOUP_JAR)) ; \
>-@@ -2095,9 +2095,7 @@ clean-test-code-coverage-tools-jacoco:
>- @ENABLE_PLUGIN_TRUE@	 $(PLUGIN_TEST_SRCS) ;
>- @ENABLE_PLUGIN_TRUE@	$(SYSTEM_JDK_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
>- @ENABLE_PLUGIN_TRUE@	  plugin/tests/LiveConnect/*.class ;
>--@ENABLE_PLUGIN_TRUE@	cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} \
>--@ENABLE_PLUGIN_TRUE@	  plugin/tests/LiveConnect ;
>--@ENABLE_PLUGIN_TRUE@	echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ;
>-+@ENABLE_PLUGIN_TRUE@	@echo "Done. Now launch \"firefox file://`realpath plugin/tests/LiveConnect`/index.html\"" ;
>- @ENABLE_PLUGIN_TRUE@	mkdir -p stamps
>- @ENABLE_PLUGIN_TRUE@	touch stamps/plugin-tests.stamp
>- 
>
>Property changes on: java/icedtea-web/files/patch-Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: java/icedtea-web/files/patch-configure
>===================================================================
>--- java/icedtea-web/files/patch-configure	(Revision 528914)
>+++ java/icedtea-web/files/patch-configure	(nicht existent)
>@@ -1,36 +0,0 @@
>---- configure.orig	2016-02-03 13:49:09 UTC
>-+++ configure
>-@@ -10114,14 +10114,10 @@ if test "${with_junit+set}" = set; then 
>-         JUNIT_JAR=no
>-         ;;
>-       *)
>--        if test -f "${withval}"; then
>--          JUNIT_JAR="${withval}"
>--        elif test -z "${withval}"; then
>-+        if test -z "${withval}"; then
>-           JUNIT_JAR=yes
>-         else
>--          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
>--$as_echo "not found" >&6; }
>--          as_fn_error $? "\"The junit jar ${withval} was not found.\"" "$LINENO" 5
>-+          JUNIT_JAR="${withval}"
>-         fi
>-         ;;
>-     esac
>-@@ -10186,14 +10182,10 @@ if test "${with_hamcrest+set}" = set; th
>-         HAMCREST_JAR=no
>-         ;;
>-       *)
>--        if test -f "${withval}"; then
>--          HAMCREST_JAR="${withval}"
>--        elif test -z "${withval}"; then
>-+        if test -z "${withval}"; then
>-           HAMCREST_JAR=yes
>-         else
>--          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
>--$as_echo "not found" >&6; }
>--          as_fn_error $? "\"The hamcrest jar ${withval} was not found.\"" "$LINENO" 5
>-+          HAMCREST_JAR="${withval}"
>-         fi
>-         ;;
>-     esac
>
>Property changes on: java/icedtea-web/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: java/icedtea-web/files/patch-configure.ac
>===================================================================
>--- java/icedtea-web/files/patch-configure.ac	(nicht existent)
>+++ java/icedtea-web/files/patch-configure.ac	(Arbeitskopie)
>@@ -0,0 +1,11 @@
>+--- 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*)
>
>Property changes on: java/icedtea-web/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java
>===================================================================
>--- java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java	(Revision 528914)
>+++ java/icedtea-web/files/patch-netx_net_sourceforge_jnlp_util_XDesktopEntry.java	(Arbeitskopie)
>@@ -1,26 +1,24 @@
>---- netx/net/sourceforge/jnlp/util/XDesktopEntry.java.orig	2016-02-03 13:47:43 UTC
>-+++ netx/net/sourceforge/jnlp/util/XDesktopEntry.java
>-@@ -78,7 +78,7 @@ import net.sourceforge.jnlp.security.dia
>-  */
>- public class XDesktopEntry {
>+--- 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 @@
>  
>+ 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;
>-@@ -202,14 +202,14 @@ public class XDesktopEntry {
>-         //Shortcut executes the jnlp as it was with system preferred java. It should work fine offline
>-         //absolute - works in case of self built
>-         String exec = System.getProperty("icedtea-web.bin.location");
>+@@ -219,12 +219,12 @@
>+         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;
>          }
>-         if (exec != null) {
>-             return exec;
>-         }
>+         
> -        return "javaws";
> +        return "itweb-javaws";
>      }
>Index: java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc
>===================================================================
>--- java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc	(nicht existent)
>+++ java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc	(Arbeitskopie)
>@@ -0,0 +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 @@
>+     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");
>
>Property changes on: java/icedtea-web/files/patch-plugin_icedteanp_IcedTeaNPPlugin.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/icedtea-web/pkg-plist
>===================================================================
>--- java/icedtea-web/pkg-plist	(Revision 528914)
>+++ java/icedtea-web/pkg-plist	(Arbeitskopie)
>@@ -1,6 +1,6 @@
>-bin/itweb-javaws
>-bin/itweb-policyeditor
>-bin/itweb-settings
>+bin/itweb-javaws.sh
>+bin/itweb-policyeditor.sh
>+bin/itweb-settings.sh
> %%PLUGIN%%%%WEBPLUGIN_DIR%%/IcedTeaPlugin.so
> man/cs/man1/icedtea-web-plugin.1.gz
> man/cs/man1/icedtea-web.1.gz
>@@ -26,6 +26,6 @@
> share/applications/itweb-policyeditor.desktop
> share/applications/itweb-settings.desktop
> %%DATADIR%%/javaws_splash.png
>-%%DATADIR%%/netx.jar
>+%%DATADIR%%/javaws.jar
> %%PLUGIN%%%%DATADIR%%/plugin.jar
> share/pixmaps/itweb-javaws.png

Actions: View | Diff

Attachments on bug 244976: 212611 | 215350 | 215574 | 216383 | 216446 | 216744 | 216757 | 216865 | 216912