network/microsoft-edge: Update for version 100.0.1185.50.

Signed-off-by: Reza Talebi <reza.talebi.73@outlook.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

11 files changed, 48 insertions, 22 deletions

diff --git a/network/microsoft-edge/icons/hicolor/128x128/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/128x128/apps/microsoft-edge.png
new file mode 100644
index 0000000000..9f74d4c6cb
--- /dev/null
+++ b/network/microsoft-edge/icons/hicolor/128x128/apps/microsoft-edge.png
diff --git a/network/microsoft-edge/icons/hicolor/16x16/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/16x16/apps/microsoft-edge.png
new file mode 100644
index 0000000000..357971306d
--- /dev/null
+++ b/network/microsoft-edge/icons/hicolor/16x16/apps/microsoft-edge.png
diff --git a/network/microsoft-edge/icons/hicolor/22x22/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/22x22/apps/microsoft-edge.png
new file mode 100644
index 0000000000..4418d57d80
--- /dev/null
+++ b/network/microsoft-edge/icons/hicolor/22x22/apps/microsoft-edge.png
diff --git a/network/microsoft-edge/icons/hicolor/24x24/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/24x24/apps/microsoft-edge.png
new file mode 100644
index 0000000000..89307dcd14
--- /dev/null
+++ b/network/microsoft-edge/icons/hicolor/24x24/apps/microsoft-edge.png
diff --git a/network/microsoft-edge/icons/hicolor/256x256/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/256x256/apps/microsoft-edge.png
new file mode 100644
index 0000000000..907a668874
--- /dev/null
+++ b/network/microsoft-edge/icons/hicolor/256x256/apps/microsoft-edge.png
diff --git a/network/microsoft-edge/icons/hicolor/32x32/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/32x32/apps/microsoft-edge.png
new file mode 100644
index 0000000000..1a91512d0f
--- /dev/null
+++ b/network/microsoft-edge/icons/hicolor/32x32/apps/microsoft-edge.png
diff --git a/network/microsoft-edge/icons/hicolor/48x48/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/48x48/apps/microsoft-edge.png
new file mode 100644
index 0000000000..56d6a8fbf0
--- /dev/null
+++ b/network/microsoft-edge/icons/hicolor/48x48/apps/microsoft-edge.png
diff --git a/network/microsoft-edge/icons/hicolor/64x64/apps/microsoft-edge.png b/network/microsoft-edge/icons/hicolor/64x64/apps/microsoft-edge.png
new file mode 100644
index 0000000000..f965dbc14c
--- /dev/null
+++ b/network/microsoft-edge/icons/hicolor/64x64/apps/microsoft-edge.png
diff --git a/network/microsoft-edge/microsoft-edge.SlackBuild b/network/microsoft-edge/microsoft-edge.SlackBuild
index 4e3fa4231b..18a274585c 100644
--- a/network/microsoft-edge/microsoft-edge.SlackBuild
+++ b/network/microsoft-edge/microsoft-edge.SlackBuild
@@ -27,8 +27,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=microsoft-edge
-SRCNAM=$PRGNAM-stable-bin
-VERSION=${VERSION:-100.0.1185.29}
+SRCNAM=$PRGNAM-stable
+VERSION=${VERSION:-100.0.1185.50}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -41,6 +41,9 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# 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"
   exit 0
@@ -64,10 +67,10 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
+rm -rf $PRGNAM-${VERSION}
+mkdir -p $PRGNAM-${VERSION}
+rpm2cpio $CWD/$SRCNAM-${VERSION}-${BUILD}.${ARCH}.rpm | cpio -D $PRGNAM-${VERSION} -idmv
 cd $PRGNAM-$VERSION
-tar -I zstd -xvf $CWD/${SRCNAM}-${VERSION}-${BUILD}-${ARCH}.pkg.tar.zst
 
 mkdir usr/lib64
 mv opt/microsoft/msedge usr/lib64/
@@ -76,6 +79,10 @@ mv opt/microsoft/msedge usr/lib64/
 mv usr/share/man usr/
 
 rm -fR etc opt
+
+# Moving icons to the source
+cp -r $CWD/icons usr/share/
+
 patch -p1 < "$CWD/updater.diff"
 
 chown -R root:root .
diff --git a/network/microsoft-edge/microsoft-edge.info b/network/microsoft-edge/microsoft-edge.info
index 1f15431cbe..f1b2bad143 100644
--- a/network/microsoft-edge/microsoft-edge.info
+++ b/network/microsoft-edge/microsoft-edge.info
@@ -1,10 +1,10 @@
 PRGNAM="microsoft-edge"
-VERSION="100.0.1185.29"
+VERSION="100.0.1185.50"
 HOMEPAGE="https://www.microsoft.com/edge"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://builds.garudalinux.org/repos/chaotic-aur/x86_64/microsoft-edge-stable-bin-100.0.1185.29-1-x86_64.pkg.tar.zst"
-MD5SUM_x86_64="d16100ad7144ec1aceffec9e517091e8"
+DOWNLOAD_x86_64="https://packages.microsoft.com/yumrepos/edge/microsoft-edge-stable-100.0.1185.50-1.x86_64.rpm"
+MD5SUM_x86_64="d3dff3ae3326c571741b36c3b95baf57"
 REQUIRES=""
 MAINTAINER="Reza Talebi"
 EMAIL="reza.talebi.73@outlook.com"
diff --git a/network/microsoft-edge/updater.diff b/network/microsoft-edge/updater.diff
index ca209b07f2..5022f320a9 100644
--- a/network/microsoft-edge/updater.diff
+++ b/network/microsoft-edge/updater.diff
@@ -1,12 +1,31 @@
 diff --git a/usr/bin/microsoft-edge-stable b/usr/bin/microsoft-edge-stable
-index c0ec973..b8c06ea 100755
+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
-@@ -12,4 +12,4 @@ 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 /opt/microsoft/msedge/microsoft-edge $EDGE_USER_FLAGS "$@"
+@@ -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
@@ -50,14 +69,14 @@ index 80dec09..fbdf731 100644
    </web-browsers>
  </default-apps>
 diff --git a/usr/share/menu/microsoft-edge.menu b/usr/share/menu/microsoft-edge.menu
-index c266f74..7871356 100644
---- a/usr/share/menu/microsoft-edge.menu
+new file mode 100644
+index 0000000..7871356
+--- /dev/null
 +++ b/usr/share/menu/microsoft-edge.menu
-@@ -2,5 +2,5 @@
-   section="Applications/Network/Web Browsing" \
-   hints="Web browsers" \
-   title="Microsoft Edge" \
--  icon="/opt/microsoft/msedge/product_logo_32.xpm" \
--  command="/opt/microsoft/msedge/microsoft-edge"
+@@ -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"