diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-31 17:53:39 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-31 17:54:05 +0100 |
| commit | 616badeade7c836abd0e65f8f2637d5ce7bca6a1 (patch) | |
| tree | 1c12b9fb36beb1cd0c90aee3bc78c0a061cdf461 | |
| parent | ea9c118b7205b8c122439431f8fe9864207fceab (diff) | |
| download | ptxdist-616badeade7c836abd0e65f8f2637d5ce7bca6a1.tar.gz ptxdist-616badeade7c836abd0e65f8f2637d5ce7bca6a1.tar.xz | |
glib-networking: version bump 2.56.0 -> 2.62.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/glib-networking-2.56.0/0001-Fix-building-tls-plugin-without-pkcs11.patch | 53 | ||||
| -rw-r--r-- | patches/glib-networking-2.56.0/series | 4 | ||||
| -rw-r--r-- | rules/glib-networking.make | 4 |
3 files changed, 2 insertions, 59 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 diff --git a/patches/glib-networking-2.56.0/series b/patches/glib-networking-2.56.0/series deleted file mode 100644 index 6ae3cf04e..000000000 --- a/patches/glib-networking-2.56.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Fix-building-tls-plugin-without-pkcs11.patch -# d134d132cfd73c7bdc1d2394c6abfe5c - git-ptx-patches magic diff --git a/rules/glib-networking.make b/rules/glib-networking.make index c1061c34d..069675db8 100644 --- a/rules/glib-networking.make +++ b/rules/glib-networking.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLIB_NETWORKING) += glib-networking # # Paths and names # -GLIB_NETWORKING_VERSION := 2.56.0 -GLIB_NETWORKING_MD5 := f9e720a79014cc7d07eabd02ade0ae4e +GLIB_NETWORKING_VERSION := 2.62.1 +GLIB_NETWORKING_MD5 := 64ca1e1e43e623b916059585bf7e4758 GLIB_NETWORKING := glib-networking-$(GLIB_NETWORKING_VERSION) GLIB_NETWORKING_SUFFIX := tar.xz GLIB_NETWORKING_URL := http://ftp.gnome.org/pub/GNOME/sources/glib-networking/$(basename $(GLIB_NETWORKING_VERSION))/$(GLIB_NETWORKING).$(GLIB_NETWORKING_SUFFIX) |