diff --git a/files/bisq.desktop b/files/bisq.desktop --- a/files/bisq.desktop +++ b/files/bisq.desktop @@ -2,7 +2,7 @@ Name=Bisq GenericName=P2P Bitcoin Exchange Comment=Bisq is an open-source desktop application that allows you to buy and sell bitcoins in exchange for national currencies, or alternative crypto currencies. -Exec=/usr/bin/bisq +Exec=/usr/bin/bisq-desktop Icon=bisq Terminal=false Type=Application diff --git a/files/java-shim.sh b/files/java-shim.sh new file mode 100755 --- /dev/null +++ b/files/java-shim.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -z "$JAVA_HOME" ]; then + export JAVA_HOME=/usr/lib64/openjdk-11 +fi + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : bisq -version : 0.6.7 -release : 3 +version : 1.3.5 +release : 4 source : - - https://github.com/bisq-network/bisq/archive/v0.6.7.tar.gz : 10a5c325232d2b6c650bb17450273335c5fed3c99fd06273dcc831f2c0f5b98c + - git|https://github.com/bisq-network/bisq.git : v1.3.5 # requires a Git repository for LFS license : AGPL-3.0-or-later component : network.web summary : Decentralized Bitcoin exchange @@ -10,16 +10,34 @@ Bisq is an open-source desktop application that allows you to buy and sell Bitcoins in exchange for national currencies, or alternative cryptocurrencies. networking : yes builddeps : - - apache-maven - - openjfx-8 + - git-lfs + - openjdk-11 rundeps : - - openjfx-8 + - openjdk-11 +setup : | + git lfs install + git lfs pull build : | - mvn -Dmaven.repo.local=$workdir/repo -X -DskipTests -Dmaven.javadoc.skip=true package + export JAVA_HOME=/usr/lib64/openjdk-11 + export GRADLE_USER_HOME=$workdir/.gradle + + # tests will always fail, so disable them with -x test + ./gradlew --no-daemon build -x test install : | - install -Dm00644 gui/target/shaded.jar $installdir/usr/share/bisq/bisq.jar - install -Dm00755 $pkgfiles/bisq.sh $installdir/usr/bin/bisq - cp -a gui/target/lib $installdir/usr/share/bisq + install -dm00755 $installdir/usr/bin/ + install -dm00644 $installdir/usr/share/bisq/lib/ + + cp -R lib/* $installdir/usr/share/bisq/lib/ + + install -Dm00755 bisq-* $installdir/usr/share/bisq/ + + pushd $installdir/usr/share/bisq/ + for FILE in bisq-*; do + cp $pkgfiles/java-shim.sh $installdir/usr/bin/$FILE + echo "/usr/share/bisq/$FILE \"\$@\"" >> $installdir/usr/bin/$FILE + chmod +x $installdir/usr/bin/$FILE + done + popd - install -Dm00644 package/linux/icon.png $installdir/usr/share/pixmaps/bisq.png + install -Dm00644 desktop/package/linux/icon.png $installdir/usr/share/pixmaps/bisq.png install -Dm00644 $pkgfiles/bisq.desktop -t $installdir/usr/share/applications diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ bisq - Fabio Forni - livingsilver94.solus@redaril.me + Campbell Jones + dev@serebit.com AGPL-3.0-or-later network.web @@ -19,21 +19,231 @@ network.web - /usr/bin/bisq + /usr/bin/bisq-cli + /usr/bin/bisq-daemon + /usr/bin/bisq-desktop + /usr/bin/bisq-monitor + /usr/bin/bisq-pricenode + /usr/bin/bisq-relay + /usr/bin/bisq-seednode + /usr/bin/bisq-statsnode /usr/share/applications/bisq.desktop - /usr/share/bisq/bisq.jar - /usr/share/bisq/lib/bcpg-jdk15on.jar - /usr/share/bisq/lib/bcprov-jdk15on.jar + /usr/share/bisq/bisq-cli + /usr/share/bisq/bisq-daemon + /usr/share/bisq/bisq-desktop + /usr/share/bisq/bisq-monitor + /usr/share/bisq/bisq-pricenode + /usr/share/bisq/bisq-relay + /usr/share/bisq/bisq-seednode + /usr/share/bisq/bisq-statsnode + /usr/share/bisq/lib/animal-sniffer-annotations-1.18.jar + /usr/share/bisq/lib/annotations-13.0.jar + /usr/share/bisq/lib/annotations-4.1.1.4.jar + /usr/share/bisq/lib/aopalliance-1.0.jar + /usr/share/bisq/lib/api-common-1.5.0.jar + /usr/share/bisq/lib/assets.jar + /usr/share/bisq/lib/auto-value-1.4.jar + /usr/share/bisq/lib/base64-2.3.9.jar + /usr/share/bisq/lib/bcpg-jdk15on-1.56.jar + /usr/share/bisq/lib/bcprov-jdk15on-1.56.jar + /usr/share/bisq/lib/bitcoinj-core-a88d36d.jar + /usr/share/bisq/lib/bridj-0.7.0.jar + /usr/share/bisq/lib/btcd-cli4j-core-975ff5d4.jar + /usr/share/bisq/lib/btcd-cli4j-daemon-975ff5d4.jar + /usr/share/bisq/lib/checker-compat-qual-2.5.5.jar + /usr/share/bisq/lib/classmate-1.3.4.jar + /usr/share/bisq/lib/cli.jar + /usr/share/bisq/lib/common.jar + /usr/share/bisq/lib/commons-codec-1.13.jar + /usr/share/bisq/lib/commons-compress-1.18.jar + /usr/share/bisq/lib/commons-io-2.6.jar + /usr/share/bisq/lib/commons-lang3-3.8.jar + /usr/share/bisq/lib/commons-logging-1.2.jar + /usr/share/bisq/lib/core-1.51.0.0.jar + /usr/share/bisq/lib/core-2.0.jar + /usr/share/bisq/lib/core.jar + /usr/share/bisq/lib/daemon.jar + /usr/share/bisq/lib/desktop-1.3.5.jar + /usr/share/bisq/lib/easybind-1.0.3.jar + /usr/share/bisq/lib/error_prone_annotations-2.3.3.jar + /usr/share/bisq/lib/failureaccess-1.0.1.jar + /usr/share/bisq/lib/fast-uuid-0.1.jar + /usr/share/bisq/lib/firebase-admin-6.2.0.jar + /usr/share/bisq/lib/fontawesomefx-8.0.0.jar + /usr/share/bisq/lib/fontawesomefx-commons-9.1.2.jar + /usr/share/bisq/lib/fontawesomefx-materialdesignfont-2.0.26-9.1.2.jar + /usr/share/bisq/lib/gax-1.23.0.jar + /usr/share/bisq/lib/gax-grpc-1.23.0.jar + /usr/share/bisq/lib/gax-httpjson-0.40.0.jar + /usr/share/bisq/lib/google-api-client-1.23.0.jar + /usr/share/bisq/lib/google-api-client-gson-1.23.0.jar + /usr/share/bisq/lib/google-api-services-storage-v1-rev114-1.23.0.jar + /usr/share/bisq/lib/google-auth-library-credentials-0.17.1.jar + /usr/share/bisq/lib/google-auth-library-oauth2-http-0.9.0.jar + /usr/share/bisq/lib/google-cloud-core-1.27.0.jar + /usr/share/bisq/lib/google-cloud-core-grpc-1.27.0.jar + /usr/share/bisq/lib/google-cloud-core-http-1.27.0.jar + /usr/share/bisq/lib/google-cloud-firestore-0.45.0-beta.jar + /usr/share/bisq/lib/google-cloud-storage-1.27.0.jar + /usr/share/bisq/lib/google-http-client-1.23.0.jar + /usr/share/bisq/lib/google-http-client-appengine-1.23.0.jar + /usr/share/bisq/lib/google-http-client-gson-1.23.0.jar + /usr/share/bisq/lib/google-http-client-jackson-1.23.0.jar + /usr/share/bisq/lib/google-http-client-jackson2-1.23.0.jar + /usr/share/bisq/lib/google-oauth-client-1.23.0.jar + /usr/share/bisq/lib/grpc-api-1.25.0.jar + /usr/share/bisq/lib/grpc-auth-1.25.0.jar + /usr/share/bisq/lib/grpc-context-1.25.0.jar + /usr/share/bisq/lib/grpc-core-1.25.0.jar + /usr/share/bisq/lib/grpc-netty-shaded-1.25.0.jar + /usr/share/bisq/lib/grpc-protobuf-1.25.0.jar + /usr/share/bisq/lib/grpc-protobuf-lite-1.25.0.jar + /usr/share/bisq/lib/grpc-stub-1.25.0.jar + /usr/share/bisq/lib/gson-2.8.5.jar + /usr/share/bisq/lib/guava-20.0.jar + /usr/share/bisq/lib/guava-28.1-android.jar + /usr/share/bisq/lib/guava-jdk5-17.0.jar + /usr/share/bisq/lib/guice-4.2.2.jar + /usr/share/bisq/lib/hibernate-validator-5.3.6.Final.jar + /usr/share/bisq/lib/httpclient-4.5.12.jar + /usr/share/bisq/lib/httpcore-4.4.13.jar + /usr/share/bisq/lib/j2objc-annotations-1.3.jar + /usr/share/bisq/lib/jackson-annotations-2.8.0.jar + /usr/share/bisq/lib/jackson-annotations-2.8.10.jar + /usr/share/bisq/lib/jackson-core-2.1.3.jar + /usr/share/bisq/lib/jackson-core-2.8.10.jar + /usr/share/bisq/lib/jackson-core-asl-1.9.11.jar + /usr/share/bisq/lib/jackson-databind-2.8.10.jar + /usr/share/bisq/lib/javafx-base-11.0.2-linux.jar + /usr/share/bisq/lib/javafx-base-11.0.2.jar + /usr/share/bisq/lib/javafx-controls-11.0.2-linux.jar + /usr/share/bisq/lib/javafx-controls-11.0.2.jar + /usr/share/bisq/lib/javafx-fxml-11.0.2-linux.jar + /usr/share/bisq/lib/javafx-graphics-11.0.2-linux.jar + /usr/share/bisq/lib/javafx-graphics-11.0.2.jar + /usr/share/bisq/lib/javafx-swing-11.0.2-linux.jar + /usr/share/bisq/lib/javase-2.0.jar + /usr/share/bisq/lib/javax.inject-1.jar + /usr/share/bisq/lib/javax.servlet-api-3.1.0.jar + /usr/share/bisq/lib/javax.ws.rs-api-2.1.jar + /usr/share/bisq/lib/jboss-logging-3.3.1.Final.jar + /usr/share/bisq/lib/jcip-annotations-1.0.jar + /usr/share/bisq/lib/jcl-over-slf4j-1.7.25.jar + /usr/share/bisq/lib/jcsv-1.4.0.jar + /usr/share/bisq/lib/jetty-http-9.3.6.v20151106.jar + /usr/share/bisq/lib/jetty-io-9.3.6.v20151106.jar + /usr/share/bisq/lib/jetty-security-9.3.6.v20151106.jar + /usr/share/bisq/lib/jetty-server-9.3.6.v20151106.jar + /usr/share/bisq/lib/jetty-servlet-9.3.6.v20151106.jar + /usr/share/bisq/lib/jetty-util-9.3.6.v20151106.jar + /usr/share/bisq/lib/jetty-webapp-9.3.6.v20151106.jar + /usr/share/bisq/lib/jetty-xml-9.3.6.v20151106.jar + /usr/share/bisq/lib/jfoenix-9.0.6.jar + /usr/share/bisq/lib/joda-time-2.9.2.jar + /usr/share/bisq/lib/jopt-simple-5.0.4.jar + /usr/share/bisq/lib/jsocks-567e1cd.jar + /usr/share/bisq/lib/json-20160810.jar + /usr/share/bisq/lib/jsr305-3.0.2.jar + /usr/share/bisq/lib/jtorctl-1.5.jar + /usr/share/bisq/lib/jul-to-slf4j-1.7.25.jar + /usr/share/bisq/lib/kotlin-logging-1.5.4.jar + /usr/share/bisq/lib/kotlin-stdlib-1.3.41.jar + /usr/share/bisq/lib/kotlin-stdlib-common-1.3.41.jar + /usr/share/bisq/lib/kotlin-stdlib-jdk7-1.3.41.jar + /usr/share/bisq/lib/kotlin-stdlib-jdk8-1.3.41.jar + /usr/share/bisq/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar + /usr/share/bisq/lib/log4j-over-slf4j-1.7.25.jar + /usr/share/bisq/lib/logback-classic-1.1.11.jar + /usr/share/bisq/lib/logback-core-1.1.11.jar + /usr/share/bisq/lib/monitor.jar + /usr/share/bisq/lib/netty-buffer-4.1.25.Final.jar + /usr/share/bisq/lib/netty-codec-4.1.25.Final.jar + /usr/share/bisq/lib/netty-codec-dns-4.1.25.Final.jar + /usr/share/bisq/lib/netty-codec-http-4.1.25.Final.jar + /usr/share/bisq/lib/netty-codec-http2-4.1.25.Final.jar + /usr/share/bisq/lib/netty-codec-socks-4.1.25.Final.jar + /usr/share/bisq/lib/netty-common-4.1.25.Final.jar + /usr/share/bisq/lib/netty-handler-4.1.25.Final.jar + /usr/share/bisq/lib/netty-handler-proxy-4.1.25.Final.jar + /usr/share/bisq/lib/netty-resolver-4.1.25.Final.jar + /usr/share/bisq/lib/netty-resolver-dns-4.1.25.Final.jar + /usr/share/bisq/lib/netty-transport-4.1.25.Final.jar + /usr/share/bisq/lib/okhttp-2.7.2.jar + /usr/share/bisq/lib/okio-1.6.0.jar + /usr/share/bisq/lib/opencensus-api-0.21.0.jar + /usr/share/bisq/lib/opencensus-contrib-grpc-metrics-0.21.0.jar + /usr/share/bisq/lib/opencensus-contrib-http-util-0.11.1.jar + /usr/share/bisq/lib/orchid-1.2.1.jar + /usr/share/bisq/lib/p2p.jar + /usr/share/bisq/lib/perfmark-api-0.19.0.jar + /usr/share/bisq/lib/pricenode-0.7.2-SNAPSHOT.jar + /usr/share/bisq/lib/proto-google-cloud-firestore-v1beta1-0.10.0.jar + /usr/share/bisq/lib/proto-google-common-protos-1.12.0.jar + /usr/share/bisq/lib/proto-google-iam-v1-0.10.0.jar + /usr/share/bisq/lib/proto.jar + /usr/share/bisq/lib/protobuf-java-3.10.0.jar + /usr/share/bisq/lib/protobuf-java-util-3.5.1.jar + /usr/share/bisq/lib/pushy-0.13.2.jar + /usr/share/bisq/lib/qrgen-1.3.jar + /usr/share/bisq/lib/relay.jar + /usr/share/bisq/lib/rescu-2.0.1.jar + /usr/share/bisq/lib/scrypt-1.4.0.jar + /usr/share/bisq/lib/seednode.jar + /usr/share/bisq/lib/signpost-core-1.2.1.2.jar + /usr/share/bisq/lib/slf4j-api-1.7.25.jar + /usr/share/bisq/lib/snakeyaml-1.17.jar + /usr/share/bisq/lib/spark-core-2.5.2.jar + /usr/share/bisq/lib/spring-aop-4.3.14.RELEASE.jar + /usr/share/bisq/lib/spring-beans-4.3.14.RELEASE.jar + /usr/share/bisq/lib/spring-boot-1.5.10.RELEASE.jar + /usr/share/bisq/lib/spring-boot-actuator-1.5.10.RELEASE.jar + /usr/share/bisq/lib/spring-boot-autoconfigure-1.5.10.RELEASE.jar + /usr/share/bisq/lib/spring-boot-starter-1.5.10.RELEASE.jar + /usr/share/bisq/lib/spring-boot-starter-actuator-1.5.10.RELEASE.jar + /usr/share/bisq/lib/spring-boot-starter-logging-1.5.10.RELEASE.jar + /usr/share/bisq/lib/spring-boot-starter-tomcat-1.5.10.RELEASE.jar + /usr/share/bisq/lib/spring-boot-starter-web-1.5.10.RELEASE.jar + /usr/share/bisq/lib/spring-context-4.3.14.RELEASE.jar + /usr/share/bisq/lib/spring-core-4.3.14.RELEASE.jar + /usr/share/bisq/lib/spring-expression-4.3.14.RELEASE.jar + /usr/share/bisq/lib/spring-web-4.3.14.RELEASE.jar + /usr/share/bisq/lib/spring-webmvc-4.3.14.RELEASE.jar + /usr/share/bisq/lib/statsnode.jar + /usr/share/bisq/lib/threetenbp-1.3.3.jar + /usr/share/bisq/lib/tomcat-annotations-api-8.5.27.jar + /usr/share/bisq/lib/tomcat-embed-core-8.5.27.jar + /usr/share/bisq/lib/tomcat-embed-el-8.5.27.jar + /usr/share/bisq/lib/tomcat-embed-websocket-8.5.27.jar + /usr/share/bisq/lib/tor-0.6.7.jar + /usr/share/bisq/lib/tor-binary-geoip-0.4.2.6.jar + /usr/share/bisq/lib/tor-binary-linux32-0.4.2.6.jar + /usr/share/bisq/lib/tor-binary-linux64-0.4.2.6.jar + /usr/share/bisq/lib/tor-binary-macos-0.4.2.6.jar + /usr/share/bisq/lib/tor-binary-windows-0.4.2.6.jar + /usr/share/bisq/lib/tor.external-0.6.7.jar + /usr/share/bisq/lib/tor.native-0.6.7.jar + /usr/share/bisq/lib/validation-api-1.1.0.Final.jar + /usr/share/bisq/lib/webcam-capture-0.3.12.jar + /usr/share/bisq/lib/websocket-api-9.3.6.v20151106.jar + /usr/share/bisq/lib/websocket-client-9.3.6.v20151106.jar + /usr/share/bisq/lib/websocket-common-9.3.6.v20151106.jar + /usr/share/bisq/lib/websocket-server-9.3.6.v20151106.jar + /usr/share/bisq/lib/websocket-servlet-9.3.6.v20151106.jar + /usr/share/bisq/lib/xchange-bitcoinaverage-4.3.3.jar + /usr/share/bisq/lib/xchange-coinmarketcap-4.3.3.jar + /usr/share/bisq/lib/xchange-core-4.3.3.jar + /usr/share/bisq/lib/xchange-poloniex-4.3.3.jar + /usr/share/bisq/lib/xz-1.6.jar /usr/share/pixmaps/bisq.png - - 2020-05-08 - 0.6.7 + + 2020-06-20 + 1.3.5 Packaging update - Fabio Forni - livingsilver94.solus@redaril.me + Campbell Jones + dev@serebit.com \ No newline at end of file