[PR PATCH] eclipse: update to 4.32 [WIP]

[PR PATCH] eclipse: update to 4.32 [WIP]

[jadynbrammer]

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

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

https://github.com/jadynbrammer/void-packages update-eclipse-to-4.32
https://github.com/void-linux/void-packages/pull/51993

eclipse: update to 4.32 [WIP]
#### Testing the changes
- I tested the changes in this PR: **Briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- (no other archs supported)

Package builds successfully but cannot be installed:

```
eclipse-4.32.0_1: broken, unresolvable shlib `ld-linux-riscv64-lp64d.so.1'
Transaction aborted due to unresolved shlibs.
```

Requesting assistance resolving.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eclipse-to-4.32-51993.patch --]
[-- Type: text/x-diff, Size: 1339 bytes --]

From c227898edfc07bc2d22bb24c7eb0d97d7b918be0 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 25 Aug 2024 20:03:44 -0500
Subject: [PATCH] eclipse: update to 4.32

---
 srcpkgs/eclipse/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 3bd6569c33585f..d747c60b32c0c7 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.30.0
-revision=2
+version=4.32.0
+revision=1
 #code name of version
-_release=2023-12
+_release=2024-06
 archs="x86_64"
 depends="openjdk11 gtk+3 libwebkit2gtk41 libXtst
  hicolor-icon-theme desktop-file-utils"
@@ -14,9 +14,9 @@ homepage="https://eclipse.org"
 make_dirs="/usr/lib/eclipse/dropins 0770 root users"
 _patch=R
 _edition=java
-_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
+_mirror="http://mirror.umd.edu/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
-checksum=09fda3acd8da911b5e18efd6d7ca27784f440ccdd52f28bf94869f81f7e9ad47
+checksum=7d77e3d0f226c9dda73d491a1af3aeec11807881e44e870a1fde2833f55df8b5
 nopie=yes
 nostrip=yes
 allow_unknown_shlibs=yes # glibc sonames issue

Re: [PR PATCH] [Updated] eclipse: update to 4.32 [WIP]

[jadynbrammer]

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

There is an updated pull request by jadynbrammer against master on the void-packages repository

https://github.com/jadynbrammer/void-packages update-eclipse-to-4.32
https://github.com/void-linux/void-packages/pull/51993

eclipse: update to 4.32 [WIP]
#### Testing the changes
- I tested the changes in this PR: **Briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- (no other archs supported)

Package builds successfully but cannot be installed:

```
eclipse-4.32.0_1: broken, unresolvable shlib `ld-linux-riscv64-lp64d.so.1'
Transaction aborted due to unresolved shlibs.
```

Requesting assistance resolving.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eclipse-to-4.32-51993.patch --]
[-- Type: text/x-diff, Size: 2017 bytes --]

From d394a40bf9efa92393725cc6858e15fe2984ed6b Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 25 Aug 2024 20:03:44 -0500
Subject: [PATCH] eclipse: update to 4.32

---
 srcpkgs/eclipse/template | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 3bd6569c33585f..fdec739e68e29a 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,11 +1,11 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.30.0
-revision=2
+version=4.32.0
+revision=1
 #code name of version
-_release=2023-12
+_release=2024-06
 archs="x86_64"
-depends="openjdk11 gtk+3 libwebkit2gtk41 libXtst
+depends="openjdk21 gtk+3 libwebkit2gtk41 libXtst
  hicolor-icon-theme desktop-file-utils"
 short_desc="IDE for Java and other languages"
 maintainer="mobinmob <mobinmob@disroot.org>"
@@ -14,12 +14,11 @@ homepage="https://eclipse.org"
 make_dirs="/usr/lib/eclipse/dropins 0770 root users"
 _patch=R
 _edition=java
-_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
+_mirror="http://mirror.umd.edu/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
-checksum=09fda3acd8da911b5e18efd6d7ca27784f440ccdd52f28bf94869f81f7e9ad47
+checksum=7d77e3d0f226c9dda73d491a1af3aeec11807881e44e870a1fde2833f55df8b5
 nopie=yes
 nostrip=yes
