Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/java6-openjdk/patches/java6-openjdk-6.1.10.4-xerces211.patch

    Annotation of /trunk/java6-openjdk/patches/java6-openjdk-6.1.10.4-xerces211.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1657 - (hide annotations) (download)
    Sat Feb 18 21:54:08 2012 UTC (12 years, 2 months ago) by niro
    File size: 5295 byte(s) 
    -pkg move openjdk -> java6-openjdk
    1 niro 1602 diff -Naur icedtea6-1.10.4/Makefile.am icedtea6-1.10.4-magellan/Makefile.am
    2     --- icedtea6-1.10.4/Makefile.am 2011-10-13 18:27:35.063986484 +0200
    3     +++ icedtea6-1.10.4-magellan/Makefile.am 2012-01-05 17:21:09.701981562 +0100
    4     @@ -1275,7 +1275,11 @@
    5     ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
    6     ln -sf $(XALAN2_SERIALIZER_JAR) \
    7     $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
    8     - ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
    9     + ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar && \
    10     + if test -f "$(XML_APIS_JAR)"; then \
    11     + ln -sf $(XML_APIS_JAR) \
    12     + $(ECJ_BOOT_DIR)/lib/endorsed/xml-apis.jar; \
    13     + fi
    14     mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
    15     cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar && \
    16     ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
    17     diff -Naur icedtea6-1.10.4/Makefile.in icedtea6-1.10.4-magellan/Makefile.in
    18     --- icedtea6-1.10.4/Makefile.in 2011-10-13 19:39:49.922906360 +0200
    19     +++ icedtea6-1.10.4-magellan/Makefile.in 2012-01-05 17:22:18.592981561 +0100
    20     @@ -296,6 +296,7 @@
    21     XERCES2_JAR = @XERCES2_JAR@
    22     XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
    23     XINERAMA_LIBS = @XINERAMA_LIBS@
    24     +XML_APIS_JAR = @XML_APIS_JAR@
    25     XPROTO_CFLAGS = @XPROTO_CFLAGS@
    26     XPROTO_LIBS = @XPROTO_LIBS@
    27     XP_CFLAGS = @XP_CFLAGS@
    28     @@ -1703,7 +1704,11 @@
    29     ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
    30     ln -sf $(XALAN2_SERIALIZER_JAR) \
    31     $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
    32     - ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar
    33     + ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar && \
    34     + if test -f "$(XML_APIS_JAR)"; then \
    35     + ln -sf $(XML_APIS_JAR) \
    36     + $(ECJ_BOOT_DIR)/lib/endorsed/xml-apis.jar; \
    37     + fi
    38     mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \
    39     cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar && \
    40     ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
    41     diff -Naur icedtea6-1.10.4/acinclude.m4 icedtea6-1.10.4-magellan/acinclude.m4
    42     --- icedtea6-1.10.4/acinclude.m4 2011-07-11 23:43:43.361068652 +0200
    43     +++ icedtea6-1.10.4-magellan/acinclude.m4 2012-01-05 17:19:36.389981559 +0100
    44     @@ -556,7 +556,7 @@
    45     [
    46     AC_MSG_CHECKING(for endorsed jars dir)
    47     AC_ARG_WITH([endorsed-dir],
    48     - [AS_HELP_STRING(--with-endorsed-dir,specify directory of endorsed jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar))],
    49     + [AS_HELP_STRING(--with-endorsed-dir,specify directory of endorsed jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar, xml-apis.jar))],
    50     [
    51     if test "x${withval}" = "xno"; then
    52     ENDORSED_JARS="${withval}"
    53     @@ -564,8 +564,10 @@
    54     else if test -f "${withval}/xalan-j2.jar"; then
    55     if test -f "${withval}/xalan-j2-serializer.jar"; then
    56     if test -f "${withval}/xerces-j2.jar"; then
    57     + if test -f "${withval}/xml-apis.jar"; then
    58     ENDORSED_JARS="${withval}"
    59     AC_MSG_RESULT(${withval})
    60     + fi
    61     fi
    62     fi
    63     fi
    64     @@ -577,8 +579,10 @@
    65     if test -f "/usr/share/java/xalan-j2.jar"; then
    66     if test -f "/usr/share/java/xalan-j2-serializer.jar"; then
    67     if test -f "/usr/share/java/xerces-j2.jar"; then
    68     - ENDORSED_JARS="/usr/share/java/xalan-j2.jar /usr/share/java/xalan-j2-serializer.jar /usr/share/java/xerces-j2.jar"
    69     + if test -f "/usr/share/java/xml-apis.jar"; then
    70     + ENDORSED_JARS="/usr/share/java/xalan-j2.jar /usr/share/java/xalan-j2-serializer.jar /usr/share/java/xerces-j2.jar /usr/share/java/xml-apis.jar"
    71     AC_MSG_RESULT(/usr/share/java)
    72     + fi
    73     fi
    74     fi
    75     fi
    76     @@ -587,7 +591,7 @@
    77     fi
    78     fi
    79     if test -z "${ENDORSED_JARS}"; then
    80     - AC_MSG_ERROR("A directory containing required jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar) was not found.")
    81     + AC_MSG_ERROR("A directory containing required jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar, xml-apis.jar) was not found.")
    82     fi
    83     AC_SUBST(ENDORSED_JARS)
    84     ])
    85     @@ -725,6 +729,33 @@
    86     AC_SUBST(XERCES2_JAR)
    87     ])
    88    
    89     +AC_DEFUN([IT_FIND_XML_APIS_JAR],
    90     +[
    91     + AC_MSG_CHECKING([for a xerces2 xml-apis jar])
    92     + AC_ARG_WITH([xml-apis-jar],
    93     + [AS_HELP_STRING(--with-xml-apis-jar,specify location of the xerces2 xml-apis jar)],
    94     + [
    95     + if test -f "${withval}" ; then
    96     + XML_APIS_JAR="${withval}"
    97     + fi
    98     + ],
    99     + [
    100     + XML_APIS_JAR=
    101     + ])
    102     + if test -z "${XML_APIS_JAR}"; then
    103     + if test -e "/usr/share/java/xml-apis.jar"; then
    104     + XML_APIS_JAR=/usr/share/java/xml-apis.jar
    105     + else
    106     + AC_MSG_RESULT(no)
    107     + fi
    108     + fi
    109     + if test -z "${XML_APIS_JAR}"; then
    110     + AC_MSG_ERROR("A xerces2 xml-apis jar was not found.")
    111     + fi
    112     + AC_MSG_RESULT(${XML_APIS_JAR})
    113     + AC_SUBST(XML_APIS_JAR)
    114     +])
    115     +
    116     AC_DEFUN([IT_FIND_RHINO_JAR],
    117     [
    118     AC_MSG_CHECKING([whether to include Javascript support via Rhino])
    119     diff -Naur icedtea6-1.10.4/configure.ac icedtea6-1.10.4-magellan/configure.ac
    120     --- icedtea6-1.10.4/configure.ac 2011-10-13 19:39:16.561204799 +0200
    121     +++ icedtea6-1.10.4-magellan/configure.ac 2012-01-05 17:20:23.648981560 +0100
    122     @@ -159,6 +159,7 @@
    123     IT_FIND_XALAN2_JAR
    124     IT_FIND_XALAN2_SERIALIZER_JAR
    125     IT_FIND_XERCES2_JAR
    126     + IT_FIND_XML_APIS_JAR
    127     fi
    128     AC_CONFIG_FILES([javac], [chmod +x javac])
    129     AC_CONFIG_FILES([javap], [chmod +x javap])