From d33626b89804dcd1d41c97e906e0da69752f302c Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 2 Mar 2016 04:38:52 +0000
Subject: [PATCH] Use correct includes for NSPR/NSS headers

The header files provided by NSS3 are inside versioned directories,
`$includedir/nss3` and `$includedir/nspr4`, which are provided by the
nss3 pkg-config file as include directives for the compiler.

We can also use nspr.h as a single entry point, to avoid cherry picking
specific headers.

https://bugzilla.freedesktop.org/show_bug.cgi?id=94360
---
 poppler/SignatureHandler.cc |  2 +-
 poppler/SignatureHandler.h  | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/poppler/SignatureHandler.cc b/poppler/SignatureHandler.cc
index 01496e3..21d9c4d 100644
--- a/poppler/SignatureHandler.cc
+++ b/poppler/SignatureHandler.cc
@@ -15,7 +15,7 @@
 
 #include "SignatureHandler.h"
 #include "goo/gmem.h"
-#include <nss/secmod.h>
+#include <secmod.h>
 
 #include <dirent.h>
 #include <Error.h>
diff --git a/poppler/SignatureHandler.h b/poppler/SignatureHandler.h
index e6ace24..8e2a4da 100644
--- a/poppler/SignatureHandler.h
+++ b/poppler/SignatureHandler.h
@@ -17,21 +17,17 @@
 #include "SignatureInfo.h"
 
 /* NSPR Headers */
-#include <nspr/prprf.h>
-#include <nspr/prtypes.h>
-#include <nspr/plgetopt.h>
-#include <nspr/prio.h>
-#include <nspr/prerror.h>
+#include <nspr.h>
 
 /* NSS headers */
-#include <nss/cms.h>
-#include <nss/nss.h>
-#include <nss/cert.h>
-#include <nss/cryptohi.h>
-#include <nss/secerr.h>
-#include <nss/secoid.h>
-#include <nss/secmodt.h>
-#include <nss/sechash.h>
+#include <cms.h>
+#include <nss.h>
+#include <cert.h>
+#include <cryptohi.h>
+#include <secerr.h>
+#include <secoid.h>
+#include <secmodt.h>
+#include <sechash.h>
 
 class SignatureHandler
 {
-- 
2.5.0