diff options
4 files changed, 55 insertions, 76 deletions
diff --git a/recipes-core/icedtea/icedtea7-native_2.1.1.bb b/recipes-core/icedtea/icedtea7-native_2.1.1.bb deleted file mode 100644 index 9fff461..0000000 --- a/recipes-core/icedtea/icedtea7-native_2.1.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require openjdk-7-release-03b147.inc - -PR = "${INC_PR}.1" - -ICEDTEA = "icedtea-2.1.1" - -SRC_URI[iced.md5sum] = "32859fa5f7337d58ae848311e2a94761" -SRC_URI[iced.sha256sum] = "4a015cf3fb8fb9aa6b3ce4a41fd9bc5dcb417a1885a10a01e92d0cc7a5ffdc65" - diff --git a/recipes-core/icedtea/icedtea7-native_2.1.3.bb b/recipes-core/icedtea/icedtea7-native_2.1.3.bb new file mode 100644 index 0000000..7391c65 --- /dev/null +++ b/recipes-core/icedtea/icedtea7-native_2.1.3.bb @@ -0,0 +1,36 @@ +require openjdk-7-release-03b147.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" diff --git a/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch b/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch index cd26990..332808a 100644 --- a/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch +++ b/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch @@ -1,8 +1,8 @@ -Index: icedtea-2.1/configure.ac +Index: icedtea-2.1.3/configure.ac =================================================================== ---- icedtea-2.1.orig/configure.ac -+++ icedtea-2.1/configure.ac -@@ -171,71 +171,19 @@ IT_CHECK_FOR_LCMS +--- icedtea-2.1.3.orig/configure.ac 2012-10-17 10:18:59.262849964 +0200 ++++ icedtea-2.1.3/configure.ac 2012-11-23 09:39:02.244405345 +0100 +@@ -171,7 +171,6 @@ IT_CHECK_FOR_GTK IT_CHECK_FOR_GIO IT_CHECK_FOR_FONTCONFIG @@ -10,45 +10,7 @@ Index: icedtea-2.1/configure.ac IT_CHECK_FOR_SYSCALLS AC_CONFIG_FILES([remove-intree-libraries.sh]) --dnl Check for Xproto headers and libraries. --PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no]) --if test "x${XPROTO_FOUND}" = xno --then -- AC_MSG_ERROR([Could not find Xproto headers - \ -- Try installing xorg-x11-proto-devel.]) --fi --AC_SUBST(XT_CFLAGS) --AC_SUBST(XT_LIBS) -- --dnl Check for libXt headers and libraries. --PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no]) --if test "x${XT_FOUND}" = xno --then -- AC_MSG_ERROR([Could not find Xt - \ -- Try installing libXt-devel.]) --fi --AC_SUBST(XT_CFLAGS) --AC_SUBST(XT_LIBS) -- --dnl Check for libXp headers and libraries. --PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) --if test "x${XP_FOUND}" = xno --then -- AC_MSG_ERROR([Could not find Xp - \ -- Try installing libXp-devel.]) --fi --AC_SUBST(XP_CFLAGS) --AC_SUBST(XP_LIBS) -- - dnl Check for libX11 headers and libraries. - PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) - if test "x${X11_FOUND}" = xno - then -- AC_MSG_ERROR([Could not find x11 - \ -- Try installing libX11-devel.]) -+ AC_MSG_ERROR([Could not find x11 - \ -+ Try installing libX11-devel.]) - fi +@@ -205,17 +204,6 @@ AC_SUBST(X11_CFLAGS) AC_SUBST(X11_LIBS) @@ -63,20 +25,10 @@ Index: icedtea-2.1/configure.ac -AC_SUBST(XINERAMA_CFLAGS) -AC_SUBST(XINERAMA_LIBS) - --if test "x${ENABLE_XRENDER}" = "xyes" --then -- PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no]) -- if test "x${XRENDER_FOUND}" = xno -- then -- AC_MSG_ERROR([Could not find Xrender extension - \ --Try installing libXrender-devel or configure --disable-xrender.]) -- fi --fi -- - if test "x${ENABLE_SYSTEMTAP}" = xyes; then - AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], - [SDT_H_FOUND='no'; -@@ -297,16 +245,6 @@ public: + if test "x${ENABLE_XRENDER}" = "xyes" + then + PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no]) +@@ -287,16 +275,6 @@ AC_CONFIG_FILES([tapset/jstack.stp]) fi @@ -93,7 +45,7 @@ Index: icedtea-2.1/configure.ac dnl Check for freetype2 headers and libraries. PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] ,[FREETYPE2_FOUND=no]) -@@ -318,19 +256,6 @@ fi +@@ -308,19 +286,6 @@ AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(FREETYPE2_LIBS) diff --git a/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch b/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch index 1999170..e975707 100644 --- a/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch +++ b/recipes-core/icedtea/openjdk-7-03b147/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 |