[vlc-commits] contrib: gnutls: Drop pkgconfig patch for macOS
David Fuhrmann
git at videolan.org
Thu Dec 28 00:12:56 CET 2017
vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Dec 27 18:41:46 2017 +0100| [aa124682833436f9240959467a6679a665c7b2b3] | committer: Jean-Baptiste Kempf
contrib: gnutls: Drop pkgconfig patch for macOS
Checking for that specific symbol is not needed anymore since
the keychain lookup patch is not needed anymore. Additionally,
this patched a pkgconfig file which is not needed by vlc and is not
even installed / compiled.
(cherry picked from commit a1cb2bdf07e125cadab9cf0fd9197fd2d5241715)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=aa124682833436f9240959467a6679a665c7b2b3
---
contrib/src/gnutls/gnutls-pkgconfig-osx.patch | 42 ---------------------------
contrib/src/gnutls/rules.mak | 1 -
2 files changed, 43 deletions(-)
diff --git a/contrib/src/gnutls/gnutls-pkgconfig-osx.patch b/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
deleted file mode 100644
index 7b7cc45770..0000000000
--- a/contrib/src/gnutls/gnutls-pkgconfig-osx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru gnutls/libdane/gnutls-dane.pc.in gnutls-fixed/libdane/gnutls-dane.pc.in
---- gnutls/libdane/gnutls-dane.pc.in 2015-03-23 08:19:23.000000000 +0100
-+++ gnutls-fixed/libdane/gnutls-dane.pc.in 2016-06-04 14:25:53.000000000 +0200
-@@ -18,7 +18,7 @@
- Description: DANE security library for the GNU system
- URL: http://www.gnu.org/software/gnutls/
- Version: @VERSION@
--Libs: -L${libdir} -lgnutls-dane
-+Libs: -L${libdir} -lgnutls-dane @INTL_MACOSX_LIBS@
- Libs.private: @UNBOUND_LIBS@
- Requires.private: gnutls
- Cflags: -I${includedir}
-diff -ru gnutls/m4/intlmacosx.m4 gnutls-fixed/m4/intlmacosx.m4
---- gnutls/m4/intlmacosx.m4 2015-03-23 19:23:36.000000000 +0100
-+++ gnutls-fixed/m4/intlmacosx.m4 2016-06-04 14:25:53.000000000 +0200
-@@ -43,9 +43,25 @@
- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
- fi
-+ AC_CACHE_CHECK([for SecTrustCopyAnchorCertificates],
-+ [SecTrustCopyAnchorCertificates],
-+ [gt_save_LIBS="$LIBS"
-+ LIBS="$LIBS -Wl,-framework -Wl,Security"
-+ AC_TRY_LINK([#include <Security/SecTrust.h>],
-+ [SecTrustCopyAnchorCertificates(NULL)],
-+ [gt_cv_func_SecTrustCopyAnchorCertificates=yes],
-+ [gt_cv_func_SecTrustCopyAnchorCertificates=no])
-+ LIBS="$gt_save_LIBS"])
-+ if test $gt_cv_func_SecTrustCopyAnchorCertificates = yes; then
-+ AC_DEFINE([HAVE_SecTrustCopyAnchorCertificates], [1],
-+ [Define to 1 if you have the MacOS X function SecTrustCopyAnchorCertificates in the Security framework.])
-+ fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-+ INTL_MACOSX_LIBS+="-Wl,-framework -Wl,CoreFoundation "
-+ fi
-+ if test $gt_cv_func_SecTrustCopyAnchorCertificates = yes; then
-+ INTL_MACOSX_LIBS+="-Wl,-framework -Wl,Security "
- fi
- AC_SUBST([INTL_MACOSX_LIBS])
- ])
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 2ebe6b8eb5..d0a7c30a1f 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -33,7 +33,6 @@ ifdef HAVE_ANDROID
endif
$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
ifdef HAVE_MACOSX
- $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-osx.patch
$(APPLY) $(SRC)/gnutls/gnutls-disable-getentropy-osx.patch
$(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch
endif
More information about the vlc-commits
mailing list