Page MenuHomeSolus
Files F11047889

D8980.id21627.diff
No OneTemporary
Actions

D8980.id21627.diff
View Options

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,5 @@
+This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository.
+
+- Campbell Jones
+ - IRC: serebit
+ - Email: dev@serebit.com
diff --git a/files/use-dumb-terminal-settings-as-backup.patch b/files/use-dumb-terminal-settings-as-backup.patch
new file mode 100644
--- /dev/null
+++ b/files/use-dumb-terminal-settings-as-backup.patch
@@ -0,0 +1,51 @@
+diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/NativePlatformConsoleDetector.java b/subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/NativePlatformConsoleDetector.java
+index 9a33da7801e..849fd2280e1 100644
+--- a/subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/NativePlatformConsoleDetector.java
++++ b/subprojects/native/src/main/java/org/gradle/internal/nativeintegration/console/NativePlatformConsoleDetector.java
+@@ -16,6 +16,8 @@
+
+ package org.gradle.internal.nativeintegration.console;
+
++import net.rubygrapefruit.platform.NativeException;
++import net.rubygrapefruit.platform.terminal.TerminalOutput;
+ import net.rubygrapefruit.platform.terminal.Terminals;
+ import org.gradle.internal.os.OperatingSystem;
+
+@@ -38,12 +40,13 @@ public ConsoleMetaData getConsole() {
+ return null;
+ }
+
+- boolean stdout = terminals.isTerminal(Stdout);
+- boolean stderr = terminals.isTerminal(Stderr);
+- if (stdout) {
+- return new NativePlatformConsoleMetaData(stdout, stderr, terminals.getTerminal(Stdout));
+- } else if (stderr) {
+- return new NativePlatformConsoleMetaData(stdout, stderr, terminals.getTerminal(Stderr));
++ TerminalOutput stdout = obtainTerminal(Stdout);
++ TerminalOutput stderr = obtainTerminal(Stderr);
++
++ if (stdout != null) {
++ return new NativePlatformConsoleMetaData(true, stderr != null, stdout);
++ } else if (stderr != null) {
++ return new NativePlatformConsoleMetaData(false, true, stderr);
+ }
+ return null;
+ }
+@@ -52,4 +55,17 @@ public ConsoleMetaData getConsole() {
+ public boolean isConsoleInput() {
+ return terminals.isTerminalInput();
+ }
++
++ private TerminalOutput obtainTerminal(Terminals.Output output) {
++ if (!terminals.isTerminal(output)) {
++ return null;
++ }
++
++ try {
++ return terminals.getTerminal(output);
++ } catch (NativeException ex) {
++ // couldn't find a termcap entry, so use dumb terminal settings
++ return null;
++ }
++ }
+ }
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -11,22 +11,20 @@
Gradle is a build tool with a focus on build automation and support for multi-language development.
networking : yes
builddeps :
- - openjdk-11
+ - gradle
+ - git
rundeps :
- openjdk-11
environment: |
- export M2_HOME=$workdir/.m2
- export TERM=xterm-256color
export JAVA_HOME=/usr/lib64/openjdk-11
+ export GRADLE_USER_HOME=$workdir/.gradle
setup : |
export GRADLE_COMPLETION_VERSION=1.4.1
-
- mkdir -p $M2_HOME/conf
- echo "<settings><localRepository>$M2_HOME/</localRepository></settings>" > $M2_HOME/conf/settings.xml
tar xf $sources/v$GRADLE_COMPLETION_VERSION.tar.gz
+
+ %patch -p1 < $pkgfiles/use-dumb-terminal-settings-as-backup.patch
build : |
- export GRADLE_USER_HOME=$workdir/.gradle
- ./gradlew --no-daemon install -PfinalRelease=1 -Pgradle_installPath=$installdir/usr/share/gradle
+ gradle --no-daemon install -PfinalRelease=1 -Pgradle_installPath=$installdir/usr/share/gradle --stacktrace --info
install : |
install -Dm00755 $pkgfiles/gradle -t $installdir/usr/bin
rm $installdir/usr/share/gradle/{LICENSE,NOTICE}
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,7 +3,7 @@
<Name>gradle</Name>
<Packager>
<Name>Campbell Jones</Name>
- <Email>dev@serebit.com</Email>
+ <Email>git@serebit.com</Email>
</Packager>
<License>Apache-2.0</License>
<PartOf>programming.java</PartOf>
@@ -241,11 +241,112 @@
</Package>
<History>
<Update release="12">
- <Date>2020-05-30</Date>
+ <Date>2020-06-02</Date>
<Version>6.4.1</Version>
- <Comment>Packaging update</Comment>
+ <Comment>Update Gradle to 6.4.1 and use OpenJDK 11
+
+Summary: Too many updates to include a changelog. Next update will include notable changes.
+
+Test Plan: Built wraith-master
+
+Reviewers: #triage_team, DataDrake
+
+Reviewed By: #triage_team, DataDrake
+
+Subscribers: DataDrake
+
+Differential Revision: https://dev.getsol.us/D8958</Comment>
<Name>Campbell Jones</Name>
- <Email>dev@serebit.com</Email>
+ <Email>git@serebit.com</Email>
+ </Update>
+ <Update release="10">
+ <Date>2020-05-13</Date>
+ <Version>4.9</Version>
+ <Comment>Make gradle use openjdk-8 specifically
+
+Summary: Make gradle use openjdk-8 specifically.
+
+Test Plan: Successfully built ipscan with `make local`.
+
+Reviewers: #triage_team, DataDrake
+
+Reviewed By: #triage_team, DataDrake
+
+Subscribers: DataDrake
+
+Differential Revision: https://dev.getsol.us/D8681</Comment>
+ <Name>Fabio Forni</Name>
+ <Email>fabio@redaril.me</Email>
+ </Update>
+ <Update release="9">
+ <Date>2020-04-02</Date>
+ <Version>4.9</Version>
+ <Comment>Install bash-completion in the correct path</Comment>
+ <Name>F. von Gellhorn</Name>
+ <Email>flinux@vongellhorn.ch</Email>
+ </Update>
+ <Update release="8">
+ <Date>2019-11-18</Date>
+ <Version>4.9</Version>
+ <Comment>Update Gradle to 4.9
+
+Summary: Remove desktop file, as it&apos;s unnecessary for a primarily terminal-based program. Upgrade to the latest version that fully supports being built with JDK 8.
+
+Test Plan: Build openjfx-8 and a moderately sized personal Gradle project
+
+Reviewers: #triage_team, DataDrake
+
+Reviewed By: #triage_team, DataDrake
+
+Subscribers: DataDrake
+
+Differential Revision: https://dev.getsol.us/D7512</Comment>
+ <Name>Campbell Jones</Name>
+ <Email>git@serebit.com</Email>
+ </Update>
+ <Update release="7">
+ <Date>2017-04-19</Date>
+ <Version>3.5.0</Version>
+ <Comment>Update to 3.5 because Twitter asked nicely
+
+Signed-off-by: Ikey Doherty &lt;ikey@solus-project.com&gt;</Comment>
+ <Name>Ikey Doherty</Name>
+ <Email>ikey@solus-project.com</Email>
+ </Update>
+ <Update release="6">
+ <Date>2017-02-22</Date>
+ <Version>3.4.0</Version>
+ <Comment>Update to 3.4.0</Comment>
+ <Name>Sönke Behrendt</Name>
+ <Email>thesoenke@outlook.com</Email>
+ </Update>
+ <Update release="5">
+ <Date>2017-02-04</Date>
+ <Version>3.30</Version>
+ <Comment>Updated to 3.3.0 (theSoenke)</Comment>
+ <Name>Bryan T. Meyers</Name>
+ <Email>bmeyers@datadrake.com</Email>
+ </Update>
+ <Update release="3">
+ <Date>2016-11-23</Date>
+ <Version>3.1.0</Version>
+ <Comment>Move to programming.java</Comment>
+ <Name>Joshua Strobl</Name>
+ <Email>joshua@stroblindustries.com</Email>
+ </Update>
+ <Update release="2">
+ <Date>2016-10-06</Date>
+ <Version>3.1.0</Version>
+ <Comment>Fixed version reporting</Comment>
+ <Name>Bryan T. Meyers</Name>
+ <Email>bmeyers@datadrake.com</Email>
+ </Update>
+ <Update release="1">
+ <Date>2016-10-02</Date>
+ <Version>3.1.0</Version>
+ <Comment>Initial commit of gradle</Comment>
+ <Name>Sönke Behrendt</Name>
+ <Email>thesoenke@outlook.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:55 PM (3 h, 5 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5843013
Default Alt Text
D8980.id21627.diff (8 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.