-allow_unknown_shlibs=yes # glibc sonames issue
 python_version=3
 
 
@@ -29,6 +28,10 @@ do_install() {
 	sed -i '6i-vm' ${DESTDIR}/usr/lib/eclipse/eclipse.ini
 	sed -i '7i/usr/lib/jvm/openjdk11/bin' ${DESTDIR}/usr/lib/eclipse/eclipse.ini
 
+	# remove libjnidispatch for other platforms (prevents false unresolved shlibs issues)
+	find "$DESTDIR"/usr/lib/eclipse/plugins/com.sun.jna*/com/sun/jna -name libjnidispatch.so \
+		-not -path '*/linux-x86-64/*' -delete
+
 	vbin ${FILESDIR}/eclipse.sh eclipse
 	vinstall ${FILESDIR}/eclipse.desktop 644 usr/share/applications
 

Re: [PR REVIEW] eclipse: update to 4.32

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51993#discussion_r1730678945

Comment:
these variables aren't used anywhere but the url, they should just get merged into it

and https on the mirror

Re: eclipse: update to 4.32

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51993#issuecomment-2309340626

Comment:
we could also add aarch64, there's a distfile for that: https://mirror.umd.edu/eclipse/technology/epp/downloads/release/2024-06/R/eclipse-java-2024-06-R-linux-gtk-aarch64.tar.gz

(put distfiles and checksum in an XBPS_TARGET_MACHINE case statement)

Re: eclipse: update to 4.32

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51993#issuecomment-2309340626

Comment:
we could also add aarch64, there's a distfile for that: https://mirror.umd.edu/eclipse/technology/epp/downloads/release/2024-06/R/eclipse-java-2024-06-R-linux-gtk-aarch64.tar.gz

(put distfiles and checksum in an XBPS_TARGET_MACHINE case statement)

and this might mean adjusting the find command for jnidispatch

Re: [PR PATCH] [Updated] eclipse: update to 4.32 and add aarch64 support

[jadynbrammer]

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

There is an updated pull request by jadynbrammer against master on the void-packages repository

https://github.com/jadynbrammer/void-packages update-eclipse-to-4.32
https://github.com/void-linux/void-packages/pull/51993

eclipse: update to 4.32 and add aarch64 support
#### 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.
- I built this PR locally for other architectures: aarch64 (xbuild, untested)

EDIT: thanks @classabbyamp for the assist fixing this one :3

Eclipse is shipping libs for all supported platforms in their tarballs now, and this was causing dependency problems. Deleting the offending libraries from the build dir fixes the issue.

~~Package builds successfully but cannot be installed:~~

~~eclipse-4.32.0_1: broken, unresolvable shlib `ld-linux-riscv64-lp64d.so.1'~~
~~Transaction aborted due to unresolved shlibs.~~

~~Requesting assistance resolving.~~

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eclipse-to-4.32-51993.patch --]
[-- Type: text/x-diff, Size: 2528 bytes --]

From 543ed02cd7955894043e3fe5134cab11a3f4015a Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 25 Aug 2024 20:03:44 -0500
Subject: [PATCH] eclipse: update to 4.32

* added aarch64 support

* cleaned up / refactored template
---
 srcpkgs/eclipse/template | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 3bd6569c33585f..acd82dbbe20389 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,27 +1,29 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.30.0
-revision=2
-#code name of version
-_release=2023-12
-archs="x86_64"
-depends="openjdk11 gtk+3 libwebkit2gtk41 libXtst
+version=4.32.0
+revision=1
+archs="x86_64* aarch64*"
+depends="openjdk21 gtk+3 libwebkit2gtk41 libXtst
  hicolor-icon-theme desktop-file-utils"
 short_desc="IDE for Java and other languages"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="EPL-1.0"
 homepage="https://eclipse.org"
 make_dirs="/usr/lib/eclipse/dropins 0770 root users"
-_patch=R
-_edition=java
-_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
-distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
-checksum=09fda3acd8da911b5e18efd6d7ca27784f440ccdd52f28bf94869f81f7e9ad47
 nopie=yes
 nostrip=yes
-allow_unknown_shlibs=yes # glibc sonames issue
 python_version=3
 
+case ${XBPS_TARGET_MACHINE} in
+	x86_64*)
+		distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/2024-06/R/eclipse-java-2024-06-R-linux-gtk-x86_64.tar.gz"
+		checksum="7d77e3d0f226c9dda73d491a1af3aeec11807881e44e870a1fde2833f55df8b5"
+		;;
+	aarch64*)
+		distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/2024-06/R/eclipse-java-2024-06-R-linux-gtk-aarch64.tar.gz"
+		checksum="d046576e781722ca3c7d2f1bbd20cfc91182aded9d174fbac3295d43a1a11a6a"
+		;;
+esac
 
 do_install() {
 	vmkdir usr/lib/eclipse
@@ -29,6 +31,10 @@ do_install() {
 	sed -i '6i-vm' ${DESTDIR}/usr/lib/eclipse/eclipse.ini
 	sed -i '7i/usr/lib/jvm/openjdk11/bin' ${DESTDIR}/usr/lib/eclipse/eclipse.ini
 
+	# remove libjnidispatch for other platforms (prevents false unresolved shlibs issues)
+	find "$DESTDIR"/usr/lib/eclipse/plugins/com.sun.jna*/com/sun/jna \
+		-name libjnidispatch.so -not -path '*/linux-x86-64/*' -delete
+
 	vbin ${FILESDIR}/eclipse.sh eclipse
 	vinstall ${FILESDIR}/eclipse.desktop 644 usr/share/applications
 

Re: [PR PATCH] [Updated] eclipse: update to 4.32 and add aarch64 support

[jadynbrammer]

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

There is an updated pull request by jadynbrammer against master on the void-packages repository

https://github.com/jadynbrammer/void-packages update-eclipse-to-4.32
https://github.com/void-linux/void-packages/pull/51993

eclipse: update to 4.32 and add aarch64 support
#### 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.
- I built this PR locally for other architectures: aarch64 (xbuild, untested)

EDIT: thanks @classabbyamp for the assist fixing this one :3

Eclipse is shipping libs for all supported platforms in their tarballs now, and this was causing dependency problems. Deleting the offending libraries from the build dir fixes the issue.

~~Package builds successfully but cannot be installed:~~

~~eclipse-4.32.0_1: broken, unresolvable shlib `ld-linux-riscv64-lp64d.so.1'~~
~~Transaction aborted due to unresolved shlibs.~~

~~Requesting assistance resolving.~~

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eclipse-to-4.32-51993.patch --]
[-- Type: text/x-diff, Size: 2789 bytes --]

