diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2012-05-27 10:15:56 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2012-05-27 10:15:56 +0000 |
| commit | 2d935ea939cf3294b48d3ec83bab82c28ae556f2 (patch) | |
| tree | 0421d388e89a142fab8a90de8ad83f015d561d15 /macosx-support-lib-patches/gnutls-pkgconfig.patch | |
| parent | 73fbd6894d1a9569fb0ff1dad43636522bfc0806 (diff) | |
- Update cmake, gnutls and pixman to current version
- unpack an xz file with xzcat instead of gzcat
- remove some trailing whitespace
- the update of gnutls required two changes in the gnutls
build stuff: a) gnutls.pc is now generated from gnutls.pc.in
and b) we now need to build with --without-p11-kit
svn path=/trunk/; revision=42861
Diffstat (limited to 'macosx-support-lib-patches/gnutls-pkgconfig.patch')
| -rw-r--r-- | macosx-support-lib-patches/gnutls-pkgconfig.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/macosx-support-lib-patches/gnutls-pkgconfig.patch b/macosx-support-lib-patches/gnutls-pkgconfig.patch index e599afd18a..f0ad93ec1a 100644 --- a/macosx-support-lib-patches/gnutls-pkgconfig.patch +++ b/macosx-support-lib-patches/gnutls-pkgconfig.patch @@ -1,10 +1,8 @@ -*** gnutls.pc.orig 2011-07-15 15:02:32.000000000 -0700 ---- gnutls.pc 2011-07-15 15:02:42.000000000 -0700 -*************** -*** 21,25 **** - Version: 2.12.7 - Libs: -L${libdir} -lgnutls - Libs.private: -L/usr/local/lib -lgcrypt -L/usr/local/lib -lgpg-error -L/usr/local/lib -lintl -liconv -lc -R/usr/local/lib -- Requires.private: zlib - Cflags: -I${includedir} ---- 21,24 ---- +--- gnutls.pc.in.orig 2012-05-27 02:08:48.000000000 +0200 ++++ gnutls.pc.in 2012-05-27 02:11:39.000000000 +0200 +@@ -21,5 +21,4 @@ + Version: @VERSION@ + Libs: -L${libdir} -lgnutls + Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ +-@GNUTLS_REQUIRES_PRIVATE@ + Cflags: -I${includedir} |