summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2004-11-16 18:40:33 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2004-11-16 18:40:33 +0000
commit9ca7b3928ff9434c10577d5d71d565345fd4783f (patch)
tree5adb766bba511df7ca68a5753649605c1e118a2f /dev-java/libgtk-java/files
parentAdded to ~ppc. (Manifest recommit) (diff)
downloadgentoo-2-9ca7b3928ff9434c10577d5d71d565345fd4783f.tar.gz
gentoo-2-9ca7b3928ff9434c10577d5d71d565345fd4783f.tar.bz2
gentoo-2-9ca7b3928ff9434c10577d5d71d565345fd4783f.zip
Initial import. Fixes #70559.
Diffstat (limited to 'dev-java/libgtk-java/files')
-rw-r--r--dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r11
-rw-r--r--dev-java/libgtk-java/files/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch20
-rw-r--r--dev-java/libgtk-java/files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch42
-rw-r--r--dev-java/libgtk-java/files/libgtk-java-2.4.6_install-doc.patch12
-rw-r--r--dev-java/libgtk-java/files/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch11
5 files changed, 86 insertions, 0 deletions
diff --git a/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r1 b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r1
new file mode 100644
index 000000000000..1f417fd76435
--- /dev/null
+++ b/dev-java/libgtk-java/files/digest-libgtk-java-2.4.6-r1
@@ -0,0 +1 @@
+MD5 3f4533073d2c51cb444d16ecf91e9d08 libgtk-java-2.4.6.tar.bz2 438133
diff --git a/dev-java/libgtk-java/files/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch b/dev-java/libgtk-java/files/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch
new file mode 100644
index 000000000000..eaaff0df5498
--- /dev/null
+++ b/dev-java/libgtk-java/files/libgtk-java-2.4.6_gcj-autoconf-macro-fix.patch
@@ -0,0 +1,20 @@
+diff -Nuar libgtk-java-2.4.6-orig/macros/am_path_gcj.m4 libgtk-java-2.4.6/macros/am_path_gcj.m4
+--- libgtk-java-2.4.6-orig/macros/am_path_gcj.m4 2004-11-07 15:35:08.296300000 +1100
++++ libgtk-java-2.4.6/macros/am_path_gcj.m4 2004-11-07 15:37:39.916147374 +1100
+@@ -96,14 +96,14 @@
+ GCJ_HOME=`which gcj | sed 's/\(.*\).bin.*gcj/\1/'`
+ fi
+
+- cat << \EOF > Test.java
++ cat << EOF > Test.java
+ /* [#]line __oline__ "configure" */
+ public class Test {
+ public static void main(String[[]] args) {
+ System.out.println(System.getProperty("sun.boot.class.path"));
+ }
+ }
+-EOF
++EOF
+ GCJ_JAR=`gcj -C Test.java && gij Test`
+ rm Test.java Test.class
+ if test x$GCJ_JAR == x ; then
diff --git a/dev-java/libgtk-java/files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch b/dev-java/libgtk-java/files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch
new file mode 100644
index 000000000000..20dc164db15a
--- /dev/null
+++ b/dev-java/libgtk-java/files/libgtk-java-2.4.6_gentoo-PN-SLOT.patch
@@ -0,0 +1,42 @@
+diff -Nuar libgtk-java-2.4.6-ORIG/Makefile.in libgtk-java-2.4.6-EDIT/Makefile.in
+--- libgtk-java-2.4.6-ORIG/Makefile.in 2004-10-07 04:54:44.000000000 +1000
++++ libgtk-java-2.4.6-EDIT/Makefile.in 2004-11-08 16:39:29.876740128 +1100
+@@ -46,8 +46,8 @@
+ -for f in $(DOCUMENTS); do $(INSTALL) -m644 $$f $(DESTDIR)$(datadir)/doc/libgtk$(gtkapiversion)-java || exit 1; done;
+ -$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig/
+ $(INSTALL) -m644 gtk2-java.pc $(DESTDIR)$(libdir)/pkgconfig/
+- -$(INSTALL) -d $(DESTDIR)$(datadir)/libgtk-java/macros/
+- $(INSTALL) -m644 macros/*.m4 $(DESTDIR)$(datadir)/libgtk-java/macros/
++ -$(INSTALL) -d $(DESTDIR)@INSTALLED_MACRO_DIR@
++ $(INSTALL) -m644 macros/*.m4 $(DESTDIR)@INSTALLED_MACRO_DIR@
+ $(MAKE) -C doc install
+
+ # install native (gcj compiled) libraries
+diff -Nuar libgtk-java-2.4.6-ORIG/configure.in libgtk-java-2.4.6-EDIT/configure.in
+--- libgtk-java-2.4.6-ORIG/configure.in 2004-11-01 23:04:59.000000000 +1100
++++ libgtk-java-2.4.6-EDIT/configure.in 2004-11-08 15:53:21.000000000 +1100
+@@ -23,9 +23,9 @@
+ gtkapiversion="2.4"
+ AC_SUBST(gtkapiversion)
+
+-INSTALLED_CLASSPATH=\${prefix}/share/java/gtk${gtkapiversion}-${gtkversion}.jar
+-INSTALLED_JNI_DIR=\${prefix}/lib/jni/
+-INSTALLED_MACRO_DIR=\${prefix}/share/libgtk-java/macros/
++INSTALLED_CLASSPATH=\${prefix}/share/${PN}-${SLOT}/lib/gtk${gtkapiversion}-${gtkversion}.jar
++INSTALLED_JNI_DIR=\${prefix}/lib/
++INSTALLED_MACRO_DIR=\${prefix}/share/${PN}-${SLOT}/macros/
+ AC_SUBST(INSTALLED_CLASSPATH)
+ AC_SUBST(INSTALLED_JNI_DIR)
+ AC_SUBST(INSTALLED_MACRO_DIR)
+diff -Nuar libgtk-java-2.4.6-ORIG/src/Makefile.in libgtk-java-2.4.6-EDIT/src/Makefile.in
+--- libgtk-java-2.4.6-ORIG/src/Makefile.in 2004-07-28 22:31:30.000000000 +1000
++++ libgtk-java-2.4.6-EDIT/src/Makefile.in 2004-11-08 15:03:09.000000000 +1100
+@@ -15,7 +15,7 @@
+ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ #
+
+-CLASSPATH = @CLASSPATH@:java:
++CLASSPATH = java
+
+ OBJECTS:= \
+ $(shell ls jni/*.c | sort | sed -e 's=\.c=\.o=g')
diff --git a/dev-java/libgtk-java/files/libgtk-java-2.4.6_install-doc.patch b/dev-java/libgtk-java/files/libgtk-java-2.4.6_install-doc.patch
new file mode 100644
index 000000000000..0a1f36c1fad2
--- /dev/null
+++ b/dev-java/libgtk-java/files/libgtk-java-2.4.6_install-doc.patch
@@ -0,0 +1,12 @@
+diff -Nuar libgtk-java-2.4.6-ORIG/Makefile.in libgtk-java-2.4.6-EDIT/Makefile.in
+--- libgtk-java-2.4.6-ORIG/Makefile.in 2004-10-07 04:54:44.000000000 +1000
++++ libgtk-java-2.4.6-EDIT/Makefile.in 2004-11-08 16:51:29.352689812 +1100
+@@ -37,7 +37,7 @@
+ # Install core gtk java libraries and required libraries
+ install: @GCJ_INSTALL_TARGETS@
+ -$(INSTALL) -d $(DESTDIR)$(datadir)/java/
+- -$(INSTALL) -d $(DESTDIR)$(datadir)/doc/libgtk$(apiversion)-java/
++ -$(INSTALL) -d $(DESTDIR)$(datadir)/doc/libgtk$(gtkapiversion)-java/
+ -$(INSTALL) -d $(DESTDIR)$(libdir)/
+ $(INSTALL) -s -m644 lib/libgtkjava$(gtkapiversion).so.$(gtkversion) $(DESTDIR)$(libdir)/
+ $(INSTALL) -m644 lib/gtk$(gtkapiversion)-$(gtkversion).jar $(DESTDIR)$(datadir)/java/
diff --git a/dev-java/libgtk-java/files/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch b/dev-java/libgtk-java/files/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch
new file mode 100644
index 000000000000..3bc3a655e057
--- /dev/null
+++ b/dev-java/libgtk-java/files/libgtk-java-2.4.6_no-docbook-autoconf-macro.patch
@@ -0,0 +1,11 @@
+diff -Nuar libgtk-java-2.4.6-orig/macros/jg_common.m4 libgtk-java-2.4.6/macros/jg_common.m4
+--- libgtk-java-2.4.6-orig/macros/jg_common.m4 2004-07-11 04:39:42.000000000 -0400
++++ libgtk-java-2.4.6/macros/jg_common.m4 2004-11-16 09:33:03.000000000 -0500
+@@ -6,7 +6,6 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+-AM_PATH_DOCBOOK
+ AC_PROG_JAVAC
+ AC_PROG_JAVAC_WORKS
+ AC_PROG_JAVADOC