summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Bayer2015-06-21 14:07:32 +0200
committerChristoph Bayer2015-06-21 14:07:32 +0200
commit7e298c57bf110f935413210b6f5284cf58604b26 (patch)
treefb1dff4763cbda20835525f5c2b9e58a4155ffa2
downloadaur-7e298c57bf110f935413210b6f5284cf58604b26.tar.gz
Initial import
-rw-r--r--.SRCINFO77
-rw-r--r--004_add-fontconfig.patch12
-rw-r--r--005_enable-infinality.patch259
-rw-r--r--006_allow-linux-4.patch11
-rw-r--r--PKGBUILD285
-rw-r--r--install_jdk8-openjdk.sh50
-rw-r--r--install_jre8-openjdk-headless.sh48
-rw-r--r--install_jre8-openjdk.sh55
8 files changed, 797 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 00000000000..149afc39706
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,77 @@
+pkgbase = java8-openjdk
+ pkgver = 8.u45
+ pkgrel = 1
+ url = http://openjdk.java.net/
+ arch = i686
+ arch = x86_64
+ license = custom
+ makedepends = jdk7-openjdk
+ makedepends = ccache
+ makedepends = cpio
+ makedepends = unzip
+ makedepends = zip
+ makedepends = libxrender
+ makedepends = libxtst
+ makedepends = fontconfig
+ makedepends = libcups
+ makedepends = alsa-lib
+ source = jdk8u-jdk8u45-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u45-b14.tar.gz
+ source = corba-jdk8u45-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u45-b14.tar.gz
+ source = hotspot-jdk8u45-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u45-b14.tar.gz
+ source = jdk-jdk8u45-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u45-b14.tar.gz
+ source = jaxws-jdk8u45-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u45-b14.tar.gz
+ source = jaxp-jdk8u45-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u45-b14.tar.gz
+ source = langtools-jdk8u45-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u45-b14.tar.gz
+ source = nashorn-jdk8u45-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u45-b14.tar.gz
+ source = 004_add-fontconfig.patch
+ source = 005_enable-infinality.patch
+ source = 006_allow-linux-4.patch
+ sha256sums = b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2
+ sha256sums = 6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de
+ sha256sums = 1dc7c5038f57f77a1e92cf1b48a188a0291805e69f570e1164efb7adb34c5a59
+ sha256sums = 2b125825962a2ff110afadb37784faf276e7146023c4a6cede6a3f923f48c692
+ sha256sums = e6f6233c26335536436de89ebf741df8b142119d8b41abc34c3287dd155a43bb
+ sha256sums = c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976
+ sha256sums = eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9
+ sha256sums = e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9
+ sha256sums = 7eccdeda71d651423a066c942b3d300eccd8d95e161725fa508d84f0bc010ceb
+ sha256sums = efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac
+ sha256sums = 769cd85c0fe71345224eb5a61faff7441070e612a3ccfbb8e92d4dd827d21b04
+
+pkgname = jre8-openjdk-headless-infinality
+ pkgdesc = OpenJDK Java 8 headless runtime environment with infinality patch applied
+ install = install_jre8-openjdk-headless.sh
+ depends = java-runtime-common
+ depends = ca-certificates-utils
+ depends = nss
+ optdepends = java-rhino: for some JavaScript support
+ provides = java-runtime-headless=8
+ provides = java-runtime-headless-openjdk=8
+ conflicts = jre8-openjdk-headless
+ replaces = jre8-openjdk-headless-wm
+ backup =
+
+pkgname = jre8-openjdk-infinality
+ pkgdesc = OpenJDK Java 8 full runtime environment with infinality patch applied
+ install = install_jre8-openjdk.sh
+ depends = jre8-openjdk-headless-infinality=8.u45-1
+ depends = xdg-utils
+ depends = hicolor-icon-theme
+ optdepends = icedtea-web: web browser plugin + Java Web Start
+ optdepends = alsa-lib: for basic sound support
+ optdepends = gtk2: for the Gtk+ look and feel - desktop usage
+ provides = java-runtime=8
+ provides = java-runtime-openjdk=8
+ conflicts = jre8-openjdk
+ replaces = jre8-openjdk-wm
+
+pkgname = jdk8-openjdk-infinality
+ pkgdesc = OpenJDK Java 8 development kit with infinality patch applied
+ install = install_jdk8-openjdk.sh
+ depends = java-environment-common
+ depends = jre8-openjdk-infinality=8.u45-1
+ provides = java-environment=8
+ provides = java-environment-openjdk=8
+ conflicts = jdk8-openjdk
+ replaces = jdk8-openjdk-wm
+
diff --git a/004_add-fontconfig.patch b/004_add-fontconfig.patch
new file mode 100644
index 00000000000..da25036b9a2
--- /dev/null
+++ b/004_add-fontconfig.patch
@@ -0,0 +1,12 @@
+diff -rupN a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
+--- a/make/lib/Awt2dLibraries.gmk 2014-09-14 18:57:10.466023148 +0200
++++ b/make/lib/Awt2dLibraries.gmk 2014-09-14 18:58:11.888148006 +0200
+@@ -827,7 +827,7 @@ $(eval $(call SetupNativeCompilation,BUI
+ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
+- LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
++ LDFLAGS_SUFFIX_linux := -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
+ LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
+ LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\
+ LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
diff --git a/005_enable-infinality.patch b/005_enable-infinality.patch
new file mode 100644
index 00000000000..ce3e610f843
--- /dev/null
+++ b/005_enable-infinality.patch
@@ -0,0 +1,259 @@
+diff -rupN a/src/share/native/sun/font/freetypeScaler.c b/src/share/native/sun/font/freetypeScaler.c
+--- a/src/share/native/sun/font/freetypeScaler.c 2014-09-14 16:28:06.108295959 +0200
++++ b/src/share/native/sun/font/freetypeScaler.c 2014-09-14 16:28:45.569693174 +0200
+@@ -23,6 +23,9 @@
+ * questions.
+ */
+
++/* Use Infinality patches as default */
++#define INFINALITY
++
+ #include "jni.h"
+ #include "jni_util.h"
+ #include "jlong.h"
+@@ -38,6 +41,10 @@
+ #include FT_SIZES_H
+ #include FT_OUTLINE_H
+ #include FT_SYNTHESIS_H
++#ifdef INFINALITY
++#include FT_LCD_FILTER_H
++#include <fontconfig/fontconfig.h>
++#endif
+
+ #include "fontscaler.h"
+
+@@ -676,6 +683,147 @@ static void CopyFTSubpixelVToSubpixel(co
+ }
+ }
+
++#ifdef INFINALITY
++typedef struct {
++ FT_Render_Mode ftRenderMode;
++ int ftLoadFlags;
++ FT_LcdFilter ftLcdFilter;
++} RenderingProperties;
++
++static FcPattern* matchedPattern(const FcChar8* family, double ptSize) {
++ /*
++ we will create pattern to find our family and size in
++ fontconfig configuration, and then will return it's
++ properties:
++ */
++ FcPattern* fcPattern = 0;
++ fcPattern = FcPatternCreate();
++ FcValue fcValue;
++ fcValue.type = FcTypeString;
++ fcValue.u.s = family;
++ FcPatternAdd(fcPattern, FC_FAMILY, fcValue, FcTrue);
++ FcPatternAddBool(fcPattern, FC_SCALABLE, FcTrue);
++ FcPatternAddDouble(fcPattern, FC_SIZE, ptSize);
++ // TODO FcPatternAddInteger(pattern, FC_WEIGHT, weight_value);
++ // TODO FcPatternAddInteger(pattern, FC_SLANT, slant_value);
++ // TODO FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size_value);
++ // TODO FcPatternAddInteger(pattern, FC_WIDTH, stretch); 100 in most cases
++ FcConfigSubstitute(0, fcPattern, FcMatchPattern);
++ FcConfigSubstitute(0, fcPattern, FcMatchFont);
++ FcDefaultSubstitute(fcPattern);
++ FcResult res;
++
++ FcPattern *pattern = 0;
++ pattern = FcFontMatch(0, fcPattern, &res);
++ FcPatternDestroy(fcPattern);
++ return pattern;
++}
++
++static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) {
++
++ FcPattern *pattern = matchedPattern(family, ptSize);
++
++ int ftLoadFalgs = FT_LOAD_DEFAULT;
++ FT_Render_Mode ftRenderMode;
++ FT_LcdFilter ftLcdFilter;
++ char horizontal = 1;
++ FcBool b;
++
++ // subpixel order:
++ if (aaType == TEXT_AA_ON)
++ ftRenderMode = FT_RENDER_MODE_NORMAL;
++ else if (aaType == TEXT_AA_OFF)
++ ftRenderMode = FT_RENDER_MODE_MONO;
++ else if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &b) == FcResultMatch)
++ if (b) {
++ int subpixel = FC_RGBA_UNKNOWN;
++ FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel);
++ if (subpixel == FC_RGBA_UNKNOWN)
++ subpixel = FC_RGBA_NONE;
++ switch (subpixel) {
++ case FC_RGBA_NONE:
++ ftRenderMode = FT_RENDER_MODE_NORMAL;
++ break;
++ case FC_RGBA_RGB:
++ case FC_RGBA_BGR:
++ ftRenderMode = FT_RENDER_MODE_LCD;
++ horizontal = 1;
++ break;
++ case FC_RGBA_VRGB:
++ case FC_RGBA_VBGR:
++ ftRenderMode = FT_RENDER_MODE_LCD_V;
++ horizontal = 0;
++ break;
++ default:
++ break;
++ }
++ } else {
++ ftRenderMode = FT_RENDER_MODE_NORMAL;
++ }
++
++ // loading mode:
++ if (aaType == TEXT_AA_OFF)
++ ftLoadFalgs |= FT_LOAD_TARGET_MONO;
++ else {
++ int hint_style = FC_HINT_NONE;
++ FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &hint_style);
++ switch (hint_style) {
++ case FC_HINT_NONE:
++ ftLoadFalgs |= FT_LOAD_NO_HINTING;
++ break;
++ case FC_HINT_SLIGHT:
++ ftLoadFalgs |= FT_LOAD_TARGET_LIGHT;
++ break;
++ case FC_HINT_MEDIUM:
++ ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
++ break;
++ case FC_HINT_FULL:
++ if (aaType == TEXT_AA_ON)
++ ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
++ else
++ ftLoadFalgs |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V;
++ break;
++ default:
++ // what else to use as default?
++ ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
++ break;
++ }
++ }
++
++ // autohinting:
++ if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &b) == FcResultMatch)
++ if (b)
++ ftLoadFalgs |= FT_LOAD_FORCE_AUTOHINT;
++
++ // LCD filter:
++ int filter = FC_LCD_DEFAULT;
++ FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &filter);
++ switch (filter) {
++ case FC_LCD_NONE:
++ ftLcdFilter = FT_LCD_FILTER_NONE;
++ break;
++ case FC_LCD_DEFAULT:
++ ftLcdFilter = FT_LCD_FILTER_DEFAULT;
++ break;
++ case FC_LCD_LIGHT:
++ ftLcdFilter = FT_LCD_FILTER_LIGHT;
++ break;
++ case FC_LCD_LEGACY:
++ ftLcdFilter = FT_LCD_FILTER_LEGACY;
++ break;
++ default:
++ // new unknown lcd filter type?! will use default one:
++ ftLcdFilter = FT_LCD_FILTER_DEFAULT;
++ break;
++ }
++
++ FcPatternDestroy(pattern);
++
++ rp->ftRenderMode = ftRenderMode;
++ rp->ftLoadFlags = ftLoadFalgs;
++ rp->ftLcdFilter = ftLcdFilter;
++}
++#endif
+
+ /*
+ * Class: sun_font_FreetypeFontScaler
+@@ -691,7 +839,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+ UInt16 width, height;
+ GlyphInfo *glyphInfo;
+ int glyph_index;
++#ifndef INFINALITY
+ int renderFlags = FT_LOAD_RENDER, target;
++#endif
+ FT_GlyphSlot ftglyph;
+
+ FTScalerContext* context =
+@@ -709,6 +859,11 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+ return ptr_to_jlong(getNullGlyphImage());
+ }
+
++#ifdef INFINALITY
++ RenderingProperties renderingProperties;
++ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
++ context->ptsz, context->aaType, &renderingProperties);
++#else
+ /* if algorithmic styling is required then we do not request bitmap */
+ if (context->doBold || context->doItalize) {
+ renderFlags = FT_LOAD_DEFAULT;
+@@ -731,10 +886,17 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+ target = FT_LOAD_TARGET_LCD_V;
+ }
+ renderFlags |= target;
++#endif
+
+ glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
+
++#ifdef INFINALITY
++ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
++ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
++#else
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
++#endif
++
+ if (error) {
+ //do not destroy scaler yet.
+ //this can be problem of particular context (e.g. with bad transform)
+@@ -753,9 +915,13 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+
+ /* generate bitmap if it is not done yet
+ e.g. if algorithmic styling is performed and style was added to outline */
++#ifdef INFINALITY
++ FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);
++#else
+ if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) {
+ FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
+ }
++#endif
+
+ width = (UInt16) ftglyph->bitmap.width;
+ height = (UInt16) ftglyph->bitmap.rows;
+@@ -969,7 +1135,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+ static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
+ FTScalerContext *context, FTScalerInfo* scalerInfo,
+ jint glyphCode, jfloat xpos, jfloat ypos) {
++#ifndef INFINALITY
+ int renderFlags;
++#endif
+ int glyph_index;
+ FT_Error error;
+ FT_GlyphSlot ftglyph;
+@@ -984,11 +1152,22 @@ static FT_Outline* getFTOutline(JNIEnv*
+ return NULL;
+ }
+
++#ifdef INFINALITY
++ RenderingProperties renderingProperties;
++ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
++ context->ptsz, context->aaType, &renderingProperties);
++#else
+ renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
++#endif
+
+ glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
+
++#ifdef INFINALITY
++ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
++#else
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
++#endif
++
+ if (error) {
+ return NULL;
+ }
diff --git a/006_allow-linux-4.patch b/006_allow-linux-4.patch
new file mode 100644
index 00000000000..dd946db4694
--- /dev/null
+++ b/006_allow-linux-4.patch
@@ -0,0 +1,11 @@
+--- a/make/linux/Makefile 2015-04-25 16:11:11.030365435 +0200
++++ b/make/linux/Makefile 2015-04-25 16:11:36.447912960 +0200
+@@ -229,7 +229,7 @@ checks: check_os_version check_j2se_vers
+ # Solaris 2.5.1, 2.6).
+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
+
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
+ OS_VERSION := $(shell uname -r)
+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 00000000000..05c0d5aba82
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,285 @@
+# Contributor: Christoph Bayer <chrbayer@criby.de>
+# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
+
+# TODO
+# once icedtea:
+# pulse
+# add policytool desktop files
+
+pkgname=('jre8-openjdk-headless-infinality' 'jre8-openjdk-infinality' 'jdk8-openjdk-infinality')
+pkgbase=java8-openjdk
+_java_ver=8
+_jdk_update=45
+_jdk_build=14
+pkgver=${_java_ver}.u${_jdk_update}
+_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://openjdk.java.net/'
+license=('custom')
+makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip'
+ 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
+_url_src=http://hg.openjdk.java.net/jdk8u/jdk8u
+source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
+ corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz
+ hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz
+ jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz
+ jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
+ jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
+ langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
+ nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
+ 004_add-fontconfig.patch
+ 005_enable-infinality.patch
+ 006_allow-linux-4.patch)
+
+sha256sums=('b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2'
+ '6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de'
+ '1dc7c5038f57f77a1e92cf1b48a188a0291805e69f570e1164efb7adb34c5a59'
+ '2b125825962a2ff110afadb37784faf276e7146023c4a6cede6a3f923f48c692'
+ 'e6f6233c26335536436de89ebf741df8b142119d8b41abc34c3287dd155a43bb'
+ 'c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976'
+ 'eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9'
+ 'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9'
+ '7eccdeda71d651423a066c942b3d300eccd8d95e161725fa508d84f0bc010ceb'
+ 'efeee8db0710bc217b5e886224450f6cf50938004e8c140eb9aee0a699d2d5ac'
+ '769cd85c0fe71345224eb5a61faff7441070e612a3ccfbb8e92d4dd827d21b04')
+
+case "${CARCH}" in
+ 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
+ 'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;;
+esac
+
+_jdkname=openjdk8
+_jvmdir=/usr/lib/jvm/java-8-openjdk
+_prefix="jdk8u-${_repo_ver}/image"
+_imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})"
+_nonheadless=(bin/policytool
+ lib/${_JARCH}/libjsound.so
+ lib/${_JARCH}/libjsoundalsa.so
+ lib/${_JARCH}/libsplashscreen.so)
+
+prepare() {
+ cd "${srcdir}/jdk8u-${_repo_ver}"
+
+ for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
+ do
+ ln -s ../${subrepo}-${_repo_ver} ${subrepo}
+ done
+
+ cd "${srcdir}/jdk8u-${_repo_ver}/jdk"
+ # Apply infinality patches
+ patch -p1 < "${srcdir}/004_add-fontconfig.patch"
+ patch -p1 < "${srcdir}/005_enable-infinality.patch"
+
+ cd "${srcdir}/hotspot-${_repo_ver}"
+ # Apply linux version patch
+ patch -p1 < "${srcdir}/006_allow-linux-4.patch"
+}
+
+build() {
+ cd "${srcdir}/jdk8u-${_repo_ver}"
+
+ unset JAVA_HOME
+ unset _JAVA_OPTIONS
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
+ export MAKEFLAGS=${MAKEFLAGS/-j*}
+
+ install -d -m 755 "${srcdir}/${_prefix}/"
+ sh configure \
+ --prefix="${srcdir}/${_prefix}" \
+ --with-update-version="${_jdk_update}" \
+ --with-build-number="b${_jdk_build}" \
+ --with-milestone="fcs" \
+ --enable-unlimited-crypto \
+ --with-zlib=system
+
+ # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed)
+ #--with-giflib=system \
+
+ # Without 'DEBUG_BINARIES', i686 won't build
+ # http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html
+ make \
+ DEBUG_BINARIES=true
+ # These help to debug builds:
+ #LOG=trace HOTSPOT_BUILD_JOBS=1
+
+ make docs
+
+ # FIXME sadly 'DESTDIR' is not used here!
+ make install
+
+ cd "${srcdir}/${_imgdir}"
+
+ # A lot of build stuff were directly taken from
+ # http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/tree/java-1.8.0-openjdk.spec
+
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+ find . -iname '*.jar' -exec chmod ugo+r {} \;
+ chmod ugo+r lib/ct.sym
+
+ # remove redundant *diz and *debuginfo files
+ find . -iname '*.diz' -exec rm {} \;
+ find . -iname '*.debuginfo' -exec rm {} \;
+}
+
+#check() {
+# cd "${srcdir}/${pkgname}-${pkgver}"
+# make -k check
+#}
+
+package_jre8-openjdk-headless-infinality() {
+ pkgdesc='OpenJDK Java 8 headless runtime environment with infinality patch applied'
+ depends=('java-runtime-common' 'ca-certificates-utils' 'nss')
+ optdepends=('java-rhino: for some JavaScript support')
+ provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8')
+ conflicts=('jre8-openjdk-headless')
+ # Upstream config files that should go to etc and get backup
+ _backup_etc=(etc/java-8-openjdk/${_JARCH}/jvm.cfg
+ etc/java-8-openjdk/calendars.properties
+ etc/java-8-openjdk/content-types.properties
+ etc/java-8-openjdk/flavormap.properties
+ etc/java-8-openjdk/images/cursors/cursors.properties
+ etc/java-8-openjdk/logging.properties
+ etc/java-8-openjdk/management/jmxremote.access
+ etc/java-8-openjdk/management/jmxremote.password
+ etc/java-8-openjdk/management/management.properties
+ etc/java-8-openjdk/management/snmp.acl
+ etc/java-8-openjdk/net.properties
+ etc/java-8-openjdk/psfont.properties.ja
+ etc/java-8-openjdk/psfontj2d.properties
+ etc/java-8-openjdk/security/java.policy
+ etc/java-8-openjdk/security/java.security
+ etc/java-8-openjdk/sound.properties)
+ replaces=('jre8-openjdk-headless-wm')
+ backup=(${_backup_etc[@]})
+ install=install_jre8-openjdk-headless.sh
+
+ cd "${srcdir}/${_imgdir}/jre"
+
+ install -d -m 755 "${pkgdir}${_jvmdir}/jre/"
+ cp -a bin lib "${pkgdir}${_jvmdir}/jre"
+
+ # Set config files
+ mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
+ mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
+
+ # Remove 'non-headless' lib files
+ for f in ${_nonheadless[@]}; do
+ rm "${pkgdir}${_jvmdir}/jre/${f}"
+ done
+
+ # Man pages
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+ for file in *; do
+ install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1"
+ install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1"
+ done
+ popd
+
+ # Link JKS keystore from ca-certificates-utils
+ rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
+ ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
+
+ # Install license
+ install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
+ install -m 644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
+ "${pkgdir}/usr/share/licenses/${pkgbase}"
+ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ # Move config files that were set in _backup_etc from ./lib to /etc
+ for file in ${_backup_etc[@]}; do
+ _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/}
+ install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
+ ln -sf /${file} "${pkgdir}${_filepkgpath}"
+ done
+}
+
+package_jre8-openjdk-infinality() {
+ pkgdesc='OpenJDK Java 8 full runtime environment with infinality patch applied'
+ depends=("jre8-openjdk-headless-infinality=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
+ optdepends=('icedtea-web: web browser plugin + Java Web Start'
+ 'alsa-lib: for basic sound support'
+ 'gtk2: for the Gtk+ look and feel - desktop usage')
+ # TODO when adding IcedTea: 'giflib: for gif format support'
+ # TODO when adding IcedTea: 'libpulse: for advanced sound support'
+ provides=('java-runtime=8' 'java-runtime-openjdk=8')
+ conflicts=('jre8-openjdk')
+ install=install_jre8-openjdk.sh
+ replaces=('jre8-openjdk-wm')
+
+ cd "${srcdir}/${_imgdir}/jre"
+
+ # TODO? Should /usr/lib/jvm/java-8-openjdk/jre/lib/sound.properties belong to jre?
+ for f in ${_nonheadless[@]}; do
+ install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
+ done
+
+ # Man pages
+ pushd "${pkgdir}${_jvmdir}/jre/bin"
+ install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+ for file in *; do
+ install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1"
+ install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+ "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1"
+ done
+ popd
+
+ # Desktop files
+ # TODO add these when switching to IcedTea
+ #install -D -m 644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" \
+ # "${pkgdir}/usr/share/applications/policytool.desktop"
+
+ # Install license
+ install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
+ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_jdk8-openjdk-infinality() {
+ pkgdesc='OpenJDK Java 8 development kit with infinality patch applied'
+ depends=('java-environment-common' "jre8-openjdk-infinality=${pkgver}-${pkgrel}")
+ provides=('java-environment=8' 'java-environment-openjdk=8')
+ conflicts=('jdk8-openjdk')
+ replaces=('jdk8-openjdk-wm')
+ install=install_jdk8-openjdk.sh
+
+ cd "${srcdir}/${_imgdir}"
+
+ # Main files
+ install -d -m 755 "${pkgdir}${_jvmdir}"
+
+ cp -a include lib "${pkgdir}${_jvmdir}"
+
+ # 'bin' files
+ pushd bin
+
+ # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
+ for b in $(ls | grep -v java-rmi.cgi); do
+ if [ -e ../jre/bin/${b} ]; then
+ # Provide a link of the jre binary in the jdk/bin/ directory
+ ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
+ else
+ # Copy binary to jdk/bin/
+ install -D -m 755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
+ # Copy man page
+ install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1"
+ install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1"
+ fi
+ done
+ popd
+
+ # Handling 'java-rmi.cgi' separately
+ install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
+
+ # Desktop files.
+ # TODO add these when switching to IcedTea
+ #install -m 644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" \
+ # "${pkgdir}/usr/share/applications"
+
+ # link license
+ install -d -m 755 "${pkgdir}/usr/share/licenses/"
+ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
diff --git a/install_jdk8-openjdk.sh b/install_jdk8-openjdk.sh
new file mode 100644
index 00000000000..faac872502a
--- /dev/null
+++ b/install_jdk8-openjdk.sh
@@ -0,0 +1,50 @@
+THIS_JDK='java-8-openjdk'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "" | ${THIS_JDK}/jre)
+ /usr/bin/archlinux-java set ${THIS_JDK}
+ ;;
+ ${THIS_JDK})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+post_upgrade() {
+ default=$(fix_default)
+ if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
+ /usr/bin/archlinux-java set ${THIS_JDK}
+ fi
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+pre_remove() {
+ if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
+ /usr/bin/archlinux-java unset
+ if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
+ /usr/bin/archlinux-java set ${THIS_JDK}/jre
+ fi
+ fi
+}
diff --git a/install_jre8-openjdk-headless.sh b/install_jre8-openjdk-headless.sh
new file mode 100644
index 00000000000..5d7a0de43f4
--- /dev/null
+++ b/install_jre8-openjdk-headless.sh
@@ -0,0 +1,48 @@
+THIS_JRE='java-8-openjdk/jre'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ ;;
+ ${THIS_JRE} | ${THIS_JRE/\/jre})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+post_upgrade() {
+ if [ -z $(fix_default) ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+ /usr/bin/update-ca-trust
+ fi
+}
+
+pre_remove() {
+ default=$(fix_default)
+ if [ "x${default/\/jre}" = "x${THIS_JRE/\/jre}" ]; then
+ /usr/bin/archlinux-java unset
+ echo "No Java environment is set as default anymore"
+ fi
+}
diff --git a/install_jre8-openjdk.sh b/install_jre8-openjdk.sh
new file mode 100644
index 00000000000..857020bfe83
--- /dev/null
+++ b/install_jre8-openjdk.sh
@@ -0,0 +1,55 @@
+THIS_JRE='java-8-openjdk/jre'
+
+fix_default() {
+ if [ ! -x /usr/bin/java ]; then
+ /usr/bin/archlinux-java unset
+ echo ""
+ else
+ /usr/bin/archlinux-java get
+ fi
+}
+
+post_install() {
+ default=$(fix_default)
+ case ${default} in
+ "")
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ ;;
+ ${THIS_JRE} | ${THIS_JRE/\/jre})
+ # Nothing
+ ;;
+ *)
+ echo "Default Java environment is already set to '${default}'"
+ echo "See 'archlinux-java help' to change it"
+ ;;
+ esac
+
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ echo "when you use a non-reparenting window manager,"
+ echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+
+# update-desktop-database -q
+}
+
+post_upgrade() {
+ if [ -z $(fix_default) ]; then
+ /usr/bin/archlinux-java set ${THIS_JRE}
+ fi
+
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+
+# update-desktop-database -q
+}
+
+pre_remove() {
+ if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then
+ /usr/bin/archlinux-java unset
+ echo "No Java environment is set as default anymore"
+ fi
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+
+# update-desktop-database -q
+}