Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=32a8822b963b0bde90a13fc4359049c320da72f6
commit 32a8822b963b0bde90a13fc4359049c320da72f6 Author: Marius Cirsta <mcir...@frugalware.org> Date: Sun Jul 8 23:04:18 2012 +0000 java-gnome-4.1.1-1-x86_64 * rebuild with openjava diff --git a/source/gnome-extra/java-gnome/FrugalBuild b/source/gnome-extra/java-gnome/FrugalBuild index 753bde1..413c8d2 100644 --- a/source/gnome-extra/java-gnome/FrugalBuild +++ b/source/gnome-extra/java-gnome/FrugalBuild @@ -1,21 +1,28 @@ -# Compiling time: 1.09 SBU +# Compiling time: 2.40 SBU # Maintainer: Elentir <elen...@frugalware.org> pkgname=java-gnome pkgver=4.1.1 pkgrel=1 pkgdesc="Java bindings for GTK and GNOME" -url="http://java-gnome.sourceforge.net/4.0/"; +url="http://java-gnome.sourceforge.net"; depends=('gtksourceview3' 'libnotify' 'unique' 'gtkspell' 'libglade3' 'librsvg') -makedepends=('junit' 'j2sdk' 'j2re') +makedepends=('junit') groups=('gnome-extra') archs=('i686' 'x86_64') -Finclude gnome +Finclude gnome openjava replaces=('glib-java' 'cairo-java' 'libgtk-java' 'libgnome-java') _F_archive_grepv="-rc" up2date="Flasttar http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.1/"; -source=(${source[@]} java-gnome-frugalware.patch) +source=(${source[@]} frugal-fix.patch jdk7-fix.patch) Fconfopts="prefix=/usr" sha1sums=('b34f1fe7c1d393c081e88bed1241cf190f502d36' \ - '870217967c3c4319ee1efb497634ed57ac5685ca') + '8a14b735068f3b97d51f07f609b9ff590b0e3c75' \ + '70f021687bb1d82e193002cd78a3787c2955471d') + unset MAKEFLAGS + +build() +{ + Fbuild jdk=$JAVA_HOME runtime=java +} diff --git a/source/gnome-extra/java-gnome/java-gnome-frugalware.patch b/source/gnome-extra/java-gnome/frugal-fix.patch similarity index 87% rename from source/gnome-extra/java-gnome/java-gnome-frugalware.patch rename to source/gnome-extra/java-gnome/frugal-fix.patch index 851de6f..c477f93 100644 --- a/source/gnome-extra/java-gnome/java-gnome-frugalware.patch +++ b/source/gnome-extra/java-gnome/frugal-fix.patch @@ -1,7 +1,15 @@ -diff -Naur java-gnome-4.1.1/configure java-gnome-4.1.1/configure ---- java-gnome-4.1.1/configure 2010-11-18 02:33:25.000000000 +0100 -+++ java-gnome-4.1.1/configure 2010-11-30 18:58:55.996000013 +0100 -@@ -628,6 +628,9 @@ +--- java-gnome-4.1.1/configure 2011-07-11 04:34:06.000000000 +0000 ++++ java-gnome-4.1.1.new/configure 2012-07-08 22:41:16.000000000 +0000 +@@ -395,7 +395,7 @@ + return + } + +- $output = `$program $args Hello 2>/dev/null`; ++ $output = `$program $args Hello`; + chomp $output; + + if (($? != 0) || ($output ne "Hello")) { +@@ -629,6 +629,9 @@ } elsif ( -f "/etc/SuSE-release" ) { output "Open SuSE"; $os = "suse"; @@ -11,7 +19,7 @@ diff -Naur java-gnome-4.1.1/configure java-gnome-4.1.1/configure } elsif ( -f "/etc/arch-release" ) { output "Arch"; $os = "arch"; -@@ -756,7 +759,12 @@ +@@ -765,7 +768,12 @@ "JUnit test framework", "junit", "/usr/share/java/junit.jar"); @@ -25,7 +33,7 @@ diff -Naur java-gnome-4.1.1/configure java-gnome-4.1.1/configure } else { bail "failed!", "This OS not configured with defaults!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG."; -@@ -1432,6 +1440,45 @@ +@@ -1528,6 +1536,45 @@ check_jar($jar, "$vendor jar", $jar_candidate, ""); check_javadoc($javadoc, "$vendor javadoc", $javadoc_candidate, ""); @@ -71,12 +79,10 @@ diff -Naur java-gnome-4.1.1/configure java-gnome-4.1.1/configure } else { bail "failed!", "This OS not configured with a workable Java compiler checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG."; } -@@ -1841,6 +1888,52 @@ - } - check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea"); +@@ -1927,6 +1974,52 @@ -+ # check gij (the bytecode interpreter from the GCJ project) -+ my $gij_candidate; + # check gij (the bytecode interpreter from the GCJ project) + my $gij_candidate; + if ($gcj_home) { + $gij_candidate = "$gcj_home/bin/gij"; + } else { @@ -119,8 +125,10 @@ diff -Naur java-gnome-4.1.1/configure java-gnome-4.1.1/configure + $java_candidate = "/usr/lib/java/bin/java"; + $vendor = "IBM"; + } -+ check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea"); ++ check_runtime($java, "$vendor java VM", $java_candidate, "-cp . -client -ea"); + - # check gij (the bytecode interpreter from the GCJ project) - my $gij_candidate; ++ # check gij (the bytecode interpreter from the GCJ project) ++ my $gij_candidate; if ($gcj_home) { + $gij_candidate = "$gcj_home/bin/gij"; + } else { diff --git a/source/gnome-extra/java-gnome/jdk7-fix.patch b/source/gnome-extra/java-gnome/jdk7-fix.patch new file mode 100644 index 0000000..931e295 --- /dev/null +++ b/source/gnome-extra/java-gnome/jdk7-fix.patch @@ -0,0 +1,29 @@ +--- java-gnome-4.1.1/src/bindings/org/gnome/glib/Plumbing.java.orig 2011-07-11 06:34:06.000000000 +0200 ++++ java-gnome-4.1.1/src/bindings/org/gnome/glib/Plumbing.java 2011-12-15 21:18:02.130046113 +0100 +@@ -153,7 +153,7 @@ + * Retrieve an array of appropriate Java Boxeds for the given array of + * pointers. + */ +- protected static Boxed[] boxedArrayFor(final Class<?> type, final long[] pointers, Boxed[] boxeds) { ++ protected static Boxed[] boxedArrayFor(final Class<? extends Boxed> type, final long[] pointers, Boxed[] boxeds) { + if (pointers == null) { + return null; + } +@@ -170,7 +170,7 @@ + * @throw ClassCastException if the GType pointed by given pointer is not + * a GBoxed. + */ +- protected static Boxed boxedFor(Class<?> type, final long pointer) { ++ protected static Boxed boxedFor(Class<? extends Boxed> type, final long pointer) { + Boxed proxy; + + if (pointer == 0L) { +@@ -202,7 +202,7 @@ + * + * @see #boxedFor(Class, long) + */ +- protected static void fillBoxedArray(Class<?> type, Boxed[] boxeds, long[] pointers) { ++ protected static void fillBoxedArray(Class<? extends Boxed> type, Boxed[] boxeds, long[] pointers) { + if (pointers == null) { + return; + } \ No newline at end of file _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
