Merge pull request #19664 from heljkon/mingw-w64-notepad++-8.6.1-1

notepad++: update to 8.6.1
msys2 · Jan 7, 2024 · 5f79317 · 5f79317
2 parents 07050ff + 4a2ee3e
commit 5f79317
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/mingw-w64-notepad++/PKGBUILD b/mingw-w64-notepad++/PKGBUILD
@@ -1,7 +1,7 @@
 _realname=notepad++
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=8.6
+pkgver=8.6.1
 pkgrel=1
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
@@ -21,15 +21,25 @@ source=(
   notepad++
   msys2.readme.txt
   msys2.create.portable.sh
+  Parameters.h.patch
 )
 validpgpkeys=('14BCE4362749B2B51F8C71226C429F1D8D84F46E')
 sha256sums=(
-  'b7ebc95000a7da2d60858abf68db0291d9c7732d80053a623329f21620668724'
+  'a8fd564b08dc49058d4edf92699a24b1e3017f97900a074e8e582109ac7d8b41'
   'c944d0a1897b2fe20ef4a6a21257189686dcce8d95096f4129a7a65dd8cb19c5'
   'f4468e0fa0e476fc77282cb0b3cff845ed8bce91a816a7c04e8d272abf5c5b1c'
   'c6bc527d7330c61c3c99569dce9330ff89078269d5b1e0977d4ab10ed0978ceb'
+  '985e957f5d2d5fdcfce801502c3ea3ab01de4f141776f5b8610e72caad1ca5f1'
 )
 
+prepare() {
+  cd "${srcdir}/notepad-plus-plus-${pkgver}"
+  if [ "$MSYSTEM" == "CLANG64" ]
+  then
+    patch -p1 < ../Parameters.h.patch
+  fi
+}
+
 build() {
   mkdir -p "${srcdir}"/build-${MSYSTEM}
   cd "${srcdir}"/build-${MSYSTEM}

diff --git a/mingw-w64-notepad++/Parameters.h.patch b/mingw-w64-notepad++/Parameters.h.patch
@@ -0,0 +1,12 @@
+diff -Naur a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h
+--- a/PowerEditor/src/Parameters.h	2024-01-05 17:26:31.000000000 +0100
++++ b/PowerEditor/src/Parameters.h	2024-01-06 18:51:24.132449700 +0100
+@@ -587,7 +587,7 @@
+ 	LangMenuItem(LangType lt, int cmdID = 0, const std::wstring& langName = TEXT("")):
+ 	_langType(lt), _cmdID(cmdID), _langName(langName){};
+
+-	bool operator<(const LangMenuItem& rhs)
++	bool operator<(const LangMenuItem& rhs) const
+ 	{
+ 		std::wstring lhs_lang(this->_langName.length(), ' '), rhs_lang(rhs._langName.length(), ' ');
+ 		std::transform(this->_langName.begin(), this->_langName.end(), lhs_lang.begin(), towlower);