13 files changed, 46 insertions, 118 deletions
diff --git a/network/microsoft-edge/README b/network/microsoft-edge/README
index c2eef051fa..4643e8a054 100644
--- a/network/microsoft-edge/README
+++ b/network/microsoft-edge/README
@@ -1,3 +1,7 @@
-Microsoft Edge is a cross-platform web browser created and
-developed by Microsoft. It is based on Chromium and offers a fast,
-reliabe and secure browsing experience.
+Microsoft Edge is a proprietary, cross-platform web browser
+created by Microsoft. It was first released in 2015 as part
+of Windows 10 and Xbox One and later ported to other
+platforms as a fork of Google's Chromium open-source
+project: Android and iOS, macOS, older Windows versions
+(Windows 7, Windows Server 2008 R2 and later), and most
+recently Linux.
diff --git a/network/microsoft-edge/icons/hicolor/128x128/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/128x128/apps/microsoft-edge.png
deleted file mode 100644
index 9f74d4c6cb..0000000000
--- a/network/microsoft-edge/icons/hicolor/128x128/apps/microsoft-edge.png
+++ /dev/null
diff --git a/network/microsoft-edge/icons/hicolor/16x16/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/16x16/apps/microsoft-edge.png
deleted file mode 100644
index 357971306d..0000000000
--- a/network/microsoft-edge/icons/hicolor/16x16/apps/microsoft-edge.png
+++ /dev/null
diff --git a/network/microsoft-edge/icons/hicolor/22x22/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/22x22/apps/microsoft-edge.png
deleted file mode 100644
index 4418d57d80..0000000000
--- a/network/microsoft-edge/icons/hicolor/22x22/apps/microsoft-edge.png
+++ /dev/null
diff --git a/network/microsoft-edge/icons/hicolor/24x24/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/24x24/apps/microsoft-edge.png
deleted file mode 100644
index 89307dcd14..0000000000
--- a/network/microsoft-edge/icons/hicolor/24x24/apps/microsoft-edge.png
+++ /dev/null
diff --git a/network/microsoft-edge/icons/hicolor/256x256/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/256x256/apps/microsoft-edge.png
deleted file mode 100644
index 907a668874..0000000000
--- a/network/microsoft-edge/icons/hicolor/256x256/apps/microsoft-edge.png
+++ /dev/null
diff --git a/network/microsoft-edge/icons/hicolor/32x32/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/32x32/apps/microsoft-edge.png
deleted file mode 100644
index 1a91512d0f..0000000000
--- a/network/microsoft-edge/icons/hicolor/32x32/apps/microsoft-edge.png
+++ /dev/null
diff --git a/network/microsoft-edge/icons/hicolor/48x48/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/48x48/apps/microsoft-edge.png
deleted file mode 100644
index 56d6a8fbf0..0000000000
--- a/network/microsoft-edge/icons/hicolor/48x48/apps/microsoft-edge.png
+++ /dev/null
diff --git a/network/microsoft-edge/icons/hicolor/64x64/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/64x64/apps/microsoft-edge.png
deleted file mode 100644
index f965dbc14c..0000000000
--- a/network/microsoft-edge/icons/hicolor/64x64/apps/microsoft-edge.png
+++ /dev/null
diff --git a/network/microsoft-edge/microsoft-edge.SlackBuild b/network/microsoft-edge/microsoft-edge.SlackBuild
index d6a064c08e..74965061bd 100644
--- a/network/microsoft-edge/microsoft-edge.SlackBuild
+++ b/network/microsoft-edge/microsoft-edge.SlackBuild
@@ -2,6 +2,7 @@
 #
 # Slackware build script for microsoft-edge.
 #
+# Copyright 2023 Andrew Payne <phalange@komputermatrix.com>
 # Copyright 2021  Reza Talebi, Shahin Shahr, Iran.
 # All rights reserved.
 #
@@ -22,14 +23,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Pouria Rezaei <Pouria.rz@outlook.com>
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=microsoft-edge
-SRCNAM=$PRGNAM-stable
-VERSION=${VERSION:-103.0.1264.37}
+BRANCH=stable
+VERSION=${VERSION:-117.0.2045.55}
 BUILD=${BUILD:-1}
