diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 0001-strip-non-compile-deps.patch | 60 | ||||
-rw-r--r-- | PKGBUILD | 10 |
3 files changed, 70 insertions, 4 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Wed Apr 10 06:04:46 UTC 2019 +# Fri Apr 19 07:35:10 UTC 2019 pkgbase = freenet pkgdesc = An encrypted network without censorship pkgver = 0.7.5.1484 @@ -25,6 +25,7 @@ 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 = 0001-strip-non-compile-deps.patch source = run.sh source = freenet.service source = freenet.ini @@ -35,6 +36,7 @@ pkgbase = freenet sha256sums = SKIP sha256sums = SKIP sha256sums = 0d91d2462f36d35235cc86cbdee11890cadec91a0a01b89d96010924f6c2be99 + sha256sums = d3d2f43e2bdaa93bfaa60fa2c82f6b42fb50539db2ad48e03664b537a4aa8071 sha256sums = a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769 sha256sums = 434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f sha256sums = c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25 diff --git a/0001-strip-non-compile-deps.patch b/0001-strip-non-compile-deps.patch new file mode 100644 index 000000000000..7d28b7a60efe --- /dev/null +++ b/0001-strip-non-compile-deps.patch @@ -0,0 +1,60 @@ +From 8a83c8f528f49a271265a85a9830ec53f28c2162 Mon Sep 17 00:00:00 2001 +From: skydrome <skydrome@protonmail.org> +Date: Fri, 19 Apr 2019 03:25:22 -0400 +Subject: [PATCH] strip non-compile deps + +--- + build.gradle | 8 -------- + dependencies.gradle | 5 ----- + 2 files changed, 13 deletions(-) + +diff --git a/build.gradle b/build.gradle +index db7d1b5ec..0d1d06a01 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -15,8 +15,6 @@ plugins { + id "java" + id "maven-publish" + +- id "com.github.spotbugs" version "1.7.1" +- id "org.sonarqube" version "2.7" + id "com.adarshr.test-logger" version "1.6.0" + id "org.ajoberstar.grgit" version "3.1.1" + } +@@ -38,7 +36,6 @@ sourceSets { + } + + // Configuration +-apply from: "$rootDir/gradle/analysis.gradle" + + // output: build01484-13-g5831bbf + String gitrev = grgit.open(dir: project.rootDir).describe() +@@ -234,10 +231,5 @@ dependencyVerification { + 'net.java.dev.jna:jna-platform:4.2.2:jna-platform-4.2.2.jar:32aca873a4cb14721d939bbc8287a828919c05e8e1040b3fe8290f6128cdecca', + 'net.java.dev.jna:jna:4.2.2:jna-4.2.2.jar:1f38af54e06c6e6f6dbf39ba2c052b952dea5dddb4871127b34639ddeb11bdbe', + 'org.freenetproject:freenet-ext:29:freenet-ext-29.jar:32f2b3d6beedf54137ea2f9a3ebef67666d769f0966b08cd17fd7db59ba4d79f', +- 'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a', +- 'org.mockito:mockito-core:1.9.5:mockito-core-1.9.5.jar:f97483ba0944b9fa133aa29638764ddbeadb51ec3dbc02074c58fa2caecd07fa', +- 'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c', +- 'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9', +- 'org.objenesis:objenesis:1.0:objenesis-1.0.jar:c5694b55d92527479382f254199b3c6b1d8780f652ad61e9ca59919887f491a8', + ] + } +diff --git a/dependencies.gradle b/dependencies.gradle +index 7a0d30184..da0752c6a 100644 +--- a/dependencies.gradle ++++ b/dependencies.gradle +@@ -39,10 +39,5 @@ ext { + [config: "implementation", dep: libs.jna], + [config: "implementation", dep: libs.jnaplatform], + [config: "implementation", dep: libs.freenet], +- [config: "testImplementation", dep: libs.junit], +- [config: "testImplementation", dep: libs.mockito], +- [config: "testImplementation", dep: libs.hamcrest], +- [config: "testRuntimeOnly", dep: libs.junitvintage], +- [config: "spotbugsPlugins", dep: libs.findsecbugs], + ] + } +-- +2.21.0 + @@ -31,6 +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" + '0001-strip-non-compile-deps.patch' 'run.sh' 'freenet.service' 'freenet.ini' 'wrapper.config') sha256sums=('SKIP' @@ -39,6 +40,7 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' '0d91d2462f36d35235cc86cbdee11890cadec91a0a01b89d96010924f6c2be99' + 'd3d2f43e2bdaa93bfaa60fa2c82f6b42fb50539db2ad48e03664b537a4aa8071' 'a6581d33448c2989ef9f7e888e7e47a8784b0159e76bf8f6bc97eec1d7d55769' '434f67e2e86edb555b7dfb572a52d7ff719373989e1f1830f779bfccc678539f' 'c0ce093a098d91dee6be294f8a2fc929aabad95612f994933194d0da5c4cdd25' @@ -54,7 +56,8 @@ prepare() { cd "fred" # Gradle 5.3 and Java 11 support - git pull origin pull/657/head + git pull origin pull/658/head + git apply -v "$srcdir/0001-strip-non-compile-deps.patch" sed -i "$srcdir/plugin-WebOfTrust/build.xml" \ -e 's:value="7":value="1.8":' @@ -62,13 +65,14 @@ prepare() { -e 's:value="1.5":value="1.8":' sed -i "$srcdir/plugin-KeyUtils/build.xml" \ -e 's:value="1.6":value="1.8":' + sed -i "gradle.properties" \ + -e "s:targetJavaVersion.*:targetJavaVersion=$(javac -version 2>&1 |awk '{print $2}'):" } build() { cd "fred" - [[ -r "$HOME/.gradle" ]] || - export GRADLE_USER_HOME="$srcdir" + export GRADLE_USER_HOME="$srcdir/.gradle" msg "Building Freenet..." gradle --no-build-cache copyRuntimeLibs |