Accepting request 634919 from home:fstrba:branches:devel:tools:scm:svn
Allow to build on systems with JDK versions that lack the javah tool OBS-URL: https://build.opensuse.org/request/show/634919 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=287
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
b43abdfe52
commit
3231ad53b4
555
subversion-1.10.2-java10.patch
Normal file
555
subversion-1.10.2-java10.patch
Normal file
@ -0,0 +1,555 @@
|
||||
--- subversion-1.10.2/build/generator/gen_base.py 2018-01-05 05:00:06.000000000 +0100
|
||||
+++ subversion-1.10.2/build/generator/gen_base.py 2018-09-11 09:53:40.901926565 +0200
|
||||
@@ -900,115 +900,67 @@
|
||||
def __init__(self, name, options, gen_obj):
|
||||
TargetLinked.__init__(self, name, options, gen_obj)
|
||||
self.link_cmd = options.get('link-cmd')
|
||||
- self.packages = options.get('package-roots', '').split()
|
||||
+ self.package = options.get('package')
|
||||
self.jar = options.get('jar')
|
||||
self.deps = [ ]
|
||||
-
|
||||
-class TargetJavaHeaders(TargetJava):
|
||||
- def __init__(self, name, options, gen_obj):
|
||||
- TargetJava.__init__(self, name, options, gen_obj)
|
||||
self.objext = '.class'
|
||||
- self.javah_objext = '.h'
|
||||
self.headers = options.get('headers')
|
||||
self.classes = options.get('classes')
|
||||
- self.package = options.get('package')
|
||||
- self.output_dir = self.headers
|
||||
+ self.native = options.get('native', '')
|
||||
+ self.output_dir = self.classes
|
||||
+ self.headers_dir = self.headers
|
||||
|
||||
def add_dependencies(self):
|
||||
sources = _collect_paths(self.sources, self.path)
|
||||
+ native = _collect_paths(self.native, self.path)
|
||||
+
|
||||
+ class_pkg_list = self.package.split('.')
|
||||
+ sourcepath = build_path_split(self.path)[:-len(class_pkg_list)]
|
||||
+ sourcepath = build_path_join(*sourcepath)
|
||||
|
||||
for src, reldir in sources:
|
||||
if src[-5:] != '.java':
|
||||
raise GenError('ERROR: unknown file extension on ' + src)
|
||||
|
||||
+ sfile = SourceFile(src, reldir)
|
||||
+ sfile.sourcepath = sourcepath
|
||||
+
|
||||
class_name = build_path_basename(src[:-5])
|
||||
|
||||
- class_header = build_path_join(self.headers, class_name + '.h')
|
||||
- class_header_win = build_path_join(self.headers,
|
||||
- self.package.replace(".", "_")
|
||||
- + "_" + class_name + '.h')
|
||||
- class_pkg_list = self.package.split('.')
|
||||
class_pkg = build_path_join(*class_pkg_list)
|
||||
class_file = ObjectFile(build_path_join(self.classes, class_pkg,
|
||||
class_name + self.objext),
|
||||
- self.when)
|
||||
+ self.compile_cmd, self.when)
|
||||
class_file.source_generated = 1
|
||||
class_file.class_name = class_name
|
||||
- hfile = HeaderFile(class_header, self.package + '.' + class_name,
|
||||
- self.compile_cmd)
|
||||
- hfile.filename_win = class_header_win
|
||||
- hfile.source_generated = 1
|
||||
- self.gen_obj.graph.add(DT_OBJECT, hfile, class_file)
|
||||
- self.deps.append(hfile)
|
||||
|
||||
- # target (a linked item) depends upon object
|
||||
- self.gen_obj.graph.add(DT_LINK, self.name, hfile)
|
||||
+ self.gen_obj.graph.add(DT_OBJECT, class_file, sfile)
|
||||
+ self.gen_obj.graph.add(DT_LINK, self.name, class_file)
|
||||
+ self.deps.append(class_file)
|
||||
+
|
||||
+ if (src, reldir) in native:
|
||||
+ class_header = build_path_join(self.headers, class_name + '.h')
|
||||
+ class_header_win = build_path_join(self.headers,
|
||||
+ self.package.replace(".", "_")
|
||||
+ + "_" + class_name + '.h')
|
||||
+ hfile = HeaderFile(class_header, self.package + '.' + class_name,
|
||||
+ self.compile_cmd)
|
||||
+ hfile.filename_win = class_header_win
|
||||
+ hfile.source_generated = 1
|
||||
+ self.gen_obj.graph.add(DT_OBJECT, hfile, sfile)
|
||||
+ self.deps.append(hfile)
|
||||
|
||||
+ # target (a linked item) depends upon object
|
||||
+ self.gen_obj.graph.add(DT_LINK, self.name, hfile)
|
||||
|
||||
- # collect all the paths where stuff might get built
|
||||
- ### we should collect this from the dependency nodes rather than
|
||||
- ### the sources. "what dir are you going to put yourself into?"
|
||||
- self.gen_obj.target_dirs.append(self.path)
|
||||
- self.gen_obj.target_dirs.append(self.classes)
|
||||
- self.gen_obj.target_dirs.append(self.headers)
|
||||
- for pattern in self.sources.split():
|
||||
- dirname = build_path_dirname(pattern)
|
||||
- if dirname:
|
||||
- self.gen_obj.target_dirs.append(build_path_join(self.path, dirname))
|
||||
-
|
||||
- self.gen_obj.graph.add(DT_INSTALL, self.name, self)
|
||||
-
|
||||
-class TargetJavaClasses(TargetJava):
|
||||
- def __init__(self, name, options, gen_obj):
|
||||
- TargetJava.__init__(self, name, options, gen_obj)
|
||||
- self.objext = '.class'
|
||||
- self.lang = 'java'
|
||||
- self.classes = options.get('classes')
|
||||
- self.output_dir = self.classes
|
||||
-
|
||||
- def add_dependencies(self):
|
||||
- sources = []
|
||||
- for p in self.path.split():
|
||||
- sources.extend(_collect_paths(self.sources, p))
|
||||
-
|
||||
- for src, reldir in sources:
|
||||
- if src[-5:] == '.java':
|
||||
- objname = src[:-5] + self.objext
|
||||
-
|
||||
- # As .class files are likely not generated into the same
|
||||
- # directory as the source files, the object path may need
|
||||
- # adjustment. To this effect, take "target_ob.classes" into
|
||||
- # account.
|
||||
- dirs = build_path_split(objname)
|
||||
- sourcedirs = dirs[:-1] # Last element is the .class file name.
|
||||
- while sourcedirs:
|
||||
- if sourcedirs.pop() in self.packages:
|
||||
- sourcepath = build_path_join(*sourcedirs)
|
||||
- objname = build_path_join(self.classes, *dirs[len(sourcedirs):])
|
||||
- break
|
||||
- else:
|
||||
- raise GenError('Unable to find Java package root in path "%s"' % objname)
|
||||
- else:
|
||||
- raise GenError('ERROR: unknown file extension on "' + src + '"')
|
||||
-
|
||||
- ofile = ObjectFile(objname, self.compile_cmd, self.when)
|
||||
- sfile = SourceFile(src, reldir)
|
||||
- sfile.sourcepath = sourcepath
|
||||
-
|
||||
- # object depends upon source
|
||||
- self.gen_obj.graph.add(DT_OBJECT, ofile, sfile)
|
||||
-
|
||||
- # target (a linked item) depends upon object
|
||||
- self.gen_obj.graph.add(DT_LINK, self.name, ofile)
|
||||
-
|
||||
- # Add the class file to the dependency tree for this target
|
||||
- self.deps.append(ofile)
|
||||
|
||||
# collect all the paths where stuff might get built
|
||||
### we should collect this from the dependency nodes rather than
|
||||
### the sources. "what dir are you going to put yourself into?"
|
||||
- self.gen_obj.target_dirs.extend(self.path.split())
|
||||
+ self.gen_obj.target_dirs.append(self.path)
|
||||
self.gen_obj.target_dirs.append(self.classes)
|
||||
+ if self.headers:
|
||||
+ self.gen_obj.target_dirs.append(self.headers)
|
||||
for pattern in self.sources.split():
|
||||
dirname = build_path_dirname(pattern)
|
||||
if dirname:
|
||||
@@ -1057,8 +1009,7 @@
|
||||
'apache-mod': TargetApacheMod,
|
||||
'shared-only-lib': TargetSharedOnlyLib,
|
||||
'shared-only-cxx-lib': TargetSharedOnlyCxxLib,
|
||||
- 'javah' : TargetJavaHeaders,
|
||||
- 'java' : TargetJavaClasses,
|
||||
+ 'java' : TargetJava,
|
||||
'i18n' : TargetI18N,
|
||||
'sql-header' : TargetSQLHeader,
|
||||
}
|
||||
--- subversion-1.10.2/build/generator/gen_make.py 2018-06-14 06:00:08.000000000 +0200
|
||||
+++ subversion-1.10.2/build/generator/gen_make.py 2018-09-11 09:45:32.519487855 +0200
|
||||
@@ -309,6 +309,8 @@
|
||||
ezt_target.link_cmd = target_ob.link_cmd
|
||||
if hasattr(target_ob, 'output_dir'):
|
||||
ezt_target.output_dir = target_ob.output_dir
|
||||
+ if hasattr(target_ob, 'headers_dir'):
|
||||
+ ezt_target.headers_dir = target_ob.headers_dir
|
||||
|
||||
# Add additional install dependencies if necessary
|
||||
if target_ob.add_install_deps:
|
||||
--- subversion-1.10.2/build/generator/gen_win.py 2017-07-28 12:30:34.000000000 +0200
|
||||
+++ subversion-1.10.2/build/generator/gen_win.py 2018-09-11 09:54:53.190287529 +0200
|
||||
@@ -362,6 +362,9 @@
|
||||
|
||||
elif isinstance(target, gen_base.TargetJavaClasses):
|
||||
classes = targetdir = self.path(target.classes)
|
||||
+ headers = ''
|
||||
+ if self.headers is not None:
|
||||
+ headers = '-h %s' % self.quote(self.headers)
|
||||
if self.junit_path is not None:
|
||||
classes = "%s;%s" % (classes, self.junit_path)
|
||||
|
||||
@@ -375,6 +378,7 @@
|
||||
|
||||
cbuild = ("%s -g -Xlint -Xlint:-options " +
|
||||
per_project_flags +
|
||||
+ headers +
|
||||
" -target 1.5 -source 1.5 -classpath "
|
||||
" %s -d %s "
|
||||
" -sourcepath %s $(InputPath)") \
|
||||
--- subversion-1.10.2/build/generator/templates/build-outputs.mk.ezt 2015-04-17 15:30:25.000000000 +0200
|
||||
+++ subversion-1.10.2/build/generator/templates/build-outputs.mk.ezt 2018-09-11 09:45:32.519487855 +0200
|
||||
@@ -102,13 +102,9 @@
|
||||
[target.varname]_OBJECTS = [for target.objects][if-index target.objects first][else] [end][target.objects][end]
|
||||
[target.varname]_DEPS = $([target.varname]_HEADERS) $([target.varname]_OBJECTS)[for target.add_deps] [target.add_deps][end][for target.deps][if-index target.deps first][else] [end][target.deps][end]
|
||||
[target.name]: $([target.varname]_DEPS)
|
||||
-[if-any target.headers][target.varname]_CLASS_FILENAMES =[for target.header_class_filenames] [target.header_class_filenames][end]
|
||||
-[target.varname]_CLASSES =[for target.header_classes] [target.header_classes][end]
|
||||
-$([target.varname]_HEADERS): $([target.varname]_CLASS_FILENAMES)
|
||||
- [target.link_cmd] -d [target.output_dir] -classpath [target.classes]:$([target.varname]_CLASSPATH) $([target.varname]_CLASSES)
|
||||
-[end][if-any target.sources][target.varname]_SRC =[for target.sources] [target.sources][end]
|
||||
-$([target.varname]_OBJECTS): $([target.varname]_SRC)
|
||||
- [target.link_cmd] -d [target.output_dir] -classpath [target.classes]:$([target.varname]_CLASSPATH) $([target.varname]_SRC)
|
||||
+[if-any target.sources][target.varname]_SRC =[for target.sources] [target.sources][end]
|
||||
+$([target.varname]_HEADERS) $([target.varname]_OBJECTS): $([target.varname]_SRC)
|
||||
+ [target.link_cmd][if-any target.headers] -h [target.headers_dir][end] -d [target.output_dir] -classpath [target.classes]:$([target.varname]_CLASSPATH) $([target.varname]_SRC)
|
||||
[if-any target.jar]
|
||||
$(JAR) cf [target.jar_path] -C [target.classes][for target.packages] [target.packages][end][end][end]
|
||||
[else][is target.type "i18n"][target.varname]_DEPS =[for target.add_deps] [target.add_deps][end][for target.objects] [target.objects][end][for target.deps] [target.deps][end]
|
||||
--- subversion-1.10.2/build.conf 2018-07-13 06:00:07.000000000 +0200
|
||||
+++ subversion-1.10.2/build.conf 2018-09-11 09:45:32.523487875 +0200
|
||||
@@ -608,16 +608,14 @@
|
||||
[javahl-java]
|
||||
type = java
|
||||
path = subversion/bindings/javahl/src/org/apache/subversion/javahl
|
||||
- subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
|
||||
- subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
|
||||
- subversion/bindings/javahl/src/org/apache/subversion/javahl/types
|
||||
- subversion/bindings/javahl/src/org/apache/subversion/javahl/util
|
||||
-src-root = subversion/bindings/javahl/src
|
||||
sources = *.java
|
||||
+native = CommitItemStateFlags.java NativeResources.java SVNClient.java
|
||||
+ SVNRepos.java
|
||||
install = javahl-java
|
||||
link-cmd = $(COMPILE_JAVAHL_JAVAC)
|
||||
classes = subversion/bindings/javahl/classes
|
||||
-package-roots = org
|
||||
+headers = subversion/bindings/javahl/include
|
||||
+package = org.apache.subversion.javahl
|
||||
|
||||
[javahl-compat-java]
|
||||
type = java
|
||||
@@ -626,10 +624,12 @@
|
||||
install = javahl-java
|
||||
link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
|
||||
classes = subversion/bindings/javahl/classes
|
||||
-add-deps = $(javahl_java_DEPS)
|
||||
+add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS)
|
||||
+ $(javahl_types_java_DEPS) $(javahl_util_java_DEPS)
|
||||
+ $(javahl_java_DEPS)
|
||||
### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in.
|
||||
#jar = svn-javahl.jar
|
||||
-package-roots = org
|
||||
+package = org.tigris.subversion.javahl
|
||||
|
||||
[javahl-tests]
|
||||
type = java
|
||||
@@ -638,10 +638,12 @@
|
||||
install = javahl-java
|
||||
link-cmd = $(COMPILE_JAVAHL_JAVAC)
|
||||
classes = subversion/bindings/javahl/classes
|
||||
-package-roots = org
|
||||
+package = org.apache.subversion.javhl
|
||||
### Java targets don't do up-to-date checks yet.
|
||||
#add-deps = javahl-java
|
||||
-add-deps = $(javahl_java_DEPS)
|
||||
+add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS)
|
||||
+ $(javahl_types_java_DEPS) $(javahl_util_java_DEPS)
|
||||
+ $(javahl_java_DEPS)
|
||||
|
||||
[javahl-compat-tests]
|
||||
type = java
|
||||
@@ -650,65 +652,59 @@
|
||||
install = javahl-java
|
||||
link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
|
||||
classes = subversion/bindings/javahl/classes
|
||||
-package-roots = org
|
||||
+package = org.tigris.subversion.javahl
|
||||
### Java targets don't do up-to-date checks yet.
|
||||
#add-deps = javahl-compat-java
|
||||
add-deps = $(javahl_compat_java_DEPS)
|
||||
|
||||
-[javahl-callback-javah]
|
||||
-type = javah
|
||||
+[javahl-callback-java]
|
||||
+type = java
|
||||
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
|
||||
classes = subversion/bindings/javahl/classes
|
||||
headers = subversion/bindings/javahl/include
|
||||
package = org.apache.subversion.javahl.callback
|
||||
sources = *.java
|
||||
-add-deps = $(javahl_java_DEPS)
|
||||
-install = javahl-javah
|
||||
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
|
||||
+native = UserPasswordCallback.java
|
||||
+install = javahl-java
|
||||
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
|
||||
|
||||
-[javahl-remote-javah]
|
||||
-type = javah
|
||||
+[javahl-remote-java]
|
||||
+type = java
|
||||
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
|
||||
classes = subversion/bindings/javahl/classes
|
||||
headers = subversion/bindings/javahl/include
|
||||
package = org.apache.subversion.javahl.remote
|
||||
sources = *.java
|
||||
-add-deps = $(javahl_java_DEPS)
|
||||
-install = javahl-javah
|
||||
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
|
||||
+native = CommitEditor.java RemoteFactory.java RemoteSession.java
|
||||
+ StateReporter.java
|
||||
+install = javahl-java
|
||||
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
|
||||
|
||||
-[javahl-types-javah]
|
||||
-type = javah
|
||||
+[javahl-types-java]
|
||||
+type = java
|
||||
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/types
|
||||
classes = subversion/bindings/javahl/classes
|
||||
headers = subversion/bindings/javahl/include
|
||||
package = org.apache.subversion.javahl.types
|
||||
sources = *.java
|
||||
-add-deps = $(javahl_java_DEPS)
|
||||
-install = javahl-javah
|
||||
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
|
||||
+native = NativeInputStream.java NativeOutputStream.java Revision.java
|
||||
+ RevisionRangeList.java RuntimeVersion.java VersionExtended.java
|
||||
+ Version.java
|
||||
+install = javahl-java
|
||||
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
|
||||
|
||||
-[javahl-util-javah]
|
||||
-type = javah
|
||||
+[javahl-util-java]
|
||||
+type = java
|
||||
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/util
|
||||
classes = subversion/bindings/javahl/classes
|
||||
headers = subversion/bindings/javahl/include
|
||||
package = org.apache.subversion.javahl.util
|
||||
sources = *.java
|
||||
-add-deps = $(javahl_java_DEPS)
|
||||
-install = javahl-javah
|
||||
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
|
||||
-
|
||||
-[javahl-javah]
|
||||
-type = javah
|
||||
-path = subversion/bindings/javahl/src/org/apache/subversion/javahl
|
||||
-classes = subversion/bindings/javahl/classes
|
||||
-headers = subversion/bindings/javahl/include
|
||||
-package = org.apache.subversion.javahl
|
||||
-sources = *.java
|
||||
-add-deps = $(javahl_java_DEPS)
|
||||
-install = javahl-javah
|
||||
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
|
||||
+native = ConfigImpl.java ConfigLib.java DiffLib.java PropLib.java
|
||||
+ RequestChannel.java ResponseChannel.java SubstLib.java
|
||||
+ TunnelChannel.java
|
||||
+install = javahl-java
|
||||
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
|
||||
|
||||
[libsvnjavahl]
|
||||
description = Subversion Java HighLevel binding
|
||||
@@ -717,9 +713,9 @@
|
||||
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
|
||||
libsvn_subr libsvn_fs aprutil apriconv apr java-sdk
|
||||
sources = *.cpp jniwrapper/*.cpp
|
||||
-add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
|
||||
- $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS)
|
||||
- $(javahl_util_javah_DEPS) $(javahl_javah_DEPS)
|
||||
+add-deps = $(javahl_java_DEPS) $(javahl_callback_java_DEPS)
|
||||
+ $(javahl_remote_java_DEPS) $(javahl_types_java_DEPS)
|
||||
+ $(javahl_util_java_DEPS) $(javahl_java_DEPS)
|
||||
install = javahl-lib
|
||||
# need special build rule to include -I$(JDK)/include/jni.h
|
||||
compile-cmd = $(COMPILE_JAVAHL_CXX)
|
||||
@@ -1630,7 +1626,7 @@
|
||||
[__JAVAHL__]
|
||||
type = project
|
||||
path = build/win32
|
||||
-libs = javahl-java javahl-javah libsvnjavahl
|
||||
+libs = javahl-java libsvnjavahl
|
||||
|
||||
[__JAVAHL_TESTS__]
|
||||
type = project
|
||||
--- subversion-1.10.2/Makefile.in 2018-02-16 05:00:12.000000000 +0100
|
||||
+++ subversion-1.10.2/Makefile.in 2018-09-11 09:45:32.519487855 +0200
|
||||
@@ -218,7 +218,6 @@
|
||||
# special compilation for files destined for javahl (i.e. C++)
|
||||
COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
|
||||
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
|
||||
-COMPILE_JAVAHL_JAVAH = $(JAVAH)
|
||||
COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS)
|
||||
|
||||
# On Mac OS X, export an env variable so that the tests can run without
|
||||
@@ -393,7 +392,6 @@
|
||||
JAVADOC = @JAVADOC@
|
||||
JAVAC_FLAGS = @JAVAC_FLAGS@
|
||||
JAVAC_COMPAT_FLAGS = @JAVAC_COMPAT_FLAGS@
|
||||
-JAVAH = @JAVAH@
|
||||
JAR = @JAR@
|
||||
|
||||
JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@
|
||||
@@ -494,8 +492,8 @@
|
||||
install-static: @INSTALL_STATIC_RULES@
|
||||
|
||||
# JavaHL target aliases
|
||||
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-remote-javah javahl-types-javah javahl-util-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
|
||||
-install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
|
||||
+javahl: mkdir-init javahl-java javahl-callback-java javahl-remote-java javahl-types-java javahl-util-java javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
|
||||
+install-javahl: javahl install-javahl-java install-javahl-lib
|
||||
javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
|
||||
|
||||
clean-javahl:
|
||||
--- subversion-1.10.2/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java 2014-05-27 14:22:06.000000000 +0200
|
||||
+++ subversion-1.10.2/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java 2018-09-11 10:26:13.980546426 +0200
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
package org.apache.subversion.javahl.callback;
|
||||
|
||||
+import java.lang.annotation.Native;
|
||||
+
|
||||
/**
|
||||
* <p>The interface for requesting authentication credentials from the
|
||||
* user. Should the javahl bindings need the matching information,
|
||||
@@ -40,17 +42,17 @@
|
||||
/**
|
||||
* Reject the connection to the server.
|
||||
*/
|
||||
- public static final int Reject = 0;
|
||||
+ @Native public static final int Reject = 0;
|
||||
|
||||
/**
|
||||
* Accept the connection to the server <i>once</i>.
|
||||
*/
|
||||
- public static final int AcceptTemporary = 1;
|
||||
+ @Native public static final int AcceptTemporary = 1;
|
||||
|
||||
/**
|
||||
* Accept the connection to the server <i>forever</i>.
|
||||
*/
|
||||
- public static final int AcceptPermanently = 2;
|
||||
+ @Native public static final int AcceptPermanently = 2;
|
||||
|
||||
/**
|
||||
* If there are problems with the certifcate of the SSL-server, this
|
||||
--- subversion-1.10.2/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java 2013-04-15 19:11:15.000000000 +0200
|
||||
+++ subversion-1.10.2/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java 2018-09-11 10:19:35.598432341 +0200
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
package org.apache.subversion.javahl;
|
||||
|
||||
+import java.lang.annotation.Native;
|
||||
+
|
||||
/**
|
||||
* The constants in this interface describe the changes to an item to
|
||||
* be committed.
|
||||
@@ -32,36 +34,36 @@
|
||||
/**
|
||||
* the item has been added
|
||||
*/
|
||||
- public static final int Add=1;
|
||||
+ @Native public static final int Add=1;
|
||||
|
||||
/**
|
||||
* the item has been deleted
|
||||
*/
|
||||
- public static final int Delete=2;
|
||||
+ @Native public static final int Delete=2;
|
||||
|
||||
/**
|
||||
* the item has text modifications
|
||||
*/
|
||||
- public static final int TextMods=4;
|
||||
+ @Native public static final int TextMods=4;
|
||||
|
||||
/**
|
||||
* the item has property modifications
|
||||
*/
|
||||
- public static final int PropMods=8;
|
||||
+ @Native public static final int PropMods=8;
|
||||
|
||||
/**
|
||||
* the item has been copied
|
||||
*/
|
||||
- public static final int IsCopy=16;
|
||||
+ @Native public static final int IsCopy=16;
|
||||
|
||||
/**
|
||||
* the item has a lock token
|
||||
*/
|
||||
- public static final int LockToken = 32;
|
||||
+ @Native public static final int LockToken = 32;
|
||||
|
||||
/**
|
||||
* the item was moved to this location
|
||||
* @since 1.8
|
||||
*/
|
||||
- public static int MovedHere = 64;
|
||||
+ @Native public static int MovedHere = 64;
|
||||
}
|
||||
--- subversion-1.10.2/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java 2013-11-21 20:21:24.000000000 +0100
|
||||
+++ subversion-1.10.2/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java 2018-09-11 10:18:59.654241604 +0200
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
package org.apache.subversion.javahl.types;
|
||||
|
||||
+import java.lang.annotation.Native;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
@@ -144,42 +145,42 @@
|
||||
/**
|
||||
* last committed revision
|
||||
*/
|
||||
- public static final Revision HEAD = new Revision(Kind.head);
|
||||
+ @Native public static final Revision HEAD = new Revision(Kind.head);
|
||||
|
||||
/**
|
||||
* first existing revision
|
||||
*/
|
||||
- public static final Revision START = new Revision(Kind.unspecified);
|
||||
+ @Native public static final Revision START = new Revision(Kind.unspecified);
|
||||
|
||||
/**
|
||||
* unspecified revision
|
||||
*/
|
||||
- public static final Revision UNSPECIFIED = START;
|
||||
+ @Native public static final Revision UNSPECIFIED = START;
|
||||
|
||||
/**
|
||||
* last committed revision, needs working copy
|
||||
*/
|
||||
- public static final Revision COMMITTED = new Revision(Kind.committed);
|
||||
+ @Native public static final Revision COMMITTED = new Revision(Kind.committed);
|
||||
|
||||
/**
|
||||
* previous committed revision, needs working copy
|
||||
*/
|
||||
- public static final Revision PREVIOUS = new Revision(Kind.previous);
|
||||
+ @Native public static final Revision PREVIOUS = new Revision(Kind.previous);
|
||||
|
||||
/**
|
||||
* base revision of working copy
|
||||
*/
|
||||
- public static final Revision BASE = new Revision(Kind.base);
|
||||
+ @Native public static final Revision BASE = new Revision(Kind.base);
|
||||
|
||||
/**
|
||||
* working version in working copy
|
||||
*/
|
||||
- public static final Revision WORKING = new Revision(Kind.working);
|
||||
+ @Native public static final Revision WORKING = new Revision(Kind.working);
|
||||
|
||||
/**
|
||||
* Marker revision number for no real revision
|
||||
*/
|
||||
- public static final int SVN_INVALID_REVNUM = -1;
|
||||
+ @Native public static final int SVN_INVALID_REVNUM = -1;
|
||||
|
||||
/**
|
||||
* class to specify a Revision by number
|
||||
10
subversion-1.10.2-javadoc.patch
Normal file
10
subversion-1.10.2-javadoc.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- subversion-1.10.2/Makefile.in 2018-02-16 05:00:12.000000000 +0100
|
||||
+++ subversion-1.10.2/Makefile.in 2018-09-11 10:55:03.062316623 +0200
|
||||
@@ -721,7 +721,6 @@
|
||||
doc-javahl:
|
||||
$(JAVADOC) -d $(abs_builddir)/doc/javadoc \
|
||||
-sourcepath $(top_srcdir)/subversion/bindings/javahl/src \
|
||||
- -link http://java.sun.com/javase/6/docs/api/ \
|
||||
org.tigris.subversion.javahl \
|
||||
org.apache.subversion.javahl \
|
||||
org.apache.subversion.javahl.callback \
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 11 08:36:11 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patches:
|
||||
* subversion-1.10.2-java10.patch
|
||||
+ Partly upstream patch to remove javah requirement to build
|
||||
Subversion Java bindings.
|
||||
+ Apply only for builds with jdk10+ that don't have javah tool
|
||||
any more
|
||||
* subversion-1.10.2-javadoc.patch
|
||||
+ Avoid loading Internet URLs during the build
|
||||
- Allow building with all Java versions starting with 1.6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 23 13:48:11 UTC 2018 - astieger@suse.com
|
||||
|
||||
|
||||
@ -54,6 +54,8 @@ Source43: subversion.svndiff.sh
|
||||
Source50: https://people.apache.org/keys/group/subversion.asc#/subversion.keyring
|
||||
Source51: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2.asc
|
||||
Source92: %{name}-rpmlintrc
|
||||
Patch0: subversion-1.10.2-java10.patch
|
||||
Patch1: subversion-1.10.2-javadoc.patch
|
||||
Patch11: subversion.libtool-verbose.patch
|
||||
Patch20: subversion-swig-perl-install_vendor.patch
|
||||
Patch23: subversion-swig-perl-Wall.patch
|
||||
@ -89,8 +91,6 @@ BuildRequires: pkgconfig(serf-1) >= 1.3.4
|
||||
BuildRequires: pkgconfig(sqlite3) >= %{sqlite_minimum_version}
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
# Package needs javah which was deprecated with this version of java
|
||||
BuildConflicts: java-devel >= 10
|
||||
# in openSUSE Leap 42.3, lz4 was incorrectly packaged
|
||||
BuildConflicts: pkgconfig(liblz4) = 124
|
||||
Requires: libsqlite3-0 >= %{sqlite_minimum_version}
|
||||
@ -241,6 +241,10 @@ parameters and keywords for the svn command and other tools.
|
||||
|
||||
%prep
|
||||
%setup -q -a 4
|
||||
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 10}%{!?pkg_vcmp:0}
|
||||
%patch0 -p1
|
||||
%endif
|
||||
%patch1 -p1
|
||||
%patch11 -p1
|
||||
%patch20 -p1
|
||||
%patch23 -p1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user