diff options
Diffstat (limited to 'recipes-core')
| -rw-r--r-- | recipes-core/icedtea/openjdk-7-03b147/icedtea-disable-desktop-dirs.patch | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-disable-desktop-dirs.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-disable-desktop-dirs.patch deleted file mode 100644 index 739804a..0000000 --- a/recipes-core/icedtea/openjdk-7-03b147/icedtea-disable-desktop-dirs.patch +++ /dev/null | |||
| @@ -1,91 +0,0 @@ | |||
| 1 | diff --git openjdk/jdk/make/common/Subdirs.gmk openjdk/jdk/make/common/Subdirs.gmk | ||
| 2 | index f212d50..da6e9e1 100644 | ||
| 3 | --- openjdk/jdk/make/common/Subdirs.gmk | ||
| 4 | +++ openjdk/jdk/make/common/Subdirs.gmk | ||
| 5 | @@ -88,28 +88,6 @@ done | ||
| 6 | @$(ECHO) "Done Processing OTHERSUBDIRS: $(OTHERSUBDIRS)" | ||
| 7 | endef | ||
| 8 | |||
| 9 | -# | ||
| 10 | -# Iterate the list specified in SUBDIRS_<group> only if | ||
| 11 | -# SUBDIRS_<group> is set. | ||
| 12 | -# | ||
| 13 | -ifdef SUBDIRS_desktop | ||
| 14 | - define subdirs-desktop-loop | ||
| 15 | - @$(call subdirs-group-loop,SUBDIRS_desktop) | ||
| 16 | - endef | ||
| 17 | -else | ||
| 18 | - define subdirs-desktop-loop | ||
| 19 | - endef | ||
| 20 | -endif # SUBDIRS_desktop | ||
| 21 | - | ||
| 22 | -ifdef SUBDIRS_enterprise | ||
| 23 | - define subdirs-enterprise-loop | ||
| 24 | - @$(call subdirs-group-loop,SUBDIRS_enterprise) | ||
| 25 | - endef | ||
| 26 | -else | ||
| 27 | -define subdirs-enterprise-loop | ||
| 28 | -endef | ||
| 29 | -endif # SUBDIRS_enterprise | ||
| 30 | - | ||
| 31 | ifdef SUBDIRS_management | ||
| 32 | define subdirs-management-loop | ||
| 33 | @$(call subdirs-group-loop,SUBDIRS_management) | ||
| 34 | @@ -140,7 +118,7 @@ endif # SUBDIRS_tools | ||
| 35 | # | ||
| 36 | # If BUILD_MODULES is not set or it's set to "all", | ||
| 37 | # iterate all groups. | ||
| 38 | -SUBDIRS_all = $(SUBDIRS) $(SUBDIRS_desktop) $(SUBDIRS_enterprise) \ | ||
| 39 | +SUBDIRS_all = $(SUBDIRS) $(SUBDIRS_enterprise) \ | ||
| 40 | $(SUBDIRS_management) $(SUBDIRS_misc) $(SUBDIRS_tools) | ||
| 41 | |||
| 42 | define SUBDIRS-loop | ||
| 43 | diff --git a/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c b/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c | ||
| 44 | index 5de53ca..b598a22 100644 | ||
| 45 | --- a/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c | ||
| 46 | +++ b/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c | ||
| 47 | @@ -29,7 +29,7 @@ | ||
| 48 | #include "X11SurfaceData.h" | ||
| 49 | |||
| 50 | /*#include <xcb/xcb.h>*/ | ||
| 51 | -#include <Xrender.h> | ||
| 52 | +#include <X11/extensions/Xrender.h> | ||
| 53 | |||
| 54 | #ifndef RepeatNone /* added in 0.10 */ | ||
| 55 | #define RepeatNone 0 | ||
| 56 | diff --git a/jdk/make/sun/xawt/FILES_c_unix.gmk b/jdk/make/sun/xawt/FILES_c_unix.gmk | ||
| 57 | index 57b34c3..c629f78 100644 | ||
| 58 | --- a/jdk/make/sun/xawt/FILES_c_unix.gmk | ||
| 59 | +++ b/jdk/make/sun/xawt/FILES_c_unix.gmk | ||
| 60 | @@ -84,15 +84,8 @@ FILES_c = \ | ||
| 61 | XRSurfaceData.c \ | ||
| 62 | XRBackendNative.c | ||
| 63 | |||
| 64 | -ifndef USE_SYSTEM_GTK | ||
| 65 | FILES_c += \ | ||
| 66 | gtk_fp.c | ||
| 67 | -endif | ||
| 68 | - | ||
| 69 | -ifndef USE_SYSTEM_CUPS | ||
| 70 | -FILES_c += \ | ||
| 71 | - cups_fp.c | ||
| 72 | -endif | ||
| 73 | |||
| 74 | ifndef USE_SYSTEM_FONTCONFIG | ||
| 75 | FILES_c += \ | ||
| 76 | diff --git a/jdk/make/sun/awt/FILES_c_unix.gmk b/jdk/make/sun/awt/FILES_c_unix.gmk | ||
| 77 | index dc1f61e..489abc1 100644 | ||
| 78 | --- a/jdk/make/sun/awt/FILES_c_unix.gmk | ||
| 79 | +++ b/jdk/make/sun/awt/FILES_c_unix.gmk | ||
| 80 | @@ -230,11 +230,6 @@ FILES_NO_MOTIF_c = \ | ||
| 81 | AccelGlyphCache.c \ | ||
| 82 | CUPSfuncs.c | ||
| 83 | |||
| 84 | -ifndef USE_SYSTEM_CUPS | ||
| 85 | -FILES_NO_MOTIF_c += \ | ||
| 86 | - cups_fp.c | ||
| 87 | -endif | ||
| 88 | - | ||
| 89 | ifndef USE_SYSTEM_FONTCONFIG | ||
| 90 | FILES_NO_MOTIF_c += \ | ||
| 91 | fontconfig_fp.c | ||
