pool/libreadline-java
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 627287 from Java:packages

Browse Source 
- Version bump to 0.8.2:
  * bugfix: using tab completion would crash the virtual machine
  * getVar()/setVar() (Bernhard)
  * unicode support (Andrew)
  * added bats test case and running on travis ci (Andrew)
  * various build fixes (Andrew)
- Update URL/Source to point to current location
- Refresh patches:
  * libreadline-java-0.8.0-jdk10.patch
  * libreadline-java-0.8.0-sourcetarget.patch
  * libreadline-java-ncurses.patch
- Remove upstream merged:
  * libreadline-java-0.8.0-missing-return-type.patch

OBS-URL: https://build.opensuse.org/request/show/627287
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreadline-java?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2018-08-07 08:49:43 +00:00 committed by Git OBS Bridge
commit 9563fce20d
8 changed files with 71 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libreadline-java-0.8.0-jdk10.patch
View File

@ -1,5 +1,7 @@
--- libreadline-java-0.8.0/src/Makefile 2017-12-18 11:50:48.209823175 +0100 Index: libreadline-java-0.8.2/src/Makefile
+++ libreadline-java-0.8.0/src/Makefile 2017-12-18 11:51:06.361823244 +0100 ===================================================================
--- libreadline-java-0.8.2.orig/src/Makefile
+++ libreadline-java-0.8.2/src/Makefile
@@ -2,11 +2,12 @@ @@ -2,11 +2,12 @@
# #
@ -15,23 +17,24 @@
native: always native: always
cd native ; $(MAKE) T_LIBS="$(T_LIBS)" JAVAINCLUDE="$(JAVAINCLUDE)" \ cd native ; $(MAKE) T_LIBS="$(T_LIBS)" JAVAINCLUDE="$(JAVAINCLUDE)" \
--- libreadline-java-0.8.0/src/native/Makefile 2017-12-18 11:50:48.209823175 +0100 Index: libreadline-java-0.8.2/src/native/Makefile
+++ libreadline-java-0.8.0/src/native/Makefile 2017-12-18 11:52:03.693823460 +0100 ===================================================================
@@ -103,14 +103,10 @@ --- libreadline-java-0.8.2.orig/src/native/Makefile
+++ libreadline-java-0.8.2/src/native/Makefile
@@ -132,14 +132,10 @@ endif
getline.$(OBJ_EXT): getline.c getline.$(OBJ_EXT): getline.c
$(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -D$(TG) -c getline.c $(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) -c getline.c
-org_gnu_readline_Readline.$(OBJ_EXT): org_gnu_readline_Readline.h \ -org_gnu_readline_Readline.$(OBJ_EXT): org_gnu_readline_Readline.h \
- org_gnu_readline_Readline.c - org_gnu_readline_Readline.c
- $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -D$(TG) \ - $(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) \
- -c org_gnu_readline_Readline.c - -c org_gnu_readline_Readline.c
+org_gnu_readline_Readline.$(OBJ_EXT): org_gnu_readline_Readline.h org_gnu_readline_Readline.c +org_gnu_readline_Readline.$(OBJ_EXT): org_gnu_readline_Readline.h org_gnu_readline_Readline.c
+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -D$(TG) -c org_gnu_readline_Readline.c + $(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) -c org_gnu_readline_Readline.c
org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class
- javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline - $(JAVA_HOME)/bin/javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline
- touch org_gnu_readline_Readline.h - touch org_gnu_readline_Readline.h
clean: clean:
-rm -f org_gnu_readline_Readline.h \ -rm -f org_gnu_readline_Readline.h \
Only in libreadline-java-0.8.0/src/native: Makefile.orig

13
libreadline-java-0.8.0-missing-return-type.patch
View File

@ -1,13 +0,0 @@
Index: libreadline-java-0.8.0/src/native/org_gnu_readline_Readline.c
===================================================================
--- libreadline-java-0.8.0.orig/src/native/org_gnu_readline_Readline.c
+++ libreadline-java-0.8.0/src/native/org_gnu_readline_Readline.c
@@ -430,7 +430,7 @@ const char *java_completer(char *text, i
jtext = (*jniEnv)->NewStringUTF(jniEnv,text);
if (jniMethodId == 0) {
- return;
+ return ((const char *)NULL);
}
completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject,

18
libreadline-java-0.8.0-sourcetarget.patch
View File

@ -1,11 +1,13 @@
--- libreadline-java-0.8.0/Makefile 2017-12-18 11:50:48.197823175 +0100 Index: libreadline-java-0.8.2/Makefile
+++ libreadline-java-0.8.0/Makefile 2017-12-18 13:31:13.714940274 +0100 ===================================================================
@@ -70,7 +70,7 @@ --- libreadline-java-0.8.2.orig/Makefile
+++ libreadline-java-0.8.2/Makefile
@@ -37,7 +37,7 @@ T_LIBS = JavaReadline
## normal javac ## normal javac
JAVAC = javac JAVAC = $(JAVA_HOME)/bin/javac
-JC_FLAGS = -JC_FLAGS += -target 1.5 -source 1.5
+JC_FLAGS = -source 1.6 -target 1.6 +JC_FLAGS += -target 1.6 -source 1.6
# installation directories --------------------------------------------------
## with jikes
#JAVAC = jikes

3
libreadline-java-0.8.0-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cdcfd9910bfe2dca4cd08b2462ec05efee7395e9b9c3efcb51e85fa70548c890
size 77122

3
libreadline-java-0.8.2-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0a3d9b867e98a463e74da9cd495dcd1d6f67722bf4a40f9ce21f7df634ae234
size 96508

36
libreadline-java-ncurses.patch
View File

@ -1,24 +1,26 @@
diff -urN ../libreadline-java-0.8.0.orig/src/native/Makefile ./src/native/Makefile Index: src/native/Makefile
--- ../libreadline-java-0.8.0.orig/src/native/Makefile 2003-01-07 05:14:35.000000000 -0500 ===================================================================
+++ ./src/native/Makefile 2007-07-05 13:54:47.000000000 -0400 --- src/native/Makefile.orig
@@ -45,9 +45,8 @@ +++ src/native/Makefile
CFLAGS=-DWIN32=$(WIN32) -D__IBMC__ @@ -43,10 +43,8 @@ NATIVE_CFLAGS := -fpic -DPOSIX $(CFLAGS)
else LD_FLAGS = -shared
INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC) INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC)
-LIBPATH = -L/usr/lib/termcap -LIBPATH = -L/usr/lib/termcap
-
-JavaReadline_LIBS = -lreadline -ltermcap -lhistory -JavaReadline_LIBS = -lreadline -ltermcap -lhistory
-JavaEditline_LIBS = -ledit -ltermcap -JavaEditline_LIBS = -ledit -ltermcap
+JavaReadline_LIBS = -lreadline -ltinfo -lhistory +JavaReadline_LIBS = -lreadline -ltinfo -lhistory
+JavaEditline_LIBS = -ledit -lncurses +JavaEditline_LIBS = -ledit -lncurses
ifeq (cygwin,$(WIN32)) JavaGetline_LIBS =
JavaGetline_LIBS = -lcygwin
endif
@@ -97,7 +96,7 @@
$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
$(OBJECTS) -W1,-e,_readline_init@12
else
- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
+ $(CC) -shared $(OBJECTS) $($(TG)_LIBS) -o $@
endif
endif endif
@@ -125,7 +123,7 @@ ifeq (MSWIN,$(OS_FLAVOR))
$(CC) $(LD_FLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -Fe$@
endif
ifeq (LINUX,$(OS_FLAVOR))
- $(CC) $(LD_FLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
+ $(CC) $(LD_FLAGS) $(OBJECTS) $($(TG)_LIBS) -o $@
endif
ifeq (MAC,$(OS_FLAVOR))
$(CC) $(LD_FLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@

17
libreadline-java.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Aug 3 07:26:14 UTC 2018 - tchvatal@suse.com
- Version bump to 0.8.2:
* bugfix: using tab completion would crash the virtual machine
* getVar()/setVar() (Bernhard)
* unicode support (Andrew)
* added bats test case and running on travis ci (Andrew)
* various build fixes (Andrew)
- Update URL/Source to point to current location
- Refresh patches:
* libreadline-java-0.8.0-jdk10.patch
* libreadline-java-0.8.0-sourcetarget.patch
* libreadline-java-ncurses.patch
- Remove upstream merged:
* libreadline-java-0.8.0-missing-return-type.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 18 10:57:33 UTC 2017 - fstrba@suse.com Mon Dec 18 10:57:33 UTC 2017 - fstrba@suse.com

17
libreadline-java.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreadline-java # spec file for package libreadline-java
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,17 +17,16 @@
Name: libreadline-java Name: libreadline-java
Version: 0.8.0 Version: 0.8.2
Release: 0 Release: 0
Summary: Java Wrapper for the EditLine Library Summary: Java Wrapper for the EditLine Library
License: LGPL-2.1+ License: LGPL-2.1-or-later
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://java-readline.sf.net/ URL: https://github.com/aclemons/java-readline
Source0: http://download.sourceforge.net/java-readline/libreadline-java-0.8.0-src.tar.gz Source0: https://github.com/aclemons/java-readline/releases/download/v%{version}/%{name}-%{version}-src.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
Patch0: libreadline-java-ncurses.patch Patch0: libreadline-java-ncurses.patch
Patch1: libreadline-java-libdir.patch Patch1: libreadline-java-libdir.patch
Patch2: libreadline-java-0.8.0-missing-return-type.patch
Patch3: libreadline-java-0.8.0-jdk10.patch Patch3: libreadline-java-0.8.0-jdk10.patch
Patch4: libreadline-java-0.8.0-sourcetarget.patch Patch4: libreadline-java-0.8.0-sourcetarget.patch
BuildRequires: fdupes BuildRequires: fdupes
@ -57,7 +56,6 @@ wrapper. This package contains the javadoc documentation for it.
%setup -q %setup -q
%patch0 %patch0
%patch1 %patch1
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
@ -77,8 +75,6 @@ do
done done
%install %install
# install jar file and JNI library under %{_libdir}/%{name}
# FIXME: fix jpackage-utils to handle multilib correctly
mkdir -p %{buildroot}%{_libdir}/%{name} mkdir -p %{buildroot}%{_libdir}/%{name}
install -m 644 %{name}.jar \ install -m 644 %{name}.jar \
%{buildroot}%{_libdir}/%{name}/%{name}.jar %{buildroot}%{_libdir}/%{name}/%{name}.jar
@ -90,7 +86,8 @@ cp -a api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files %files
%doc ChangeLog NEWS README README.1st VERSION COPYING.LIB %license COPYING.LIB
%doc ChangeLog NEWS README README.1st VERSION
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%attr(-,root,root) %{_libdir}/%{name}/* %attr(-,root,root) %{_libdir}/%{name}/*