From a36980df18eefe8929ff0a63e76646f77db3b88e Mon Sep 17 00:00:00 2001 From: MagomeYae <91249055+MagomeYae@users.noreply.github.com> Date: Mon, 29 Nov 2021 23:12:26 +0800 Subject: fix(pkg): Fix java-16-openjdk build Signed-off-by: MagomeYae <91249055+MagomeYae@users.noreply.github.com> --- .gitmodules | 5 +---- repo/.hook/java-16-openjdk | 2 ++ repo/.yaydeps/java-16-openjdk | 1 - repo/jdk8 | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 repo/.hook/java-16-openjdk delete mode 100644 repo/.yaydeps/java-16-openjdk delete mode 160000 repo/jdk8 diff --git a/.gitmodules b/.gitmodules index f9211c2..c3678e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -42,7 +42,4 @@ url = https://aur.archlinux.org/gtk3-classic.git [submodule "repo/java-16-openjdk"] path = repo/java-16-openjdk - url = https://aur.archlinux.org/java-16-openjdk.git -[submodule "repo/jdk8"] - path = repo/jdk8 - url = https://aur.archlinux.org/jdk8.git + url = https://aur.archlinux.org/java-16-openjdk.git \ No newline at end of file diff --git a/repo/.hook/java-16-openjdk b/repo/.hook/java-16-openjdk new file mode 100644 index 0000000..bc97027 --- /dev/null +++ b/repo/.hook/java-16-openjdk @@ -0,0 +1,2 @@ +#!/bin/bash +sed -i 's/java-environment-jdk<=16/jdk11-openjdk/g' PKGBUILD \ No newline at end of file diff --git a/repo/.yaydeps/java-16-openjdk b/repo/.yaydeps/java-16-openjdk deleted file mode 100644 index a13c335..0000000 --- a/repo/.yaydeps/java-16-openjdk +++ /dev/null @@ -1 +0,0 @@ -jdk8 diff --git a/repo/jdk8 b/repo/jdk8 deleted file mode 160000 index aaa610f..0000000 --- a/repo/jdk8 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aaa610fd0842a3c984d9dc81ce6f207bd023f942 -- cgit v1.3.1