File 0001-Fix-pkg-config-information-add-requires-fi... of Package orcania

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-pkg-config-information-add-requires-fields-as-me.patch of Package orcania (Revision 57beaf405020497976442cce31cac459)

Currently displaying revision 57beaf405020497976442cce31cac459 , Show latest

From f73ba97a3b43f6c87b28f098f74b9360b42640d0 Mon Sep 17 00:00:00 2001
From: Nicolas Mora <github@babelouest.org>
Date: Thu, 2 Aug 2018 08:14:42 -0400
Subject: [PATCH 1/2] Fix pkg-config information, add requires fields as
 mentionned in babelouest/ulfius#62

---
 CMakeLists.txt   | 14 +++++++++++++-
 liborcania.pc.in |  6 ++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12ce70a..9c8e0e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,6 +83,14 @@ else ()
     add_definitions(-DU_DISABLE_JANSSON)
 endif ()
 
+if (WITH_JANSSON)
+  set(PKGCONF_REQ "jansson >= 2.1")
+  set(PKGCONF_REQ_PRIVATE ${PKGCONF_REQ})
+else ()
+  set(PKGCONF_REQ "")
+  set(PKGCONF_REQ_PRIVATE "")
+endif ()
+
 # static library
 
 option(BUILD_STATIC "Build static library." OFF)
@@ -215,7 +223,11 @@ set(CPACK_DEBIAN_PACKAGE_NAME "liborcania")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "mail@babelouest.org")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/babelouest/orcania")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4), libcurl3-gnutls (>= 7.16.2), libjansson4 (>= 2.1)")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4)")
+if (WITH_JANSSON)
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libjansson4 (>= 2.1)")
+endif ()
+set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME})
 set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME})
 
 set(CPACK_SOURCE_GENERATOR "TGZ")
diff --git a/liborcania.pc.in b/liborcania.pc.in
index c714977..7749118 100644
--- a/liborcania.pc.in
+++ b/liborcania.pc.in
@@ -1,5 +1,5 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix={prefix}
 libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
 includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
@@ -7,5 +7,7 @@ Name: @PROJECT_NAME@
 Description: @PROJECT_DESCRIPTION@
 URL: @PROJECT_BUGREPORT_PATH@
 Version: @LIBRARY_VERSION@
+Requires: @PKGCONF_REQ@
+Requires.private: @PKGCONF_REQ_PRIVATE@
 Libs: -L${libdir} -lorcania
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir}
-- 
2.16.4

Places

File 0001-Fix-pkg-config-information-add-requires-fields-as-me.patch of Package orcania (Revision 57beaf405020497976442cce31cac459)

Places