From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail5.wrs.com (mail5.windriver.com [192.103.53.11]) by mail.openembedded.org (Postfix) with ESMTP id A965F7CD6C for ; Tue, 19 Mar 2019 07:57:28 +0000 (UTC) Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id x2J7v9Rt011274 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Tue, 19 Mar 2019 00:57:19 -0700 Received: from ljiang0-OptiPlex-9020.wrs.com (128.224.162.158) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.3.439.0; Tue, 19 Mar 2019 00:56:58 -0700 From: Jiang Lu To: , Date: Tue, 19 Mar 2019 15:54:50 +0800 Message-ID: <20190319075451.18823-2-lu.jiang@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190319075451.18823-1-lu.jiang@windriver.com> References: <20190319075451.18823-1-lu.jiang@windriver.com> MIME-Version: 1.0 Subject: [oe-core 1/2] libsoup:add soup_uri_to_string_with_password X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2019 07:57:28 -0000 Content-Type: text/plain The existed soup_uri_to_string does not have password, add a function to support it. Besides, allow libsoup compiled as a native package and add glib-networking into dependency list. Signed-off-by: Hongxu Jia Signed-off-by: Jiang Lu --- ...add-soup_uri_to_string_with_password.patch | 67 +++++++++++++++++++ .../libsoup/libsoup-2.4_2.64.2.bb | 5 +- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libsoup/libsoup-2.4/0001-add-soup_uri_to_string_with_password.patch diff --git a/meta/recipes-support/libsoup/libsoup-2.4/0001-add-soup_uri_to_string_with_password.patch b/meta/recipes-support/libsoup/libsoup-2.4/0001-add-soup_uri_to_string_with_password.patch new file mode 100644 index 0000000000..c679d6b9e5 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/0001-add-soup_uri_to_string_with_password.patch @@ -0,0 +1,67 @@ +From 82c2f059bc7c491c8c4c728408eb913bfc4a6f0a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 6 Jun 2018 22:37:30 +0800 +Subject: [PATCH] add soup_uri_to_string_with_password + +The existed soup_uri_to_string does not have password, add a +function to support it. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + libsoup/soup-uri.c | 21 +++++++++++++++++++++ + libsoup/soup-uri.h | 5 +++++ + 2 files changed, 26 insertions(+) + +diff --git a/libsoup/soup-uri.c b/libsoup/soup-uri.c +index 3eafd87..8421f1c 100644 +--- a/libsoup/soup-uri.c ++++ b/libsoup/soup-uri.c +@@ -619,6 +619,27 @@ soup_uri_to_string (SoupURI *uri, gboolean just_path_and_query) + } + + /** ++ * soup_uri_to_string_with_password: ++ * @uri: a #SoupURI ++ * @just_path_and_query: if %TRUE, output just the path and query portions ++ * ++ * Returns a string representing @uri. ++ * ++ * If @just_path_and_query is %TRUE, this concatenates the path and query ++ * together. That is, it constructs the string that would be needed in ++ * the Request-Line of an HTTP request for @uri. ++ * ++ * Note that the output will contain a password, if @uri does. ++ * ++ * Return value: a string representing @uri, which the caller must free. ++ **/ ++char * ++soup_uri_to_string_with_password (SoupURI *uri, gboolean just_path_and_query) ++{ ++ return soup_uri_to_string_internal (uri, just_path_and_query, TRUE, FALSE); ++} ++ ++/** + * soup_uri_copy: + * @uri: a #SoupURI + * +diff --git a/libsoup/soup-uri.h b/libsoup/soup-uri.h +index b9360c6..af702d3 100644 +--- a/libsoup/soup-uri.h ++++ b/libsoup/soup-uri.h +@@ -57,6 +57,11 @@ char *soup_uri_to_string (SoupURI *uri, + gboolean just_path_and_query); + + SOUP_AVAILABLE_IN_2_4 ++char *soup_uri_to_string_with_password (SoupURI *uri, ++ gboolean just_path_and_query); ++ ++ ++SOUP_AVAILABLE_IN_2_4 + SoupURI *soup_uri_copy (SoupURI *uri); + + SOUP_AVAILABLE_IN_2_4 +-- +2.7.4 + diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb index ae7c1a6863..c2284c0458 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.64.2.bb @@ -11,6 +11,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ file://0001-Do-not-enforce-no-introspection-when-cross-building.patch \ + file://0001-add-soup_uri_to_string_with_password.patch \ " SRC_URI[md5sum] = "cac755dc6c6acd6e0c70007f547548f5" SRC_URI[sha256sum] = "75ddc194a5b1d6f25033bb9d355f04bfe5c03e0e1c71ed0774104457b3a786c6" @@ -48,4 +49,6 @@ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'Tr DEBIAN_NOAUTONAME_${PN} = "1" # glib-networking is needed for SSL, proxies, etc. -RRECOMMENDS_${PN} = "glib-networking" +DEPENDS += "glib-networking" + +BBCLASSEXTEND = "native" -- 2.17.1