From e95d29155173d94d488e12c0a0221fcc9cdeb9ec Mon Sep 17 00:00:00 2001
From: Klemens Nanni <klemens@posteo.de>
Date: Sun, 22 May 2022 05:52:56 +0200
Subject: [PATCH 1/2] Fix pcsc-lite include directory on UNIX

OpenBSD fails to compile `QPCSC_p.h` (in the qdigidoc4 build) since
pcsc-lite's include path does not match.

pkg-config(1), as used by CMake to detect the libpcsclite dependency:
```
$ pkg-config --cflags libpcsclite
-I/sr/local/include/PCSC -pthread
```

Hence, "PCSC/" must be omitted in sources since CMake will use
`-I/sr/local/include/PCSC` already.

Debian's code search[0] shows lots of other software projects including
`<winscard.h>` rather than `<PCSC/winscard.h>`, but it also shows a
trend towards purposefully doing the former/latter on !MAC/MAC.

Inspecting Ubuntu's libpcsclite-dev package[0] containing the
libpcsclite.pc file confirms that at least Ubuntu uses
`-I/usr/include/PCSC`, i.e. with "PCSC/" like OpenBSD.

On OpenBSD, compilation fails since `-I/usr/local` is neither used by
default nor pulled in via any other dependency configured via CMake.

I am unable to test MacOS and Windows builds, but neither platforms are
effected by this change.

I am unable to test Linux builds, but my strong suspicion is that this
works by accident since, contrary to OpenBSD,  `-I/usr` is used in one
way or the other, making "/usr" + "PCSC/winscard.h" work.

0: https://codesearch.debian.net/search?q=PCSC%2Fwinscard.h&literal=1
1: https://packages.ubuntu.com/bionic/amd64/libpcsclite-dev/download

Signed-off-by: Klemens Nanni <klemens@posteo.de>
---
 QPCSC_p.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/QPCSC_p.h b/QPCSC_p.h
index 0397665..1628694 100644
--- a/QPCSC_p.h
+++ b/QPCSC_p.h
@@ -29,10 +29,14 @@
 #define NOMINMAX
 #include <winsock2.h>
 #include <winscard.h>
-#else
+#elif Q_OS_MAC
 #include <PCSC/wintypes.h>
 #include <PCSC/winscard.h>
 #include <arpa/inet.h>
+#else
+#include <wintypes.h>
+#include <winscard.h>
+#include <arpa/inet.h>
 #endif
 
 #ifndef SCARD_CTL_CODE

From ab82e09fe4de017d0772e80c4962a18932de9d38 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Fri, 16 Sep 2022 13:27:33 +0300
Subject: [PATCH 2/2] Apply suggestions from code review

---
 QPCSC_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/QPCSC_p.h b/QPCSC_p.h
index 1628694..52f5b4f 100644
--- a/QPCSC_p.h
+++ b/QPCSC_p.h
@@ -29,7 +29,7 @@
 #define NOMINMAX
 #include <winsock2.h>
 #include <winscard.h>
-#elif Q_OS_MAC
+#elif defined(Q_OS_MAC)
 #include <PCSC/wintypes.h>
 #include <PCSC/winscard.h>
 #include <arpa/inet.h>