7 files changed, 35 insertions, 31 deletions
diff --git a/development/eclipse-php/README b/development/eclipse-php/README
index 6e65655c66..71af43ab36 100644
--- a/development/eclipse-php/README
+++ b/development/eclipse-php/README
@@ -1,5 +1,6 @@
-The essential tools for any PHP developer, including a PHP language support,
-Git client, Mylyn and editors for JavaScript, HTML, CSS and XML.
+The essential tools for any PHP developer, including a PHP language
+support, Git client, Mylyn and editors for JavaScript, HTML, CSS and
+XML.
 
 This package includes:
 
@@ -11,11 +12,11 @@ This package includes:
 **********
 UPGRADING:
 **********
-if you find an error during Eclipse initialization, check
-this two files:
+if you find an error during Eclipse initialisation, check
+these two files:
 
 /opt/eclipse-php/configuration/config.ini
 /opt/eclipse-php/eclipse.ini
 
-If you haven't done modifications in those files, overwrite
+If you haven't made modifications to those files, overwrite
 them with config.ini.new and eclipse.ini.new.
diff --git a/development/eclipse-php/doinst.sh b/development/eclipse-php/doinst.sh
index 95382d88a1..e6a482879a 100644
--- a/development/eclipse-php/doinst.sh
+++ b/development/eclipse-php/doinst.sh
@@ -1,14 +1,11 @@
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then
-    # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     rm $NEW
   fi
-  # Otherwise, we leave the .new copy for the admin to consider...
 }
 
 if [ -x /usr/bin/update-desktop-database ]; then
diff --git a/development/eclipse-php/eclipse-php.SlackBuild b/development/eclipse-php/eclipse-php.SlackBuild
index dd4ee82561..5b16d8a7de 100644
--- a/development/eclipse-php/eclipse-php.SlackBuild
+++ b/development/eclipse-php/eclipse-php.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for eclipse-php
 
@@ -21,16 +21,20 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Update by: Igor Alexandrov <igora.vault@gmail.com>
 # Update by: Andre Barboza <bmg.andre@gmail.com>
 # Update by: Andrew Clemons <andrew.clemons@gmail.com>
 # Modified from classical eclipse slackbuild
 # This script is just a binary repackaging.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=eclipse-php
-VERSION=${VERSION:-201809}
-SRCVERSION=${SRCVERSION:-2018-09}
+VERSION=${VERSION:-4.31}
+SRCVERSION=${SRCVERSION:-2024-03-R}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,13 +59,11 @@ mkdir -p $TMP $PKG/opt/$PRGNAM $OUTPUT
 cd $PKG/opt/$PRGNAM
 
 # Untar source code tarball according with ARCH value
-# ARCH can be 'i586' or 'x86_64'
-if [ "$ARCH" = "x86_64" ]; then
+# ARCH can only be 'x86_64' or 'aarch64'
+if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ] ; then
   tar --strip-components=1 -xvf $CWD/$PRGNAM-$SRCVERSION-linux-gtk-$ARCH.tar.gz
-elif case "$ARCH" in i?86) true ;; *) false ;; esac ; then
-  tar --strip-components=1 -xvf $CWD/$PRGNAM-$SRCVERSION-linux-gtk.tar.gz
 else
-  printf "$ARCH is not supported...\n"
+  printf "%s is not supported...\n" "$ARCH"
   exit 1
 fi
 
@@ -82,9 +88,7 @@ chmod 0755 $PKG/usr/bin/$PRGNAM
 
 # Add eclipse to KDE/GNOME/XFCE menu and install an icon for them
 install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-ECLIPSE_ICON=$(find . -name "*eclipse48.png" | grep "org.eclipse.platform")
-install -D -m 0644 "$PKG/opt/$PRGNAM/${ECLIPSE_ICON}" \
-  $PKG/usr/share/pixmaps/$PRGNAM.png
+install -D -m 0644 -t "$PKG/usr/share/pixmaps/" "$CWD/$PRGNAM.png"
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -103,4 +107,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/eclipse-php/eclipse-php.desktop b/development/eclipse-php/eclipse-php.desktop
index 481c6a7ea7..ca52b3ce70 100644
--- a/development/eclipse-php/eclipse-php.desktop
+++ b/development/eclipse-php/eclipse-php.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=env SWT_GTK3=0 eclipse-php
+Exec=eclipse-php
 Name=Eclipse PHP
 GenericName=Eclipse IDE for PHP Developers
 Icon=eclipse-php
diff --git a/development/eclipse-php/eclipse-php.info b/development/eclipse-php/eclipse-php.info
index f5ca71ce5f..2df51b7915 100644
--- a/development/eclipse-php/eclipse-php.info
+++ b/development/eclipse-php/eclipse-php.info
@@ -1,10 +1,12 @@
 PRGNAM="eclipse-php"
-VERSION="201809"
-HOMEPAGE="http://www.eclipse.org"
-DOWNLOAD="http://download.eclipse.org/technology/epp/downloads/release/2018-09/R/eclipse-php-2018-09-linux-gtk.tar.gz"
-MD5SUM="9da2679e2d4bcc147b436bbb097a1e65"
-DOWNLOAD_x86_64="http://download.eclipse.org/technology/epp/downloads/release/2018-09/R/eclipse-php-2018-09-linux-gtk-x86_64.tar.gz"
-MD5SUM_x86_64="2e4bba8c58e564ef6efa50ccaba6ed36"
-REQUIRES="jdk webkitgtk"
+VERSION="4.31"
+HOMEPAGE="https://www.eclipse.org"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download.eclipse.org/technology/epp/downloads/release/2024-03/R/eclipse-php-2024-03-R-linux-gtk-x86_64.tar.gz \
+                 https://download.eclipse.org/technology/epp/downloads/release/2024-03/R/eclipse-php-2024-03-R-linux-gtk-aarch64.tar.gz"
+MD5SUM_x86_64="ab8d96d1abfb4a5c9dea22eb18dd7bd3 \
+               ab6a3881a147d96e134ed210c446e083"
+REQUIRES=""
 MAINTAINER="Giuseppe Di Terlizzi"
 EMAIL="giuseppe.diterlizzi@gmail.com"
diff --git a/development/eclipse-php/eclipse-php.png b/development/eclipse-php/eclipse-php.png
new file mode 100644
index 0000000000..10ddd537d9
--- /dev/null
+++ b/development/eclipse-php/eclipse-php.png
diff --git a/development/eclipse-php/slack-desc b/development/eclipse-php/slack-desc
index bb12471d4c..70df76eb50 100644
--- a/development/eclipse-php/slack-desc
+++ b/development/eclipse-php/slack-desc
@@ -13,7 +13,7 @@ eclipse-php: support, Git client, Mylyn and editors for JavaScript, HTML, CSS an
 eclipse-php: XML.
 eclipse-php:
 eclipse-php:
-eclipse-php: Homepage: http://www.eclipse.org
+eclipse-php: Homepage: https://www.eclipse.org/
 eclipse-php:
 eclipse-php:
 eclipse-php: