Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0228013513a4d89b584f8192b13c3d77102a655
commit f0228013513a4d89b584f8192b13c3d77102a655 Author: Elentir <elen...@frugalware.org> Date: Wed Dec 1 17:44:03 2010 +0100 java-gnome-4.0.17-1-i686 * version bump diff --git a/source/gnome-extra/java-gnome/FrugalBuild b/source/gnome-extra/java-gnome/FrugalBuild index c2057cc..6a69898 100644 --- a/source/gnome-extra/java-gnome/FrugalBuild +++ b/source/gnome-extra/java-gnome/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Elentir <elen...@frugalware.org> pkgname=java-gnome -pkgver=4.0.16 +pkgver=4.0.17 pkgrel=1 pkgdesc="Java bindings for GTK and GNOME" url="http://java-gnome.sourceforge.net/4.0/"; @@ -16,5 +16,5 @@ _F_archive_grepv="-rc" up2date="Flasttar http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/"; source=(${sour...@]} java-gnome-frugalware.patch) Fconfopts="prefix=/usr" -sha1sums=('beb0ae9d454a5446acdfb7c3664d9f4e6f8f6c20' \ - '5d2e91a8085ae407b4bd5197692028c8c04dfe05') +sha1sums=('8b58ad400963348fdf3159c894a2f32c96a5835d' \ + 'e18e31f7aa021f498115e786b62c522d6f518b81') diff --git a/source/gnome-extra/java-gnome/java-gnome-frugalware.patch b/source/gnome-extra/java-gnome/java-gnome-frugalware.patch index c6a56da..1a896ee 100644 --- a/source/gnome-extra/java-gnome/java-gnome-frugalware.patch +++ b/source/gnome-extra/java-gnome/java-gnome-frugalware.patch @@ -1,42 +1,36 @@ -diff -Naur java-gnome-4.0.15/configure java-gnome-4.0.15-2/configure ---- java-gnome-4.0.15/configure 2010-03-15 23:58:36.000000000 +0100 -+++ java-gnome-4.0.15-2/configure 2010-05-28 19:53:26.000000000 +0200 -@@ -634,6 +634,9 @@ - } elsif ( -f "/etc/mandriva-release" ) { - output "Mandriva"; - $os = "mandriva"; +diff -Naur java-gnome-4.0.17/configure java-gnome-4.0.17-2/configure +--- java-gnome-4.0.17/configure 2010-11-18 02:33:25.000000000 +0100 ++++ java-gnome-4.0.17-2/configure 2010-11-30 18:58:55.996000013 +0100 +@@ -628,6 +628,9 @@ + } elsif ( -f "/etc/SuSE-release" ) { + output "Open SuSE"; + $os = "suse"; +} elsif ( -f "/etc/frugalware-release" ) { -+ output "Frugalware"; -+ $os = "frugalware"; - } elsif ( -f "/etc/release" ) { - if (`grep Solaris /etc/release`) { - output "Solaris"; -@@ -738,8 +741,13 @@ ++ output "Frugalware"; ++ $os = "frugalware"; + } elsif ( -f "/etc/arch-release" ) { + output "Arch"; + $os = "arch"; +@@ -756,7 +759,12 @@ + "JUnit test framework", "junit", "/usr/share/java/junit.jar"); - -- - +} elsif ($os eq "frugalware") { + + check_prereq(@junit_jars, + "JUnit test framework", + "junit", -+ "/usr/share/java/junit.jar"); -+ ++ "/usr/share/java/junit.jar"); + } else { bail "failed!", "This OS not configured with defaults!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG."; - } -@@ -1369,6 +1377,49 @@ +@@ -1432,6 +1440,45 @@ check_jar($jar, "$vendor jar", $jar_candidate, ""); check_javadoc($javadoc, "$vendor javadoc", $javadoc_candidate, ""); +} elsif ($os eq "frugalware") { -+ # we can do much better than this, especially for java/javac. -+ # Should we just go with known paths, or...? `which` is so lame -+ -+ # check ecj, the standalone Eclipse compiler. -+ check_compiler($ecj, "Eclipse ecj", which("ecj"), "-g -preserveAllLocals -nowarn -source 1.5 -target 1.5"); ++ check_compiler($ecj, "Eclipse ecj", which("ecj"), "-g -preserveAllLocals -nowarn -source 1.5 -target 1.5"); + + my $javac_candidate; + my $javah_candidate; @@ -77,26 +71,10 @@ diff -Naur java-gnome-4.0.15/configure java-gnome-4.0.15-2/configure } else { bail "failed!", "This OS not configured with a workable Java compiler checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG."; } -@@ -1765,6 +1816,52 @@ +@@ -1841,6 +1888,52 @@ } - check_runtime($cacao, "CACAO VM", $cacao_candidate, ""); + check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea"); -+} elsif ($os eq "frugalware") { -+ # check for a proper JDK/JRE java Virtual Machine. Red Hat is using -+ # the alternatives system symlinks to select JVMs, and then *again* -+ # to select versions. All the symlinks end up back in /usr/lib/jvm with -+ # predictable names, which makes this workable. -+ my $java_candidate; -+ my $vendor; -+ if ($jdk_home) { -+ $java_candidate = "$jdk_home/bin/java"; -+ $vendor = "Specified"; -+ } else { -+ $java_candidate = "/usr/lib/java/bin/java"; -+ $vendor = "IBM"; -+ } -+ check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea"); -+ + # check gij (the bytecode interpreter from the GCJ project) + my $gij_candidate; + if ($gcj_home) { @@ -127,6 +105,22 @@ diff -Naur java-gnome-4.0.15/configure java-gnome-4.0.15-2/configure + } + check_runtime($cacao, "CACAO VM", $cacao_candidate, ""); + - } else { - bail "failed!", "This OS not configured with appropriate Java VM checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG."; - } ++} elsif ($os eq "frugalware") { ++ # check for a proper JDK/JRE java Virtual Machine. Red Hat is using ++ # the alternatives system symlinks to select JVMs, and then *again* ++ # to select versions. All the symlinks end up back in /usr/lib/jvm with ++ # predictable names, which makes this workable. ++ my $java_candidate; ++ my $vendor; ++ if ($jdk_home) { ++ $java_candidate = "$jdk_home/bin/java"; ++ $vendor = "Specified"; ++ } else { ++ $java_candidate = "/usr/lib/java/bin/java"; ++ $vendor = "IBM"; ++ } ++ check_runtime($java, "$vendor java VM", $java_candidate, "-client -ea"); ++ + # check gij (the bytecode interpreter from the GCJ project) + my $gij_candidate; + if ($gcj_home) { _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