From 92fc4fbc8ba24f1eeaa0337e18899e5dd4380615 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 25 Aug 2024 20:03:44 -0500
Subject: [PATCH] eclipse: update to 4.32

* added aarch64 support

* cleaned up / refactored template
---
 srcpkgs/eclipse/template | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 3bd6569c33585f..e6a4a5fe100893 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,27 +1,29 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.30.0
-revision=2
-#code name of version
-_release=2023-12
-archs="x86_64"
-depends="openjdk11 gtk+3 libwebkit2gtk41 libXtst
+version=4.32.0
+revision=1
+archs="x86_64* aarch64*"
+depends="openjdk21 gtk+3 libwebkit2gtk41 libXtst
  hicolor-icon-theme desktop-file-utils"
 short_desc="IDE for Java and other languages"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="EPL-1.0"
 homepage="https://eclipse.org"
 make_dirs="/usr/lib/eclipse/dropins 0770 root users"
-_patch=R
-_edition=java
-_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
-distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
-checksum=09fda3acd8da911b5e18efd6d7ca27784f440ccdd52f28bf94869f81f7e9ad47
 nopie=yes
 nostrip=yes
-allow_unknown_shlibs=yes # glibc sonames issue
 python_version=3
 
+case ${XBPS_TARGET_MACHINE} in
+	x86_64*)
+		distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/2024-06/R/eclipse-java-2024-06-R-linux-gtk-x86_64.tar.gz"
+		checksum="7d77e3d0f226c9dda73d491a1af3aeec11807881e44e870a1fde2833f55df8b5"
+		;;
+	aarch64*)
+		distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/2024-06/R/eclipse-java-2024-06-R-linux-gtk-aarch64.tar.gz"
+		checksum="d046576e781722ca3c7d2f1bbd20cfc91182aded9d174fbac3295d43a1a11a6a"
+		;;
+esac
 
 do_install() {
 	vmkdir usr/lib/eclipse
@@ -29,6 +31,19 @@ do_install() {
 	sed -i '6i-vm' ${DESTDIR}/usr/lib/eclipse/eclipse.ini
 	sed -i '7i/usr/lib/jvm/openjdk11/bin' ${DESTDIR}/usr/lib/eclipse/eclipse.ini
 
+	# remove libjnidispatch.so for platforms other than the current build
+	# (prevents false unresolved shlibs issues)
+	case ${XBPS_TARGET_MACHINE} in
+		x86_64*)
+			find "$DESTDIR"/usr/lib/eclipse/plugins/com.sun.jna*/com/sun/jna \
+				-name libjnidispatch.so -not -path '*/linux-x86-64/*' -delete
+			;;
+		aarch64*)
+			find "$DESTDIR"/usr/lib/eclipse/plugins/com.sun.jna*/com/sun/jna \
+				-name libjnidispatch.so -not -path '*/linux-aarch64/*' -delete
+			;;
+	esac
+
 	vbin ${FILESDIR}/eclipse.sh eclipse
 	vinstall ${FILESDIR}/eclipse.desktop 644 usr/share/applications
 

