Accepting request 961197 from Java:packages
Add Automatic-Module-Name to manifest and fix build with jflex 1.7 OBS-URL: https://build.opensuse.org/request/show/961197 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qdox?expand=0&rev=27
This commit is contained in:
commit
42a3d85716
21
Port-to-JFlex-1.7.0.patch
Normal file
21
Port-to-JFlex-1.7.0.patch
Normal file
@ -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 );
|
@ -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"/>
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user