diff options
Diffstat (limited to 'recipes-core/icedtea/openjdk-7-03b147')
-rw-r--r-- | recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch | 68 | ||||
-rw-r--r-- | recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch | 18 |
2 files changed, 19 insertions, 67 deletions
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 @@ | |||
1 | Index: icedtea-2.1/configure.ac | 1 | Index: icedtea-2.1.3/configure.ac |
2 | =================================================================== | 2 | =================================================================== |
3 | --- icedtea-2.1.orig/configure.ac | 3 | --- icedtea-2.1.3.orig/configure.ac 2012-10-17 10:18:59.262849964 +0200 |
4 | +++ icedtea-2.1/configure.ac | 4 | +++ icedtea-2.1.3/configure.ac 2012-11-23 09:39:02.244405345 +0100 |
5 | @@ -171,71 +171,19 @@ IT_CHECK_FOR_LCMS | 5 | @@ -171,7 +171,6 @@ |
6 | IT_CHECK_FOR_GTK | 6 | IT_CHECK_FOR_GTK |
7 | IT_CHECK_FOR_GIO | 7 | IT_CHECK_FOR_GIO |
8 | IT_CHECK_FOR_FONTCONFIG | 8 | IT_CHECK_FOR_FONTCONFIG |
@@ -10,45 +10,7 @@ Index: icedtea-2.1/configure.ac | |||
10 | IT_CHECK_FOR_SYSCALLS | 10 | IT_CHECK_FOR_SYSCALLS |
11 | AC_CONFIG_FILES([remove-intree-libraries.sh]) | 11 | AC_CONFIG_FILES([remove-intree-libraries.sh]) |
12 | 12 | ||
13 | -dnl Check for Xproto headers and libraries. | 13 | @@ -205,17 +204,6 @@ |
14 | -PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no]) | ||
15 | -if test "x${XPROTO_FOUND}" = xno | ||
16 | -then | ||
17 | - AC_MSG_ERROR([Could not find Xproto headers - \ | ||
18 | - Try installing xorg-x11-proto-devel.]) | ||
19 | -fi | ||
20 | -AC_SUBST(XT_CFLAGS) | ||
21 | -AC_SUBST(XT_LIBS) | ||
22 | - | ||
23 | -dnl Check for libXt headers and libraries. | ||
24 | -PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no]) | ||
25 | -if test "x${XT_FOUND}" = xno | ||
26 | -then | ||
27 | - AC_MSG_ERROR([Could not find Xt - \ | ||
28 | - Try installing libXt-devel.]) | ||
29 | -fi | ||
30 | -AC_SUBST(XT_CFLAGS) | ||
31 | -AC_SUBST(XT_LIBS) | ||
32 | - | ||
33 | -dnl Check for libXp headers and libraries. | ||
34 | -PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
35 | -if test "x${XP_FOUND}" = xno | ||
36 | -then | ||
37 | - AC_MSG_ERROR([Could not find Xp - \ | ||
38 | - Try installing libXp-devel.]) | ||
39 | -fi | ||
40 | -AC_SUBST(XP_CFLAGS) | ||
41 | -AC_SUBST(XP_LIBS) | ||
42 | - | ||
43 | dnl Check for libX11 headers and libraries. | ||
44 | PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) | ||
45 | if test "x${X11_FOUND}" = xno | ||
46 | then | ||
47 | - AC_MSG_ERROR([Could not find x11 - \ | ||
48 | - Try installing libX11-devel.]) | ||
49 | + AC_MSG_ERROR([Could not find x11 - \ | ||
50 | + Try installing libX11-devel.]) | ||
51 | fi | ||
52 | AC_SUBST(X11_CFLAGS) | 14 | AC_SUBST(X11_CFLAGS) |
53 | AC_SUBST(X11_LIBS) | 15 | AC_SUBST(X11_LIBS) |
54 | 16 | ||
@@ -63,20 +25,10 @@ Index: icedtea-2.1/configure.ac | |||
63 | -AC_SUBST(XINERAMA_CFLAGS) | 25 | -AC_SUBST(XINERAMA_CFLAGS) |
64 | -AC_SUBST(XINERAMA_LIBS) | 26 | -AC_SUBST(XINERAMA_LIBS) |
65 | - | 27 | - |
66 | -if test "x${ENABLE_XRENDER}" = "xyes" | 28 | if test "x${ENABLE_XRENDER}" = "xyes" |
67 | -then | 29 | then |
68 | - PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no]) | 30 | PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no]) |
69 | - if test "x${XRENDER_FOUND}" = xno | 31 | @@ -287,16 +275,6 @@ |
70 | - then | ||
71 | - AC_MSG_ERROR([Could not find Xrender extension - \ | ||
72 | -Try installing libXrender-devel or configure --disable-xrender.]) | ||
73 | - fi | ||
74 | -fi | ||
75 | - | ||
76 | if test "x${ENABLE_SYSTEMTAP}" = xyes; then | ||
77 | AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], | ||
78 | [SDT_H_FOUND='no'; | ||
79 | @@ -297,16 +245,6 @@ public: | ||
80 | AC_CONFIG_FILES([tapset/jstack.stp]) | 32 | AC_CONFIG_FILES([tapset/jstack.stp]) |
81 | fi | 33 | fi |
82 | 34 | ||
@@ -93,7 +45,7 @@ Index: icedtea-2.1/configure.ac | |||
93 | dnl Check for freetype2 headers and libraries. | 45 | dnl Check for freetype2 headers and libraries. |
94 | PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] | 46 | PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] |
95 | ,[FREETYPE2_FOUND=no]) | 47 | ,[FREETYPE2_FOUND=no]) |
96 | @@ -318,19 +256,6 @@ fi | 48 | @@ -308,19 +286,6 @@ |
97 | AC_SUBST(FREETYPE2_CFLAGS) | 49 | AC_SUBST(FREETYPE2_CFLAGS) |
98 | AC_SUBST(FREETYPE2_LIBS) | 50 | AC_SUBST(FREETYPE2_LIBS) |
99 | 51 | ||
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 @@ | |||
1 | Index: icedtea-2.1/Makefile.am | 1 | Index: 03b21-2.1.3-r2.0/icedtea-2.1.3/Makefile.am |
2 | =================================================================== | 2 | =================================================================== |
3 | --- icedtea-2.1.orig/Makefile.am | 3 | --- icedtea-2.1.3/Makefile.am 2012-11-23 00:40:49.323361758 +0100 |
4 | +++ icedtea-2.1/Makefile.am | 4 | +++ icedtea-2.1.3/Makefile.am 2012-11-23 00:41:55.500083848 +0100 |
5 | @@ -18,7 +18,7 @@ JAXP_SHA256SUM = 8ce48c704f38285207ee6dc | 5 | @@ -18,7 +18,7 @@ |
6 | JAXWS_SHA256SUM = 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa | 6 | JAXWS_SHA256SUM = 6d0858d46b68d6e8488e70d1675e5b656aeb4ef51e8ee4e330e77219f92c1c0c |
7 | JDK_SHA256SUM = 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d | 7 | JDK_SHA256SUM = 11146763409098a42dd9896f3fb7e7324a58c5cff5298009eb347ad26abeed51 |
8 | LANGTOOLS_SHA256SUM = c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c | 8 | LANGTOOLS_SHA256SUM = 3a4039348aa49547fffa96563b77b704c72e2ac3ead2c132843ba1e9fe4dbad2 |
9 | -OPENJDK_SHA256SUM = ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7 | 9 | -OPENJDK_SHA256SUM = 0f2e414fee619e78c33bceaee7c440efa598d651b23a75fd61e1282ad6001839 |
10 | +OPENJDK_SHA256SUM = 758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e | 10 | +OPENJDK_SHA256SUM = 54a0ef02b56b265b4122324e08a33c42ececbf2a300ada260611e7b6ccdba96d |
11 | 11 | ||
12 | CACAO_VERSION = a567bcb7f589 | 12 | CACAO_VERSION = a567bcb7f589 |
13 | CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 | 13 | CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 |