Sync from SUSE:SLFO:Main libreadline-java revision 13523d2229fd1cbe3a274d3f40339ab3
This commit is contained in:
parent
35751fa35a
commit
edd57bcca1
27
libreadline-java-gcc14.patch
Normal file
27
libreadline-java-gcc14.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
--- libreadline-java-0.8.3/src/native/org_gnu_readline_Readline.c 2024-05-06 17:37:38.514389018 +0200
|
||||||
|
+++ libreadline-java-0.8.3/src/native/org_gnu_readline_Readline.c 2024-05-06 17:56:42.055629445 +0200
|
||||||
|
@@ -198,18 +198,18 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
static char** globalStringInternals[] = {
|
||||||
|
- /* const */ &rl_library_version,
|
||||||
|
- /* const */ &rl_readline_name,
|
||||||
|
+ /* const */ (char **) &rl_library_version,
|
||||||
|
+ /* const */ (char **) &rl_readline_name,
|
||||||
|
&undefinedInternalString, /* &rl_prompt, */
|
||||||
|
&rl_line_buffer,
|
||||||
|
&undefinedInternalString, /* const &rl_terminal_name, */
|
||||||
|
&undefinedInternalString, /* &rl_executing_macro, */
|
||||||
|
- /* const */ &rl_basic_word_break_characters,
|
||||||
|
- /* const */ &rl_completer_word_break_characters,
|
||||||
|
- /* const */ &rl_completer_quote_characters,
|
||||||
|
+ /* const */ (char **) &rl_basic_word_break_characters,
|
||||||
|
+ /* const */ (char **) &rl_completer_word_break_characters,
|
||||||
|
+ /* const */ (char **) &rl_completer_quote_characters,
|
||||||
|
&undefinedInternalString, /* const &rl_basic_quote_characters, */
|
||||||
|
&undefinedInternalString, /* const &rl_filename_quote_characters, */
|
||||||
|
- /* const */ &rl_special_prefixes,
|
||||||
|
+ /* const */ (char **) &rl_special_prefixes,
|
||||||
|
|
||||||
|
&undefinedInternalString, /* &history_word_delimiters, */
|
||||||
|
&undefinedInternalString, /* &history_no_expand_chars, */
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 6 15:58:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* libreadline-java-gcc14.patch
|
||||||
|
+ cast out constness and fix build with gcc14
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Feb 21 14:36:44 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Use %patch -P N instead of deprecated %patchN.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon May 9 14:32:42 UTC 2022 - David Anes <david.anes@suse.com>
|
Mon May 9 14:32:42 UTC 2022 - David Anes <david.anes@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libreadline-java
|
# spec file for package libreadline-java
|
||||||
#
|
#
|
||||||
# Copyright (c) 2022 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# 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
|
||||||
@ -16,6 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%global make make
|
||||||
Name: libreadline-java
|
Name: libreadline-java
|
||||||
Version: 0.8.3
|
Version: 0.8.3
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -28,6 +29,7 @@ Source1: baselibs.conf
|
|||||||
Patch0: libreadline-java-ncurses.patch
|
Patch0: libreadline-java-ncurses.patch
|
||||||
Patch1: libreadline-java-libdir.patch
|
Patch1: libreadline-java-libdir.patch
|
||||||
Patch3: libreadline-java-0.8.0-jdk10.patch
|
Patch3: libreadline-java-0.8.0-jdk10.patch
|
||||||
|
Patch4: libreadline-java-gcc14.patch
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: java-devel >= 1.8
|
BuildRequires: java-devel >= 1.8
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
@ -53,17 +55,18 @@ wrapper. This package contains the javadoc documentation for it.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0
|
%patch -P 0
|
||||||
%patch1
|
%patch -P 1
|
||||||
%patch3 -p1
|
%patch -P 3 -p1
|
||||||
|
%patch -P 4 -p1
|
||||||
find . -name "*.jar" -exec rm -f {} \;
|
find . -name "*.jar" -exec rm -f {} \;
|
||||||
sed -i 's|@LIBDIR@|%{_libdir}|' src/org/gnu/readline/Readline.java
|
sed -i 's|@LIBDIR@|%{_libdir}|' src/org/gnu/readline/Readline.java
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export JAVA_HOME=%{java_home}
|
export JAVA_HOME=%{java_home}
|
||||||
export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
|
export PATH=$JAVA_HOME/bin:$JAVA_HOME/jre/bin:$PATH
|
||||||
make CFLAGS="%{optflags} -fPIC -DPOSIX" T_LIBS=JavaEditline -j1
|
%make CFLAGS="%{optflags} -fPIC -DPOSIX" T_LIBS=JavaEditline -j1
|
||||||
make apidoc -j1
|
%make apidoc -j1
|
||||||
|
|
||||||
# fix debuginfo package
|
# fix debuginfo package
|
||||||
rm -f org test
|
rm -f org test
|
||||||
|
Loading…
Reference in New Issue
Block a user