packages: icedtea6/icedtea6.spec, icedtea6/icedtea6-no_dtdtype_patch.patch ...

[jajcus]

Author: jajcus                       Date: Fri Apr 16 18:20:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not apply the dtdtype patch to jaxws even though configure decided it is needed. It actually breaks the build

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.41 -> 1.42) , icedtea6-no_dtdtype_patch.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.41 packages/icedtea6/icedtea6.spec:1.42
--- packages/icedtea6/icedtea6.spec:1.41	Fri Apr 16 18:59:51 2010
+++ packages/icedtea6/icedtea6.spec	Fri Apr 16 20:20:46 2010
@@ -28,6 +28,7 @@
 # Source4-md5:	a2f7b972124cd776ff71e7754eb9a429
 Patch0:		%{name}-i486.patch
 Patch1:		%{name}-ecj_single_thread.patch
+Patch2:		%{name}-no_dtdtype_patch.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 %{!?with_bootstrap:BuildRequires:	ant-nodeps}
@@ -353,6 +354,8 @@
 # workaround for an ECJ bug
 %patch1 -p1
 
+%patch2 -p1
+
 # let the build system extract the sources where it wants them
 mkdir drops
 ln -s %{SOURCE1} .
@@ -820,6 +823,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2010/04/16 18:20:46  jajcus
+- do not apply the dtdtype patch to jaxws even though configure decided it is needed. It actually breaks the build
+
 Revision 1.41  2010/04/16 16:59:51  jajcus
 - workaround for ECJ bug when running multiple threads
 

================================================================
Index: packages/icedtea6/icedtea6-no_dtdtype_patch.patch
diff -u /dev/null packages/icedtea6/icedtea6-no_dtdtype_patch.patch:1.1
--- /dev/null	Fri Apr 16 20:20:52 2010
+++ packages/icedtea6/icedtea6-no_dtdtype_patch.patch	Fri Apr 16 20:20:46 2010
@@ -0,0 +1,14 @@
+--- icedtea6-1.8/Makefile.am.orig	2010-04-12 23:55:51.000000000 +0200
++++ icedtea6-1.8/Makefile.am	2010-04-16 19:40:57.496933541 +0200
+@@ -408,11 +408,6 @@
+ 	patches/ecj/getannotation-cast.patch \
+ 	patches/ecj/override.patch
+ 
+-if DTDTYPE_QNAME
+-ICEDTEA_ECJ_PATCHES += \
+-	patches/ecj/icedtea-jaxws-getdtdtype.patch
+-endif
+-
+ ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES)
+ 
+ # OpenJDK build environment.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.41&r2=1.42&f=u