diff options
| author | skydrome | 2019-04-10 02:07:35 -0400 |
|---|---|---|
| committer | skydrome | 2019-04-10 02:07:35 -0400 |
| commit | 778fc69cd6b95c710468d5abecc7049c21fa4f80 (patch) | |
| tree | f9854290e32d43cbb2d34eac4954a4ee6b3c3e7b | |
| parent | 9ff6c736c86166e4c9784d74aab6d9f95d607f34 (diff) | |
| download | aur-778fc69cd6b95c710468d5abecc7049c21fa4f80.tar.gz | |
final fix for gradle 5
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | gradle.properties | 3 |
3 files changed, 4 insertions, 13 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Tue Apr 9 08:34:17 UTC 2019 +# Wed Apr 10 06:04:46 UTC 2019 pkgbase = freenet pkgdesc = An encrypted network without censorship pkgver = 0.7.5.1484 @@ -25,7 +25,6 @@ pkgbase = freenet source = git+https://github.com/freenet/plugin-WebOfTrust.git#branch=next source = IpToCountry.dat::http://software77.net/geo-ip/?DL=4 source = https://github.com/freenet/seedrefs/files/1609768/seednodes.zip - source = gradle.properties source = run.sh source = freenet.service source = freenet.ini @@ -36,7 +35,6 @@ pkgbase = freenet sha256sums = SKIP sha256sums = SKIP sha256sums = 0d91d2462f36d35235cc86cbdee11890cadec91a0a01b89d96010924f6c2be99 - sha256sums = aa93d349c75703b2bc30d44ec18017c4e99e0b71341e6c13848210ab8e4abc68 sha256sums = a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769 sha256sums = 434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f sha256sums = c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25 @@ -31,7 +31,7 @@ source=("git+https://github.com/freenet/fred.git${_fred}" "git+https://github.com/freenet/plugin-WebOfTrust.git${_wot}" "IpToCountry.dat::http://software77.net/geo-ip/?DL=4" "https://github.com/freenet/seedrefs/files/1609768/seednodes.zip" - 'gradle.properties' 'run.sh' 'freenet.service' 'freenet.ini' 'wrapper.config') + 'run.sh' 'freenet.service' 'freenet.ini' 'wrapper.config') sha256sums=('SKIP' 'SKIP' @@ -39,7 +39,6 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' '0d91d2462f36d35235cc86cbdee11890cadec91a0a01b89d96010924f6c2be99' - 'aa93d349c75703b2bc30d44ec18017c4e99e0b71341e6c13848210ab8e4abc68' 'a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769' '434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f' 'c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25' @@ -55,11 +54,8 @@ prepare() { cd "fred" # Gradle 5.3 and Java 11 support - export GIT_COMMITTER_NAME="aur" GIT_COMMITTER_EMAIL="aur" - git fetch https://github.com/skydrome/fred.git gradle-5.3 - git cherry-pick 1abf6fa6^..f696204a + git pull origin pull/657/head - ln -sf "$srcdir/gradle.properties" . sed -i "$srcdir/plugin-WebOfTrust/build.xml" \ -e 's:value="7":value="1.8":' sed -i "$srcdir/plugin-UPnP/build.xml" \ @@ -75,7 +71,7 @@ build() { export GRADLE_USER_HOME="$srcdir" msg "Building Freenet..." - gradle copyRuntimeLibs + gradle --no-daemon copyRuntimeLibs build_plugins } diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 1076a5a5dea0..000000000000 --- a/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -org.gradle.daemon = false -org.gradle.parallel = true -org.gradle.jvmargs = -Xms256m -Xmx512m
\ No newline at end of file |