5 files changed, 26 insertions, 30 deletions
diff --git a/development/notepad++/README b/development/notepad++/README
index 44f9851f08..fee5432901 100644
--- a/development/notepad++/README
+++ b/development/notepad++/README
@@ -4,9 +4,10 @@ languages.
 Running in the MS Windows environment, its use is governed by
 GNU General Public License.
 
-This Slackbuild is made as an example of how you can run windows
-software i686 or x86_64 in Slackware without installing multilib.
-It uses a dedicated AppImage bundled with Notepad++.
+You can modify the laucher bash script to fit your needs.
+Have a look at the included notepad++ and the SlackBuild.
 
-You can modify the wrapper bash script to fit your needs.
-Have a look at the included wrapper.patch and the SlackBuild.
+Once installed Notepad++ will update itself following from the
+regular updates from the upstream author, even if this SlackBuild
+is updated. To bypass this you should manually remove Notepad++
+from your ".wine" setup.
diff --git a/development/notepad++/notepad++ b/development/notepad++/notepad++
index c07903a329..87fca8a718 100644
--- a/development/notepad++/notepad++
+++ b/development/notepad++/notepad++
@@ -22,23 +22,27 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-VERSION=8.7.9
+VERSION=8.8.5
 ARCH=`uname -m`
 
+PRGNAM=`find "$HOME/.wine/drive_c" -name "notepad++.exe" -print`
+FOLDER=`dirname "${PRGNAM}"`
 if [ "$ARCH" = "x86_64" ]; then
-    if ! [ -f "$HOME/.wine/drive_c/Program Files/Notepad++/notepad++.exe" ]; then
+    if ! [ -f "${PRGNAM}" ]; then
         wine /opt/Notepad++/npp.${VERSION}.Installer.x64.exe /S
-        rm -rf $HOME/.local/share/applications/wine/Programs/Notepad++.desktop
+        rm -rf "$HOME/.local/share/applications/wine/Programs/Notepad++.desktop"
         kbuildsycoca5 > /dev/null 2>&1
+        PRGNAM=`find "$HOME/.wine/drive_c" -name "notepad++.exe" -print`
+        FOLDER=`dirname "${PRGNAM}"`
     fi
-    cd "$HOME/.wine/drive_c/Program Files/Notepad++"
-    wine "./notepad++.exe" "${@:2}"
 elif [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
-    if ! [ -f "$HOME/.wine/drive_c/Program Files/Notepad++/notepad++.exe" ]; then
+    if ! [ -f "${PRGNAM}" ]; then
         wine /opt/Notepad++/npp.${VERSION}.Installer.exe /S
-        rm -rf $HOME/.local/share/applications/wine/Programs/Notepad++.desktop
+        rm -rf "$HOME/.local/share/applications/wine/Programs/Notepad++.desktop"
         kbuildsycoca5 > /dev/null 2>&1
+        PRGNAM=`find "$HOME/.wine/drive_c" -name "notepad++.exe" -print`
+        FOLDER=`dirname "${PRGNAM}"`
     fi
-    cd "$HOME/.wine/drive_c/Program Files/Notepad++"
-    wine "./notepad++.exe" "${@:2}"
 fi
+cd "${FOLDER}"
+wine "${PRGNAM}" "${@:2}"
diff --git a/development/notepad++/notepad++.SlackBuild b/development/notepad++/notepad++.SlackBuild
index ed1d038369..984f196e14 100644
--- a/development/notepad++/notepad++.SlackBuild
+++ b/development/notepad++/notepad++.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=notepad++
-VERSION=${VERSION:-8.7.9}
+VERSION=${VERSION:-8.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -47,16 +47,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-else
-  SLKCFLAGS="-O2"
-fi
-
 set -e
 
 rm -rf $PKG
diff --git a/development/notepad++/notepad++.desktop b/development/notepad++/notepad++.desktop
index a888e1e16e..cf0de23446 100644
--- a/development/notepad++/notepad++.desktop
+++ b/development/notepad++/notepad++.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Notepad++
 GenericName=Notepad++
+Comment=A powerful text editor from the Windows universe
 Exec=/opt/Notepad++/notepad++ "\\$@"
 Icon=notepad++
 Terminal=false
diff --git a/development/notepad++/notepad++.info b/development/notepad++/notepad++.info
index cf58af6bcc..7fa3f1952c 100644
--- a/development/notepad++/notepad++.info
+++ b/development/notepad++/notepad++.info
@@ -1,10 +1,10 @@
 PRGNAM="notepad++"
-VERSION="8.7.9"
+VERSION="8.8.5"
 HOMEPAGE="https://notepad-plus-plus.org/"
-DOWNLOAD="https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.7.9/npp.8.7.9.Installer.exe"
-MD5SUM="79b7d6b064fbeef72b1057a60217e7d2"
-DOWNLOAD_x86_64="https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.7.9/npp.8.7.9.Installer.x64.exe"
-MD5SUM_x86_64="22fe54746f6c4d6e5a7986296ec5e931"
+DOWNLOAD="https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.8.5/npp.8.8.5.Installer.exe"
+MD5SUM="aa36d1c28e143f963b8f7ed98582ee4f"
+DOWNLOAD_x86_64="https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.8.5/npp.8.8.5.Installer.x64.exe"
+MD5SUM_x86_64="0616d259ae0a5f648a94382402e6008b"
 REQUIRES="wine"
 MAINTAINER="Antonio Leal"
 EMAIL="antonioleal@yahoo.com"