diff options
| author | Ilya Lipnitskiy | 2020-03-23 14:09:47 -0700 |
|---|---|---|
| committer | Ilya Lipnitskiy | 2020-03-23 14:24:23 -0700 |
| commit | 552c8015843f1678ec631a87e166201c14e52985 (patch) | |
| tree | 06017fa6898e164587d0d4a2244c8d144727ddee | |
| parent | 5aa89f98277daa1fe54e21e7467afb3fc79ea637 (diff) | |
| download | aur-552c8015843f1678ec631a87e166201c14e52985.tar.gz | |
Hard-code Java 13 for now for easier startup
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rwxr-xr-x | asciidocfx | 3 | ||||
| -rw-r--r-- | repo-https.patch | 33 | ||||
| -rw-r--r-- | versions.patch | 20 |
5 files changed, 75 insertions, 9 deletions
@@ -1,19 +1,23 @@ pkgbase = asciidocfx pkgdesc = Asciidoc Editor and Toolchain written with JavaFX pkgver = 1.7.1 - pkgrel = 1 + pkgrel = 2 url = http://asciidocfx.com/ arch = any license = Apache makedepends = maven>=3.3.9 - makedepends = java-environment>=12 + makedepends = java-environment>=11 makedepends = gendesk - depends = java-environment>=12 + depends = java-environment=13 depends = java-openjfx source = https://github.com/asciidocfx/AsciidocFX/archive/v1.7.1.tar.gz source = asciidocfx + source = repo-https.patch + source = versions.patch sha512sums = 0bb8d8fb2cc486fab2578bd08ceaf20cd5db3df371f4065cd5e9fc431afb65056113ecb364324876ecd3fe8030646cdd6ea6be5532e8a8f7bdc169709a060d3e - sha512sums = 1d3e26797e573244177ed44f18a48da8a902b5fb54575fb2998b433346e90fadea54387416b1b720531d2a4b72f51d67e33cc4096eb6b34098170e20a23741a1 + sha512sums = 6482d9a0c6133a5d19efeabe9ba581e43858a162777d30afab3bd2575c6c9bcc336c9b7edb7c14a4434f42e64765f735f721fed1db16e2eb298c4889a09f136a + sha512sums = f936480034d81c173c1af74ad30590f5915ff2c3d3bcb82e8b7b492b9d5af28b3f98d764a522aaf9b2cfb39a1343d63e7a6a2d2a71f53aea232c1f8bc96042e3 + sha512sums = 3aa8793fab11538b9adc91a862a0607d53f2f7f0093fcc9119e0e3f741e687b1e5f858093333cd27faff9f950941e2ed6b0a9b47cdbb027fd5ff8c18f5d2f296 pkgname = asciidocfx @@ -3,26 +3,34 @@ pkgname=asciidocfx pkgver=1.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Asciidoc Editor and Toolchain written with JavaFX" arch=('any') url='http://asciidocfx.com/' license=('Apache') -makedepends=('maven>=3.3.9' 'java-environment>=12' 'gendesk') -depends=('java-environment>=12' 'java-openjfx') +makedepends=('maven>=3.3.9' 'java-environment>=11' 'gendesk') +depends=('java-environment=13' 'java-openjfx') source=( "https://github.com/asciidocfx/AsciidocFX/archive/v${pkgver}.tar.gz" 'asciidocfx' + 'repo-https.patch' + 'versions.patch' ) sha512sums=( '0bb8d8fb2cc486fab2578bd08ceaf20cd5db3df371f4065cd5e9fc431afb65056113ecb364324876ecd3fe8030646cdd6ea6be5532e8a8f7bdc169709a060d3e' - '1d3e26797e573244177ed44f18a48da8a902b5fb54575fb2998b433346e90fadea54387416b1b720531d2a4b72f51d67e33cc4096eb6b34098170e20a23741a1' + '6482d9a0c6133a5d19efeabe9ba581e43858a162777d30afab3bd2575c6c9bcc336c9b7edb7c14a4434f42e64765f735f721fed1db16e2eb298c4889a09f136a' + 'f936480034d81c173c1af74ad30590f5915ff2c3d3bcb82e8b7b492b9d5af28b3f98d764a522aaf9b2cfb39a1343d63e7a6a2d2a71f53aea232c1f8bc96042e3' + '3aa8793fab11538b9adc91a862a0607d53f2f7f0093fcc9119e0e3f741e687b1e5f858093333cd27faff9f950941e2ed6b0a9b47cdbb027fd5ff8c18f5d2f296' ) prepare() { + cd "AsciidocFX-${pkgver}" + patch --forward --strip=1 --input="${srcdir}/repo-https.patch" + patch --forward --strip=1 --input="${srcdir}/versions.patch" + cd .. # Generate a desktop entry # -f: forces and overrides the file if any diff --git a/asciidocfx b/asciidocfx index 9fdaec02a52f..3a4c229943ba 100755 --- a/asciidocfx +++ b/asciidocfx @@ -5,8 +5,9 @@ for name in $BASEDIR/lib/*.jar; do done PATH_TO_FX=/usr/lib/jvm/java-13-openjfx/lib +PATH_TO_JAVA=/usr/lib/jvm/java-13-openjdk/bin/java -exec /usr/bin/java \ +exec $PATH_TO_JAVA \ -cp $CP \ -Duser.language=en \ -Duser.country=US \ diff --git a/repo-https.patch b/repo-https.patch new file mode 100644 index 000000000000..02052aafbeda --- /dev/null +++ b/repo-https.patch @@ -0,0 +1,33 @@ +diff --git a/pom.xml b/pom.xml +index eabac46..f24470e 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -399,7 +399,7 @@ + <repository> + <id>central</id> + <name>Maven Central</name> +- <url>http://repo1.maven.org/maven2/</url> ++ <url>https://repo1.maven.org/maven2/</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> +@@ -421,16 +421,16 @@ + <checksumPolicy>warn</checksumPolicy> + <updatePolicy>always</updatePolicy> + </releases> +- <url>http://www.sparetimelabs.com/maven2</url> ++ <url>https://www.sparetimelabs.com/maven2</url> + </repository> + <repository> + <id>jcenter-central</id> + <name>jcenter</name> +- <url>http://jcenter.bintray.com</url> ++ <url>https://jcenter.bintray.com</url> + </repository> + <repository> + <id>ej-technologies</id> +- <url>http://maven.ej-technologies.com/repository</url> ++ <url>https://maven.ej-technologies.com/repository</url> + </repository> + </repositories> + diff --git a/versions.patch b/versions.patch new file mode 100644 index 000000000000..30fff1c21d10 --- /dev/null +++ b/versions.patch @@ -0,0 +1,20 @@ +diff --git a/pom.xml b/pom.xml +index f24470e..0574aee 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -12,13 +12,13 @@ + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> +- <java.version>12</java.version> ++ <java.version>11</java.version> + <maven.compiler.source>${java.version}</maven.compiler.source> + <maven.compiler.target>${java.version}</maven.compiler.target> + <mainClass>com.kodedu.boot.AppStarter</mainClass> + <install4j.home>/home/travis/build/asciidocfx/AsciidocFX/install4j8.0</install4j.home> + <install4j.licenseKey>${env.LICENSE_KEY_8}</install4j.licenseKey> +- <openjfx.version>12</openjfx.version> ++ <openjfx.version>13</openjfx.version> + <ikonli.version>11.3.4</ikonli.version> + <jaxb.version>2.3.2</jaxb.version> + </properties> |