* Re: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
@ 2022-01-13 20:32 ` Piraty
2022-01-13 20:32 ` Piraty
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Piraty @ 2022-01-13 20:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/34746#issuecomment-1012493503
Comment:
```
$ xxbuild $(grep -rl gradle srcpkgs/*/template | cut -d/ -f2)
<stuff>
SUMMARY
pkg:gradle host:x86_64 target:x86_64 cross:n result:OK
pkg:jadx host:x86_64 target:x86_64 cross:n result:OK
pkg:ghidra host:x86_64 target:x86_64 cross:n result:OK
pkg:freerouting host:x86_64 target:x86_64 cross:n result:FAILED
```
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
2022-01-13 20:32 ` Piraty
@ 2022-01-13 20:32 ` Piraty
2022-01-14 17:45 ` [PR PATCH] [Updated] " unspecd
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Piraty @ 2022-01-13 20:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/34746#issuecomment-1012493503
Comment:
```
$ xxbuild $(grep -rl gradle srcpkgs/*/template | cut -d/ -f2)
<stuff>
SUMMARY
pkg:gradle host:x86_64 target:x86_64 cross:n result:OK
pkg:jadx host:x86_64 target:x86_64 cross:n result:OK
pkg:ghidra host:x86_64 target:x86_64 cross:n result:OK
pkg:freerouting host:x86_64 target:x86_64 cross:n result:FAILED
```
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
2022-01-13 20:32 ` Piraty
2022-01-13 20:32 ` Piraty
@ 2022-01-14 17:45 ` unspecd
2022-01-14 17:48 ` unspecd
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: unspecd @ 2022-01-14 17:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gradle
https://github.com/void-linux/void-packages/pull/34746
gradle: update to 7.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
Supersedes #31971.
A patch file from https://github.com/void-linux/void-packages/pull/34746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gradle-34746.patch --]
[-- Type: text/x-diff, Size: 15760 bytes --]
From 851df0d64878e8d9cc34a99bec12d04d84b8d632 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 29 Dec 2021 09:00:40 +1100
Subject: [PATCH 1/2] gradle: update to 7.3.3.
---
srcpkgs/gradle/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 8e9f08a9910b..4732bcfbb5a7 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
# Template file for 'gradle'
pkgname=gradle
-version=6.8.1
+version=7.3.3
revision=1
depends="virtual?java-environment"
short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
homepage="https://gradle.org/"
changelog="https://docs.gradle.org/${version}/release-notes.html"
distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
+checksum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
do_install() {
vmkdir "usr/lib/gradle"
From b08980c8b33528cd45aa52dc537b6d65f2791999 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 15 Jan 2022 04:17:28 +1100
Subject: [PATCH 2/2] freerouting: update to 1.4.5.1.
---
...06a0f72abe86f7883956aa56fa48b9804ecf.patch | 57 ++++++
...e1fa34bc8ee41021453235cb29e8013eefa4.patch | 191 ++++++++++++++++++
...e4ba58cf36038558421e38509d6ad125da2b.patch | 59 ++++++
srcpkgs/freerouting/template | 15 +-
4 files changed, 319 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
create mode 100644 srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
create mode 100644 srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
diff --git a/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
new file mode 100644
index 000000000000..3fa4031330d5
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
@@ -0,0 +1,57 @@
+From 6d2006a0f72abe86f7883956aa56fa48b9804ecf Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 20:21:13 +0100
+Subject: [PATCH] Remove deprecated Gradle settings
+
+---
+ build.gradle | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 2991bcb..fadfda4 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,7 +1,7 @@
+ buildscript {
+ repositories {
+ mavenCentral()
+- jcenter()
++ google()
+ }
+
+ dependencies {
+@@ -49,17 +49,17 @@ if (JavaVersion.current().isJava8Compatible()) {
+
+ repositories {
+ mavenCentral()
+- jcenter()
++ google()
+ }
+
+ dependencies {
+- testCompile group: 'junit', name: 'junit', version: '4.10'
++ testImplementation group: 'junit', name: 'junit', version: '4.10'
+
+ // https://mvnrepository.com/artifact/javax.help/javahelp
+- compile group: 'javax.help', name: 'javahelp', version: '2.0.05'
++ implementation group: 'javax.help', name: 'javahelp', version: '2.0.05'
+
+- compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
+- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
++ implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
++ implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
+ }
+
+
+@@ -88,8 +88,10 @@ jar {
+
+ task executableJar(type: Jar) {
+ classifier = 'executable'
++
++ duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+
+- from configurations.runtime.asFileTree.files.collect { zipTree(it) }
++ from configurations.runtimeClasspath.collect { zipTree(it) }
+
+ from files(sourceSets.main.output)
+
diff --git a/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch b/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
new file mode 100644
index 000000000000..d681af403da9
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
@@ -0,0 +1,191 @@
+From 8139e1fa34bc8ee41021453235cb29e8013eefa4 Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 23:43:22 +0100
+Subject: [PATCH] Remove the javax.help dependency
+
+---
+ .../mihosoft/freerouting/gui/BoardFrame.java | 16 ++-
+ .../freerouting/gui/BoardMenuBar.java | 12 +-
+ .../freerouting/gui/BoardMenuHelp.java | 116 ------------------
+ 3 files changed, 9 insertions(+), 135 deletions(-)
+ delete mode 100644 src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+index d728053..dbe25c5 100644
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
++++ b/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+@@ -387,12 +387,12 @@ public void set_context_sensitive_help(java.awt.Component p_component, String p_
+ curr_component = p_component;
+ }
+ String help_id = "html_files." + p_help_id;
+- javax.help.CSH.setHelpIDString(curr_component, help_id);
+- if (help_broker==null) {
+- FRLogger.warn("help_broker is null");
+- return;
+- }
+- help_broker.enableHelpKey(curr_component, help_id, help_set);
++// javax.help.CSH.setHelpIDString(curr_component, help_id);
++// if (help_broker==null) {
++// FRLogger.warn("help_broker is null");
++// return;
++// }
++// help_broker.enableHelpKey(curr_component, help_id, help_set);
+ }
+ }
+
+@@ -699,9 +699,7 @@ public void repaint_all()
+ final boolean is_web_start;
+
+ private final boolean help_system_used;
+- static javax.help.HelpSet help_set = null;
+- static javax.help.HelpBroker help_broker = null;
+-
++
+ private final boolean confirm_cancel;
+
+ private final java.util.ResourceBundle resources;
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+index db9dd06..272dfb6 100644
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
++++ b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+@@ -48,16 +48,8 @@ static BoardMenuBar get_instance(BoardFrame p_board_frame,
+ menubar.add(info_menu);
+ javax.swing.JMenu other_menu = BoardMenuOther.get_instance(p_board_frame);
+ menubar.add(other_menu);
+- if (p_help_system_used)
+- {
+- javax.swing.JMenu help_menu = new BoardMenuHelp(p_board_frame);
+- menubar.add(help_menu);
+- }
+- else
+- {
+- javax.swing.JMenu help_menu = new BoardMenuHelpReduced(p_board_frame);
+- menubar.add(help_menu);
+- }
++ javax.swing.JMenu help_menu = new BoardMenuHelpReduced(p_board_frame);
++ menubar.add(help_menu);
+ return menubar;
+ }
+
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+deleted file mode 100644
+index 85d89a7..0000000
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/*
+- * Copyright (C) 2014 Alfons Wirtz
+- * website www.freerouting.net
+- *
+- * Copyright (C) 2017 Michael Hoffer <info@michaelhoffer.de>
+- * Website www.freerouting.mihosoft.eu
+-*
+- * This program is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License at <http://www.gnu.org/licenses/>
+- * for more details.
+- *
+- * BoardMenuHelp.java
+- *
+- * Created on 19. Oktober 2005, 08:15
+- *
+- */
+-
+-package eu.mihosoft.freerouting.gui;
+-
+-import eu.mihosoft.freerouting.logger.FRLogger;
+-
+-import javax.help.CSH;
+-import javax.help.HelpSet;
+-import javax.help.HelpSetException;
+-import java.net.URL;
+-
+-/**
+- *
+- * @author Alfons Wirtz
+- */
+-public class BoardMenuHelp extends BoardMenuHelpReduced
+-{
+- /**
+- * Creates a new instance of BoardMenuHelp
+- * Separated from BoardMenuHelpReduced to avoid ClassNotFound exception when the library
+- * jh.jar is not found, which is only used in this extended class.
+- */
+- public BoardMenuHelp(BoardFrame p_board_frame)
+- {
+- super(p_board_frame);
+- this.initialize_help(p_board_frame.get_locale());
+- javax.swing.JMenuItem direct_help_window = new javax.swing.JMenuItem();
+- direct_help_window.setText(this.resources.getString("direct_help"));
+- if (direct_help != null)
+- {
+- direct_help_window.addActionListener(direct_help);
+- }
+- this.add(direct_help_window, 0);
+- javax.swing.JMenuItem contents_window = new javax.swing.JMenuItem();
+- contents_window.setText(this.resources.getString("contents"));
+- if (contents_help != null)
+- {
+- contents_window.addActionListener(contents_help);
+- }
+- this.add(contents_window, 0);
+- }
+-
+- private void initialize_help(java.util.Locale p_locale)
+- {
+- // try to find the helpset and create a HelpBroker object
+- if (BoardFrame.help_broker == null)
+- {
+- String language = p_locale.getLanguage();
+- String helpset_name;
+- if (language.equalsIgnoreCase("de"))
+- {
+- helpset_name = "/eu/mihosoft/freerouting/helpset/de/Help.hs";
+- }
+- else
+- {
+- helpset_name = "/eu/mihosoft/freerouting/helpset/en/Help.hs";
+- }
+- try
+- {
+- // original author tries to get language specific url
+- // via HelpSet utility methods which does not work that well
+- // and doesn't really make sense if the language is specified
+- // manually
+- // TODO find out why previous approach does not work reliably
+- URL hsURL = getClass().getResource(helpset_name);
+- if (hsURL == null)
+- {
+- FRLogger.warn("HelpSet " + helpset_name + " not found.");
+- }
+- else
+- {
+- BoardFrame.help_set = new HelpSet(null, hsURL);
+- }
+- }
+- catch (HelpSetException ee)
+- {
+- FRLogger.error("HelpSet " + helpset_name + " could not be opened.", ee);
+- }
+- if (BoardFrame.help_set != null)
+- {
+- BoardFrame.help_broker = BoardFrame.help_set.createHelpBroker();
+- }
+- if (BoardFrame.help_broker != null)
+- {
+- // CSH.DisplayHelpFromSource is a convenience class to display the helpset
+- contents_help = new CSH.DisplayHelpFromSource(BoardFrame.help_broker);
+- direct_help = new CSH.DisplayHelpAfterTracking(BoardFrame.help_broker);
+- }
+- }
+- }
+-
+- private static CSH.DisplayHelpFromSource contents_help = null;
+- private static CSH.DisplayHelpAfterTracking direct_help = null;
+-}
diff --git a/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch b/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
new file mode 100644
index 000000000000..0e41031947e3
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
@@ -0,0 +1,59 @@
+From cd59e4ba58cf36038558421e38509d6ad125da2b Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 23:44:08 +0100
+Subject: [PATCH] Upgrade Gradle to v7.3
+
+---
+ build.gradle | 4 ++--
+ gradle/wrapper/gradle-wrapper.properties | 2 +-
+ src/main/java/module-info.java | 10 +++++-----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index fadfda4..9daba09 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -24,7 +24,7 @@ plugins {
+ ext.mainClassName = 'eu.mihosoft.freerouting.gui.MainApplication'
+
+ wrapper {
+- gradleVersion = '6.2'
++ gradleVersion = '7.3'
+ }
+
+ sourceCompatibility = '11'
+@@ -160,7 +160,7 @@ dist.dependsOn+="assemble"
+ task run(type: JavaExec) {
+ classpath = sourceSets.main.runtimeClasspath
+
+- main = mainClassName
++ mainClass = mainClassName
+
+ // arguments to pass to the application
+ // args 'appArg1'
+diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
+index b7c8c5d..e750102 100644
+--- a/gradle/wrapper/gradle-wrapper.properties
++++ b/gradle/wrapper/gradle-wrapper.properties
+@@ -1,5 +1,5 @@
+ distributionBase=GRADLE_USER_HOME
+ distributionPath=wrapper/dists
+-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
++distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+ zipStoreBase=GRADLE_USER_HOME
+ zipStorePath=wrapper/dists
+diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
+index fede9df..d165817 100644
+--- a/src/main/java/module-info.java
++++ b/src/main/java/module-info.java
+@@ -1,5 +1,5 @@
+-//module eu.mihosoft.freerouting {
+-// requires java.desktop;
+-// requires java.logging;
+-// requires eu.mihosoft.freerouting.deps.jh;
+-//}
++module eu.mihosoft.freerouting {
++ requires java.desktop;
++ requires java.logging;
++ requires org.apache.logging.log4j;
++}
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index e8c5b371e436..95cffecdc803 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -1,15 +1,24 @@
# Template file for 'freerouting'
pkgname=freerouting
-version=1.4.4
+version=1.4.5.1
revision=2
-hostmakedepends="gradle openjdk11"
+hostmakedepends="dos2unix gradle openjdk11"
depends="openjdk11"
short_desc="Advanced PCB autorouter"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/freerouting/freerouting"
distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
-checksum=0b8abc9e06ec894e83d97983d3ab0a85127c5fb7a913da533cea431c515c59ce
+checksum=f423b7ad9fe6be57247f5f79f7c77390061998a50bc3bddc42e010c5a3fe556a
+
+post_extract() {
+ # git eats CRLFs, so the patch has wrong line ending.
+ # Instead convert the target file to LF-only.
+ dos2unix $wrksrc/src/main/java/module-info.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+}
do_build() {
. /etc/profile.d/10_openjdk11.sh
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (2 preceding siblings ...)
2022-01-14 17:45 ` [PR PATCH] [Updated] " unspecd
@ 2022-01-14 17:48 ` unspecd
2022-01-14 19:32 ` unspecd
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: unspecd @ 2022-01-14 17:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gradle
https://github.com/void-linux/void-packages/pull/34746
gradle: update to 7.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
Supersedes #31971.
A patch file from https://github.com/void-linux/void-packages/pull/34746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gradle-34746.patch --]
[-- Type: text/x-diff, Size: 15772 bytes --]
From 851df0d64878e8d9cc34a99bec12d04d84b8d632 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 29 Dec 2021 09:00:40 +1100
Subject: [PATCH 1/2] gradle: update to 7.3.3.
---
srcpkgs/gradle/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 8e9f08a9910b..4732bcfbb5a7 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
# Template file for 'gradle'
pkgname=gradle
-version=6.8.1
+version=7.3.3
revision=1
depends="virtual?java-environment"
short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
homepage="https://gradle.org/"
changelog="https://docs.gradle.org/${version}/release-notes.html"
distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
+checksum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
do_install() {
vmkdir "usr/lib/gradle"
From a29a507fe18da3e6c4fde2f9a50f341548c169c2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 15 Jan 2022 04:17:28 +1100
Subject: [PATCH 2/2] freerouting: update to 1.4.5.1.
---
...06a0f72abe86f7883956aa56fa48b9804ecf.patch | 57 ++++++
...e1fa34bc8ee41021453235cb29e8013eefa4.patch | 191 ++++++++++++++++++
...e4ba58cf36038558421e38509d6ad125da2b.patch | 59 ++++++
srcpkgs/freerouting/template | 17 +-
4 files changed, 320 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
create mode 100644 srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
create mode 100644 srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
diff --git a/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
new file mode 100644
index 000000000000..3fa4031330d5
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
@@ -0,0 +1,57 @@
+From 6d2006a0f72abe86f7883956aa56fa48b9804ecf Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 20:21:13 +0100
+Subject: [PATCH] Remove deprecated Gradle settings
+
+---
+ build.gradle | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 2991bcb..fadfda4 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,7 +1,7 @@
+ buildscript {
+ repositories {
+ mavenCentral()
+- jcenter()
++ google()
+ }
+
+ dependencies {
+@@ -49,17 +49,17 @@ if (JavaVersion.current().isJava8Compatible()) {
+
+ repositories {
+ mavenCentral()
+- jcenter()
++ google()
+ }
+
+ dependencies {
+- testCompile group: 'junit', name: 'junit', version: '4.10'
++ testImplementation group: 'junit', name: 'junit', version: '4.10'
+
+ // https://mvnrepository.com/artifact/javax.help/javahelp
+- compile group: 'javax.help', name: 'javahelp', version: '2.0.05'
++ implementation group: 'javax.help', name: 'javahelp', version: '2.0.05'
+
+- compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
+- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
++ implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
++ implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
+ }
+
+
+@@ -88,8 +88,10 @@ jar {
+
+ task executableJar(type: Jar) {
+ classifier = 'executable'
++
++ duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+
+- from configurations.runtime.asFileTree.files.collect { zipTree(it) }
++ from configurations.runtimeClasspath.collect { zipTree(it) }
+
+ from files(sourceSets.main.output)
+
diff --git a/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch b/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
new file mode 100644
index 000000000000..d681af403da9
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
@@ -0,0 +1,191 @@
+From 8139e1fa34bc8ee41021453235cb29e8013eefa4 Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 23:43:22 +0100
+Subject: [PATCH] Remove the javax.help dependency
+
+---
+ .../mihosoft/freerouting/gui/BoardFrame.java | 16 ++-
+ .../freerouting/gui/BoardMenuBar.java | 12 +-
+ .../freerouting/gui/BoardMenuHelp.java | 116 ------------------
+ 3 files changed, 9 insertions(+), 135 deletions(-)
+ delete mode 100644 src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+index d728053..dbe25c5 100644
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
++++ b/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+@@ -387,12 +387,12 @@ public void set_context_sensitive_help(java.awt.Component p_component, String p_
+ curr_component = p_component;
+ }
+ String help_id = "html_files." + p_help_id;
+- javax.help.CSH.setHelpIDString(curr_component, help_id);
+- if (help_broker==null) {
+- FRLogger.warn("help_broker is null");
+- return;
+- }
+- help_broker.enableHelpKey(curr_component, help_id, help_set);
++// javax.help.CSH.setHelpIDString(curr_component, help_id);
++// if (help_broker==null) {
++// FRLogger.warn("help_broker is null");
++// return;
++// }
++// help_broker.enableHelpKey(curr_component, help_id, help_set);
+ }
+ }
+
+@@ -699,9 +699,7 @@ public void repaint_all()
+ final boolean is_web_start;
+
+ private final boolean help_system_used;
+- static javax.help.HelpSet help_set = null;
+- static javax.help.HelpBroker help_broker = null;
+-
++
+ private final boolean confirm_cancel;
+
+ private final java.util.ResourceBundle resources;
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+index db9dd06..272dfb6 100644
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
++++ b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+@@ -48,16 +48,8 @@ static BoardMenuBar get_instance(BoardFrame p_board_frame,
+ menubar.add(info_menu);
+ javax.swing.JMenu other_menu = BoardMenuOther.get_instance(p_board_frame);
+ menubar.add(other_menu);
+- if (p_help_system_used)
+- {
+- javax.swing.JMenu help_menu = new BoardMenuHelp(p_board_frame);
+- menubar.add(help_menu);
+- }
+- else
+- {
+- javax.swing.JMenu help_menu = new BoardMenuHelpReduced(p_board_frame);
+- menubar.add(help_menu);
+- }
++ javax.swing.JMenu help_menu = new BoardMenuHelpReduced(p_board_frame);
++ menubar.add(help_menu);
+ return menubar;
+ }
+
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+deleted file mode 100644
+index 85d89a7..0000000
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/*
+- * Copyright (C) 2014 Alfons Wirtz
+- * website www.freerouting.net
+- *
+- * Copyright (C) 2017 Michael Hoffer <info@michaelhoffer.de>
+- * Website www.freerouting.mihosoft.eu
+-*
+- * This program is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License at <http://www.gnu.org/licenses/>
+- * for more details.
+- *
+- * BoardMenuHelp.java
+- *
+- * Created on 19. Oktober 2005, 08:15
+- *
+- */
+-
+-package eu.mihosoft.freerouting.gui;
+-
+-import eu.mihosoft.freerouting.logger.FRLogger;
+-
+-import javax.help.CSH;
+-import javax.help.HelpSet;
+-import javax.help.HelpSetException;
+-import java.net.URL;
+-
+-/**
+- *
+- * @author Alfons Wirtz
+- */
+-public class BoardMenuHelp extends BoardMenuHelpReduced
+-{
+- /**
+- * Creates a new instance of BoardMenuHelp
+- * Separated from BoardMenuHelpReduced to avoid ClassNotFound exception when the library
+- * jh.jar is not found, which is only used in this extended class.
+- */
+- public BoardMenuHelp(BoardFrame p_board_frame)
+- {
+- super(p_board_frame);
+- this.initialize_help(p_board_frame.get_locale());
+- javax.swing.JMenuItem direct_help_window = new javax.swing.JMenuItem();
+- direct_help_window.setText(this.resources.getString("direct_help"));
+- if (direct_help != null)
+- {
+- direct_help_window.addActionListener(direct_help);
+- }
+- this.add(direct_help_window, 0);
+- javax.swing.JMenuItem contents_window = new javax.swing.JMenuItem();
+- contents_window.setText(this.resources.getString("contents"));
+- if (contents_help != null)
+- {
+- contents_window.addActionListener(contents_help);
+- }
+- this.add(contents_window, 0);
+- }
+-
+- private void initialize_help(java.util.Locale p_locale)
+- {
+- // try to find the helpset and create a HelpBroker object
+- if (BoardFrame.help_broker == null)
+- {
+- String language = p_locale.getLanguage();
+- String helpset_name;
+- if (language.equalsIgnoreCase("de"))
+- {
+- helpset_name = "/eu/mihosoft/freerouting/helpset/de/Help.hs";
+- }
+- else
+- {
+- helpset_name = "/eu/mihosoft/freerouting/helpset/en/Help.hs";
+- }
+- try
+- {
+- // original author tries to get language specific url
+- // via HelpSet utility methods which does not work that well
+- // and doesn't really make sense if the language is specified
+- // manually
+- // TODO find out why previous approach does not work reliably
+- URL hsURL = getClass().getResource(helpset_name);
+- if (hsURL == null)
+- {
+- FRLogger.warn("HelpSet " + helpset_name + " not found.");
+- }
+- else
+- {
+- BoardFrame.help_set = new HelpSet(null, hsURL);
+- }
+- }
+- catch (HelpSetException ee)
+- {
+- FRLogger.error("HelpSet " + helpset_name + " could not be opened.", ee);
+- }
+- if (BoardFrame.help_set != null)
+- {
+- BoardFrame.help_broker = BoardFrame.help_set.createHelpBroker();
+- }
+- if (BoardFrame.help_broker != null)
+- {
+- // CSH.DisplayHelpFromSource is a convenience class to display the helpset
+- contents_help = new CSH.DisplayHelpFromSource(BoardFrame.help_broker);
+- direct_help = new CSH.DisplayHelpAfterTracking(BoardFrame.help_broker);
+- }
+- }
+- }
+-
+- private static CSH.DisplayHelpFromSource contents_help = null;
+- private static CSH.DisplayHelpAfterTracking direct_help = null;
+-}
diff --git a/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch b/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
new file mode 100644
index 000000000000..0e41031947e3
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
@@ -0,0 +1,59 @@
+From cd59e4ba58cf36038558421e38509d6ad125da2b Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 23:44:08 +0100
+Subject: [PATCH] Upgrade Gradle to v7.3
+
+---
+ build.gradle | 4 ++--
+ gradle/wrapper/gradle-wrapper.properties | 2 +-
+ src/main/java/module-info.java | 10 +++++-----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index fadfda4..9daba09 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -24,7 +24,7 @@ plugins {
+ ext.mainClassName = 'eu.mihosoft.freerouting.gui.MainApplication'
+
+ wrapper {
+- gradleVersion = '6.2'
++ gradleVersion = '7.3'
+ }
+
+ sourceCompatibility = '11'
+@@ -160,7 +160,7 @@ dist.dependsOn+="assemble"
+ task run(type: JavaExec) {
+ classpath = sourceSets.main.runtimeClasspath
+
+- main = mainClassName
++ mainClass = mainClassName
+
+ // arguments to pass to the application
+ // args 'appArg1'
+diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
+index b7c8c5d..e750102 100644
+--- a/gradle/wrapper/gradle-wrapper.properties
++++ b/gradle/wrapper/gradle-wrapper.properties
+@@ -1,5 +1,5 @@
+ distributionBase=GRADLE_USER_HOME
+ distributionPath=wrapper/dists
+-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
++distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+ zipStoreBase=GRADLE_USER_HOME
+ zipStorePath=wrapper/dists
+diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
+index fede9df..d165817 100644
+--- a/src/main/java/module-info.java
++++ b/src/main/java/module-info.java
+@@ -1,5 +1,5 @@
+-//module eu.mihosoft.freerouting {
+-// requires java.desktop;
+-// requires java.logging;
+-// requires eu.mihosoft.freerouting.deps.jh;
+-//}
++module eu.mihosoft.freerouting {
++ requires java.desktop;
++ requires java.logging;
++ requires org.apache.logging.log4j;
++}
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index e8c5b371e436..f643eabdb6fe 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -1,15 +1,24 @@
# Template file for 'freerouting'
pkgname=freerouting
-version=1.4.4
-revision=2
-hostmakedepends="gradle openjdk11"
+version=1.4.5.1
+revision=1
+hostmakedepends="dos2unix gradle openjdk11"
depends="openjdk11"
short_desc="Advanced PCB autorouter"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/freerouting/freerouting"
distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
-checksum=0b8abc9e06ec894e83d97983d3ab0a85127c5fb7a913da533cea431c515c59ce
+checksum=f423b7ad9fe6be57247f5f79f7c77390061998a50bc3bddc42e010c5a3fe556a
+
+post_extract() {
+ # git eats CRLFs, so the patch has wrong line ending.
+ # Instead convert the target file to LF-only.
+ dos2unix $wrksrc/src/main/java/module-info.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+}
do_build() {
. /etc/profile.d/10_openjdk11.sh
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (3 preceding siblings ...)
2022-01-14 17:48 ` unspecd
@ 2022-01-14 19:32 ` unspecd
2022-01-14 20:25 ` unspecd
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: unspecd @ 2022-01-14 19:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gradle
https://github.com/void-linux/void-packages/pull/34746
gradle: update to 7.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
Supersedes #31971.
#### TODO for packages
- [ ] apache-jmeter
- [x] chatty
- [ ] freeplane
- [x] freerouting
- [x] ghidra
- [x] jadx
A patch file from https://github.com/void-linux/void-packages/pull/34746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gradle-34746.patch --]
[-- Type: text/x-diff, Size: 17037 bytes --]
From 851df0d64878e8d9cc34a99bec12d04d84b8d632 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 29 Dec 2021 09:00:40 +1100
Subject: [PATCH 1/3] gradle: update to 7.3.3.
---
srcpkgs/gradle/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 8e9f08a9910b..4732bcfbb5a7 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
# Template file for 'gradle'
pkgname=gradle
-version=6.8.1
+version=7.3.3
revision=1
depends="virtual?java-environment"
short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
homepage="https://gradle.org/"
changelog="https://docs.gradle.org/${version}/release-notes.html"
distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
+checksum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
do_install() {
vmkdir "usr/lib/gradle"
From a29a507fe18da3e6c4fde2f9a50f341548c169c2 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 15 Jan 2022 04:17:28 +1100
Subject: [PATCH 2/3] freerouting: update to 1.4.5.1.
---
...06a0f72abe86f7883956aa56fa48b9804ecf.patch | 57 ++++++
...e1fa34bc8ee41021453235cb29e8013eefa4.patch | 191 ++++++++++++++++++
...e4ba58cf36038558421e38509d6ad125da2b.patch | 59 ++++++
srcpkgs/freerouting/template | 17 +-
4 files changed, 320 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
create mode 100644 srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
create mode 100644 srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
diff --git a/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
new file mode 100644
index 000000000000..3fa4031330d5
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
@@ -0,0 +1,57 @@
+From 6d2006a0f72abe86f7883956aa56fa48b9804ecf Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 20:21:13 +0100
+Subject: [PATCH] Remove deprecated Gradle settings
+
+---
+ build.gradle | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 2991bcb..fadfda4 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,7 +1,7 @@
+ buildscript {
+ repositories {
+ mavenCentral()
+- jcenter()
++ google()
+ }
+
+ dependencies {
+@@ -49,17 +49,17 @@ if (JavaVersion.current().isJava8Compatible()) {
+
+ repositories {
+ mavenCentral()
+- jcenter()
++ google()
+ }
+
+ dependencies {
+- testCompile group: 'junit', name: 'junit', version: '4.10'
++ testImplementation group: 'junit', name: 'junit', version: '4.10'
+
+ // https://mvnrepository.com/artifact/javax.help/javahelp
+- compile group: 'javax.help', name: 'javahelp', version: '2.0.05'
++ implementation group: 'javax.help', name: 'javahelp', version: '2.0.05'
+
+- compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
+- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
++ implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
++ implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
+ }
+
+
+@@ -88,8 +88,10 @@ jar {
+
+ task executableJar(type: Jar) {
+ classifier = 'executable'
++
++ duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+
+- from configurations.runtime.asFileTree.files.collect { zipTree(it) }
++ from configurations.runtimeClasspath.collect { zipTree(it) }
+
+ from files(sourceSets.main.output)
+
diff --git a/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch b/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
new file mode 100644
index 000000000000..d681af403da9
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
@@ -0,0 +1,191 @@
+From 8139e1fa34bc8ee41021453235cb29e8013eefa4 Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 23:43:22 +0100
+Subject: [PATCH] Remove the javax.help dependency
+
+---
+ .../mihosoft/freerouting/gui/BoardFrame.java | 16 ++-
+ .../freerouting/gui/BoardMenuBar.java | 12 +-
+ .../freerouting/gui/BoardMenuHelp.java | 116 ------------------
+ 3 files changed, 9 insertions(+), 135 deletions(-)
+ delete mode 100644 src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+index d728053..dbe25c5 100644
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
++++ b/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+@@ -387,12 +387,12 @@ public void set_context_sensitive_help(java.awt.Component p_component, String p_
+ curr_component = p_component;
+ }
+ String help_id = "html_files." + p_help_id;
+- javax.help.CSH.setHelpIDString(curr_component, help_id);
+- if (help_broker==null) {
+- FRLogger.warn("help_broker is null");
+- return;
+- }
+- help_broker.enableHelpKey(curr_component, help_id, help_set);
++// javax.help.CSH.setHelpIDString(curr_component, help_id);
++// if (help_broker==null) {
++// FRLogger.warn("help_broker is null");
++// return;
++// }
++// help_broker.enableHelpKey(curr_component, help_id, help_set);
+ }
+ }
+
+@@ -699,9 +699,7 @@ public void repaint_all()
+ final boolean is_web_start;
+
+ private final boolean help_system_used;
+- static javax.help.HelpSet help_set = null;
+- static javax.help.HelpBroker help_broker = null;
+-
++
+ private final boolean confirm_cancel;
+
+ private final java.util.ResourceBundle resources;
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+index db9dd06..272dfb6 100644
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
++++ b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+@@ -48,16 +48,8 @@ static BoardMenuBar get_instance(BoardFrame p_board_frame,
+ menubar.add(info_menu);
+ javax.swing.JMenu other_menu = BoardMenuOther.get_instance(p_board_frame);
+ menubar.add(other_menu);
+- if (p_help_system_used)
+- {
+- javax.swing.JMenu help_menu = new BoardMenuHelp(p_board_frame);
+- menubar.add(help_menu);
+- }
+- else
+- {
+- javax.swing.JMenu help_menu = new BoardMenuHelpReduced(p_board_frame);
+- menubar.add(help_menu);
+- }
++ javax.swing.JMenu help_menu = new BoardMenuHelpReduced(p_board_frame);
++ menubar.add(help_menu);
+ return menubar;
+ }
+
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+deleted file mode 100644
+index 85d89a7..0000000
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/*
+- * Copyright (C) 2014 Alfons Wirtz
+- * website www.freerouting.net
+- *
+- * Copyright (C) 2017 Michael Hoffer <info@michaelhoffer.de>
+- * Website www.freerouting.mihosoft.eu
+-*
+- * This program is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License at <http://www.gnu.org/licenses/>
+- * for more details.
+- *
+- * BoardMenuHelp.java
+- *
+- * Created on 19. Oktober 2005, 08:15
+- *
+- */
+-
+-package eu.mihosoft.freerouting.gui;
+-
+-import eu.mihosoft.freerouting.logger.FRLogger;
+-
+-import javax.help.CSH;
+-import javax.help.HelpSet;
+-import javax.help.HelpSetException;
+-import java.net.URL;
+-
+-/**
+- *
+- * @author Alfons Wirtz
+- */
+-public class BoardMenuHelp extends BoardMenuHelpReduced
+-{
+- /**
+- * Creates a new instance of BoardMenuHelp
+- * Separated from BoardMenuHelpReduced to avoid ClassNotFound exception when the library
+- * jh.jar is not found, which is only used in this extended class.
+- */
+- public BoardMenuHelp(BoardFrame p_board_frame)
+- {
+- super(p_board_frame);
+- this.initialize_help(p_board_frame.get_locale());
+- javax.swing.JMenuItem direct_help_window = new javax.swing.JMenuItem();
+- direct_help_window.setText(this.resources.getString("direct_help"));
+- if (direct_help != null)
+- {
+- direct_help_window.addActionListener(direct_help);
+- }
+- this.add(direct_help_window, 0);
+- javax.swing.JMenuItem contents_window = new javax.swing.JMenuItem();
+- contents_window.setText(this.resources.getString("contents"));
+- if (contents_help != null)
+- {
+- contents_window.addActionListener(contents_help);
+- }
+- this.add(contents_window, 0);
+- }
+-
+- private void initialize_help(java.util.Locale p_locale)
+- {
+- // try to find the helpset and create a HelpBroker object
+- if (BoardFrame.help_broker == null)
+- {
+- String language = p_locale.getLanguage();
+- String helpset_name;
+- if (language.equalsIgnoreCase("de"))
+- {
+- helpset_name = "/eu/mihosoft/freerouting/helpset/de/Help.hs";
+- }
+- else
+- {
+- helpset_name = "/eu/mihosoft/freerouting/helpset/en/Help.hs";
+- }
+- try
+- {
+- // original author tries to get language specific url
+- // via HelpSet utility methods which does not work that well
+- // and doesn't really make sense if the language is specified
+- // manually
+- // TODO find out why previous approach does not work reliably
+- URL hsURL = getClass().getResource(helpset_name);
+- if (hsURL == null)
+- {
+- FRLogger.warn("HelpSet " + helpset_name + " not found.");
+- }
+- else
+- {
+- BoardFrame.help_set = new HelpSet(null, hsURL);
+- }
+- }
+- catch (HelpSetException ee)
+- {
+- FRLogger.error("HelpSet " + helpset_name + " could not be opened.", ee);
+- }
+- if (BoardFrame.help_set != null)
+- {
+- BoardFrame.help_broker = BoardFrame.help_set.createHelpBroker();
+- }
+- if (BoardFrame.help_broker != null)
+- {
+- // CSH.DisplayHelpFromSource is a convenience class to display the helpset
+- contents_help = new CSH.DisplayHelpFromSource(BoardFrame.help_broker);
+- direct_help = new CSH.DisplayHelpAfterTracking(BoardFrame.help_broker);
+- }
+- }
+- }
+-
+- private static CSH.DisplayHelpFromSource contents_help = null;
+- private static CSH.DisplayHelpAfterTracking direct_help = null;
+-}
diff --git a/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch b/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
new file mode 100644
index 000000000000..0e41031947e3
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
@@ -0,0 +1,59 @@
+From cd59e4ba58cf36038558421e38509d6ad125da2b Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 23:44:08 +0100
+Subject: [PATCH] Upgrade Gradle to v7.3
+
+---
+ build.gradle | 4 ++--
+ gradle/wrapper/gradle-wrapper.properties | 2 +-
+ src/main/java/module-info.java | 10 +++++-----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index fadfda4..9daba09 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -24,7 +24,7 @@ plugins {
+ ext.mainClassName = 'eu.mihosoft.freerouting.gui.MainApplication'
+
+ wrapper {
+- gradleVersion = '6.2'
++ gradleVersion = '7.3'
+ }
+
+ sourceCompatibility = '11'
+@@ -160,7 +160,7 @@ dist.dependsOn+="assemble"
+ task run(type: JavaExec) {
+ classpath = sourceSets.main.runtimeClasspath
+
+- main = mainClassName
++ mainClass = mainClassName
+
+ // arguments to pass to the application
+ // args 'appArg1'
+diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
+index b7c8c5d..e750102 100644
+--- a/gradle/wrapper/gradle-wrapper.properties
++++ b/gradle/wrapper/gradle-wrapper.properties
+@@ -1,5 +1,5 @@
+ distributionBase=GRADLE_USER_HOME
+ distributionPath=wrapper/dists
+-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
++distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+ zipStoreBase=GRADLE_USER_HOME
+ zipStorePath=wrapper/dists
+diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
+index fede9df..d165817 100644
+--- a/src/main/java/module-info.java
++++ b/src/main/java/module-info.java
+@@ -1,5 +1,5 @@
+-//module eu.mihosoft.freerouting {
+-// requires java.desktop;
+-// requires java.logging;
+-// requires eu.mihosoft.freerouting.deps.jh;
+-//}
++module eu.mihosoft.freerouting {
++ requires java.desktop;
++ requires java.logging;
++ requires org.apache.logging.log4j;
++}
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index e8c5b371e436..f643eabdb6fe 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -1,15 +1,24 @@
# Template file for 'freerouting'
pkgname=freerouting
-version=1.4.4
-revision=2
-hostmakedepends="gradle openjdk11"
+version=1.4.5.1
+revision=1
+hostmakedepends="dos2unix gradle openjdk11"
depends="openjdk11"
short_desc="Advanced PCB autorouter"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/freerouting/freerouting"
distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
-checksum=0b8abc9e06ec894e83d97983d3ab0a85127c5fb7a913da533cea431c515c59ce
+checksum=f423b7ad9fe6be57247f5f79f7c77390061998a50bc3bddc42e010c5a3fe556a
+
+post_extract() {
+ # git eats CRLFs, so the patch has wrong line ending.
+ # Instead convert the target file to LF-only.
+ dos2unix $wrksrc/src/main/java/module-info.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+}
do_build() {
. /etc/profile.d/10_openjdk11.sh
From 2a2eca8d6234d591c9ac9eaa972666dbeffccf00 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 15 Jan 2022 06:31:17 +1100
Subject: [PATCH 3/3] freeplane: change distfiles
---
srcpkgs/freeplane/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 97b392f81d25..2e7adb76ea4a 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -2,14 +2,15 @@
pkgname=freeplane
version=1.9.12
revision=1
+wrksrc="freeplane-release-${version}"
hostmakedepends="apache-ant openjdk8 unzip gradle"
depends="virtual?java-runtime"
short_desc="Application for Mind Mapping, Knowledge Management, Project Management"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later"
homepage="http://freeplane.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=80ac01adcdd4d4125a823cccac10e58337892c8929cb32d5d357ec4921f893b0
+distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz"
+checksum=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f
make_dirs="
/usr/share/freeplane/fwdir/condperm/ 755 root root
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (4 preceding siblings ...)
2022-01-14 19:32 ` unspecd
@ 2022-01-14 20:25 ` unspecd
2022-01-16 17:15 ` Piraty
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: unspecd @ 2022-01-14 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/34746#issuecomment-1013450734
Comment:
apache-jmeter needs too many patches to make it work with gradle 7.3 even if updated to the latest version.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (5 preceding siblings ...)
2022-01-14 20:25 ` unspecd
@ 2022-01-16 17:15 ` Piraty
2022-01-20 21:18 ` knusbaum
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Piraty @ 2022-01-16 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/34746#issuecomment-1013915697
Comment:
ping @knusbaum
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (6 preceding siblings ...)
2022-01-16 17:15 ` Piraty
@ 2022-01-20 21:18 ` knusbaum
2022-01-20 21:21 ` knusbaum
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: knusbaum @ 2022-01-20 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 464 bytes --]
New comment by knusbaum on void-packages repository
https://github.com/void-linux/void-packages/pull/34746#issuecomment-1017936489
Comment:
Genuine question: Is there a particular reason we want to upgrade `gradle`? It seems makes certain packages more difficult to build, requiring patches for `freerouting`.
Void is rolling-release, but ["focuses on stability, rather than on being bleeding-edge"](https://voidlinux.org/). What do we get from this upgrade?
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (7 preceding siblings ...)
2022-01-20 21:18 ` knusbaum
@ 2022-01-20 21:21 ` knusbaum
2022-01-20 21:40 ` knusbaum
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: knusbaum @ 2022-01-20 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
New comment by knusbaum on void-packages repository
https://github.com/void-linux/void-packages/pull/34746#issuecomment-1017936489
Comment:
Genuine question: Is there a particular reason we want to upgrade `gradle`? It seems to make certain packages more difficult to build, requiring patches for `freerouting`.
Void is rolling-release, but ["focuses on stability, rather than on being bleeding-edge"](https://voidlinux.org/). What do we get from this upgrade?
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (8 preceding siblings ...)
2022-01-20 21:21 ` knusbaum
@ 2022-01-20 21:40 ` knusbaum
2022-01-21 7:38 ` [PR PATCH] [Updated] " unspecd
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: knusbaum @ 2022-01-20 21:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 785 bytes --]
New comment by knusbaum on void-packages repository
https://github.com/void-linux/void-packages/pull/34746#issuecomment-1017936489
Comment:
Genuine question: Is there a particular reason we want to upgrade `gradle`? It seems to make certain packages more difficult to build, requiring patches for `freerouting`.
Void is rolling-release, but ["focuses on stability, rather than on being bleeding-edge"](https://voidlinux.org/). What do we get from this upgrade?
That said, the recent `apache-jmeter` update (https://github.com/void-linux/void-packages/pull/35114) causes it to build with the provided `gradlew` script, removing its dependence on `gradle`. (I'm removing `gradle` as a dependency altogether in #35147) You should be able to upgrade `gradle` without affecting it.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Updated] gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (9 preceding siblings ...)
2022-01-20 21:40 ` knusbaum
@ 2022-01-21 7:38 ` unspecd
2022-01-29 10:22 ` unspecd
2022-01-30 21:49 ` [PR PATCH] [Closed]: " Piraty
12 siblings, 0 replies; 14+ messages in thread
From: unspecd @ 2022-01-21 7:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/gradle
https://github.com/void-linux/void-packages/pull/34746
gradle: update to 7.3.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
Supersedes #31971.
#### TODO for packages
- [ ] apache-jmeter
- [x] chatty
- [x] freeplane
- [x] freerouting
- [x] ghidra
- [x] jadx
A patch file from https://github.com/void-linux/void-packages/pull/34746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/gradle-34746.patch --]
[-- Type: text/x-diff, Size: 17037 bytes --]
From 9724cc70352dff00ea97b34c2bb3c12d6ebc3367 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 29 Dec 2021 09:00:40 +1100
Subject: [PATCH 1/3] gradle: update to 7.3.3.
---
srcpkgs/gradle/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gradle/template b/srcpkgs/gradle/template
index 8e9f08a9910b..4732bcfbb5a7 100644
--- a/srcpkgs/gradle/template
+++ b/srcpkgs/gradle/template
@@ -1,6 +1,6 @@
# Template file for 'gradle'
pkgname=gradle
-version=6.8.1
+version=7.3.3
revision=1
depends="virtual?java-environment"
short_desc="Build system for Java/C/C++ software"
@@ -9,7 +9,7 @@ license="Apache-2.0"
homepage="https://gradle.org/"
changelog="https://docs.gradle.org/${version}/release-notes.html"
distfiles="https://services.gradle.org/distributions/gradle-${version}-bin.zip"
-checksum=fd591a34af7385730970399f473afabdb8b28d57fd97d6625c388d090039d6fd
+checksum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
do_install() {
vmkdir "usr/lib/gradle"
From 482637618cd945fddb038ac37989a207aa1fbe9d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 15 Jan 2022 04:17:28 +1100
Subject: [PATCH 2/3] freerouting: update to 1.4.5.1.
---
...06a0f72abe86f7883956aa56fa48b9804ecf.patch | 57 ++++++
...e1fa34bc8ee41021453235cb29e8013eefa4.patch | 191 ++++++++++++++++++
...e4ba58cf36038558421e38509d6ad125da2b.patch | 59 ++++++
srcpkgs/freerouting/template | 17 +-
4 files changed, 320 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
create mode 100644 srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
create mode 100644 srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
diff --git a/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
new file mode 100644
index 000000000000..3fa4031330d5
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
@@ -0,0 +1,57 @@
+From 6d2006a0f72abe86f7883956aa56fa48b9804ecf Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 20:21:13 +0100
+Subject: [PATCH] Remove deprecated Gradle settings
+
+---
+ build.gradle | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 2991bcb..fadfda4 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,7 +1,7 @@
+ buildscript {
+ repositories {
+ mavenCentral()
+- jcenter()
++ google()
+ }
+
+ dependencies {
+@@ -49,17 +49,17 @@ if (JavaVersion.current().isJava8Compatible()) {
+
+ repositories {
+ mavenCentral()
+- jcenter()
++ google()
+ }
+
+ dependencies {
+- testCompile group: 'junit', name: 'junit', version: '4.10'
++ testImplementation group: 'junit', name: 'junit', version: '4.10'
+
+ // https://mvnrepository.com/artifact/javax.help/javahelp
+- compile group: 'javax.help', name: 'javahelp', version: '2.0.05'
++ implementation group: 'javax.help', name: 'javahelp', version: '2.0.05'
+
+- compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
+- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
++ implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0'
++ implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0'
+ }
+
+
+@@ -88,8 +88,10 @@ jar {
+
+ task executableJar(type: Jar) {
+ classifier = 'executable'
++
++ duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+
+- from configurations.runtime.asFileTree.files.collect { zipTree(it) }
++ from configurations.runtimeClasspath.collect { zipTree(it) }
+
+ from files(sourceSets.main.output)
+
diff --git a/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch b/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
new file mode 100644
index 000000000000..d681af403da9
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
@@ -0,0 +1,191 @@
+From 8139e1fa34bc8ee41021453235cb29e8013eefa4 Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 23:43:22 +0100
+Subject: [PATCH] Remove the javax.help dependency
+
+---
+ .../mihosoft/freerouting/gui/BoardFrame.java | 16 ++-
+ .../freerouting/gui/BoardMenuBar.java | 12 +-
+ .../freerouting/gui/BoardMenuHelp.java | 116 ------------------
+ 3 files changed, 9 insertions(+), 135 deletions(-)
+ delete mode 100644 src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+index d728053..dbe25c5 100644
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
++++ b/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+@@ -387,12 +387,12 @@ public void set_context_sensitive_help(java.awt.Component p_component, String p_
+ curr_component = p_component;
+ }
+ String help_id = "html_files." + p_help_id;
+- javax.help.CSH.setHelpIDString(curr_component, help_id);
+- if (help_broker==null) {
+- FRLogger.warn("help_broker is null");
+- return;
+- }
+- help_broker.enableHelpKey(curr_component, help_id, help_set);
++// javax.help.CSH.setHelpIDString(curr_component, help_id);
++// if (help_broker==null) {
++// FRLogger.warn("help_broker is null");
++// return;
++// }
++// help_broker.enableHelpKey(curr_component, help_id, help_set);
+ }
+ }
+
+@@ -699,9 +699,7 @@ public void repaint_all()
+ final boolean is_web_start;
+
+ private final boolean help_system_used;
+- static javax.help.HelpSet help_set = null;
+- static javax.help.HelpBroker help_broker = null;
+-
++
+ private final boolean confirm_cancel;
+
+ private final java.util.ResourceBundle resources;
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+index db9dd06..272dfb6 100644
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
++++ b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+@@ -48,16 +48,8 @@ static BoardMenuBar get_instance(BoardFrame p_board_frame,
+ menubar.add(info_menu);
+ javax.swing.JMenu other_menu = BoardMenuOther.get_instance(p_board_frame);
+ menubar.add(other_menu);
+- if (p_help_system_used)
+- {
+- javax.swing.JMenu help_menu = new BoardMenuHelp(p_board_frame);
+- menubar.add(help_menu);
+- }
+- else
+- {
+- javax.swing.JMenu help_menu = new BoardMenuHelpReduced(p_board_frame);
+- menubar.add(help_menu);
+- }
++ javax.swing.JMenu help_menu = new BoardMenuHelpReduced(p_board_frame);
++ menubar.add(help_menu);
+ return menubar;
+ }
+
+diff --git a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java b/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+deleted file mode 100644
+index 85d89a7..0000000
+--- a/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
++++ /dev/null
+@@ -1,116 +0,0 @@
+-/*
+- * Copyright (C) 2014 Alfons Wirtz
+- * website www.freerouting.net
+- *
+- * Copyright (C) 2017 Michael Hoffer <info@michaelhoffer.de>
+- * Website www.freerouting.mihosoft.eu
+-*
+- * This program is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License at <http://www.gnu.org/licenses/>
+- * for more details.
+- *
+- * BoardMenuHelp.java
+- *
+- * Created on 19. Oktober 2005, 08:15
+- *
+- */
+-
+-package eu.mihosoft.freerouting.gui;
+-
+-import eu.mihosoft.freerouting.logger.FRLogger;
+-
+-import javax.help.CSH;
+-import javax.help.HelpSet;
+-import javax.help.HelpSetException;
+-import java.net.URL;
+-
+-/**
+- *
+- * @author Alfons Wirtz
+- */
+-public class BoardMenuHelp extends BoardMenuHelpReduced
+-{
+- /**
+- * Creates a new instance of BoardMenuHelp
+- * Separated from BoardMenuHelpReduced to avoid ClassNotFound exception when the library
+- * jh.jar is not found, which is only used in this extended class.
+- */
+- public BoardMenuHelp(BoardFrame p_board_frame)
+- {
+- super(p_board_frame);
+- this.initialize_help(p_board_frame.get_locale());
+- javax.swing.JMenuItem direct_help_window = new javax.swing.JMenuItem();
+- direct_help_window.setText(this.resources.getString("direct_help"));
+- if (direct_help != null)
+- {
+- direct_help_window.addActionListener(direct_help);
+- }
+- this.add(direct_help_window, 0);
+- javax.swing.JMenuItem contents_window = new javax.swing.JMenuItem();
+- contents_window.setText(this.resources.getString("contents"));
+- if (contents_help != null)
+- {
+- contents_window.addActionListener(contents_help);
+- }
+- this.add(contents_window, 0);
+- }
+-
+- private void initialize_help(java.util.Locale p_locale)
+- {
+- // try to find the helpset and create a HelpBroker object
+- if (BoardFrame.help_broker == null)
+- {
+- String language = p_locale.getLanguage();
+- String helpset_name;
+- if (language.equalsIgnoreCase("de"))
+- {
+- helpset_name = "/eu/mihosoft/freerouting/helpset/de/Help.hs";
+- }
+- else
+- {
+- helpset_name = "/eu/mihosoft/freerouting/helpset/en/Help.hs";
+- }
+- try
+- {
+- // original author tries to get language specific url
+- // via HelpSet utility methods which does not work that well
+- // and doesn't really make sense if the language is specified
+- // manually
+- // TODO find out why previous approach does not work reliably
+- URL hsURL = getClass().getResource(helpset_name);
+- if (hsURL == null)
+- {
+- FRLogger.warn("HelpSet " + helpset_name + " not found.");
+- }
+- else
+- {
+- BoardFrame.help_set = new HelpSet(null, hsURL);
+- }
+- }
+- catch (HelpSetException ee)
+- {
+- FRLogger.error("HelpSet " + helpset_name + " could not be opened.", ee);
+- }
+- if (BoardFrame.help_set != null)
+- {
+- BoardFrame.help_broker = BoardFrame.help_set.createHelpBroker();
+- }
+- if (BoardFrame.help_broker != null)
+- {
+- // CSH.DisplayHelpFromSource is a convenience class to display the helpset
+- contents_help = new CSH.DisplayHelpFromSource(BoardFrame.help_broker);
+- direct_help = new CSH.DisplayHelpAfterTracking(BoardFrame.help_broker);
+- }
+- }
+- }
+-
+- private static CSH.DisplayHelpFromSource contents_help = null;
+- private static CSH.DisplayHelpAfterTracking direct_help = null;
+-}
diff --git a/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch b/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
new file mode 100644
index 000000000000..0e41031947e3
--- /dev/null
+++ b/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
@@ -0,0 +1,59 @@
+From cd59e4ba58cf36038558421e38509d6ad125da2b Mon Sep 17 00:00:00 2001
+From: Andras Fuchs <andras.fuchs@gmail.com>
+Date: Thu, 25 Nov 2021 23:44:08 +0100
+Subject: [PATCH] Upgrade Gradle to v7.3
+
+---
+ build.gradle | 4 ++--
+ gradle/wrapper/gradle-wrapper.properties | 2 +-
+ src/main/java/module-info.java | 10 +++++-----
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index fadfda4..9daba09 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -24,7 +24,7 @@ plugins {
+ ext.mainClassName = 'eu.mihosoft.freerouting.gui.MainApplication'
+
+ wrapper {
+- gradleVersion = '6.2'
++ gradleVersion = '7.3'
+ }
+
+ sourceCompatibility = '11'
+@@ -160,7 +160,7 @@ dist.dependsOn+="assemble"
+ task run(type: JavaExec) {
+ classpath = sourceSets.main.runtimeClasspath
+
+- main = mainClassName
++ mainClass = mainClassName
+
+ // arguments to pass to the application
+ // args 'appArg1'
+diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
+index b7c8c5d..e750102 100644
+--- a/gradle/wrapper/gradle-wrapper.properties
++++ b/gradle/wrapper/gradle-wrapper.properties
+@@ -1,5 +1,5 @@
+ distributionBase=GRADLE_USER_HOME
+ distributionPath=wrapper/dists
+-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
++distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+ zipStoreBase=GRADLE_USER_HOME
+ zipStorePath=wrapper/dists
+diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
+index fede9df..d165817 100644
+--- a/src/main/java/module-info.java
++++ b/src/main/java/module-info.java
+@@ -1,5 +1,5 @@
+-//module eu.mihosoft.freerouting {
+-// requires java.desktop;
+-// requires java.logging;
+-// requires eu.mihosoft.freerouting.deps.jh;
+-//}
++module eu.mihosoft.freerouting {
++ requires java.desktop;
++ requires java.logging;
++ requires org.apache.logging.log4j;
++}
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index e8c5b371e436..f643eabdb6fe 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -1,15 +1,24 @@
# Template file for 'freerouting'
pkgname=freerouting
-version=1.4.4
-revision=2
-hostmakedepends="gradle openjdk11"
+version=1.4.5.1
+revision=1
+hostmakedepends="dos2unix gradle openjdk11"
depends="openjdk11"
short_desc="Advanced PCB autorouter"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/freerouting/freerouting"
distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
-checksum=0b8abc9e06ec894e83d97983d3ab0a85127c5fb7a913da533cea431c515c59ce
+checksum=f423b7ad9fe6be57247f5f79f7c77390061998a50bc3bddc42e010c5a3fe556a
+
+post_extract() {
+ # git eats CRLFs, so the patch has wrong line ending.
+ # Instead convert the target file to LF-only.
+ dos2unix $wrksrc/src/main/java/module-info.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardFrame.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuBar.java
+ dos2unix $wrksrc/src/main/java/eu/mihosoft/freerouting/gui/BoardMenuHelp.java
+}
do_build() {
. /etc/profile.d/10_openjdk11.sh
From 26725ffd56454bf7e612b3f384e7fa312869a24d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sat, 15 Jan 2022 06:31:17 +1100
Subject: [PATCH 3/3] freeplane: change distfiles
---
srcpkgs/freeplane/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 97b392f81d25..2e7adb76ea4a 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -2,14 +2,15 @@
pkgname=freeplane
version=1.9.12
revision=1
+wrksrc="freeplane-release-${version}"
hostmakedepends="apache-ant openjdk8 unzip gradle"
depends="virtual?java-runtime"
short_desc="Application for Mind Mapping, Knowledge Management, Project Management"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later"
homepage="http://freeplane.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz"
-checksum=80ac01adcdd4d4125a823cccac10e58337892c8929cb32d5d357ec4921f893b0
+distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz"
+checksum=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f
make_dirs="
/usr/share/freeplane/fwdir/condperm/ 755 root root
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (10 preceding siblings ...)
2022-01-21 7:38 ` [PR PATCH] [Updated] " unspecd
@ 2022-01-29 10:22 ` unspecd
2022-01-30 21:49 ` [PR PATCH] [Closed]: " Piraty
12 siblings, 0 replies; 14+ messages in thread
From: unspecd @ 2022-01-29 10:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/34746#issuecomment-1024883685
Comment:
> Is there a particular reason we want to upgrade gradle?
jadx 1.3.2 requires gradle 7.0.
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PR PATCH] [Closed]: gradle: update to 7.3.3.
2021-12-29 2:23 [PR PATCH] gradle: update to 7.3.3 unspecd
` (11 preceding siblings ...)
2022-01-29 10:22 ` unspecd
@ 2022-01-30 21:49 ` Piraty
12 siblings, 0 replies; 14+ messages in thread
From: Piraty @ 2022-01-30 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]
There's a closed pull request on the void-packages repository
gradle: update to 7.3.3.
https://github.com/void-linux/void-packages/pull/34746
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
Supersedes #31971.
#### TODO for packages
- [x] apache-jmeter
- [x] chatty
- [x] freeplane
- [x] freerouting
- [x] ghidra
- [x] jadx
^ permalink raw reply [flat|nested] 14+ messages in thread