From e94e567b9dcba576eb0dc672da55d3a68dd3454d Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 23 Nov 2012 00:50:45 +0100 Subject: openjdk7: update to version 2.1.3 * libxp is gone --- .../openjdk/openjdk-7-03b21/fix-checksums.patch | 18 +++++------ recipes-core/openjdk/openjdk-7-common.inc | 4 +-- recipes-core/openjdk/openjdk-7_03b21-2.1.1.bb | 24 --------------- recipes-core/openjdk/openjdk-7_03b21-2.1.3.bb | 36 ++++++++++++++++++++++ 4 files changed, 47 insertions(+), 35 deletions(-) delete mode 100644 recipes-core/openjdk/openjdk-7_03b21-2.1.1.bb create mode 100644 recipes-core/openjdk/openjdk-7_03b21-2.1.3.bb diff --git a/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch b/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch index 1999170..e975707 100644 --- a/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch +++ b/recipes-core/openjdk/openjdk-7-03b21/fix-checksums.patch @@ -1,13 +1,13 @@ -Index: icedtea-2.1/Makefile.am +Index: 03b21-2.1.3-r2.0/icedtea-2.1.3/Makefile.am =================================================================== ---- icedtea-2.1.orig/Makefile.am -+++ icedtea-2.1/Makefile.am -@@ -18,7 +18,7 @@ JAXP_SHA256SUM = 8ce48c704f38285207ee6dc - JAXWS_SHA256SUM = 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa - JDK_SHA256SUM = 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d - LANGTOOLS_SHA256SUM = c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c --OPENJDK_SHA256SUM = ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7 -+OPENJDK_SHA256SUM = 758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e +--- icedtea-2.1.3/Makefile.am 2012-11-23 00:40:49.323361758 +0100 ++++ icedtea-2.1.3/Makefile.am 2012-11-23 00:41:55.500083848 +0100 +@@ -18,7 +18,7 @@ + JAXWS_SHA256SUM = 6d0858d46b68d6e8488e70d1675e5b656aeb4ef51e8ee4e330e77219f92c1c0c + JDK_SHA256SUM = 11146763409098a42dd9896f3fb7e7324a58c5cff5298009eb347ad26abeed51 + LANGTOOLS_SHA256SUM = 3a4039348aa49547fffa96563b77b704c72e2ac3ead2c132843ba1e9fe4dbad2 +-OPENJDK_SHA256SUM = 0f2e414fee619e78c33bceaee7c440efa598d651b23a75fd61e1282ad6001839 ++OPENJDK_SHA256SUM = 54a0ef02b56b265b4122324e08a33c42ececbf2a300ada260611e7b6ccdba96d CACAO_VERSION = a567bcb7f589 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index eb0a817..dee5995 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc @@ -41,7 +41,7 @@ DEPENDS = " \ gtk+ glib-2.0 \ cups fontconfig \ rhino \ - libxt libxp libxinerama libxrender libxtst libxi \ + libxt libxinerama libxrender libxtst libxi \ freetype alsa-lib libffi llvm2.8 \ " DEPENDS_arm = " \ @@ -51,7 +51,7 @@ DEPENDS_arm = " \ gtk+ glib-2.0 \ cups fontconfig \ rhino \ - libxt libxp libxinerama libxrender libxtst libxi \ + libxt libxinerama libxrender libxtst libxi \ freetype alsa-lib libffi \ " diff --git a/recipes-core/openjdk/openjdk-7_03b21-2.1.1.bb b/recipes-core/openjdk/openjdk-7_03b21-2.1.1.bb deleted file mode 100644 index 42577d6..0000000 --- a/recipes-core/openjdk/openjdk-7_03b21-2.1.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -require openjdk-7-release-03b21.inc - -PR = "${INC_PR}.0" - -ICEDTEA = "icedtea-2.1.1" - -SRC_URI[iced.md5sum] = "32859fa5f7337d58ae848311e2a94761" -SRC_URI[iced.sha256sum] = "4a015cf3fb8fb9aa6b3ce4a41fd9bc5dcb417a1885a10a01e92d0cc7a5ffdc65" - -HOTSPOT_CHANGESET = "8b7c4c5f6ba9" -SRC_URI[hotspot.md5sum] = "cb45a8f19d77acc1f4f48e75e36a27fe" -SRC_URI[hotspot.sha256sum] = "22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2" - -CORBA_CHANGESET = "338c21646c76" -SRC_URI[corba.md5sum] = "32d4851fca9c205fe1710a453c32a8fe" -SRC_URI[corba.sha256sum] = "10425cbbb439551293a7a96a128f25ce408c38826bef8562f4c2d65d3134a1d3" - -JAXP_CHANGESET = "7a8825b15df6" -SRC_URI[jaxp.md5sum] = "a0982b6df79739127871e355a40ca5a6" -SRC_URI[jaxp.sha256sum] = "297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2" - -JDK_CHANGESET = "d5ddeffc4651" -SRC_URI[jdk.md5sum] = "27c28d6be213df818490e69f12efe475" -SRC_URI[jdk.sha256sum] = "e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98" diff --git a/recipes-core/openjdk/openjdk-7_03b21-2.1.3.bb b/recipes-core/openjdk/openjdk-7_03b21-2.1.3.bb new file mode 100644 index 0000000..a86a032 --- /dev/null +++ b/recipes-core/openjdk/openjdk-7_03b21-2.1.3.bb @@ -0,0 +1,36 @@ +require openjdk-7-release-03b21.inc + +PR = "${INC_PR}.0" + +ICEDTEA = "icedtea-2.1.3" + +SRC_URI[iced.md5sum] = "200e74ad440f9c4bfa21cc2bd94b4325" +SRC_URI[iced.sha256sum] = "1929e57eb6718d30735e1e04e9e129457f845f7d7a8404b2b028740d0779ddb6" + +HOTSPOT_CHANGESET = "a456d0771ba0" +SRC_URI[hotspot.md5sum] = "23c46cbb8e8a2e04dafa6ef63bc810c4" +SRC_URI[hotspot.sha256sum] = "09a64fca0beff0759ef1b461d63ed6a00e43032972781bb3a55e49d8b93f67d0" + +CORBA_CHANGESET = "79ee8535bc51" +SRC_URI[corba.md5sum] = "0e04317a6a74fea66ecac51c6171413c" +SRC_URI[corba.sha256sum] = "f61dad8d484e4a9e645b7fb73da87bc44f9986a074629154f37ed46be05f5b84" + +JAXP_CHANGESET = "77e7219c7424" +SRC_URI[jaxp.md5sum] = "27ea9ad4c7a4c43eb1ccab8a0f365a50" +SRC_URI[jaxp.sha256sum] = "9cfbc0efaface20f7188870b9bf5b0ebc73d745cd9a49d013cd4e81ba223ccdc" + +JAXWS_CHANGESET = "d92eda447bca" +SRC_URI[jaxws.md5sum] = "4fb688cb0e2c703dfdedca187bb94070" +SRC_URI[jaxws.sha256sum] = "6d0858d46b68d6e8488e70d1675e5b656aeb4ef51e8ee4e330e77219f92c1c0c" + +JDK_CHANGESET = "d7ecb57d3c61" +SRC_URI[jdk.md5sum] = "0e90a9d980d44998083343a3a7614bb5" +SRC_URI[jdk.sha256sum] = "11146763409098a42dd9896f3fb7e7324a58c5cff5298009eb347ad26abeed51" + +LANGTOOLS_CHANGESET = "fd2fdb20d858" +SRC_URI[langtools.md5sum] = "48335bb031d4c75e75823e2d70f17ef5" +SRC_URI[langtools.sha256sum] = "3a4039348aa49547fffa96563b77b704c72e2ac3ead2c132843ba1e9fe4dbad2" + +OPENJDK_CHANGESET = "f89009ada191" +SRC_URI[openjdk.md5sum] = "c26bbb33addfaeb14d28a1329b4b5a3e" +SRC_URI[openjdk.sha256sum] = "54a0ef02b56b265b4122324e08a33c42ececbf2a300ada260611e7b6ccdba96d" -- cgit v1.2.3-54-g00ecf