# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1242920650 -3600
# Node ID f915b5bb3fc715d7d928a00f4e7ed944e26078af
# Parent  282bc825e2cb899874bd881f87c083151e6d8690
For pre-generated Nimbus, turn on DISABLE_NIMBUS but patch it out
for make/javax/swing/plaf.

2009-05-21  Andrew John Hughes  <ahughes@redhat.com>

	* patches/icedtea-stop-nimbus-generation.patch:
	Renamed.
	* Makefile.am:
	Turn on DISABLE_NIMBUS unless generating files.
	To still build, apply the pregenerated-nimbus patch.
	* patches/icedtea-pregenerated-nimbus.patch:
	Turns the make/javax/swing/plaf/nimbus subdirectory
	back on.

diff -r 282bc825e2cb -r f915b5bb3fc7 ChangeLog
--- a/ChangeLog	Thu May 21 13:48:23 2009 +0100
+++ b/ChangeLog	Thu May 21 16:44:10 2009 +0100
@@ -1,3 +1,14 @@
+2009-05-21  Andrew John Hughes  <ahughes@redhat.com>
+
+	* patches/icedtea-stop-nimbus-generation.patch:
+	Renamed.
+	* Makefile.am:
+	Turn on DISABLE_NIMBUS unless generating files.
+	To still build, apply the pregenerated-nimbus patch.
+	* patches/icedtea-pregenerated-nimbus.patch:
+	Turns the make/javax/swing/plaf/nimbus subdirectory
+	back on.
+
 2009-05-21  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
diff -r 282bc825e2cb -r f915b5bb3fc7 Makefile.am
--- a/Makefile.am	Thu May 21 13:48:23 2009 +0100
+++ b/Makefile.am	Thu May 21 16:44:10 2009 +0100
@@ -1560,7 +1560,7 @@
 	"ALT_HOTSPOT_IMPORT_PATH=$(CACAO_IMPORT_PATH)"
 endif
 
-if !ENABLE_NIMBUS
+if !ENABLE_NIMBUS_GENERATION
 ICEDTEA_ENV += \
 	"DISABLE_NIMBUS=true"
 endif
@@ -2099,7 +2099,7 @@
 endif
 
 if !ENABLE_NIMBUS_GENERATION
-ICEDTEA_PATCHES += patches/icedtea-stop-nimbus-generation.patch
+ICEDTEA_PATCHES += patches/icedtea-pregenerated-nimbus.patch
 endif
 
 stamps/extract.stamp: stamps/download.stamp
diff -r 282bc825e2cb -r f915b5bb3fc7 patches/icedtea-pregenerated-nimbus.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-pregenerated-nimbus.patch	Thu May 21 16:44:10 2009 +0100
@@ -0,0 +1,14 @@
+diff -Nru openjdk.orig/jdk/make/javax/swing/plaf/Makefile openjdk/jdk/make/javax/swing/plaf/Makefile
+--- openjdk.orig/jdk/make/javax/swing/plaf/Makefile	2009-05-21 16:40:04.000000000 +0100
++++ openjdk/jdk/make/javax/swing/plaf/Makefile	2009-05-21 16:40:19.000000000 +0100
+@@ -34,9 +34,7 @@
+ #
+ include FILES.gmk
+ AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
+-ifndef DISABLE_NIMBUS
+-  SUBDIRS = nimbus
+-endif
++SUBDIRS = nimbus
+ 
+ # Nimbus is handled in its own directory
+ AUTO_JAVA_PRUNE = nimbus
diff -r 282bc825e2cb -r f915b5bb3fc7 patches/icedtea-stop-nimbus-generation.patch
--- a/patches/icedtea-stop-nimbus-generation.patch	Thu May 21 13:48:23 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/tools/Makefile openjdk/jdk/make/tools/Makefile
---- openjdk.orig/jdk/make/tools/Makefile	2009-05-18 22:14:05.000000000 +0100
-+++ openjdk/jdk/make/tools/Makefile	2009-05-21 12:35:38.000000000 +0100
-@@ -53,10 +53,6 @@
-   spp                       \
-   CharsetMapping
- 
--ifndef DISABLE_NIMBUS
--  SUBDIRS += swing-nimbus
--endif
--
- all build clean clobber::
- 	$(SUBDIRS-loop)
-