PR#1: FTBFS fix - rpms/zxing - src.fedoraproject.org

rpms / zxing

#1 FTBFS fix

Merged 6 years ago by tdawson. Opened 6 years ago by merlinm.

Unknown source master into master

Fix FTBFS error resulting from deprecated JCommander usage

Merlin Mathesius • 6 years ago

f04f3bf

zxing-3.2.1-deprecated-JCommander-usage.patch

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ diff -r -u ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java`
		`+ --- ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java 2015-08-19 07:21:00.000000000 -0500`
		`+ +++ ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineEncoder.java 2018-01-24 08:59:39.472655785 -0600`
		`+ @@ -35,7 +35,8 @@`
		`+`
		`+ public static void main(String[] args) throws Exception {`
		`+ EncoderConfig config = new EncoderConfig();`
		`+ - JCommander jCommander = new JCommander(config, args);`
		`+ + JCommander jCommander = new JCommander(config);`
		`+ + jCommander.parse(args);`
		`+ jCommander.setProgramName(CommandLineEncoder.class.getSimpleName());`
		`+ if (config.help) {`
		`+ jCommander.usage();`
		`+ diff -r -u ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java`
		`+ --- ../zxing-zxing-3.2.1.unpatched/javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java 2015-08-19 07:21:00.000000000 -0500`
		`+ +++ ./javase/src/main/java/com/google/zxing/client/j2se/CommandLineRunner.java 2018-01-24 08:59:39.473655761 -0600`
		`+ @@ -49,7 +49,8 @@`
		`+`
		`+ public static void main(String[] args) throws Exception {`
		`+ DecoderConfig config = new DecoderConfig();`
		`+ - JCommander jCommander = new JCommander(config, args);`
		`+ + JCommander jCommander = new JCommander(config);`
		`+ + jCommander.parse(args);`
		`+ jCommander.setProgramName(CommandLineRunner.class.getSimpleName());`
		`+ if (config.help) {`
		`+ jCommander.usage();`

zxing.spec

file modified

+8 -1

		`@@ -1,6 +1,6 @@`
		`Name: zxing`
		`Version: 3.2.1`
		`- Release: 5%{?dist}`
		`+ Release: 6%{?dist}`
		`Summary: Java multi-format 1D/2D bar-code image processing library`
		`License: ASL 2.0`
		`URL: https://github.com/zxing/zxing/`
		`@@ -8,6 +8,9 @@`
		`# sh zxing-repack.sh <VERSION>`
		`Source0: %{name}-%{version}.tar.xz`
		`Source1: zxing-repack.sh`
		`+ # FTBFS fix manually cherry picked from upstream commit`
		`+ # https://github.com/zxing/zxing/commit/e2afb336e2f7afaa9d0895c4d16e9e85013c2f3d`
		`+ Patch0: zxing-3.2.1-deprecated-JCommander-usage.patch`

		`BuildRequires: maven-local`
		`BuildRequires: mvn(com.beust:jcommander)`
		`@@ -43,6 +46,7 @@`

		`%prep`
		`%setup -q -n %{name}-%{name}-%{version}`
		`+ %patch0`

		`%pom_remove_dep com.google.android:`
		`%pom_remove_dep :android-core`
		`@@ -128,6 +132,9 @@`
		`%license COPYING NOTICE`

		`%changelog`
		`+ * Wed Jan 24 2018 Merlin Mathesius <mmathesi@redhat.com> - 3.2.1-6`
		`+ - Fix FTBFS error resulting from deprecated JCommander usage`
		`+`
		`* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-5`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild`

merlinm commented 6 years ago

zxing currently fails to build from source in F27 and Rawhide.

The FTBFS error is the result of deprecated JCommander usage in the source files CommandLineEncoder.java and CommandLineRunner.java.

This PR fixes the error by including a patch containing two manually cherry picked fixes from upstream commit https://github.com/zxing/zxing/commit/e2afb336e2f7afaa9d0895c4d16e9e85013c2f3d

A successful Rawhide scratch build of this update can be found at https://koji.fedoraproject.org/koji/taskinfo?taskID=24416609

Metadata

Assignee

None

Tags

No Tags

Changes Summary 2

+26

file added