From 05e5a4841ea792b20d68ebe33709effe902ba07be0327b69d4dcd5c99e46c8c7 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 12 Mar 2022 06:11:00 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/qdox?expand=0&rev=39

---
 Port-to-JFlex-1.7.0.patch | 21 +++++++++++++++++++++
 qdox-build.xml            |  1 +
 qdox.changes              |  8 ++++++++
 qdox.spec                 |  2 ++
 4 files changed, 32 insertions(+)
 create mode 100644 Port-to-JFlex-1.7.0.patch

diff --git a/Port-to-JFlex-1.7.0.patch b/Port-to-JFlex-1.7.0.patch
new file mode 100644
index 0000000..e61983b
--- /dev/null
+++ b/Port-to-JFlex-1.7.0.patch
@@ -0,0 +1,21 @@
++++ qdox-2.0.1/src/grammar/lexer.flex	2022-03-12 07:00:33.182053962 +0100
+@@ -173,7 +173,7 @@
+ 	}
+ 
+     public JFlexLexer( java.io.InputStream stream, java.io.Writer writer ) {
+-       this( stream );
++       this( new java.io.InputStreamReader( stream, java.nio.charset.Charset.forName( "UTF-8" ) ) );
+        this.writer = writer;
+   	}
+ 
+--- qdox-2.0.1/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java	2021-11-13 15:25:20.000000000 +0100
++++ qdox-2.0.1/src/main/java/com/thoughtworks/qdox/library/ClassLoaderLibrary.java	2022-03-12 07:00:33.182053962 +0100
+@@ -112,7 +112,7 @@
+             if ( sourceStream != null )
+             {
+                 Builder builder = getModelBuilder();
+-                JavaLexer lexer = new JFlexLexer( sourceStream );
++                JavaLexer lexer = new JFlexLexer( new java.io.InputStreamReader( sourceStream, java.nio.charset.Charset.forName( "UTF-8" ) ) );
+                 Parser parser = new Parser( lexer, builder );
+                 parser.setDebugLexer( debugLexer );
+                 parser.setDebugParser( debugParser );
diff --git a/qdox-build.xml b/qdox-build.xml
index c2fe58c..c984a4f 100644
--- a/qdox-build.xml
+++ b/qdox-build.xml
@@ -88,6 +88,7 @@
          basedir="${build.outputDir}" 
          excludes="**/package.html">
       <manifest>
+		<attribute name="Automatic-Module-Name" value="com.thoughtworks.qdox"/>
 		<attribute name="Bundle-Localization" value="plugin"/>
 		<attribute name="Bundle-ManifestVersion" value="2"/>
 		<attribute name="Bundle-Name" value="%pluginName"/>
diff --git a/qdox.changes b/qdox.changes
index 1513bc7..c6eb7fe 100644
--- a/qdox.changes
+++ b/qdox.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar 12 06:06:28 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Add Automatic-Module-Name to the manifest
+- Added patch:
+  * Port-to-JFlex-1.7.0.patch
+    + Don't use deprecated inputstreamctor option
+
 -------------------------------------------------------------------
 Thu Jan 13 11:45:28 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/qdox.spec b/qdox.spec
index 9d17fe5..aea2468 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -25,6 +25,7 @@ Group:          Development/Libraries/Java
 URL:            https://github.com/paul-hammant/qdox
 Source0:        https://repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/%{version}/%{name}-%{version}-project.tar.bz2
 Source1:        qdox-build.xml
+Patch0:         Port-to-JFlex-1.7.0.patch
 BuildRequires:  ant
 BuildRequires:  byaccj
 BuildRequires:  fdupes
@@ -49,6 +50,7 @@ API docs for %{name}.
 %prep
 %setup -q
 cp %{SOURCE1} build.xml
+%patch0 -p1
 find -name *.jar -delete
 find -name *.class -delete
 rm -rf bootstrap