D28643.diff
No OneTemporary
Actions

Size

17 KB

Referenced Files

None

Subscribers

None

D28643.diff
View Options

	Index: head/graphics/openjump/Makefile
	===================================================================
	--- head/graphics/openjump/Makefile
	+++ head/graphics/openjump/Makefile
	@@ -2,7 +2,7 @@
	# $FreeBSD$

	PORTNAME= OpenJUMP
	-PORTVERSION= 1.15
	+PORTVERSION= 1.16
	CATEGORIES= graphics java geography
	MASTER_SITES= SF/jump-pilot/OpenJUMP/${PORTVERSION}
	DISTNAME= ${PORTNAME}-Portable-${PORTVERSION}-r${PLUS_REV}-PLUS
	@@ -34,13 +34,15 @@
	USES= zip
	USE_JAVA= yes
	JAVA_VERSION= 1.8+
	-NO_BUILD= yes
	+
	NO_ARCH= yes
	-TARGET_DIR= ${STAGEDIR}${PREFIX}/${PORTNAME}
	+NO_BUILD= yes
	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
	-PLUS_REV= 6241

	OPTIONS_DEFINE= DOCS
	+
	+PLUS_REV= 6669
	+TARGET_DIR= ${STAGEDIR}${PREFIX}/${PORTNAME}

	do-install:
	@${ECHO_CMD} "---> Installing JAR files"
	Index: head/graphics/openjump/distinfo
	===================================================================
	--- head/graphics/openjump/distinfo
	+++ head/graphics/openjump/distinfo
	@@ -1,3 +1,3 @@
	-TIMESTAMP = 1589832307
	-SHA256 (OpenJUMP-Portable-1.15-r6241-PLUS.zip) = e6926890078790dd24428ee4360699c8ab53a211879ac0c3bfab5d2bec1ac20a
	-SIZE (OpenJUMP-Portable-1.15-r6241-PLUS.zip) = 58988379
	+TIMESTAMP = 1613155608
	+SHA256 (OpenJUMP-Portable-1.16-r6669-PLUS.zip) = 068c7ba537dc2f9d9a4c63f5fd28d7c29e2e691961e2274b0f1c95b3fbfd3122
	+SIZE (OpenJUMP-Portable-1.16-r6669-PLUS.zip) = 59046717
	Index: head/graphics/openjump/files/patch-bin_oj__linux.sh
	===================================================================
	--- head/graphics/openjump/files/patch-bin_oj__linux.sh
	+++ head/graphics/openjump/files/patch-bin_oj__linux.sh
	@@ -1,4 +1,4 @@
	---- bin/oj_linux.sh.orig 2018-08-27 15:30:38 UTC
	+--- bin/oj_linux.sh.orig 2020-12-23 15:00:38 UTC
	+++ bin/oj_linux.sh
	@@ -4,9 +4,11 @@
	## if unset defaults to
	@@ -12,7 +12,7 @@

	## uncomment and change your memory configuration here
	## Xms is initial size, Xmx is maximum size
	-@@ -51,6 +53,7 @@ extract_libs(){
	+@@ -55,6 +57,7 @@ extract_libs(){
	# extract zipped files in native dir (our way to ship symlinks to desktops)
	for filepath in $(find "$1/" -name '.tgz' -o -name '.tar.gz')
	do
	@@ -20,7 +20,7 @@
	file=$(basename "$filepath")
	folder=$(dirname "$filepath")
	done=".$file.unzipped"
	-@@ -74,6 +77,7 @@ postinstall(){
	+@@ -78,6 +81,7 @@ postinstall(){

	macinstall(){
	# create app package
	@@ -28,7 +28,7 @@
	cp -R -a "$1"/bin/OpenJUMP.app/Contents "$1" &&\
	awk '{sub(/..\/oj_/,"bin/oj_",$0)}1' "$1"/bin/OpenJUMP.app/Contents/Resources/script > "$1"/Contents/Resources/script &&\
	echo patched oj.app
	-@@ -109,14 +113,20 @@ case "$1" in
	+@@ -113,14 +117,20 @@ case "$1" in
	esac

	## cd into jump home
	@@ -49,7 +49,7 @@
	# try users home dir
	JUMP_SETTINGS="$HOME/.openjump"
	# create if missing
	-@@ -134,14 +144,19 @@ fi
	+@@ -138,14 +148,19 @@ fi
	# 1. first in oj_home/jre
	# 2. in configured java_home
	# 3. in path
	@@ -69,7 +69,7 @@
	fi

	# java available
	-@@ -150,24 +165,28 @@ fi
	+@@ -154,24 +169,28 @@ fi
	add the location of java to your PATH environment variable." && ERROR=1 && end

	# resolve recursive links to java binary
	@@ -85,7 +85,7 @@
	- JAVA="$JAVA_CANDIDATE"
	- relPath "$JAVA" && JAVA="${JDIR}/${JAVA}"
	-done
	-++echo "##### awk script survived after \$1 test"
	++echo "##### awk script survived after \$1 test"
	+#while [ -L "${JAVA}" ]; do
	+# JDIR=$(dirname "$JAVA")
	+# JAVA_CANDIDATE=$(readlink -n "${JAVA}")
	@@ -109,7 +109,7 @@
	JAVA_ARCH=$(echo $JAVA_VERSIONSTRING \| grep -q -i 64-bit && echo x64 \|\| echo x86)
	JAVA_NEEDED="1.6"
	if ! is_decimal "$JAVA_VERSION"; then
	-@@ -189,7 +208,7 @@ echo ---JAVA---
	+@@ -193,7 +212,7 @@ echo ---JAVA---
	echo "Using '$(basename "${JAVA}")' found in '$(dirname "${JAVA}")'"
	"$JAVA" -version 2>&1\|awk 'BEGIN{ORS=""}{print $0"; "}END{print "\n"}'

	@@ -118,7 +118,7 @@
	if [ -f "$JUMP_PROFILE" ]; then
	source $JUMP_PROFILE
	fi
	-@@ -198,8 +217,13 @@ fi
	+@@ -202,8 +221,13 @@ fi
	if [ -z "$JUMP_LIB" ]; then
	JUMP_LIB="./lib"
	fi
	@@ -132,7 +132,7 @@

	JUMP_PLUGINS=./bin/default-plugins.xml
	if [ -z "$JUMP_PLUGINS" ] \|\| [ ! -f "$JUMP_PLUGINS" ]; then
	-@@ -208,6 +232,7 @@ if [ -z "$JUMP_PLUGINS" ] \|\| [ ! -f "$JUMP_PLUGINS" ];
	+@@ -212,6 +236,7 @@ if [ -z "$JUMP_PLUGINS" ] \|\| [ ! -f "$JUMP_PLUGINS" ];
	JUMP_PLUGINS="./scripts/default-plugins.xml"
	fi
	fi
	@@ -140,44 +140,43 @@

	# include every jar/zip in lib and native dir
	for libfile in "$JUMP_LIB/".zip "$JUMP_LIB/".jar "$JUMP_NATIVE_DIR/$JAVA_ARCH/".jar "$JUMP_NATIVE_DIR/".jar
	-@@ -216,26 +241,35 @@ do
	+@@ -220,26 +245,34 @@ do
	done
	- CLASSPATH=.:./bin:./conf:$CLASSPATH
	+ CLASSPATH=.:./bin:$CLASSPATH
	export CLASSPATH;
	+echo "##### CLASSPATH = '$CLASSPATH'"

	- ## compile jump opts
	+ ## prepend jump opts
	#
	- JUMP_OPTS="-plug-in-directory $JUMP_PLUGIN_DIR"
	+ JUMP_OPTS="-plug-in-directory $JUMP_PLUGIN_DIR $JUMP_OPTS"
	+echo "##### JUMP_OPTS = '$JUMP_OPTS'"
	if [ -f "$JUMP_PLUGINS" ]; then
	- JUMP_OPTS="$JUMP_OPTS -default-plugins $JUMP_PLUGINS"
	+ JUMP_OPTS="-default-plugins $JUMP_PLUGINS $JUMP_OPTS"
	+ echo "##### JUMP_OPTS = '$JUMP_OPTS'"
	fi
	+
	# workbench-properties.xml is used to manually load plugins (ISA uses this)
	JUMP_PROPERTIES=./bin/workbench-properties.xml
	if [ -n "$JUMP_PROPERTIES" ] && [ -f "$JUMP_PROPERTIES" ]; then
	- JUMP_OPTS="$JUMP_OPTS -properties $JUMP_PROPERTIES"
	+ JUMP_OPTS="-properties $JUMP_PROPERTIES $JUMP_OPTS"
	+ echo "##### JUMP_OPTS = '$JUMP_OPTS'"
	fi

	- # compile jre opts, respect already set ones from e.g. mac
	- JAVA_OPTS=""
	+ # compile jre opts, respect already set ones by environment
	+ JAVA_OPTS="$JAVA_MAXMEM $JAVA_LANG $JAVA_OPTS"
	+echo "##### JAVA_OPTS = '$JAVA_OPTS'"
	- JAVA_OPTS="$JAVA_OPTS $JAVA_MAXMEM $JAVA_LANG"
	-+echo "##### JAVA_OPTS = '$JAVA_OPTS'"
	JAVA_OPTS="$JAVA_OPTS -Djump.home=."
	+echo "##### JAVA_OPTS = '$JAVA_OPTS'"
	[ -n "JAVA_SAXDRIVER" ] && JAVA_OPTS="$JAVA_OPTS -Dorg.xml.sax.driver=$JAVA_SAXDRIVER"
	[ -n "$JAVA_LOOKANDFEEL" ] && JAVA_OPTS="$JAVA_OPTS -Dswing.defaultlaf=$JAVA_LOOKANDFEEL"
	+ # apply mac overrides
	JAVA_OPTS="$JAVA_OPTS $JAVA_OPTS_OVERRIDE"
	+echo "##### JAVA_OPTS = '$JAVA_OPTS'"

	- # java9 needs some packages explicitly added/exported
	+ # java9+ needs some packages explicitly added/exported
	if awk "BEGIN{if($JAVA_VERSION >= 9)exit 0;else exit 1}"; then
	-@@ -251,7 +285,8 @@ if awk "BEGIN{if( $JAVA_VERSION >= 9 && $JAVA_VERSION
	- fi
	+@@ -259,7 +292,8 @@ fi
	+ JAVA_OPTS="-Dcom.sun.media.jai.disableMediaLib=true $JAVA_OPTS"

	# in case some additional archives were placed in native dir inbetween
	-extract_libs "$JUMP_NATIVE_DIR"
	@@ -186,7 +185,7 @@

	# allow jre to find native libraries in native dir, lib/ext (backwards compatibility)
	NATIVE_PATH="$JUMP_NATIVE_DIR/$JAVA_ARCH:$JUMP_NATIVE_DIR:$JUMP_PLUGIN_DIR"
	-@@ -287,7 +322,11 @@ echo "$JUMP_SETTINGS/"
	+@@ -323,7 +357,11 @@ echo "$JUMP_SETTINGS/"

	echo ---Detect maximum memory limit---
	# use previously set or detect RAM size in bytes
	@@ -199,20 +198,19 @@
	if [ -n "$JAVA_MAXMEM" ]; then
	echo "max. memory limit defined via JAVA_MAXMEM=$JAVA_MAXMEM"
	elif ! is_number "$RAM_SIZE"; then
	-@@ -305,14 +344,18 @@ else
	+@@ -341,14 +379,19 @@ else
	else
	MEM_MAX="$MEM_MINUS1GB"
	fi
	--
	+ echo "##### MEM_MAX = '$MEM_MAX'"
	-+
	+
	# limit 32bit jre to 2GiB = 2147483648 bytes
	+ echo "##### JAVA_ARCH = '$JAVA_ARCH'"
	if [ "$JAVA_ARCH" != "x64" ] && [ "$MEM_MAX" -gt "2147483648" ]; then
	MEM_MAX=2147483648
	fi

	-- MEM_MAX_MB=`expr $MEM_MAX / 1024 / 1024`
	+ MEM_MAX_MB=`expr $MEM_MAX / 1024 / 1024`
	+ MEM_MAX_MB=`expr $MEM_MAX / 1024`
	JAVA_MAXMEM="-Xmx${MEM_MAX_MB}M"
	+ echo "##### JAVA_MAXMEM = '$JAVA_MAXMEM'"
	Index: head/graphics/openjump/pkg-plist
	===================================================================
	--- head/graphics/openjump/pkg-plist
	+++ head/graphics/openjump/pkg-plist
	@@ -2,30 +2,21 @@
	OpenJUMP/bin/log4j.xml
	OpenJUMP/bin/openjump
	OpenJUMP/bin/readme.txt
	-OpenJUMP/lib/OpenJUMP-1.15-r6241-nosrc.jar
	+OpenJUMP/lib/OpenJUMP-1.16-r6669-nosrc.jar
	OpenJUMP/lib/batik-awt-util-1.6.jar
	-OpenJUMP/lib/batik-bridge-1.6.jar
	-OpenJUMP/lib/batik-css-1.6.jar
	OpenJUMP/lib/batik-dom-1.6.jar
	-OpenJUMP/lib/batik-ext-1.6.jar
	-OpenJUMP/lib/batik-gui-util-1.6.jar
	-OpenJUMP/lib/batik-gvt-1.6.jar
	-OpenJUMP/lib/batik-parser-1.6.jar
	-OpenJUMP/lib/batik-script-1.6.jar
	-OpenJUMP/lib/batik-squiggle-1.6.jar
	OpenJUMP/lib/batik-svg-dom-1.6.jar
	OpenJUMP/lib/batik-svggen-1.6.jar
	-OpenJUMP/lib/batik-swing-1.6.jar
	OpenJUMP/lib/batik-transcoder-1.6.jar
	OpenJUMP/lib/batik-util-1.6.jar
	OpenJUMP/lib/batik-xml-1.6.jar
	-OpenJUMP/lib/bsh-2.0b4.jar
	-OpenJUMP/lib/buoy-1.8.jar
	-OpenJUMP/lib/commons-codec-1.11.jar
	-OpenJUMP/lib/commons-compress-1.18.jar
	-OpenJUMP/lib/commons-imaging-1.0-20180908.110935-119.jar
	+OpenJUMP/lib/bsh-2.0b6.jar
	+OpenJUMP/lib/buoy-1.9.jar
	+OpenJUMP/lib/commons-codec-1.14.jar
	+OpenJUMP/lib/commons-compress-1.20.jar
	+OpenJUMP/lib/commons-imaging-1.0-alpha2.jar
	OpenJUMP/lib/commons-io-2.6.jar
	-OpenJUMP/lib/commons-lang3-3.8.1.jar
	+OpenJUMP/lib/commons-lang3-3.10.jar
	OpenJUMP/lib/commons-logging-1.2.jar
	OpenJUMP/lib/cts-1.5.1.jar
	OpenJUMP/lib/ext/BeanTools/0-Help.bsh
	@@ -41,7 +32,7 @@
	OpenJUMP/lib/ext/BeanTools/9-Display_WMS_URL.bsh
	OpenJUMP/lib/ext/BeanTools/RefreshScriptsMenu.bsh
	OpenJUMP/lib/ext/BeanTools/SaveViewAsBeanTool.bsh
	-OpenJUMP/lib/ext/CadTools-0.7.jar
	+OpenJUMP/lib/ext/CadTools-1.0b.jar
	OpenJUMP/lib/ext/ColorChooser-1.3.jar
	OpenJUMP/lib/ext/ConcaveHull-Readme.txt
	OpenJUMP/lib/ext/FillPatterns/40S-TWEED_C1_064_A_RGB.JPG
	@@ -199,7 +190,7 @@
	OpenJUMP/lib/ext/FillPatterns/warp-&-weft_C1_064_B_RGB.JPG
	OpenJUMP/lib/ext/JumpChart-1.00.jar
	OpenJUMP/lib/ext/JumpFillPattern-0.3.jar
	-OpenJUMP/lib/ext/JumpPrinter-1.88.jar
	+OpenJUMP/lib/ext/JumpPrinter-1.90a.jar
	OpenJUMP/lib/ext/MeasureToolbox_12.jar
	OpenJUMP/lib/ext/OnlineDoc-0.1.jar
	OpenJUMP/lib/ext/OpenKLEM-20190224.jar
	@@ -273,55 +264,58 @@
	OpenJUMP/lib/ext/VertexImages/vector_18.wkt
	OpenJUMP/lib/ext/VertexImages/vector_19.wkt
	OpenJUMP/lib/ext/VertexImages/vector_20.wkt
	-OpenJUMP/lib/ext/VertexSymbols-0.19.jar
	+OpenJUMP/lib/ext/VertexSymbols-020a.jar
	OpenJUMP/lib/ext/ViewManager-0.3.4.jar
	OpenJUMP/lib/ext/aggregation-0.2.10.jar
	-OpenJUMP/lib/ext/bsheditor4jump-0.2.4.jar
	+OpenJUMP/lib/ext/bsheditor4jump-0.3.1.jar
	OpenJUMP/lib/ext/concave-hull-0.3.jar
	-OpenJUMP/lib/ext/csv-driver-1.0.2.jar
	+OpenJUMP/lib/ext/csv-driver-1.1.1.jar
	OpenJUMP/lib/ext/dbdatastore/mariadb-java-client-1.3.4.jar
	OpenJUMP/lib/ext/dbdatastore/mysql-connector-java-5.1.38-bin.jar
	OpenJUMP/lib/ext/dbdatastore/readme.txt
	-OpenJUMP/lib/ext/dbdatastore/sqlite-jdbc-3.20.0.jar
	+OpenJUMP/lib/ext/dbdatastore/sqlite-jdbc-3.32.3.2.jar
	OpenJUMP/lib/ext/dbquery.properties
	OpenJUMP/lib/ext/driver-dxf-0.9.0.jar
	-OpenJUMP/lib/ext/graph-toolbox-0.6.3.jar
	-OpenJUMP/lib/ext/imageio-ext/commons-lang-2.4.jar
	-OpenJUMP/lib/ext/imageio-ext/gdal-2.1.0.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-arcgrid-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcbinarygrid-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcgrid-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalbsb-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq1-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq2-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldted-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecw-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecwjp2-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalehdr-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvihdr-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvisat-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalerdasimg-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalframework-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalgeotiff-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalidrisi-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaljpeg-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalkakadujp2-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsid-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsidjp2-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalnitf-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-geocore-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-imagereadmt-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-kakadu-1.1.16.jar
	+OpenJUMP/lib/ext/graph-toolbox-0.8.0.jar
	+OpenJUMP/lib/ext/imageio-ext/FastInfoset-1.2.15.jar
	+OpenJUMP/lib/ext/imageio-ext/gdal-2.2.0.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-arcgrid-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcbinarygrid-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcgrid-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalbsb-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq1-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq2-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldted-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecw-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalehdr-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvihdr-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvisat-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalerdasimg-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalframework-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalgeotiff-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalidrisi-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaljpeg-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalkakadujp2-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsid-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsidjp2-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalnitf-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalvrt-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-geocore-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-imagereadmt-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-kakadu-1.3.2.jar
	OpenJUMP/lib/ext/imageio-ext/imageio-ext-kakadujni-5.2.6.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-nitf-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-png-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-streams-1.1.16.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-nitf-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-png-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-streams-1.3.2.jar
	OpenJUMP/lib/ext/imageio-ext/imageio-ext-tiff-1.1.13.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-turbojpeg-1.1.16.jar
	-OpenJUMP/lib/ext/imageio-ext/imageio-ext-utilities-1.1.16.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-turbojpeg-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/imageio-ext-utilities-1.3.2.jar
	+OpenJUMP/lib/ext/imageio-ext/istack-commons-runtime-3.0.7.jar
	OpenJUMP/lib/ext/imageio-ext/nitf-bindings-2.7-r1269.jar
	OpenJUMP/lib/ext/imageio-ext/pngj-2.0.1.jar
	-OpenJUMP/lib/ext/imageio-ext/turbojpeg-wrapper-1.2.1.1.jar
	+OpenJUMP/lib/ext/imageio-ext/stax-ex-1.8.jar
	+OpenJUMP/lib/ext/imageio-ext/turbojpeg-wrapper-1.2.1.5.jar
	+OpenJUMP/lib/ext/imageio-ext/txw2-2.4.0-b180830.0438.jar
	OpenJUMP/lib/ext/itext-2.1.7.jar
	OpenJUMP/lib/ext/jaxb/javax.activation-api-1.2.0.jar
	OpenJUMP/lib/ext/jaxb/jaxb-api-2.2.12.jar
	@@ -339,6 +333,7 @@
	OpenJUMP/lib/ext/jumpdbquery.jar
	OpenJUMP/lib/ext/jython/AlignSelected.py
	OpenJUMP/lib/ext/jython/ArcTool.py
	+OpenJUMP/lib/ext/jython/CADstartup.py
	OpenJUMP/lib/ext/jython/CircleTool.py
	OpenJUMP/lib/ext/jython/DistributeSelected.py
	OpenJUMP/lib/ext/jython/OvalTool.py
	@@ -372,8 +367,8 @@
	OpenJUMP/lib/ext/lib/jump-jgrapht-0.7.1.jar
	OpenJUMP/lib/ext/matching-0.8.2.jar
	OpenJUMP/lib/ext/oj_osm_reader_v1-0-4.jar
	-OpenJUMP/lib/ext/ojmapcoloring-0.5.jar
	-OpenJUMP/lib/ext/ojsextante_binding_apr2018c.jar
	+OpenJUMP/lib/ext/ojmapcoloring-0.5.2.jar
	+OpenJUMP/lib/ext/ojsextante_binding_jul2020.jar
	OpenJUMP/lib/ext/pbaseClasses.jar
	OpenJUMP/lib/ext/readme.txt
	OpenJUMP/lib/ext/set_attributes/DocumentedSample.xml
	@@ -1086,7 +1081,7 @@
	OpenJUMP/lib/ext/sextante/sextante.jar
	OpenJUMP/lib/ext/sextante/sextante_algorithms.jar
	OpenJUMP/lib/ext/sextante/sextante_gui.jar
	-OpenJUMP/lib/ext/sextante/sextante_new_algorithms.jar
	+OpenJUMP/lib/ext/sextante/sextante_new_algorithms_20200817.jar
	OpenJUMP/lib/ext/sextante/trove-0.1.8.jar
	OpenJUMP/lib/ext/topology-0.9.3.jar
	OpenJUMP/lib/ext/utils-0.1-20111127.jar
	@@ -1096,9 +1091,9 @@
	OpenJUMP/lib/ext/wfs/vecmath-1.5.2.jar
	OpenJUMP/lib/ext/workbench-properties.xml
	OpenJUMP/lib/ext/xbean-2.2.0.jar
	-OpenJUMP/lib/hamcrest-core-1.3.jar
	OpenJUMP/lib/icons/oj.ico
	OpenJUMP/lib/icons/oj.png
	+OpenJUMP/lib/jai-imageio-core-1.4.0.jar
	OpenJUMP/lib/jai_codec-1.1.3.jar
	OpenJUMP/lib/jai_core-1.1.3.jar
	OpenJUMP/lib/jai_imageio-1.1.jar
	@@ -1106,7 +1101,6 @@
	OpenJUMP/lib/jdom2-2.0.6.jar
	OpenJUMP/lib/jmatharray-20070905.jar
	OpenJUMP/lib/jmathplot-20070905.jar
	-OpenJUMP/lib/js-1.5R4.1.jar
	OpenJUMP/lib/json-simple-1.1.1.jar
	OpenJUMP/lib/jts-core-1.14.0.jar
	OpenJUMP/lib/jts-io-1.14.0.jar
	@@ -1114,7 +1108,7 @@
	OpenJUMP/lib/log4j-1.2.17.jar
	OpenJUMP/lib/native/jecw-0.0.7.jar
	OpenJUMP/lib/org-netbeans-swing-outline-7.2.jar
	-OpenJUMP/lib/postgresql-9.4.1208.jre6.jar
	+OpenJUMP/lib/postgresql-42.2.14.jar
	OpenJUMP/lib/slf4j-api-1.7.25.jar
	OpenJUMP/lib/slf4j-log4j12-1.7.25.jar
	OpenJUMP/lib/xercesImpl-2.11.0.jar

File Metadata

Mime Type: text/plain
Expires: Tue, Mar 4, 12:51 AM (11 h, 52 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 16957518
Default Alt Text: D28643.diff (17 KB)

D28643.diffNo OneTemporaryActions

D28643.diffView Options

File Metadata

Event Timeline

D28643.diff
No OneTemporary
Actions

D28643.diff
View Options