[evolution-data-server] M!83 - Adjust .pc file not to expose used crypto library

[Milan Crha <mcrha src gnome org>]

commit c2a5891df792caf78c85c7ee10a525047487ba75
Author: Alexander Traud <pabstraud compuserve com>
Date:   Wed Nov 3 11:10:29 2021 +0100

    M!83 - Adjust .pc file not to expose used crypto library
    
    Public headers of Evolution Data Server (and Camel) are not directly
    including headers of the crypto library NSS. The shared libraries
    already have links so NSS is at best only needed for static linking,
    but that must go into a the field called "private". The same applies
    for SQLite in Camel.
    
    Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/83

 CMakeLists.txt              | 2 +-
 evolution-data-server.pc.in | 2 +-
 src/camel/camel.pc.in       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6358035bf..a02f4bbc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -941,7 +941,7 @@ set(ADDRESSBOOK_LDFLAGS ${ADDRESSBOOK_LDFLAGS} ${PHONENUMBER_LDFLAGS})
 set(CALENDAR_CFLAGS ${CALENDAR_CFLAGS} -DLIBICAL_GLIB_UNSTABLE_API=1)
 
 pkg_check_modules(CAMEL REQUIRED gio-2.0 gmodule-2.0 ${mozilla_nss} ${mozilla_nspr} 
sqlite3>=${sqlite_minimum_version})
-set(CAMEL_CFLAGS ${CAMEL_CFLAGS} ${KRB5_CFLAGS} ${MANUAL_NSS_CFLAGS} ${MANUAL_NSPR_CFLAGS} ${ICU_CFLAGS})
+set(CAMEL_CFLAGS ${CAMEL_CFLAGS} ${KRB5_CFLAGS} ${MANUAL_NSS_INCLUDES} ${MANUAL_NSPR_INCLUDES} ${ICU_CFLAGS})
 set(CAMEL_LDFLAGS ${CAMEL_LDFLAGS} -lz ${KRB5_LDFLAGS} ${MANUAL_NSS_LIBS} ${MANUAL_NSPR_LIBS} ${ICU_LDFLAGS})
 
 if(NOT (MANUAL_NSPR_INCLUDES STREQUAL ""))
diff --git a/evolution-data-server.pc.in b/evolution-data-server.pc.in
index d3d582374..b8236a3ea 100644
--- a/evolution-data-server.pc.in
+++ b/evolution-data-server.pc.in
@@ -17,4 +17,4 @@ execversion=@BASE_VERSION@
 Name: evolution-data-server
 Description: The evolution data server for the calendar and addressbook
 Version: @PROJECT_VERSION@
-Requires: gio-2.0 @mozilla_nss@ @mozilla_nspr@
+Requires: gio-2.0
diff --git a/src/camel/camel.pc.in b/src/camel/camel.pc.in
index 55e1099a9..5967acf64 100644
--- a/src/camel/camel.pc.in
+++ b/src/camel/camel.pc.in
@@ -10,6 +10,6 @@ camel_providerdir=@camel_providerdir@
 Name: camel
 Description: the Evolution MIME message handling library
 Version: @PROJECT_VERSION@
-Requires: gio-2.0 sqlite3 @mozilla_nss@ @mozilla_nspr@
-Libs: -L${libdir} -lcamel-@API_VERSION@ @MANUAL_NSS_LIBS@
-Cflags: -I${privincludedir} @MANUAL_NSS_CFLAGS@
+Requires: gio-2.0
+Libs: -L${libdir} -lcamel-@API_VERSION@
+Cflags: -I${privincludedir}