patches/classpath/classpath-0.99.*.patch: via Redfoxmoon.

4 files changed, 45 insertions, 0 deletions

diff --git a/patches/classpath/classpath-0.99.fix-alsa-compilation.patch b/patches/classpath/classpath-0.99.fix-alsa-compilation.patch
new file mode 100644
index 00000000..a8d1026a
--- /dev/null
+++ b/patches/classpath/classpath-0.99.fix-alsa-compilation.patch
@@ -0,0 +1,12 @@
+diff -ru classpath-0.99.orig/native/jni/midi-alsa/Makefile.am classpath-0.99/native/jni/midi-alsa/Makefile.am
+--- classpath-0.99.orig/native/jni/midi-alsa/Makefile.am	2008-06-23 16:12:25.000000000 +0200
++++ classpath-0.99/native/jni/midi-alsa/Makefile.am	2018-06-07 16:04:06.060732894 +0200
+@@ -4,7 +4,7 @@
+ gnu_javax_sound_midi_alsa_AlsaPortDevice.c \
+ gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c
+ 
+-libgjsmalsa_la_LIBADD = -lasound
++libgjsmalsa_la_LIBADD = -lasound $(top_srcdir)/native/jni/classpath/libclasspath.la
+ libgjsmalsa_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+ 
+ AM_LDFLAGS = @CLASSPATH_MODULE@
diff --git a/patches/classpath/classpath-0.99.fix-configure.ac-libX11linking.patch b/patches/classpath/classpath-0.99.fix-configure.ac-libX11linking.patch
new file mode 100644
index 00000000..c3d4e8c1
--- /dev/null
+++ b/patches/classpath/classpath-0.99.fix-configure.ac-libX11linking.patch
@@ -0,0 +1,11 @@
+--- classpath-0.99.orig/configure.ac	2012-03-08 19:03:15.000000000 +0100
++++ classpath-0.99/configure.ac	2018-06-07 16:14:32.962168731 +0200
+@@ -553,7 +553,7 @@
+     dnl Check if we can link against the XTest library and set
+     dnl HAVE_XTEST accordingly.
+     AC_CHECK_LIB([Xtst], [XTestQueryExtension],
+-                 [AC_DEFINE(HAVE_XTEST, 1, [Define to 1 if you have libXtst.])[XTEST_LIBS="$XTEST_LIBS -X11 -lXtst"]],
++                 [AC_DEFINE(HAVE_XTEST, 1, [Define to 1 if you have libXtst.])[XTEST_LIBS="$XTEST_LIBS -lX11 -lXtst"]],
+                  [true],
+                  [${X_LIBS}])
+ 
diff --git a/patches/classpath/classpath-0.99.gcc7-fall-through-fix.patch b/patches/classpath/classpath-0.99.gcc7-fall-through-fix.patch
new file mode 100644
index 00000000..896dd7e9
--- /dev/null
+++ b/patches/classpath/classpath-0.99.gcc7-fall-through-fix.patch
@@ -0,0 +1,11 @@
+--- classpath-0.99.orig/native/jni/java-math/gnu_java_math_GMP.c	2008-06-22 04:05:39.000000000 +0200
++++ classpath-0.99/native/jni/java-math/gnu_java_math_GMP.c	2018-06-07 16:26:12.407213673 +0200
+@@ -1131,7 +1131,7 @@
+         res = 0;
+         break;
+       case 1:
+-        res = mpz_popcount (_this);
++        res = mpz_popcount (_this); /* Falls through. */
+       default:
+         JCL_ThrowException (env, "java/lang/Error",
+                             "Unexpected sign value for a native MPI");
diff --git a/patches/classpath/classpath-0.99.no-warn-deprecated-declaration.patch b/patches/classpath/classpath-0.99.no-warn-deprecated-declaration.patch
new file mode 100644
index 00000000..511ddc6b
--- /dev/null
+++ b/patches/classpath/classpath-0.99.no-warn-deprecated-declaration.patch
@@ -0,0 +1,11 @@
+--- classpath-0.99.orig/native/jni/gtk-peer/Makefile.am	2008-06-23 16:12:24.000000000 +0200
++++ classpath-0.99/native/jni/gtk-peer/Makefile.am	2018-06-07 16:12:33.902649795 +0200
+@@ -52,7 +52,7 @@
+ 
+ AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \
+              @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@
+-AM_CPPFLAGS = @CLASSPATH_INCLUDES@
++AM_CPPFLAGS = @CLASSPATH_INCLUDES@ -Wno-deprecated-declarations
+ 
+ # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk
+ # headers contain broken prototypes (by design, see gtkitemfactory.h).