Github messages for voidlinux
 help / color / mirror / Atom feed
From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: josm-18789
Date: Thu, 21 Sep 2023 15:41:02 +0200	[thread overview]
Message-ID: <20230921134102.AyiD176FotSETzTu07_VRoqLx2UJIEjD5boalesrCmY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45150@inbox.vuxu.org>

[-- 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)"

  parent reply	other threads:[~2023-09-21 13:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230921134102.AyiD176FotSETzTu07_VRoqLx2UJIEjD5boalesrCmY@z \
    --to=tinfoilsubmarine@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).