callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update 02-nss_paths.patch

Browse Source 
git-svn-id: file:///svn/pkg-evolution/experimental/evolution@3160 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Jeremy Bicha
2017-06-13 19:58:27 +00:00
parent 393fb64407
commit 6bd4193b27
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,5 +1,8 @@
evolution (3.24.1-1) UNRELEASED; urgency=medium evolution (3.24.1-1) UNRELEASED; urgency=medium
* Team upload.
[ Jeremy Bicha ]
* New upstream release (LP: #1685683) * New upstream release (LP: #1685683)
- Switch from autotools to cmake - Switch from autotools to cmake
* Bump e-d-s dependencies and build-dependencies to 3.24.1 * Bump e-d-s dependencies and build-dependencies to 3.24.1
@ -8,11 +11,12 @@ evolution (3.24.1-1) UNRELEASED; urgency=medium
* Split bogofilter, pstimport, and spamassassin support into separate * Split bogofilter, pstimport, and spamassassin support into separate
packages so that they can be individually installed or uninstalled by packages so that they can be individually installed or uninstalled by
appstream clients appstream clients
* Update 10_revert_libevolution_avoid-version.patch: * Update 10_revert_libevolution_avoid-version.patch
* Disable 02_nss_paths.patch since it's not clear whether this
is still needed
-- Jeremy Bicha <jbicha@ubuntu.com> Tue, 02 May 2017 22:17:49 -0400 [ Mathieu Trudel-Lapierre ]
* Update 02_nss_paths.patch
-- Jeremy Bicha <jbicha@ubuntu.com> Tue, 13 Jun 2017 15:17:49 -0400
evolution (3.22.6-1) unstable; urgency=medium evolution (3.22.6-1) unstable; urgency=medium

28
debian/patches/02_nss_paths.patch vendored
View File

@ -4,16 +4,20 @@ Description: Fix the NSS libdir to add a "/nss"
built-in certificate store of NSS) lives, and it's actually under libdir/nss built-in certificate store of NSS) lives, and it's actually under libdir/nss
rather than directly under libdir. rather than directly under libdir.
Index: b/configure.ac ---
cmake/modules/FindSMIME.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/cmake/modules/FindSMIME.cmake
=================================================================== ===================================================================
--- a/configure.ac --- a/cmake/modules/FindSMIME.cmake
+++ b/configure.ac +++ b/cmake/modules/FindSMIME.cmake
@@ -751,7 +751,7 @@ @@ -55,7 +55,7 @@ if((WITH_NSPR_INCLUDES STREQUAL "") AND
fi set(MANUAL_NSPR_LIBS "")
AC_DEFINE(HAVE_NSS,1,[Define if you have NSS]) set(MANUAL_NSS_INCLUDES "")
AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library]) set(MANUAL_NSS_LIBS "")
- AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`",[Define to the full path of mozilla nss library]) - set(MOZILLA_NSS_LIB_DIR "${_nss_libdir}")
+ AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`/nss",[Define to the full path of mozilla nss library]) + set(MOZILLA_NSS_LIB_DIR "${_nss_libdir}/nss")
MANUAL_NSPR_CFLAGS="" return()
MANUAL_NSPR_LIBS="" endif((NOT (mozilla_nspr STREQUAL "")) AND (NOT (mozilla_nss STREQUAL "")))
MANUAL_NSS_CFLAGS="" endif()

2
debian/patches/series vendored
View File

@ -1,2 +1,2 @@
#02_nss_paths.patch 02_nss_paths.patch
10_revert_libevolution_avoid-version.patch 10_revert_libevolution_avoid-version.patch