Re: eclipse: update to 4.32 and add aarch64 support

[jadynbrammer]

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

New comment by jadynbrammer on void-packages repository

https://github.com/void-linux/void-packages/pull/51993#issuecomment-2314428491

Comment:
distfiles refactored as requested.

I built out two `case ${XBPS_TARGET_MACHINE}` blocks; one for the distfiles and one to ensure that the correct `libjnidispatch.so` is retained for each built pkg.

Re: [PR PATCH] [Updated] eclipse: update to 4.32 and add aarch64 support

[jadynbrammer]

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

There is an updated pull request by jadynbrammer against master on the void-packages repository

https://github.com/jadynbrammer/void-packages update-eclipse-to-4.32
https://github.com/void-linux/void-packages/pull/51993

eclipse: update to 4.32 and add aarch64 support
#### 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.
- I built this PR locally for other architectures: aarch64 (xbuild, untested)

EDIT: thanks @classabbyamp for the assist fixing this one :3

Eclipse is shipping libs for all supported platforms in their tarballs now, and this was causing dependency problems. Deleting the offending libraries from the build dir fixes the issue.

~~Package builds successfully but cannot be installed:~~

~~eclipse-4.32.0_1: broken, unresolvable shlib `ld-linux-riscv64-lp64d.so.1'~~
~~Transaction aborted due to unresolved shlibs.~~

~~Requesting assistance resolving.~~

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eclipse-to-4.32-51993.patch --]
[-- Type: text/x-diff, Size: 2546 bytes --]

From 204b8b3c983235aaa5de9406bbb20dde6afe40d4 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 25 Aug 2024 20:03:44 -0500
Subject: [PATCH] eclipse: update to 4.32

* added aarch64 support

* cleaned up / refactored template
---
 srcpkgs/eclipse/template | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 3bd6569c33585f..320cad40454c95 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,27 +1,38 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.30.0
-revision=2
-#code name of version
-_release=2023-12
-archs="x86_64"
-depends="openjdk11 gtk+3 libwebkit2gtk41 libXtst
+version=4.32.0
+revision=1
+_release="2024-06"
+archs="x86_64* aarch64*"
+depends="openjdk21 gtk+3 libwebkit2gtk41 libXtst
  hicolor-icon-theme desktop-file-utils"
 short_desc="IDE for Java and other languages"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="EPL-1.0"
 homepage="https://eclipse.org"
 make_dirs="/usr/lib/eclipse/dropins 0770 root users"
-_patch=R
-_edition=java
-_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
-distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
-checksum=09fda3acd8da911b5e18efd6d7ca27784f440ccdd52f28bf94869f81f7e9ad47
 nopie=yes
 nostrip=yes
-allow_unknown_shlibs=yes # glibc sonames issue
 python_version=3
 
+case ${XBPS_TARGET_MACHINE} in
+	x86_64*)
+		distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/${_release}/R/eclipse-java-${_release}-R-linux-gtk-x86_64.tar.gz"
+		checksum="7d77e3d0f226c9dda73d491a1af3aeec11807881e44e870a1fde2833f55df8b5"
+		;;
+	aarch64*)
+		distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/${_release}/R/eclipse-java-${_release}-R-linux-gtk-aarch64.tar.gz"
+		checksum="d046576e781722ca3c7d2f1bbd20cfc91182aded9d174fbac3295d43a1a11a6a"
+		;;
+esac
+
+# Skip JNA cross-platform binary components during dependency checks
+for _jna_arch in freebsd-x86-64 freebsd-x86 linux-aarch64 linux-armel \
+		linux-arm linux-loongarch64 linux-mips64el linux-ppc64le linux-ppc \
+		linux-riscv64 linux-s390x linux-x86-64 linux-x86 openbsd-x86-64 \
+		openbsd-x86 sunos-sparc sunos-sparcv9 sunos-x86-64 sunos-x86; do
+	skiprdeps+="/usr/lib/eclipse/plugins/com.sun.jna_5.14.0.v20231211-1200/com/sun/jna/${_jna_arch}/libjnidispatch.so "
+done
 
 do_install() {
 	vmkdir usr/lib/eclipse

Re: [PR PATCH] [Updated] eclipse: update to 4.32 and add aarch64 support

[jadynbrammer]

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

There is an updated pull request by jadynbrammer against master on the void-packages repository

https://github.com/jadynbrammer/void-packages update-eclipse-to-4.32
https://github.com/void-linux/void-packages/pull/51993

eclipse: update to 4.32 and add aarch64 support
#### 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.
- I built this PR locally for other architectures: aarch64 (xbuild, untested)

EDIT: thanks @classabbyamp for the assist fixing this one :3

Eclipse is shipping libs for all supported platforms in their tarballs now, and this was causing dependency problems. Deleting the offending libraries from the build dir fixes the issue.

~~Package builds successfully but cannot be installed:~~

~~eclipse-4.32.0_1: broken, unresolvable shlib `ld-linux-riscv64-lp64d.so.1'~~
~~Transaction aborted due to unresolved shlibs.~~