+DEBBUILD=${DEBBUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -45,7 +45,7 @@ fi
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  echo "$PRGNAM-$BRANCH_$VERSION_$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
 fi
 
@@ -53,37 +53,33 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
-set -e
-
 if [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
+  BIT="amd64"
 else
-  echo "Package for $(uname -m) architecture is not available."
+  echo "$ARCH is not supported."
   exit 1
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-${VERSION}
 mkdir -p $PRGNAM-${VERSION}
-rpm2cpio $CWD/$SRCNAM-${VERSION}-${BUILD}.${ARCH}.rpm | cpio -D $PRGNAM-${VERSION} -idmv
+ar x $CWD/$PRGNAM-$BRANCH"_"${VERSION}-${DEBBUILD}_${BIT}.deb --output $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 
-mkdir usr/lib64
-mv opt/microsoft/msedge usr/lib64/
-
-# Move man where the man likes
-mv usr/share/man usr/
+rm {control.tar.xz,debian-binary,_gpgorigin}
 
-rm -fR etc opt
+xz -d data.tar.xz
+tar --extract -f data.tar
 
-# Moving icons to the source
-cp -r $CWD/icons usr/share/
-
-patch -p1 < "$CWD/updater.diff"
+# remove what won't work
+rm -rf etc
+rm -rf usr/share/gnome-control-center
+rm -rf usr/share/menu
+rm -rf usr/bin
 
 chown -R root:root .
 find -L . \
@@ -92,10 +88,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-mv * $PKG/
+mkdir -p $PKG/{usr/bin,usr/share,opt}
+  cp -a opt/ $PKG/
+  ln -s /opt/microsoft/msedge/$PRGNAM $PKG/usr/bin/$PRGNAM-$BRANCH
+  cp -a usr/share/man $PKG/usr/
+  cp -a usr/share/{appdata,applications} $PKG/usr/share/
+
+# move icon into place
+mkdir -p $PKG/usr/share/pixmaps
+cp -a opt/microsoft/msedge/product_logo_32.xpm \
+   $PKG/usr/share/pixmaps/microsoft-edge.xpm
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a usr/share/doc/microsoft-edge-stable/* $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/network/microsoft-edge/microsoft-edge.info b/network/microsoft-edge/microsoft-edge.info
index 531570056f..d62cdcdd45 100644
--- a/network/microsoft-edge/microsoft-edge.info
+++ b/network/microsoft-edge/microsoft-edge.info
@@ -1,10 +1,10 @@
 PRGNAM="microsoft-edge"
-VERSION="103.0.1264.37"
+VERSION="117.0.2045.55"
 HOMEPAGE="https://www.microsoft.com/edge"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://packages.microsoft.com/yumrepos/edge/microsoft-edge-stable-103.0.1264.37-1.x86_64.rpm"
-MD5SUM_x86_64="c440f363443ead4ac494e193e7f8a05e"
+DOWNLOAD_x86_64="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_117.0.2045.55-1_amd64.deb"
+MD5SUM_x86_64="79326169c59d70280515bc8fd8448fa9"
 REQUIRES=""
-MAINTAINER="Reza Talebi"
-EMAIL="reza.talebi.73@outlook.com"
+MAINTAINER="Andrew Payne"
+EMAIL="phalange@komputermatrix.com"
diff --git a/network/microsoft-edge/slack-desc b/network/microsoft-edge/slack-desc
index 7db5b3f1fc..0413d92cad 100644
--- a/network/microsoft-edge/slack-desc
+++ b/network/microsoft-edge/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
               |-----handy-ruler------------------------------------------------------|
-microsoft-edge: microsoft-edge (A fast and secure cross-platform web browser)
+microsoft-edge: microsoft-edge (web browser)
 microsoft-edge:
-microsoft-edge: Microsoft Edge is a cross-platform web browser created and
-microsoft-edge: developed by Microsoft. It is based on Chromium and offers a fast,
-microsoft-edge: reliabe and secure browsing experience.
+microsoft-edge: Microsoft Edge is a proprietary, cross-platform web browser created
+microsoft-edge: by Microsoft.
+microsoft-edge:
+microsoft-edge: Home page: https://www.microsoft.com/en-us/edge
 microsoft-edge:
 microsoft-edge:
-microsoft-edge: Home page: https://www.microsoft.com/edge
 microsoft-edge:
 microsoft-edge:
 microsoft-edge:
diff --git a/network/microsoft-edge/updater.diff b/network/microsoft-edge/updater.diff
deleted file mode 100644
index 5022f320a9..0000000000
--- a/network/microsoft-edge/updater.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/usr/bin/microsoft-edge-stable b/usr/bin/microsoft-edge-stable
-deleted file mode 120000
-index 275612f..0000000
---- a/usr/bin/microsoft-edge-stable
-+++ /dev/null
-@@ -1 +0,0 @@
--/opt/microsoft/msedge/microsoft-edge
-\ No newline at end of file
-diff --git a/usr/bin/microsoft-edge-stable b/usr/bin/microsoft-edge-stable
-new file mode 100755
-index 0000000..b8c06ea
---- /dev/null
-+++ b/usr/bin/microsoft-edge-stable
-@@ -0,0 +1,15 @@
-+#!/usr/bin/env sh
-+# Launches MS Edge with flags specified in $XDG_CONFIG_HOME/microsoft-edge-beta-flags.conf
-+
-+# Make script fail if `cat` fails for some reason
-+set -e
-+
-+# Set default value if variable is unset/null
-+XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}"
-+
-+# Attempt to read a config file if it exists
-+if [ -r "${XDG_CONFIG_HOME}/microsoft-edge-stable-flags.conf" ]; then
-+  EDGE_USER_FLAGS="$(cat "$XDG_CONFIG_HOME/microsoft-edge-stable-flags.conf")"
-+fi
-+
-+exec /usr/lib64/msedge/microsoft-edge $EDGE_USER_FLAGS "$@"
-diff --git a/usr/lib64/msedge/default-app-block b/usr/lib64/msedge/default-app-block
-index 7ac7165..7ad030e 100644
---- a/usr/lib64/msedge/default-app-block
-+++ b/usr/lib64/msedge/default-app-block
-@@ -1,10 +1,10 @@
-     <web-browser>
-       <name>Microsoft Edge</name>
--      <executable>/opt/microsoft/msedge/microsoft-edge</executable>
--      <command>/opt/microsoft/msedge/microsoft-edge %s</command>
-+      <executable>/usr/lib64/msedge/microsoft-edge</executable>
-+      <command>/usr/lib64/msedge/microsoft-edge %s</command>
-       <icon-name>microsoft-edge</icon-name>
-       <run-in-terminal>false</run-in-terminal>
-       <netscape-remote>true</netscape-remote>
--      <tab-command>/opt/microsoft/msedge/microsoft-edge %s</tab-command>
--      <win-command>/opt/microsoft/msedge/microsoft-edge --new-window %s</win-command>
-+      <tab-command>/usr/lib64/msedge/microsoft-edge %s</tab-command>
-+      <win-command>/usr/lib64/msedge/microsoft-edge --new-window %s</win-command>
-     </web-browser>
-diff --git a/usr/share/gnome-control-center/default-apps/microsoft-edge.xml b/usr/share/gnome-control-center/default-apps/microsoft-edge.xml
-index 80dec09..fbdf731 100644
---- a/usr/share/gnome-control-center/default-apps/microsoft-edge.xml
-+++ b/usr/share/gnome-control-center/default-apps/microsoft-edge.xml
-@@ -8,13 +8,13 @@
-   <web-browsers>
-     <web-browser>
-       <name>Microsoft Edge</name>
--      <executable>/opt/microsoft/msedge/microsoft-edge</executable>
--      <command>/opt/microsoft/msedge/microsoft-edge %s</command>
-+      <executable>/usr/lib64/msedge/microsoft-edge</executable>
-+      <command>/usr/lib64/msedge/microsoft-edge %s</command>
-       <icon-name>microsoft-edge</icon-name>
-       <run-in-terminal>false</run-in-terminal>
-       <netscape-remote>true</netscape-remote>
--      <tab-command>/opt/microsoft/msedge/microsoft-edge %s</tab-command>
--      <win-command>/opt/microsoft/msedge/microsoft-edge --new-window %s</win-command>
-+      <tab-command>/usr/lib64/msedge/microsoft-edge %s</tab-command>
-+      <win-command>/usr/lib64/msedge/microsoft-edge --new-window %s</win-command>
-     </web-browser>
-   </web-browsers>
- </default-apps>
-diff --git a/usr/share/menu/microsoft-edge.menu b/usr/share/menu/microsoft-edge.menu
-new file mode 100644
-index 0000000..7871356
---- /dev/null
-+++ b/usr/share/menu/microsoft-edge.menu
-@@ -0,0 +1,6 @@
-+?package(microsoft-edge-stable):needs="x11" \
-+  section="Applications/Network/Web Browsing" \
-+  hints="Web browsers" \
-+  title="Microsoft Edge" \
-+  icon="/usr/lib64/msedge/product_logo_32.xpm" \
-+  command="/usr/lib64/msedge/microsoft-edge"