commit e9440f4cc2800e6d0030e7c82408ea110ad5d948
Author: Jakub Bogusz <[email protected]>
Date: Tue Dec 7 17:56:50 2021 +0100
- added javah patch: replace javah (removed from JDK 10+) by javac -h
(requires JDK 8+)
libcaca-javah.patch | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
libcaca.spec | 4 ++-
2 files changed, 77 insertions(+), 1 deletion(-)
---
diff --git a/libcaca.spec b/libcaca.spec
index 58540f6..31f56ca 100644
--- a/libcaca.spec
+++ b/libcaca.spec
@@ -30,6 +30,7 @@ Patch0: %{name}-monodir.patch
Patch1: ruby-vendordir.patch
Patch2: %{name}-sh.patch
Patch3: %{name}-plugins.patch
+Patch4: %{name}-javah.patch
URL: http://caca.zoy.org/wiki/libcaca
BuildRequires: OpenGL-devel
BuildRequires: autoconf >= 2.50
@@ -57,7 +58,7 @@ BuildRequires: zlib-devel
BuildRequires: mono-csharp
%endif
%if %{with java}
-BuildRequires: jdk
+BuildRequires: jdk >= 1.8
BuildRequires: rpm-javaprov
# org_zoy_caca_Attribute.c:14:18: fatal error: caca.h: No such file or
directory
BuildRequires: libcaca-devel
@@ -276,6 +277,7 @@ Wiązania języka Ruby do libcaca.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__libtoolize}
diff --git a/libcaca-javah.patch b/libcaca-javah.patch
new file mode 100644
index 0000000..8d042fc
--- /dev/null
+++ b/libcaca-javah.patch
@@ -0,0 +1,74 @@
+--- libcaca-0.99.beta20/configure.ac.orig 2021-12-06 22:08:57.028931660
+0100
++++ libcaca-0.99.beta20/configure.ac 2021-12-07 07:32:44.049213562 +0100
+@@ -438,9 +438,8 @@ AM_CONDITIONAL(USE_CSHARP, test "${ac_cv
+ ac_cv_my_have_java="no"
+ if test "${enable_java}" != "no" -a "${ac_cv_my_have_kernel}" != "yes"; then
+ AC_PATH_PROG(JAVAC, javac, no)
+- AC_PATH_PROG(JAVAH, javah, no)
+ AC_PATH_PROG(JAR, jar, no)
+- if test "${JAVAC}" != "no" -a "${JAVAH}" != "no" -a "${JAR}" != "no"; then
++ if test "${JAVAC}" != "no" -a "${JAR}" != "no"; then
+ if test "$JAVA_HOME" = ""; then
+ # Try to resolve JAVA_HOME
+ JAVAC_EXE="$JAVAC"
+--- libcaca-0.99.beta20/java/Makefile.am.orig 2016-01-26 18:58:28.000000000
+0100
++++ libcaca-0.99.beta20/java/Makefile.am 2021-12-07 07:31:52.496537741
+0100
+@@ -55,7 +55,7 @@ java_jni_java = \
+ org/zoy/caca/TimeoutException.java \
+ org/zoy/caca/Display.java
+
+-JAVAH_FLAGS = -d . -classpath .
++JAVAH_FLAGS = -h . -classpath .
+
+ $(java_jni_classes): $(java_src)
+ $(JAVAC) -d . $(java_src)
+@@ -65,31 +65,31 @@ $(java_jni_classes): $(java_src)
+ # hence the `touch` so that javah is not run at every `make`.
+
+ org_zoy_caca_Attribute.h: org/zoy/caca/Attribute.class
+- $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Attribute
++ $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Attribute.java
+ @touch org_zoy_caca_Attribute.h
+
+ org_zoy_caca_Caca.h: org/zoy/caca/Caca.class
+- $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Caca
++ $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Caca.java
+ @touch org_zoy_caca_Caca.h
+
+ org_zoy_caca_Canvas.h: org/zoy/caca/Canvas.class
+- $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Canvas
++ $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Canvas.java
+ @touch org_zoy_caca_Canvas.h
+
+ org_zoy_caca_Display.h: org/zoy/caca/Display.class
+- $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Display
++ $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Display.java
+ @touch org_zoy_caca_Display.h
+
+ org_zoy_caca_Dither.h: org/zoy/caca/Dither.class
+- $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Dither
++ $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Dither.java
+ @touch org_zoy_caca_Dither.h
+
+ org_zoy_caca_Event.h: org/zoy/caca/Event.class
+- $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Event
++ $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Event.java
+ @touch org_zoy_caca_Event.h
+
+ org_zoy_caca_Font.h: org/zoy/caca/Font.class
+- $(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Font
++ $(JAVAC) $(JAVAH_FLAGS) org/zoy/caca/Font.java
+ @touch org_zoy_caca_Font.h
+
+ CLEANFILES = $(noinst_DATA) $(java_jar) \
+@@ -112,8 +112,8 @@ libcaca_java_la_LDFLAGS = -shared $(JAVA
+ libcaca_java_la_LIBADD = ../caca/libcaca.la
+
+ examples/Driver.class: examples/Driver.java
+- $(JAVAC) $^
++ $(JAVAC) -classpath . $^
+
+ examples/TrueColor.class: examples/TrueColor.java
+- $(JAVAC) $^
++ $(JAVAC) -classpath . $^
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcaca.git/commitdiff/e9440f4cc2800e6d0030e7c82408ea110ad5d948
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
