diff options
Diffstat (limited to 'patches/glib-networking-2.56.0/0001-Fix-building-tls-plugin-without-pkcs11.patch')
-rw-r--r-- | patches/glib-networking-2.56.0/0001-Fix-building-tls-plugin-without-pkcs11.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/patches/glib-networking-2.56.0/0001-Fix-building-tls-plugin-without-pkcs11.patch b/patches/glib-networking-2.56.0/0001-Fix-building-tls-plugin-without-pkcs11.patch deleted file mode 100644 index d071caed7..000000000 --- a/patches/glib-networking-2.56.0/0001-Fix-building-tls-plugin-without-pkcs11.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Tom Schoonjans <Tom.Schoonjans@diamond.ac.uk> -Date: Tue, 13 Mar 2018 16:57:03 +0000 -Subject: [PATCH] Fix building tls plugin without pkcs11 - -https://bugzilla.gnome.org/show_bug.cgi?id=794292 ---- - meson.build | 3 +-- - tls/tests/meson.build | 7 ++++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index f923e537d392..0eb39e3de240 100644 ---- a/meson.build -+++ b/meson.build -@@ -92,6 +92,7 @@ pkg = import('pkgconfig') - po_dir = join_paths(meson.source_root(), 'po') - - top_inc = include_directories('.') -+tls_inc = include_directories('tls') - - subdir('po') - -@@ -113,8 +114,6 @@ if enable_libproxy_support or enable_gnome_proxy_support - endif - - if enable_pkcs11_support -- tls_inc = include_directories('tls') -- - subdir('tls/pkcs11') - endif - -diff --git a/tls/tests/meson.build b/tls/tests/meson.build -index 7e1ae13c459c..d3611c115e71 100644 ---- a/tls/tests/meson.build -+++ b/tls/tests/meson.build -@@ -1,4 +1,7 @@ --incs = [top_inc] -+incs = [ -+ top_inc, -+ tls_inc -+] - - deps = [ - gio_dep, -@@ -25,8 +28,6 @@ test_programs = [ - ] - - if enable_pkcs11_support -- incs += tls_inc -- - pkcs11_deps = deps + [ - libgiopkcs11_dep, - pkcs11_dep |