summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrejs Mivre┼ćiks2016-10-20 14:24:26 +0300
committerAndrejs Mivre┼ćiks2016-10-20 14:24:26 +0300
commit4208dd0bf008e7111a990802b4dba06997cfcb64 (patch)
tree602d011211a1a59f7628ad402109d8f3ee9e9b9a
parentf5bac38a052c69fa1b34a41ab27d60f22fd72646 (diff)
downloadaur-4208dd0bf008e7111a990802b4dba06997cfcb64.tar.gz
Remove order number from patch file name
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD8
-rw-r--r--add-fontconfig.patch (renamed from 004_add-fontconfig.patch)0
-rw-r--r--enable-infinality.patch (renamed from 005_enable-infinality.patch)0
4 files changed, 9 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8964af2cb6b..562684b39b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Sep 10 19:57:07 UTC 2016
+# Thu Oct 20 11:24:05 UTC 2016
pkgbase = java8-openjdk
pkgver = 8.u102
pkgrel = 1
@@ -7,8 +7,7 @@ pkgbase = java8-openjdk
arch = i686
arch = x86_64
license = custom
- makedepends = jdk7-openjdk
- makedepends = ccache
+ makedepends = java-environment>=7
makedepends = cpio
makedepends = unzip
makedepends = zip
@@ -17,7 +16,7 @@ pkgbase = java8-openjdk
makedepends = fontconfig
makedepends = libcups
makedepends = alsa-lib
- makedepends = fontconfig-infinality
+ makedepends = fontconfig
source = jdk8u-jdk8u102-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u102-b14.tar.gz
source = corba-jdk8u102-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u102-b14.tar.gz
source = hotspot-jdk8u102-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u102-b14.tar.gz
@@ -27,8 +26,8 @@ pkgbase = java8-openjdk
source = langtools-jdk8u102-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u102-b14.tar.gz
source = nashorn-jdk8u102-b14.tar.gz::http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u102-b14.tar.gz
source = build_with_gcc6.patch
- source = 004_add-fontconfig.patch
- source = 005_enable-infinality.patch
+ source = add-fontconfig.patch
+ source = enable-infinality.patch
sha256sums = d4161e41122de3526cfe4ca4d568e79b5843e833640752fa6ba2126f6372ed96
sha256sums = ae51aaf7b6116ca11b79985f94af4b1cfed4675db6ee848904ddfc70b0ed0376
sha256sums = 147e90989a6b1f8e8f7f808b082ec90ca8d79d25fe31db1a5ae04882a71bec0a
diff --git a/PKGBUILD b/PKGBUILD
index ad70d0f8ce6..60b2756eebd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,8 +33,8 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/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
build_with_gcc6.patch
- 004_add-fontconfig.patch
- 005_enable-infinality.patch)
+ add-fontconfig.patch
+ enable-infinality.patch)
sha256sums=('d4161e41122de3526cfe4ca4d568e79b5843e833640752fa6ba2126f6372ed96'
'ae51aaf7b6116ca11b79985f94af4b1cfed4675db6ee848904ddfc70b0ed0376'
@@ -74,8 +74,8 @@ prepare() {
# Apply infinality patches
cd "${srcdir}/jdk8u-${_repo_ver}/jdk"
- patch -p1 < "${srcdir}/004_add-fontconfig.patch"
- patch -p1 < "${srcdir}/005_enable-infinality.patch"
+ patch -p1 < "${srcdir}/add-fontconfig.patch"
+ patch -p1 < "${srcdir}/enable-infinality.patch"
}
build() {
diff --git a/004_add-fontconfig.patch b/add-fontconfig.patch
index 9fc8a005fb7..9fc8a005fb7 100644
--- a/004_add-fontconfig.patch
+++ b/add-fontconfig.patch
diff --git a/005_enable-infinality.patch b/enable-infinality.patch
index ce3e610f843..ce3e610f843 100644
--- a/005_enable-infinality.patch
+++ b/enable-infinality.patch