Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171015508988200"
MIME-Version: 1.0
Date: Mon, 11 Mar 2024 11:04:49 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/security/qgpgme
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20240311110449.4461DFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171015508988200
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Mon Mar 11 11:04:49 UTC 2024

Modified Files:
	pkgsrc/security/qgpgme: distinfo
Added Files:
	pkgsrc/security/qgpgme/patches: patch-lang_qt_src_threadedjobmixin.cpp

Log Message:
qgpgme: Avoid "single" conflict.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/qgpgme/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/qgpgme/patches/patch-lang_qt_src_threadedjobmixin.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171015508988200
Content-Disposition: inline
Content-Length: 2340
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/security/qgpgme/distinfo
diff -u pkgsrc/security/qgpgme/distinfo:1.6 pkgsrc/security/qgpgme/distinfo:1.7
--- pkgsrc/security/qgpgme/distinfo:1.6	Sun Feb  4 09:23:44 2024
+++ pkgsrc/security/qgpgme/distinfo	Mon Mar 11 11:04:48 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2024/02/04 09:23:44 markd Exp $
+$NetBSD: distinfo,v 1.7 2024/03/11 11:04:48 jperkin Exp $
 
 BLAKE2s (gpgme-1.23.2.tar.bz2) = 0a78553b4c97fcdb976fbd2e09023cf9ed4454369157823716866a5eb41ee451
 SHA512 (gpgme-1.23.2.tar.bz2) = 6cfcd07e81a93de240582de5a46545420cee93d1f27fe20ea2c983780fdd3036b69fdba073cf549d68a20791e189bf4b3cdde14a43f912d2ab9ef3414c83ac75
 Size (gpgme-1.23.2.tar.bz2) = 1836904 bytes
 SHA1 (patch-lang_qt_src_Makefile.in) = abf91c449143ab8bb4003aabf4d888614ab83241
+SHA1 (patch-lang_qt_src_threadedjobmixin.cpp) = 2256e8c58890e4c6001729424db07c8abb2b43f3

Added files:

Index: pkgsrc/security/qgpgme/patches/patch-lang_qt_src_threadedjobmixin.cpp
diff -u /dev/null pkgsrc/security/qgpgme/patches/patch-lang_qt_src_threadedjobmixin.cpp:1.1
--- /dev/null	Mon Mar 11 11:04:49 2024
+++ pkgsrc/security/qgpgme/patches/patch-lang_qt_src_threadedjobmixin.cpp	Mon Mar 11 11:04:49 2024
@@ -0,0 +1,27 @@
+$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)


--_----------=_171015508988200--