~~Requesting assistance resolving.~~

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eclipse-to-4.32-51993.patch --]
[-- Type: text/x-diff, Size: 2579 bytes --]

From 02ecbfbe27b0548245031922fa0c20851845f963 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 25 Aug 2024 20:03:44 -0500
Subject: [PATCH] eclipse: update to 4.32

* added aarch64 support

* cleaned up / refactored template
---
 srcpkgs/eclipse/template | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 3bd6569c33585f..f55a7c8714d1b1 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,27 +1,39 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.30.0
-revision=2
-#code name of version
-_release=2023-12
-archs="x86_64"
-depends="openjdk11 gtk+3 libwebkit2gtk41 libXtst
+version=4.32.0
+revision=1
+_release="2024-06"
+_jna_version="5.14.0.v20231211-1200"
+archs="x86_64* aarch64*"
+depends="openjdk21 gtk+3 libwebkit2gtk41 libXtst
  hicolor-icon-theme desktop-file-utils"
 short_desc="IDE for Java and other languages"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="EPL-1.0"
 homepage="https://eclipse.org"
 make_dirs="/usr/lib/eclipse/dropins 0770 root users"
-_patch=R
-_edition=java
-_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
-distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
-checksum=09fda3acd8da911b5e18efd6d7ca27784f440ccdd52f28bf94869f81f7e9ad47
 nopie=yes
 nostrip=yes
