Mon Mar 11 11:04:49 2024 UTC (78d)
qgpgme: Avoid "single" conflict.
(jperkin)
diff -r1.6 -r1.7 pkgsrc/security/qgpgme/distinfo
diff -r0 -r1.1 pkgsrc/security/qgpgme/patches/patch-lang_qt_src_threadedjobmixin.cpp
--- pkgsrc/security/qgpgme/distinfo 2024/02/04 09:23:44 1.6
+++ pkgsrc/security/qgpgme/distinfo 2024/03/11 11:04:48 1.7
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.6 2024/02/04 09:23:44 markd Exp $ | | 1 | $NetBSD: distinfo,v 1.7 2024/03/11 11:04:48 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | BLAKE2s (gpgme-1.23.2.tar.bz2) = 0a78553b4c97fcdb976fbd2e09023cf9ed4454369157823716866a5eb41ee451 | | 3 | BLAKE2s (gpgme-1.23.2.tar.bz2) = 0a78553b4c97fcdb976fbd2e09023cf9ed4454369157823716866a5eb41ee451 |
| 4 | SHA512 (gpgme-1.23.2.tar.bz2) = 6cfcd07e81a93de240582de5a46545420cee93d1f27fe20ea2c983780fdd3036b69fdba073cf549d68a20791e189bf4b3cdde14a43f912d2ab9ef3414c83ac75 | | 4 | SHA512 (gpgme-1.23.2.tar.bz2) = 6cfcd07e81a93de240582de5a46545420cee93d1f27fe20ea2c983780fdd3036b69fdba073cf549d68a20791e189bf4b3cdde14a43f912d2ab9ef3414c83ac75 |
| 5 | Size (gpgme-1.23.2.tar.bz2) = 1836904 bytes | | 5 | Size (gpgme-1.23.2.tar.bz2) = 1836904 bytes |
| 6 | SHA1 (patch-lang_qt_src_Makefile.in) = abf91c449143ab8bb4003aabf4d888614ab83241 | | 6 | SHA1 (patch-lang_qt_src_Makefile.in) = abf91c449143ab8bb4003aabf4d888614ab83241 |
| | | 7 | SHA1 (patch-lang_qt_src_threadedjobmixin.cpp) = 2256e8c58890e4c6001729424db07c8abb2b43f3 |
$NetBSD: patch-lang_qt_src_threadedjobmixin.cpp,v 1.1 2024/03/11 11:04:49 jperkin Exp $
Avoid "single" conflict.
--- lang/qt/src/threadedjobmixin.cpp.orig 2024-03-11 11:01:40.762774232 +0000
+++ lang/qt/src/threadedjobmixin.cpp
@@ -119,7 +119,7 @@ static QList<QByteArray> from_sl(const Q
return result;
}
-static QList<QByteArray> single(const QByteArray &ba)
+static QList<QByteArray> push_single(const QByteArray &ba)
{
QList<QByteArray> result;
result.push_back(ba);
@@ -127,9 +127,9 @@ static QList<QByteArray> single(const QB
}
_detail::PatternConverter::PatternConverter(const QByteArray &ba)
- : m_list(single(ba)), m_patterns(nullptr) {}
+ : m_list(push_single(ba)), m_patterns(nullptr) {}
_detail::PatternConverter::PatternConverter(const QString &s)
- : m_list(single(s.toUtf8())), m_patterns(nullptr) {}
+ : m_list(push_single(s.toUtf8())), m_patterns(nullptr) {}
_detail::PatternConverter::PatternConverter(const QList<QByteArray> &lba)
: m_list(lba), m_patterns(nullptr) {}
_detail::PatternConverter::PatternConverter(const QStringList &sl)