diff -Nru lightzone-4.1.8/debian/changelog lightzone-4.1.8/debian/changelog --- lightzone-4.1.8/debian/changelog 2017-12-22 13:35:54.000000000 +0000 +++ lightzone-4.1.8/debian/changelog 2017-12-22 13:35:54.000000000 +0000 @@ -1,4 +1,4 @@ -lightzone (4.1.8-0ppa1zesty0) zesty; urgency=medium +lightzone (4.1.8-0ppa1zesty1) zesty; urgency=medium * Upstream sync diff -Nru lightzone-4.1.8/lightcrafts/mk/platform.mk lightzone-4.1.8/lightcrafts/mk/platform.mk --- lightzone-4.1.8/lightcrafts/mk/platform.mk 2017-12-25 11:46:04.000000000 +0000 +++ lightzone-4.1.8/lightcrafts/mk/platform.mk 2017-12-31 12:44:39.000000000 +0000 @@ -13,7 +13,14 @@ $(error "JAVA_HOME" must be set) endif -PROCESSOR:= $(shell uname -m) +## +# Target architecture +## +ifdef TARGET + PROCESSOR:= $(TARGET) +else + PROCESSOR:= $(shell uname -m) +endif ifeq ($(PROCESSOR),i486) PROCESSOR:= i386 else ifeq ($(PROCESSOR),i586) diff -Nru lightzone-4.1.8/lightcrafts/src/com/lightcrafts/model/CropBounds.java lightzone-4.1.8/lightcrafts/src/com/lightcrafts/model/CropBounds.java --- lightzone-4.1.8/lightcrafts/src/com/lightcrafts/model/CropBounds.java 2017-12-25 11:46:04.000000000 +0000 +++ lightzone-4.1.8/lightcrafts/src/com/lightcrafts/model/CropBounds.java 2017-12-31 12:44:39.000000000 +0000 @@ -306,6 +306,10 @@ } public Dimension getDimensionToFit(Dimension bounds) { + if (width <= 0 || height <= 0) { + return new Dimension(bounds.width, bounds.height); + } + // Fit longer sides double scale = (width > height) ? bounds.width / width diff -Nru lightzone-4.1.8/lightcrafts/test/src/com/lightcrafts/model/CropBoundsTest.java lightzone-4.1.8/lightcrafts/test/src/com/lightcrafts/model/CropBoundsTest.java --- lightzone-4.1.8/lightcrafts/test/src/com/lightcrafts/model/CropBoundsTest.java 2017-12-25 11:46:04.000000000 +0000 +++ lightzone-4.1.8/lightcrafts/test/src/com/lightcrafts/model/CropBoundsTest.java 2017-12-31 12:44:39.000000000 +0000 @@ -52,5 +52,9 @@ new Point2D.Double(2554.8590, 1728.0603), 3455.5752, 3455.5752, 0); assertEquals(D3455x3455, crop.getDimensionToFit(D3455x3455)); + + crop = new CropBounds( + new Point2D.Double(0, 0), 0, 0, 0); + assertEquals(D3455x3455, crop.getDimensionToFit(D3455x3455)); } } \ No newline at end of file diff -Nru lightzone-4.1.8/linux/BUILD-Linux.md lightzone-4.1.8/linux/BUILD-Linux.md --- lightzone-4.1.8/linux/BUILD-Linux.md 2017-12-25 11:46:04.000000000 +0000 +++ lightzone-4.1.8/linux/BUILD-Linux.md 2017-12-31 12:44:39.000000000 +0000 @@ -22,7 +22,7 @@ Install required packages: - sudo apt-get install debhelper devscripts build-essential ant autoconf git-core javahelp2 default-jdk default-jre-headless rsync libjpeg-turbo8-dev libtiff5-dev libx11-dev libxml2-utils + sudo apt-get install debhelper devscripts build-essential ant autoconf git-core javahelp2 default-jdk default-jre-headless rsync libjpeg-turbo8-dev liblcms2-dev libtiff5-dev libx11-dev libxml2-utils _(Note: gcc, g++, libc6-dev and make shall be installed with the build-essential.)_ diff -Nru lightzone-4.1.8/linux/lightzone.spec lightzone-4.1.8/linux/lightzone.spec --- lightzone-4.1.8/linux/lightzone.spec 2017-12-25 11:46:04.000000000 +0000 +++ lightzone-4.1.8/linux/lightzone.spec 2017-12-31 12:44:39.000000000 +0000 @@ -23,6 +23,7 @@ %define libjpeg_devel libjpeg-turbo-devel %define libX11_devel libX11-devel %define pkg_config pkgconfig +%define xmllint libxml2 %define debug_package %{nil} %endif @@ -36,6 +37,7 @@ %define libjpeg_devel libjpeg-turbo-devel %define libX11_devel libX11-devel %define pkg_config pkgconfig +%define xmllint libxml2 %define debug_package %{nil} %endif @@ -45,6 +47,7 @@ %define libjpeg_devel libjpeg8-devel %define libX11_devel xorg-x11-libX11-devel %define pkg_config pkg-config +%define xmllint libxml2 BuildRequires: update-desktop-files %endif @@ -59,6 +62,7 @@ %define lcms2_devel liblcms2-devel %define libjpeg_devel libjpeg8-devel %define pkg_config pkg-config +%define xmllint libxml2-tools %endif %if 0%{?mdkversion} || 0%{?pclinuxos} @@ -67,6 +71,7 @@ %define libjpeg_devel libjpeg8-devel %define libX11_devel libX11-devel %define pkg_config pkg-config +%define xmllint libxml2-utils %endif BuildRequires: java-%{java_version}-devel, %{libX11_devel}, ant, autoconf, gcc, gcc-c++, make, git, javahelp2, %{lcms2_devel}, %{libjpeg_devel}, libtiff-devel, %{pkg_config}, rsync @@ -74,7 +79,7 @@ BuildRequires: java-rpmbuild, libgomp-devel %endif -Requires: java-%{java_version}, javahelp2, lcms2, libxml2-utils +Requires: java-%{java_version}, javahelp2, lcms2, %{xmllint} %if 0%{?suse_version} >= 1320 Requires: xerces-j2-xml-apis %else