From 07ffff9422c5832e977d0f525735c6768a7959fe Mon Sep 17 00:00:00 2001 From: wangmy Date: Wed, 22 Jun 2022 15:48:46 +0800 Subject: 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 Signed-off-by: Wang Mingyu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../libproxy/libproxy/determinism.patch | 26 -------------- meta/recipes-support/libproxy/libproxy_0.4.17.bb | 42 ---------------------- meta/recipes-support/libproxy/libproxy_0.4.18.bb | 41 +++++++++++++++++++++ 3 files changed, 41 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-support/libproxy/libproxy/determinism.patch delete mode 100644 meta/recipes-support/libproxy/libproxy_0.4.17.bb create mode 100644 meta/recipes-support/libproxy/libproxy_0.4.18.bb 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 @@ -[PATCH] cmake/modules/config_sysconfig: Allow configuration of sysconfig module - -Checking whether the host system has /etc/sysconfig is not deterministic -when cross compiling. Allow this to be disabled by adding a configure -option for it. OpenEmbedded can set this and have deterministic build -output independent of the host OS. - -Signed-off-by: Richard Purdie -Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/160] - -Index: libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk -=================================================================== ---- libproxy-0.4.17.orig/libproxy/cmake/modules/config_sysconfig.cmk -+++ libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk -@@ -1,5 +1,8 @@ - if (NOT WIN32 AND NOT APPLE) -- if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig") -- set(SYSCONFIG_FOUND 1) -+ option(WITH_SYSCONFIG "Build sysconfig module for /etc/sysconfig" ON) -+ if(WITH_SYSCONFIG) -+ if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig") -+ set(SYSCONFIG_FOUND 1) -+ endif() - endif() - endif() -\ 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.17.bb deleted file mode 100644 index e121681ae8..0000000000 --- a/meta/recipes-support/libproxy/libproxy_0.4.17.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Library providing automatic proxy configuration management" -DESCRIPTION = "libproxy provides interfaces to get the proxy that will be \ -used to access network resources. It uses various plugins to get proxy \ -configuration via different mechanisms (e.g. environment variables or \ -desktop settings)." -HOMEPAGE = "https://github.com/libproxy/libproxy" -BUGTRACKER = "https://github.com/libproxy/libproxy/issues" -SECTION = "libs" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" - -DEPENDS = "glib-2.0" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://determinism.patch" -SRC_URI[sha256sum] = "bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05" - -UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" -UPSTREAM_CHECK_REGEX = "libproxy-(?P.*)\.tar" - -inherit cmake pkgconfig - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3" -PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" -PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" - -EXTRA_OECMAKE += " \ - -DWITH_KDE=no \ - -DWITH_MOZJS=no \ - -DWITH_NM=no \ - -DWITH_PERL=no \ - -DWITH_PYTHON2=no \ - -DWITH_PYTHON3=no \ - -DWITH_WEBKIT=no \ - -DWITH_SYSCONFIG=no \ - -DLIB_INSTALL_DIR=${libdir} \ - -DLIBEXEC_INSTALL_DIR=${libexecdir} \ -" -SECURITY_PIE_CFLAGS:remove = "-fPIE -pie" - -FILES:${PN} += "${libdir}/${BPN}/${PV}/modules" diff --git a/meta/recipes-support/libproxy/libproxy_0.4.18.bb b/meta/recipes-support/libproxy/libproxy_0.4.18.bb new file mode 100644 index 0000000000..a9f2bf6cae --- /dev/null +++ b/meta/recipes-support/libproxy/libproxy_0.4.18.bb @@ -0,0 +1,41 @@ +SUMMARY = "Library providing automatic proxy configuration management" +DESCRIPTION = "libproxy provides interfaces to get the proxy that will be \ +used to access network resources. It uses various plugins to get proxy \ +configuration via different mechanisms (e.g. environment variables or \ +desktop settings)." +HOMEPAGE = "https://github.com/libproxy/libproxy" +BUGTRACKER = "https://github.com/libproxy/libproxy/issues" +SECTION = "libs" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" + +DEPENDS = "glib-2.0" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "69b5856e9ea42c38ac77e6b8c92ffc86a71d341fef74e77bef85f9cc6c47a4b1" + +UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" +UPSTREAM_CHECK_REGEX = "libproxy-(?P.*)\.tar" + +inherit cmake pkgconfig + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3" +PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" +PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" + +EXTRA_OECMAKE += " \ + -DWITH_KDE=no \ + -DWITH_MOZJS=no \ + -DWITH_NM=no \ + -DWITH_PERL=no \ + -DWITH_PYTHON2=no \ + -DWITH_PYTHON3=no \ + -DWITH_WEBKIT=no \ + -DWITH_SYSCONFIG=no \ + -DLIB_INSTALL_DIR=${libdir} \ + -DLIBEXEC_INSTALL_DIR=${libexecdir} \ +" +SECURITY_PIE_CFLAGS:remove = "-fPIE -pie" + +FILES:${PN} += "${libdir}/${BPN}/${PV}/modules" -- cgit 1.2.3-korg