Author: megabajt Date: Mon Dec 21 20:22:03 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 4.0.14
---- Files affected:
packages/java-gnome:
java-gnome-configure.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/java-gnome/java-gnome-configure.patch
diff -u packages/java-gnome/java-gnome-configure.patch:1.2
packages/java-gnome/java-gnome-configure.patch:1.3
--- packages/java-gnome/java-gnome-configure.patch:1.2 Mon Mar 16 16:27:54 2009
+++ packages/java-gnome/java-gnome-configure.patch Mon Dec 21 21:21:58 2009
@@ -1,10 +1,10 @@
-diff -urN java-gnome-4.0.10/configure java-gnome-4.0.10.new/configure
---- java-gnome-4.0.10/configure 2009-03-05 12:21:48.000000000 +0100
-+++ java-gnome-4.0.10.new/configure 2009-03-15 00:23:50.000000000 +0100
+diff -urN java-gnome-4.0.14/configure java-gnome-4.0.14.new/configure
+--- java-gnome-4.0.14/configure 2009-12-16 01:26:17.000000000 +0100
++++ java-gnome-4.0.14.new/configure 2009-12-21 19:24:06.987616562 +0100
@@ -144,6 +144,8 @@
$str .= "pkgadd";
} elsif ($os eq "slackware") {
- $str .= "installpkg";
+ $str .= "slackpkg install";
+ } elsif ($os eq "pld") {
+ $str .= "poldek -u"
} else {
@@ -13,7 +13,7 @@
@@ -202,6 +204,8 @@
$str .= "pkgadd";
} elsif ($os eq "slackware") {
- $str .= "installpkg";
+ $str .= "slackpkg install";
+ } elsif ($os eq "pld") {
+ $str .= "poldek -u"
} else {
@@ -29,38 +29,65 @@
}
if ($os) {
-@@ -729,7 +736,12 @@
+@@ -729,8 +736,13 @@
"junit",
"/usr/share/java/junit.jar");
-
+-
+} elsif ($os eq "pld") {
+
+ 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.";
-@@ -799,6 +811,16 @@
- "libglade-2.0",
- "Glade development libraries",
- "libglade2.0_0-devel");
-+
+ }
+@@ -940,6 +952,41 @@
+ "Enchant",
+ "FIXME");
+
+} elsif ($os eq "pld") {
+ check_system_library(@gnomedev_libs,
-+ "gtk+-2.0 >= 2.14.0 pango >= 1.22 atk gdk-2.0
gtk+-unix-print-2.0 cairo-svg >= 1.6.4",
++ "gtk+-2.0 >= 2.16.0 pango >= 1.22 atk gdk-2.0
gtk+-unix-print-2.0",
+ "GTK+ development libraries",
+ "gtk+2-devel");
++
+ check_system_library(@gnomedev_libs,
-+ "libglade-2.0 >= 2.6.3",
++ "libglade-2.0",
+ "Glade development libraries",
+ "libglade2-devel");
++
++ check_system_library(@gnomedev_libs,
++ "gtksourceview-2.0 >= 2.6.2",
++ "GtkSourceView",
++ "gtksourceview2-devel");
++
++ check_system_library(@gnomedev_libs,
++ "libnotify >= 0.4.5",
++ "LibNotify",
++ "libnotify-devel");
++
++ check_system_library(@gnomedev_libs,
++ "gtkspell-2.0 >= 2.0.15",
++ "GtkSpell",
++ "gtkspell-devel");
++
++ check_system_library(@gnomedev_libs,
++ "unique-1.0 >= 1.0.8",
++ "LibUnique",
++ "libunique-devel");
++
++ check_system_library(@gnomedev_libs,
++ "enchant",
++ "Enchant",
++ "enchant-devel");
}
-@@ -1219,6 +1241,46 @@
+@@ -1360,6 +1407,46 @@
check_jar($jar, "$vendor jar", $jar_candidate, "");
check_javadoc($javadoc, "$vendor javadoc", $javadoc_candidate, "");
@@ -107,7 +134,7 @@
} else {
bail "failed!", "This OS not configured with a workable Java compiler
checks!\nTHIS IS AN INTERNAL ERROR, PLEASE FILE A BUG.";
}
-@@ -1615,6 +1677,49 @@
+@@ -1756,6 +1843,49 @@
}
check_runtime($cacao, "CACAO VM", $cacao_candidate, "");
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-gnome/java-gnome-configure.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
