summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-06-22 15:48:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-22 22:40:28 +0100
commitcaa3145825e3ebaadde57c53b101e343ec85ec07 (patch)
tree714813063afe1f71bf92537257d3a6e2b0d60dfd
parenta7414d75ed872860e1cd14d9c3fe0b88c2bb7bc2 (diff)
downloadpoky-caa3145825e3ebaadde57c53b101e343ec85ec07.tar.gz
libproxy: upgrade 0.4.17 -> 0.4.18
determinism.patch removed since it's included in 0.4.18. Changelog: ========= build: Allow configuration of sysconfig module config_envvar: Add environment variable for pacrunner debugging build: disable mozjs by default python: Support Python 3.10 and above Add Duktape pacrunner module config_kde: Compute list of config file locations ourselves cpmfog_gnome3: Add gnome-wayland to permitted DESKTOP_SESSION (From OE-Core rev: 07ffff9422c5832e977d0f525735c6768a7959fe) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libproxy/libproxy/determinism.patch26
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.18.bb (renamed from meta/recipes-support/libproxy/libproxy_0.4.17.bb)5
2 files changed, 2 insertions, 29 deletions
diff --git a/meta/recipes-support/libproxy/libproxy/determinism.patch b/meta/recipes-support/libproxy/libproxy/determinism.patch
deleted file mode 100644
index 09770f68f0..0000000000
--- a/meta/recipes-support/libproxy/libproxy/determinism.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1[PATCH] cmake/modules/config_sysconfig: Allow configuration of sysconfig module
2
3Checking whether the host system has /etc/sysconfig is not deterministic
4when cross compiling. Allow this to be disabled by adding a configure
5option for it. OpenEmbedded can set this and have deterministic build
6output independent of the host OS.
7
8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/160]
10
11Index: libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk
12===================================================================
13--- libproxy-0.4.17.orig/libproxy/cmake/modules/config_sysconfig.cmk
14+++ libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk
15@@ -1,5 +1,8 @@
16 if (NOT WIN32 AND NOT APPLE)
17- if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig")
18- set(SYSCONFIG_FOUND 1)
19+ option(WITH_SYSCONFIG "Build sysconfig module for /etc/sysconfig" ON)
20+ if(WITH_SYSCONFIG)
21+ if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig")
22+ set(SYSCONFIG_FOUND 1)
23+ endif()
24 endif()
25 endif()
26\ No newline at end of file
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.17.bb b/meta/recipes-support/libproxy/libproxy_0.4.18.bb
index e121681ae8..a9f2bf6cae 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.17.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.18.bb
@@ -12,9 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
12 12
13DEPENDS = "glib-2.0" 13DEPENDS = "glib-2.0"
14 14
15SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ 15SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz"
16 file://determinism.patch" 16SRC_URI[sha256sum] = "69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1"
17SRC_URI[sha256sum] = "bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05"
18 17
19UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" 18UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases"
20UPSTREAM_CHECK_REGEX = "libproxy-(?P<pver>.*)\.tar" 19UPSTREAM_CHECK_REGEX = "libproxy-(?P<pver>.*)\.tar"