[PR PATCH] freerouting: update to 1.5.0.

[PR PATCH] freerouting: update to 1.5.0.

[nonchip]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

There is a new pull request by nonchip against master on the void-packages repository

https://github.com/nonchip/void-packages freerouting
https://github.com/void-linux/void-packages/pull/37308

freerouting: update to 1.5.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`


A patch file from https://github.com/void-linux/void-packages/pull/37308.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freerouting-37308.patch --]
[-- Type: text/x-diff, Size: 14675 bytes --]

From 58dfb2de22712a36def3160cc1875bd7aa05a202 Mon Sep 17 00:00:00 2001
From: Kyra Zimmer <me@nonchip.de>
Date: Fri, 27 May 2022 14:30:41 +0200
Subject: [PATCH] freerouting: update to 1.5.0.

---
 ...06a0f72abe86f7883956aa56fa48b9804ecf.patch |  57 ------
 ...e1fa34bc8ee41021453235cb29e8013eefa4.patch | 191 ------------------
 ...e4ba58cf36038558421e38509d6ad125da2b.patch |  59 ------
 srcpkgs/freerouting/template                  |  15 +-
 4 files changed, 3 insertions(+), 319 deletions(-)
 delete mode 100644 srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
 delete mode 100644 srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
 delete mode 100644 srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch

diff --git a/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch b/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
deleted file mode 100644
index 3fa4031330d5..000000000000
--- a/srcpkgs/freerouting/patches/0001-6d2006a0f72abe86f7883956aa56fa48b9804ecf.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index d681af403da9..000000000000
--- a/srcpkgs/freerouting/patches/0002-8139e1fa34bc8ee41021453235cb29e8013eefa4.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-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
deleted file mode 100644
index 0e41031947e3..000000000000
--- a/srcpkgs/freerouting/patches/0003-cd59e4ba58cf36038558421e38509d6ad125da2b.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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 bfde02fc9e29..e128119f75cd 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -1,7 +1,7 @@
 # Template file for 'freerouting'
 pkgname=freerouting
-version=1.4.5.1
-revision=2
+version=1.5.0
+revision=1
 hostmakedepends="dos2unix gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
@@ -9,16 +9,7 @@ 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=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
-}
+checksum=36742a91e492956e3adc5d75e542a40f3e03d15d69d15717a9d39c0585faac44
 
 do_build() {
 	. /etc/profile.d/openjdk.sh

Re: freerouting: update to 1.5.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/37308#issuecomment-1146200629

Comment:
@ericonr

Re: [PR PATCH] [Merged]: freerouting: update to 1.5.0.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 415 bytes --]

There's a merged pull request on the void-packages repository

freerouting: update to 1.5.0.
https://github.com/void-linux/void-packages/pull/37308

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, `x86_64-glibc`