diff options
Diffstat (limited to 'java/sablevm-classpath/files')
4 files changed, 0 insertions, 104 deletions
diff --git a/java/sablevm-classpath/files/patch-include-Makefile.in b/java/sablevm-classpath/files/patch-include-Makefile.in deleted file mode 100644 index 154d0b3be8a4..000000000000 --- a/java/sablevm-classpath/files/patch-include-Makefile.in +++ /dev/null @@ -1,55 +0,0 @@ ---- include/Makefile.in.orig 2007-03-30 02:30:43.000000000 -0400 -+++ include/Makefile.in 2012-09-28 12:17:30.000000000 -0400 -@@ -59,7 +59,7 @@ - *) f=$$p;; \ - esac; - am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(includedir)" -+am__installdirs = "$(DESTDIR)$(pkgincludedir)" - includeHEADERS_INSTALL = $(INSTALL_HEADER) - HEADERS = $(include_HEADERS) - ETAGS = etags -@@ -271,7 +271,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - vm_classes = @vm_classes@ --include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h -+include_HEADERS = jawt.h jawt_md.h - DISTCLEANFILES = jni_md.h - ARG_JNI_JAVAH = -jni - ARG_CLASSPATH_JAVAH = -bootclasspath -@@ -470,20 +470,20 @@ - uninstall-info-am: - install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) -- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" -+ test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ -- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ -+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ -+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ - done - - uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(includedir)/$$f"; \ -+ echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ - done - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -@@ -566,7 +566,7 @@ - @CREATE_JNI_HEADERS_FALSE@all-local: - all-am: Makefile $(HEADERS) config.h all-local - installdirs: -- for dir in "$(DESTDIR)$(includedir)"; do \ -+ for dir in "$(DESTDIR)$(pkgincludedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done - install: install-am diff --git a/java/sablevm-classpath/files/patch-lib-Makefile b/java/sablevm-classpath/files/patch-lib-Makefile deleted file mode 100644 index dc62f973f35b..000000000000 --- a/java/sablevm-classpath/files/patch-lib-Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/Makefile.in.orig 2007-03-30 06:29:03.000000000 +0000 -+++ lib/Makefile.in 2008-02-22 18:45:25.000000000 +0000 -@@ -494,10 +494,10 @@ - sinclude $(JAVA_DEPEND) - - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@install-data-hook: --@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ mkdir -p $(JAVA_HOME)/{lib,jre/lib} -+@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ mkdir -p $(JAVA_HOME)/lib $(JAVA_HOME)/jre/lib - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ -unlink $(JAVA_HOME)/jre/lib/rt.jar - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ for f in $(pkgdata_DATA) ; do \ --@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/{lib,jre/lib}/$$f ; \ -+@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/lib/$$f $(JAVA_HOME)/jre/lib/$$f ; \ - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ $(LN_S) $(pkgdatadir)/$$f $(JAVA_HOME)/lib/$$f ; \ - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ $(LN_S) ../../lib/$$f $(JAVA_HOME)/jre/lib/$$f ; \ - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ done -@@ -505,7 +505,7 @@ - - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@uninstall-hook: - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ for f in $(pkgdata_DATA) ; do \ --@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/{lib,jre/lib}/$$f ; \ -+@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/lib/$$f $(JAVA_HOME)/jre/lib/$$f ; \ - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ done - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ -unlink $(JAVA_HOME)/jre/lib/rt.jar - @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ -(cd $(JAVA_HOME) && rmdir -p lib jre/lib) diff --git a/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c b/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c deleted file mode 100644 index 30e29a8dbed4..000000000000 --- a/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c +++ /dev/null @@ -1,14 +0,0 @@ ---- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c.orig 2013-12-16 10:19:17.000000000 +0100 -+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c 2013-12-16 10:19:47.000000000 +0100 -@@ -42,8 +42,9 @@ - #include <pango/pango.h> - #include <pango/pangoft2.h> - #include <pango/pangofc-font.h> --#include <freetype/ftglyph.h> --#include <freetype/ftoutln.h> -+#include <ft2build.h> -+#include FT_GLYPH_H -+#include FT_OUTLINE_H - #include "native_state.h" - #include "gdkfont.h" - #include "gnu_java_awt_peer_gtk_GdkTextLayout.h" diff --git a/java/sablevm-classpath/files/patch-resource-Makefile.in b/java/sablevm-classpath/files/patch-resource-Makefile.in deleted file mode 100644 index 54e67b7a746d..000000000000 --- a/java/sablevm-classpath/files/patch-resource-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- resource/Makefile.in.orig 2007-03-30 02:30:09.000000000 -0400 -+++ resource/Makefile.in 2012-10-01 17:02:09.000000000 -0400 -@@ -268,7 +268,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - vm_classes = @vm_classes@ --security_DATA = java/security/classpath.security -+security_DATA = java/security/SableVM.security - securitydir = $(libdir)/security - all: all-am - |