From 6b793521d71b33518b024a8ea3fb4d95d4c6d0c5 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 24 Dec 2023 08:48:26 +0100
Subject: [PATCH] notepad++: minor cleanups

Using versions with different lengths is fine with Arch version
comparisons, so just use the upstream version.
---
 mingw-w64-notepad++/PKGBUILD | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/mingw-w64-notepad++/PKGBUILD b/mingw-w64-notepad++/PKGBUILD
index dcbd9e2626..ea70629527 100644
--- a/mingw-w64-notepad++/PKGBUILD
+++ b/mingw-w64-notepad++/PKGBUILD
@@ -1,15 +1,14 @@
 _realname=notepad++
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-# Previous release versions had up to 4 components (e.g. 8.0 8.1 8.1.9 8.1.9.3)
-pkgver=8.6.0.0
-_release=8.6
+pkgver=8.6
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 pkgdesc="Notepad++ is a free (as in “free speech” and also as in “free beer”) source code editor and Notepad replacement that supports several languages."
-license=("GPL3")
+license=("spdx:GPL-3.0-or-later")
 url="https://notepad-plus-plus.org/"
+msys2_repository_url="https://github.com/notepad-plus-plus/notepad-plus-plus"
 options=('!emptydirs')
 
 makedepends=(
@@ -18,7 +17,7 @@ makedepends=(
 )
 
 source=(
-  https://github.com/notepad-plus-plus/notepad-plus-plus/archive/refs/tags/v${_release}.tar.gz
+  https://github.com/notepad-plus-plus/notepad-plus-plus/archive/refs/tags/v${pkgver}.tar.gz
   notepad++
   msys2.readme.txt
   msys2.create.portable.sh
@@ -34,12 +33,12 @@ sha256sums=(
 build() {
   mkdir -p "${srcdir}"/build-${MSYSTEM}
   cd "${srcdir}"/build-${MSYSTEM}
-  VERBOSE=1 mingw32-make -f "${srcdir}"/notepad-plus-plus-${_release}/PowerEditor/gcc/makefile
+  VERBOSE=1 mingw32-make -f "${srcdir}"/notepad-plus-plus-${pkgver}/PowerEditor/gcc/makefile
 }
 
 package() {
   SRC_MSYS="${srcdir}"
-  SRC_NPP="${srcdir}"/notepad-plus-plus-${_release}
+  SRC_NPP="${srcdir}"/notepad-plus-plus-${pkgver}
   BIN="${srcdir}"/build-${MSYSTEM}/bin.${MSYSTEM_CARCH}
   [ -d "$BIN" ] || BIN=${BIN}-debug