-allow_unknown_shlibs=yes # glibc sonames issue
 python_version=3
 
+case ${XBPS_TARGET_MACHINE} in
+	x86_64*)
+		distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/${_release}/R/eclipse-java-${_release}-R-linux-gtk-x86_64.tar.gz"
+		checksum="7d77e3d0f226c9dda73d491a1af3aeec11807881e44e870a1fde2833f55df8b5"
+		;;
+	aarch64*)
+		distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/${_release}/R/eclipse-java-${_release}-R-linux-gtk-aarch64.tar.gz"
+		checksum="d046576e781722ca3c7d2f1bbd20cfc91182aded9d174fbac3295d43a1a11a6a"
+		;;
+esac
+
+# Skip JNA cross-platform binary components during dependency checks
+for _jna_arch in freebsd-x86-64 freebsd-x86 linux-aarch64 linux-armel \
+		linux-arm linux-loongarch64 linux-mips64el linux-ppc64le linux-ppc \
+		linux-riscv64 linux-s390x linux-x86-64 linux-x86 openbsd-x86-64 \
+		openbsd-x86 sunos-sparc sunos-sparcv9 sunos-x86-64 sunos-x86; do
+	skiprdeps+="/usr/lib/eclipse/plugins/com.sun.jna_${_jna_version}/com/sun/jna/${_jna_arch}/libjnidispatch.so "
+done
 
 do_install() {
 	vmkdir usr/lib/eclipse

Re: eclipse: update to 4.32 and add aarch64 support

[jadynbrammer]

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

New comment by jadynbrammer on void-packages repository

https://github.com/void-linux/void-packages/pull/51993#issuecomment-2316213856

Comment:
Another refactor done; the build now properly uses `skiprdeps` to fix the shlibs errors without needing to modify upstream's package in any way. This does, unfortunately, add another version number to keep track of each time the package updates, but it's not too hard to pull the requisite numbers out of the distfiles.

Re: [PR REVIEW] eclipse: update to 4.32 and add aarch64 support

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51993#discussion_r1736669734

Comment:
```suggestion
distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/${_release}/R/eclipse-java-${_release}-R-linux-gtk-${XBPS_TARGET_MACHINE%-*}.tar.gz"
case "${XBPS_TARGET_MACHINE}" in
	x86_64*)
		checksum="7d77e3d0f226c9dda73d491a1af3aeec11807881e44e870a1fde2833f55df8b5"
		;;
	aarch64*)
```

Re: [PR REVIEW] eclipse: update to 4.32 and add aarch64 support

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51993#discussion_r1736677611

Comment:
does this really work on musl?

Re: [PR PATCH] [Updated] eclipse: update to 4.32 and add aarch64 support

[jadynbrammer]

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

There is an updated pull request by jadynbrammer against master on the void-packages repository

https://github.com/jadynbrammer/void-packages update-eclipse-to-4.32
https://github.com/void-linux/void-packages/pull/51993

eclipse: update to 4.32 and add aarch64 support
#### 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.
- I built this PR locally for other architectures: aarch64 (xbuild, untested)

EDIT: thanks @classabbyamp for the assist fixing this one :3

Eclipse is shipping libs for all supported platforms in their tarballs now, and this was causing dependency problems. Deleting the offending libraries from the build dir fixes the issue.

~~Package builds successfully but cannot be installed:~~

~~eclipse-4.32.0_1: broken, unresolvable shlib `ld-linux-riscv64-lp64d.so.1'~~
~~Transaction aborted due to unresolved shlibs.~~

~~Requesting assistance resolving.~~

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eclipse-to-4.32-51993.patch --]
[-- Type: text/x-diff, Size: 2511 bytes --]

From d8cbe0c093bf6e012d6244ace2f0441361d503f7 Mon Sep 17 00:00:00 2001
From: Jadyn Brammer <jadyn@brammer.social>
Date: Sun, 25 Aug 2024 20:03:44 -0500
Subject: [PATCH] eclipse: update to 4.32

* added aarch64 support

* cleaned up / refactored template
---
 srcpkgs/eclipse/template | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index 3bd6569c33585f..f9b1c75cd101fe 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,27 +1,38 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.30.0
-revision=2
-#code name of version
-_release=2023-12
-archs="x86_64"
-depends="openjdk11 gtk+3 libwebkit2gtk41 libXtst
+version=4.32.0
+revision=1
+_release="2024-06"
+_jna_version="5.14.0.v20231211-1200"  # Found in distfiles at eclipse/plugins/com.sun.jna_<version#>/
+archs="x86_64 aarch64"
+depends="openjdk21 gtk+3 libwebkit2gtk41 libXtst
  hicolor-icon-theme desktop-file-utils"
 short_desc="IDE for Java and other languages"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="EPL-1.0"
 homepage="https://eclipse.org"
 make_dirs="/usr/lib/eclipse/dropins 0770 root users"
-_patch=R
-_edition=java
-_mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
-distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-R-linux-gtk-x86_64.tar.gz"
-checksum=09fda3acd8da911b5e18efd6d7ca27784f440ccdd52f28bf94869f81f7e9ad47
 nopie=yes
 nostrip=yes
-allow_unknown_shlibs=yes # glibc sonames issue
 python_version=3
 
+distfiles="https://mirror.umd.edu/eclipse/technology/epp/downloads/release/${_release}/R/eclipse-java-${_release}-R-linux-gtk-${XBPS_TARGET_MACHINE%-*}.tar.gz"
+case ${XBPS_TARGET_MACHINE} in
+	x86_64)
+		checksum="7d77e3d0f226c9dda73d491a1af3aeec11807881e44e870a1fde2833f55df8b5"
+		;;
+	aarch64)
+		checksum="d046576e781722ca3c7d2f1bbd20cfc91182aded9d174fbac3295d43a1a11a6a"
+		;;
+esac
+
+# Skip JNA cross-platform binary components during dependency checks
+for _jna_arch in freebsd-x86-64 freebsd-x86 linux-aarch64 linux-armel \
+		linux-arm linux-loongarch64 linux-mips64el linux-ppc64le linux-ppc \
+		linux-riscv64 linux-s390x linux-x86-64 linux-x86 openbsd-x86-64 \
+		openbsd-x86 sunos-sparc sunos-sparcv9 sunos-x86-64 sunos-x86; do
+	skiprdeps+="/usr/lib/eclipse/plugins/com.sun.jna_${_jna_version}/com/sun/jna/${_jna_arch}/libjnidispatch.so "
+done
 
 do_install() {
 	vmkdir usr/lib/eclipse

Re: [PR REVIEW] eclipse: update to 4.32 and add aarch64 support

[jadynbrammer]

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

New review comment by jadynbrammer on void-packages repository

https://github.com/void-linux/void-packages/pull/51993#discussion_r1736986766

Comment:
Not sure, that was an oversight on my part. I've removed the wildcards. I also added your change to the distfiles and added a comment to the _jna_version variable for future maintainers.

Re: [PR PATCH] [Merged]: eclipse: update to 4.32 and add aarch64 support

[classabbyamp]

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

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

eclipse: update to 4.32 and add aarch64 support
https://github.com/void-linux/void-packages/pull/51993

Description:
#### 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.
- I built this PR locally for other architectures: aarch64 (xbuild, untested)

EDIT: thanks @classabbyamp for the assist fixing this one :3

Eclipse is shipping libs for all supported platforms in their tarballs now, and this was causing dependency problems. Deleting the offending libraries from the build dir fixes the issue.

~~Package builds successfully but cannot be installed:~~

~~eclipse-4.32.0_1: broken, unresolvable shlib `ld-linux-riscv64-lp64d.so.1'~~
~~Transaction aborted due to unresolved shlibs.~~

~~Requesting assistance resolving.~~