* [PR PATCH] New package: josm-18772
@ 2023-07-20 16:13 TinfoilSubmarine
2023-08-08 12:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2023-07-20 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is a new pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-18772
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3397 bytes --]
From f21c6c057d55e23a06f736ee51657be61de1575e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-18772
---
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 44 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
3 files changed, 55 insertions(+)
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 000000000000..eca7ea4d3194
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 000000000000..38884b48bf2b
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,44 @@
+# Template file for 'josm'
+pkgname=josm
+version=18772
+revision=1
+# Java 17 or later is reccomended by JOSM devs
+hostmakedepends="subversion apache-ant openjdk17"
+depends="desktop-file-utils hicolor-icon-theme libXtst openjdk17-jre"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=193cd1f3d85ae268713cb159f07ca43013710b930971e3d294bcb93149dfc8bc
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin native/linux/tested/usr/bin/josm
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 000000000000..b3b63e88265f
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://github.com/JOSM/josm/tags"
+pattern="\K[0-9]+(?=-tested.tar.gz)"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-18772
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
@ 2023-08-08 12:33 ` TinfoilSubmarine
2023-09-21 13:41 ` [PR PATCH] [Updated] New package: josm-18789 TinfoilSubmarine
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2023-08-08 12:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-18772
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3403 bytes --]
From cd19636f900204f0624e52f6add9c30601a835bd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-18789
---
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 44 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
3 files changed, 55 insertions(+)
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 0000000000000..eca7ea4d3194b
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 0000000000000..300effadd4145
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,44 @@
+# Template file for 'josm'
+pkgname=josm
+version=18789
+revision=1
+# Java 17 or later is reccomended by JOSM devs
+hostmakedepends="subversion apache-ant openjdk17"
+depends="desktop-file-utils hicolor-icon-theme libXtst openjdk17-jre"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=083cef042c674e714af7b7b7939da7b4f0319684999f513399ec568610ec3bcd
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin native/linux/tested/usr/bin/josm
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 0000000000000..b3b63e88265fd
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://github.com/JOSM/josm/tags"
+pattern="\K[0-9]+(?=-tested.tar.gz)"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-18789
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
2023-08-08 12:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2023-09-21 13:41 ` TinfoilSubmarine
2023-12-21 1:46 ` New package: josm-18822 github-actions
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2023-09-21 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-18789
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3403 bytes --]
From 2f3486f21b0fc16535f55aaef371953f0ce7d715 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-18822
---
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 44 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
3 files changed, 55 insertions(+)
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 0000000000000..eca7ea4d3194b
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 0000000000000..26fd64e8ab6d6
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,44 @@
+# Template file for 'josm'
+pkgname=josm
+version=18822
+revision=1
+# Java 17 or later is reccomended by JOSM devs
+hostmakedepends="subversion apache-ant openjdk17"
+depends="desktop-file-utils hicolor-icon-theme libXtst openjdk17-jre"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=48b0a50deff4e765ada4a7fc18f64ec59526d9a68d35012c1b914ad487108485
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin native/linux/tested/usr/bin/josm
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 0000000000000..b3b63e88265fd
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://github.com/JOSM/josm/tags"
+pattern="\K[0-9]+(?=-tested.tar.gz)"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New package: josm-18822
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
2023-08-08 12:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-09-21 13:41 ` [PR PATCH] [Updated] New package: josm-18789 TinfoilSubmarine
@ 2023-12-21 1:46 ` github-actions
2023-12-21 18:43 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: github-actions @ 2023-12-21 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/45150#issuecomment-1865360993
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-18822
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (2 preceding siblings ...)
2023-12-21 1:46 ` New package: josm-18822 github-actions
@ 2023-12-21 18:43 ` TinfoilSubmarine
2024-02-08 21:20 ` [PR PATCH] [Updated] New package: josm-18907 TinfoilSubmarine
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2023-12-21 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-18822
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3403 bytes --]
From 5c4601f8f33407bea19d97ba79c299696aecc8a7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-18907
---
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 44 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
3 files changed, 55 insertions(+)
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 0000000000000..eca7ea4d3194b
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 0000000000000..d68faeb518c83
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,44 @@
+# Template file for 'josm'
+pkgname=josm
+version=18907
+revision=1
+# Java 17 or later is reccomended by JOSM devs
+hostmakedepends="subversion apache-ant openjdk17"
+depends="desktop-file-utils hicolor-icon-theme libXtst openjdk17-jre"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=d16eae3ddc2543ff24edba88b06463684138fc099166553ccfa839aa6a91bd23
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin native/linux/tested/usr/bin/josm
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 0000000000000..b3b63e88265fd
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://github.com/JOSM/josm/tags"
+pattern="\K[0-9]+(?=-tested.tar.gz)"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-18907
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (3 preceding siblings ...)
2023-12-21 18:43 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2024-02-08 21:20 ` TinfoilSubmarine
2024-04-29 15:07 ` [PR PATCH] [Updated] New package: josm-18969 TinfoilSubmarine
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2024-02-08 21:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-18907
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3403 bytes --]
From 97adc1d41d5768b69e8e79f10d28ecdbd666a95f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-18969
---
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 44 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
3 files changed, 55 insertions(+)
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 0000000000000..eca7ea4d3194b
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 0000000000000..166891c271d04
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,44 @@
+# Template file for 'josm'
+pkgname=josm
+version=18969
+revision=1
+# Java 17 or later is reccomended by JOSM devs
+hostmakedepends="subversion apache-ant openjdk17"
+depends="desktop-file-utils hicolor-icon-theme libXtst openjdk17-jre"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=a3845b42d74740573468cbfcd57c74076ea3ead80b10e8ff37c13342b2260547
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin native/linux/tested/usr/bin/josm
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 0000000000000..b3b63e88265fd
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://github.com/JOSM/josm/tags"
+pattern="\K[0-9]+(?=-tested.tar.gz)"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-18969
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (4 preceding siblings ...)
2024-02-08 21:20 ` [PR PATCH] [Updated] New package: josm-18907 TinfoilSubmarine
@ 2024-04-29 15:07 ` TinfoilSubmarine
2024-07-19 16:31 ` [PR PATCH] [Updated] New package: josm-19039 TinfoilSubmarine
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2024-04-29 15:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-18969
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3409 bytes --]
From 0cd5318694f923a9f76b973a9dc1335951ab52ae Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-19039
---
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 44 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
3 files changed, 55 insertions(+)
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 00000000000000..eca7ea4d3194b6
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 00000000000000..022f1032709ca2
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,44 @@
+# Template file for 'josm'
+pkgname=josm
+version=19039
+revision=1
+# Java 17 or later is reccomended by JOSM devs
+hostmakedepends="subversion apache-ant openjdk17"
+depends="desktop-file-utils hicolor-icon-theme libXtst openjdk17-jre"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=d3298ef02bd17b0e7c61e0d76c29a1f7ff4d729cd1a53f8900bb0397eb8413bf
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin native/linux/tested/usr/bin/josm
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 00000000000000..b3b63e88265fde
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://github.com/JOSM/josm/tags"
+pattern="\K[0-9]+(?=-tested.tar.gz)"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-19039
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (5 preceding siblings ...)
2024-04-29 15:07 ` [PR PATCH] [Updated] New package: josm-18969 TinfoilSubmarine
@ 2024-07-19 16:31 ` TinfoilSubmarine
2024-07-31 8:18 ` New package: josm-19128 Emru1
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2024-07-19 16:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-19039
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3433 bytes --]
From d1678068336b197b6ae6e7c23757e6768198d62e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-19128
---
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 44 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
3 files changed, 55 insertions(+)
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 00000000000000..eca7ea4d3194b6
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 00000000000000..2ac419664753a8
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,44 @@
+# Template file for 'josm'
+pkgname=josm
+version=19128
+revision=1
+# Java 17 or later is reccomended by JOSM devs
+hostmakedepends="subversion apache-ant openjdk17"
+depends="desktop-file-utils hicolor-icon-theme libXtst openjdk17-jre"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=030d6b870049b0f114f2896363950d0d4859b9b3ba802b9f94b496e03cebe36e
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin native/linux/tested/usr/bin/josm
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 00000000000000..7c232e118d2479
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://josm.openstreetmap.de/"
+pattern="(?<=\(Latest tested version, currently )\K[\d]+(?=\))"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New package: josm-19128
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (6 preceding siblings ...)
2024-07-19 16:31 ` [PR PATCH] [Updated] New package: josm-19039 TinfoilSubmarine
@ 2024-07-31 8:18 ` Emru1
2024-07-31 9:36 ` Emru1
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Emru1 @ 2024-07-31 8:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/45150#issuecomment-2259935637
Comment:
Builded and installed, but when I launch it:
```
Using /usr/lib/jvm/openjdk17/bin/java to execute josm.
Error occurred during initialization of boot layer
java.lang.module.FindException: Module javafx.web not found
```
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New package: josm-19128
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (7 preceding siblings ...)
2024-07-31 8:18 ` New package: josm-19128 Emru1
@ 2024-07-31 9:36 ` Emru1
2024-08-01 15:06 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Emru1 @ 2024-07-31 9:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/45150#issuecomment-2260091672
Comment:
Launching it manually, without this debian scipt installed in `/usr/bin/josm` works properly
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-19128
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (8 preceding siblings ...)
2024-07-31 9:36 ` Emru1
@ 2024-08-01 15:06 ` TinfoilSubmarine
2024-08-01 15:08 ` TinfoilSubmarine
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2024-08-01 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-19128
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 6877 bytes --]
From 4c9aab882a2321e1976dcc50eb3e2163b6701ccf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-19128
---
srcpkgs/josm/patches/custom-josm-path.patch | 9 ++++
srcpkgs/josm/patches/no_debian.patch | 59 +++++++++++++++++++++
srcpkgs/josm/template | 44 +++++++++++++++
srcpkgs/josm/update | 2 +
4 files changed, 114 insertions(+)
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/patches/no_debian.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 00000000000000..eca7ea4d3194b6
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/patches/no_debian.patch b/srcpkgs/josm/patches/no_debian.patch
new file mode 100644
index 00000000000000..8f850e157ea4ff
--- /dev/null
+++ b/srcpkgs/josm/patches/no_debian.patch
@@ -0,0 +1,59 @@
+diff --git a/native/linux/tested/usr/bin/josm b/native/linux/tested/usr/bin/josm
+index d2e18ba..328e4af 100755
+--- a/native/linux/tested/usr/bin/josm
++++ b/native/linux/tested/usr/bin/josm
+@@ -1,53 +1,17 @@
+ #!/bin/bash
+-# Simple wrapper script used to start JOSM in Debian
++# Simple wrapper script used to start JOSM
+ set -e
+
+-# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK.
+-# Override to a specific one using $JAVACMD
+-if [ -e "/etc/alternatives/java" ]; then
+- ALTERNATIVE_JDK=$(readlink -n -f /etc/alternatives/java)
+-fi
+-
+ if [ -v JAVA_HOME ]; then
+ JAVA_CMDS="$JAVA_HOME/bin/java"
+ else
+ JAVA_CMDS=""
+ fi
+
+-dpkg_java() {
+- # Let's get the current architecture -- needed for multiarchified Java
+- ARCH=$(dpkg --print-architecture 2> /dev/null || true)
+- # If OpenJDK is only available headless, do not try it
+- if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \
+- || dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
+- # LTS versions in decreased order
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-21-openjdk/bin/java /usr/lib/jvm/java-21-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
+- # Released versions in decreased order
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-22-openjdk/bin/java /usr/lib/jvm/java-22-openjdk-$ARCH/bin/java"
+- # EOL versions in decreased order
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-20-openjdk/bin/java /usr/lib/jvm/java-20-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-19-openjdk/bin/java /usr/lib/jvm/java-19-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-16-openjdk/bin/java /usr/lib/jvm/java-16-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java"
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java"
+- # Development version(s)
+- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-23-openjdk/bin/java /usr/lib/jvm/java-23-openjdk-$ARCH/bin/java"
+- fi
+-}
+-
+ java_version() {
+ ${1} -version 2>&1 | head -n1 | awk -F'"' '{print $2}' | awk -F'.' '{print $1}'
+ }
+
+-if dpkg --version > /dev/null 2>&1; then
+- dpkg_java
+-fi
+-
+ # Undetermined version
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/default-java/bin/java /usr/bin/java"
+ JOSM_VERSION="josm"
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 00000000000000..2ac419664753a8
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,44 @@
+# Template file for 'josm'
+pkgname=josm
+version=19128
+revision=1
+# Java 17 or later is reccomended by JOSM devs
+hostmakedepends="subversion apache-ant openjdk17"
+depends="desktop-file-utils hicolor-icon-theme libXtst openjdk17-jre"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=030d6b870049b0f114f2896363950d0d4859b9b3ba802b9f94b496e03cebe36e
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin native/linux/tested/usr/bin/josm
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 00000000000000..7c232e118d2479
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://josm.openstreetmap.de/"
+pattern="(?<=\(Latest tested version, currently )\K[\d]+(?=\))"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New package: josm-19128
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (9 preceding siblings ...)
2024-08-01 15:06 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2024-08-01 15:08 ` TinfoilSubmarine
2024-08-02 3:05 ` TinfoilSubmarine
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2024-08-01 15:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45150#issuecomment-2263314219
Comment:
Could you try with the latest version I just pushed? It has a patch that strips out the Debian-specific stuff from `/usr/bin/josm`. That is the only change I made.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New package: josm-19128
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (10 preceding siblings ...)
2024-08-01 15:08 ` TinfoilSubmarine
@ 2024-08-02 3:05 ` TinfoilSubmarine
2024-08-04 22:39 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2024-08-02 3:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/45150#issuecomment-2264424593
Comment:
...which of course means we should just be using Void's canonical way of finding the correct jre, which is of course just using the `java` available on path, which is what you were saying in the first place. I'll update this to just do that when I get a chance instead of using the unnecessary included script.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-19128
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (11 preceding siblings ...)
2024-08-02 3:05 ` TinfoilSubmarine
@ 2024-08-04 22:39 ` TinfoilSubmarine
2024-08-11 16:13 ` New package: josm-19160 Emru1
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2024-08-04 22:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-19128
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3909 bytes --]
From 0a5c827db45c8e28b9c8f8008ca0de7a0e31a802 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-19160
---
srcpkgs/josm/files/josm | 5 +++
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 43 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
4 files changed, 59 insertions(+)
create mode 100644 srcpkgs/josm/files/josm
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/files/josm b/srcpkgs/josm/files/josm
new file mode 100644
index 00000000000000..f4e92428397e29
--- /dev/null
+++ b/srcpkgs/josm/files/josm
@@ -0,0 +1,5 @@
+#!/bin/sh
+java --add-exports=java.base/sun.security.action=ALL-UNNAMED \
+ --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED \
+ --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED \
+ -jar /usr/share/java/josm/josm.jar "$@"
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 00000000000000..eca7ea4d3194b6
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 00000000000000..89db1bb8dfde1a
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,43 @@
+# Template file for 'josm'
+pkgname=josm
+version=19160
+revision=1
+hostmakedepends="subversion apache-ant openjdk11"
+depends="desktop-file-utils hicolor-icon-theme libXtst virtual?java-runtime"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=3eba8073cb25b489ff5f312c3197190a12cdc54f3e4ab14e2b96e63e58bf6138
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin "${FILESDIR}/josm"
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 00000000000000..7c232e118d2479
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://josm.openstreetmap.de/"
+pattern="(?<=\(Latest tested version, currently )\K[\d]+(?=\))"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New package: josm-19160
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (12 preceding siblings ...)
2024-08-04 22:39 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2024-08-11 16:13 ` Emru1
2024-11-10 2:01 ` github-actions
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Emru1 @ 2024-08-11 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/45150#issuecomment-2282808869
Comment:
now it works :)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New package: josm-19160
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (13 preceding siblings ...)
2024-08-11 16:13 ` New package: josm-19160 Emru1
@ 2024-11-10 2:01 ` github-actions
2024-11-10 8:40 ` Emru1
2024-11-12 14:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
16 siblings, 0 replies; 18+ messages in thread
From: github-actions @ 2024-11-10 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/45150#issuecomment-2466545972
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New package: josm-19160
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (14 preceding siblings ...)
2024-11-10 2:01 ` github-actions
@ 2024-11-10 8:40 ` Emru1
2024-11-12 14:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
16 siblings, 0 replies; 18+ messages in thread
From: Emru1 @ 2024-11-10 8:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 144 bytes --]
New comment by Emru1 on void-packages repository
https://github.com/void-linux/void-packages/pull/45150#issuecomment-2466642144
Comment:
bump
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New package: josm-19160
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
` (15 preceding siblings ...)
2024-11-10 8:40 ` Emru1
@ 2024-11-12 14:32 ` TinfoilSubmarine
16 siblings, 0 replies; 18+ messages in thread
From: TinfoilSubmarine @ 2024-11-12 14:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/josm
https://github.com/void-linux/void-packages/pull/45150
New package: josm-19160
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45150.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/josm-45150.patch --]
[-- Type: text/x-diff, Size: 3909 bytes --]
From f1d48e3faa8431f8a0b9fb78cbbfae5e5f81f4ff Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 20 Jul 2023 10:50:19 -0400
Subject: [PATCH] New package: josm-19253
---
srcpkgs/josm/files/josm | 5 +++
srcpkgs/josm/patches/custom-josm-path.patch | 9 +++++
srcpkgs/josm/template | 43 +++++++++++++++++++++
srcpkgs/josm/update | 2 +
4 files changed, 59 insertions(+)
create mode 100644 srcpkgs/josm/files/josm
create mode 100644 srcpkgs/josm/patches/custom-josm-path.patch
create mode 100644 srcpkgs/josm/template
create mode 100644 srcpkgs/josm/update
diff --git a/srcpkgs/josm/files/josm b/srcpkgs/josm/files/josm
new file mode 100644
index 00000000000000..f4e92428397e29
--- /dev/null
+++ b/srcpkgs/josm/files/josm
@@ -0,0 +1,5 @@
+#!/bin/sh
+java --add-exports=java.base/sun.security.action=ALL-UNNAMED \
+ --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED \
+ --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED \
+ -jar /usr/share/java/josm/josm.jar "$@"
diff --git a/srcpkgs/josm/patches/custom-josm-path.patch b/srcpkgs/josm/patches/custom-josm-path.patch
new file mode 100644
index 00000000000000..eca7ea4d3194b6
--- /dev/null
+++ b/srcpkgs/josm/patches/custom-josm-path.patch
@@ -0,0 +1,9 @@
+diff --git a/native/linux/tested/etc/default/josm b/native/linux/tested/etc/default/josm
+index b646c4f..dc1d91a 100644
+--- a/native/linux/tested/etc/default/josm
++++ b/native/linux/tested/etc/default/josm
+@@ -7,3 +7,4 @@
+ # Enable OpenGL pipeline (2D graphic accelerators)
+ #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"
+
++JOSM_PATH=/usr/share/java/josm/josm.jar
diff --git a/srcpkgs/josm/template b/srcpkgs/josm/template
new file mode 100644
index 00000000000000..f200b215e088c3
--- /dev/null
+++ b/srcpkgs/josm/template
@@ -0,0 +1,43 @@
+# Template file for 'josm'
+pkgname=josm
+version=19253
+revision=1
+hostmakedepends="subversion apache-ant openjdk11"
+depends="desktop-file-utils hicolor-icon-theme libXtst virtual?java-runtime"
+short_desc="Extensible editor for OpenStreetMap"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="GPL-3.0-or-later"
+homepage="https://josm.openstreetmap.de/"
+changelog="https://josm.openstreetmap.de/wiki/Changelog"
+distfiles="https://github.com/JOSM/josm/archive/refs/tags/${version}-tested.tar.gz"
+checksum=bc20fcaae0ce4080cb611696e1c417e852c3e9f62a0e761a6983e23da8eff665
+conf_files="/etc/default/josm"
+
+post_patch() {
+ vsed -e "s,\(version.entry.commit.revision.*value=\"\).*\(\".*\),\1${version}\2,g" -i build.xml
+}
+
+do_build() {
+ . /etc/profile
+ ant clean dist
+}
+
+# adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/josm/-/blob/71ea40e37da136f4c55126fb01ae6dac2a4fcb1d/PKGBUILD#L23
+do_install() {
+ vinstall dist/josm-custom.jar 644 usr/share/java/josm josm.jar
+
+ vinstall native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop 644 usr/share/applications
+ vinstall native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml 644 usr/share/metainfo
+
+ vman native/linux/tested/usr/share/man/man1/josm.1
+
+ for i in 8 16 22 24 32 36 40 42 48 64 72 80 96 128 192 256 512; do
+ vinstall native/linux/tested/usr/share/icons/hicolor/${i}x${i}/apps/org.openstreetmap.josm.png \
+ 644 usr/share/icons/hicolor/${i}x${i}/apps
+ done
+ vinstall native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg \
+ 644 usr/share/icons/hicolor/scalable/apps
+
+ vbin "${FILESDIR}/josm"
+ vinstall native/linux/tested/etc/default/josm 644 etc/default
+}
diff --git a/srcpkgs/josm/update b/srcpkgs/josm/update
new file mode 100644
index 00000000000000..7c232e118d2479
--- /dev/null
+++ b/srcpkgs/josm/update
@@ -0,0 +1,2 @@
+site="https://josm.openstreetmap.de/"
+pattern="(?<=\(Latest tested version, currently )\K[\d]+(?=\))"
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-11-12 14:32 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-20 16:13 [PR PATCH] New package: josm-18772 TinfoilSubmarine
2023-08-08 12:33 ` [PR PATCH] [Updated] " TinfoilSubmarine
2023-09-21 13:41 ` [PR PATCH] [Updated] New package: josm-18789 TinfoilSubmarine
2023-12-21 1:46 ` New package: josm-18822 github-actions
2023-12-21 18:43 ` [PR PATCH] [Updated] " TinfoilSubmarine
2024-02-08 21:20 ` [PR PATCH] [Updated] New package: josm-18907 TinfoilSubmarine
2024-04-29 15:07 ` [PR PATCH] [Updated] New package: josm-18969 TinfoilSubmarine
2024-07-19 16:31 ` [PR PATCH] [Updated] New package: josm-19039 TinfoilSubmarine
2024-07-31 8:18 ` New package: josm-19128 Emru1
2024-07-31 9:36 ` Emru1
2024-08-01 15:06 ` [PR PATCH] [Updated] " TinfoilSubmarine
2024-08-01 15:08 ` TinfoilSubmarine
2024-08-02 3:05 ` TinfoilSubmarine
2024-08-04 22:39 ` [PR PATCH] [Updated] " TinfoilSubmarine
2024-08-11 16:13 ` New package: josm-19160 Emru1
2024-11-10 2:01 ` github-actions
2024-11-10 8:40 ` Emru1
2024-11-12 14:32 ` [PR PATCH] [Updated] " TinfoilSubmarine
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).