commit 53cb96e4dfab8c5820eb4485e396093e4a4515d2
Author: Jacek Konieczny <[email protected]>
Date: Fri Apr 16 18:20:46 2010 +0000
- do not apply the dtdtype patch to jaxws even though configure decided it
is needed. It actually breaks the build
Changed files:
icedtea6-no_dtdtype_patch.patch -> 1.1
icedtea6.spec -> 1.42
icedtea6-no_dtdtype_patch.patch | 14 ++++++++++++++
icedtea6.spec | 3 +++
2 files changed, 17 insertions(+)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index c8cd509..7639998 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -27,6 +27,7 @@ Source4:
https://jaxp.dev.java.net/files/documents/913/147329/jdk6-jaxp-2009_10_
# 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}
@@ -352,6 +353,8 @@ Wtyczka z obsługą Javy dla przeglądarek WWW.
# 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} .
diff --git a/icedtea6-no_dtdtype_patch.patch b/icedtea6-no_dtdtype_patch.patch
new file mode 100644
index 0000000..2456479
--- /dev/null
+++ b/icedtea6-no_dtdtype_patch.patch
@@ -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.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
